From ed23118b2f87bf7567c65cc61054ddd4e824af3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 11 Sep 2015 16:39:23 +0200 Subject: [PATCH 01/10] app-eselect/eselect-timidity: Remove old Package-Manager: portage-2.2.20.1 --- app-eselect/eselect-timidity/Manifest | 2 -- .../eselect-timidity-20061203.ebuild | 19 ------------------- .../eselect-timidity-20091106.ebuild | 19 ------------------- 3 files changed, 40 deletions(-) delete mode 100644 app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild delete mode 100644 app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild diff --git a/app-eselect/eselect-timidity/Manifest b/app-eselect/eselect-timidity/Manifest index 1dc3f91d01cb5..28cb33bdcedda 100644 --- a/app-eselect/eselect-timidity/Manifest +++ b/app-eselect/eselect-timidity/Manifest @@ -1,3 +1 @@ -DIST timidity.eselect-20061203.bz2 1673 SHA256 ad16938191e4f1e70f9775b6b112fbe25a92f948ca4b6ccce342b34a8acf8197 SHA512 6fce1c117120eae0e4538dc7459161a8bbfabb2dbb79a52b643a462a6ef3c05bc0e03bf05cd14785941638a60d7259bdb3afba3b3855dd0b5032855bf57ad9f7 WHIRLPOOL e85fbf127ebe29e997512cd5d584d19da910d3edeb8ebb52b08bf474cfdb706888a2ad10ad6c8d5c13e1bc5122e607eaf4e236bf73e9c2cb7d1b947734409422 -DIST timidity.eselect-20091106.bz2 1663 SHA256 5b72deaa2fb6ef51ec6196d6d50eea4b9ef38ea1779cd59a7914ad73912b1e93 SHA512 35a2682b86b4b0f4dd169be7fdb28e190782375e3071c086c865d7eb8e1e7b1dbe8b967d1169b8fa8bdd576e0b6ee4c00c2f9ff463c8419d5f5226bd802f2275 WHIRLPOOL efc5fd26f8f0111b916d1bd029c4b48340e59c7f90816b5ad32b967a5f8b9c12c24198f5f4238daa2b0c59e57107305519dc64c64750573542372b293eeb821c DIST timidity.eselect-20110513.bz2 1689 SHA256 76b4303e12540361dad180fe9d2eaf9ba0223c7e6cf9331138bc4415ca8eae6e SHA512 9af37f195dde3595cb55e3ca467928fd04b5f755545cf41ce0b3198a21107ad35e28365c1d310a77561f8ffcb1b10909b618fbdc55ca06b77492711b48c17afe WHIRLPOOL 0fef11a89e0e5b395d32dff9f972e2260a696e2c8dcd81f5054807cdabdea78660b3d3a08f7164a8351c32c8abd1b5a8ade7e4fcc2c75313c45e342e1c18223d diff --git a/app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild deleted file mode 100644 index 86c6d0e5abaa5..0000000000000 --- a/app-eselect/eselect-timidity/eselect-timidity-20061203.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manages configuration of TiMidity++ patchsets" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm hppa ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=app-admin/eselect-1.0.2" - -src_install() { - insinto /usr/share/eselect/modules - newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect || die -} diff --git a/app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild b/app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild deleted file mode 100644 index b2b4786907c76..0000000000000 --- a/app-eselect/eselect-timidity/eselect-timidity-20091106.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manages configuration of TiMidity++ patchsets" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="mirror://gentoo/timidity.eselect-${PVR}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=app-admin/eselect-1.2.3" - -src_install() { - insinto /usr/share/eselect/modules - newins "${WORKDIR}/timidity.eselect-${PVR}" timidity.eselect || die -} From a4f8cb5e28d4c7caef704fd5c7c405c70e6e49ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 11 Sep 2015 16:41:50 +0200 Subject: [PATCH 02/10] app-eselect/eselect-wxwidgets: Remove old Package-Manager: portage-2.2.20.1 --- app-eselect/eselect-wxwidgets/Manifest | 2 - .../eselect-wxwidgets-1.4.ebuild | 51 - .../eselect-wxwidgets-20131230.ebuild | 45 - .../eselect-wxwidgets/files/wx-config-1.3 | 38 - app-eselect/eselect-wxwidgets/files/wxrc-1.3 | 38 - .../eselect-wxwidgets/files/wxwin.m4-2.9 | 1063 ----------------- 6 files changed, 1237 deletions(-) delete mode 100644 app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild delete mode 100644 app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild delete mode 100644 app-eselect/eselect-wxwidgets/files/wx-config-1.3 delete mode 100644 app-eselect/eselect-wxwidgets/files/wxrc-1.3 delete mode 100644 app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9 diff --git a/app-eselect/eselect-wxwidgets/Manifest b/app-eselect/eselect-wxwidgets/Manifest index d56ccdbe8a357..20f5fba123796 100644 --- a/app-eselect/eselect-wxwidgets/Manifest +++ b/app-eselect/eselect-wxwidgets/Manifest @@ -1,3 +1 @@ DIST eselect-wxwidgets-20140423.tar.xz 6792 SHA256 e97d5734f4b0e314abdaa1a9ee148cdafed74e1cdc036e01e6ac74599736e1bb SHA512 0d83e0b6979803c8a02c20ac33a42c91fd8d350c095e26704a80c1913309f0e7d741cc466ab22e0a6ce4773deab21ca80756299a12a83d441ded968531003d0e WHIRLPOOL 31108a15a0f3774c7a5959de946c741b758d818f1dbf09f96d633e354c086863684f431a6ac59a63f559f0c65482f790a95c7dc431dc91b7b48ec4e4a2c9c730 -DIST wxwidgets.eselect-1.4.bz2 2375 SHA256 630d2a79e3c1a124a124a81db1213e1c036a5c49a5bf06a328b164d997725386 SHA512 02cd876c040d2ea2589527530e7c570c94a1ca7cae867488ec5cf4509d21386d89cb128364aff80d64d0aa29e334209f02abb6e7baf890ff9bb0c22f606fc8fd WHIRLPOOL a3d0c88cba4634d1b390f912b3bc1750f2ef06cf2d5865c3a5c958538f7fc0c664edb59693340d5c7a1e3cb4e49737400a932c14841a77ec19bff07860d99514 -DIST wxwidgets.eselect-20131230.bz2 2228 SHA256 7c3c87931b6887cf1e6c486b17fb71fefcdf6fcf8089fe09d7f70ae17e3e0722 SHA512 0406cfbc5c39d2e65b22d0e8d70ea08ea9e348342d7bc1725dd8655fdedd883fd29e14263ad95737523d6285e081ef4558c4dec00c4a9ea9b9ef01ce537978e5 WHIRLPOOL 60a0ea44ddf1faab42a63f3717aa9d1234713eb40897025b7de8ad7f64f3a77c3399f084eb3a67e236b42963d7d793f0026ea17c10ffd3328fa109218a3deebe diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild deleted file mode 100644 index 36a2cf3dd3dd5..0000000000000 --- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-1.4.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -WXWRAP_VER=1.3 -WXESELECT_VER=1.4 - -DESCRIPTION="Eselect module and wrappers for wxWidgets" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="mirror://gentoo/wxwidgets.eselect-${WXESELECT_VER}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="!<=x11-libs/wxGTK-2.6.4.0-r2" -RDEPEND=">=app-admin/eselect-1.2.3" - -S=${WORKDIR} - -src_install() { - insinto /usr/share/eselect/modules - newins "${S}"/wxwidgets.eselect-${WXESELECT_VER} wxwidgets.eselect \ - || die "Failed installing module" - - insinto /usr/share/aclocal - newins "${FILESDIR}"/wxwin.m4-2.9 wxwin.m4 || die "Failed installing m4" - - newbin "${FILESDIR}"/wx-config-${WXWRAP_VER} wx-config \ - || die "Failed installing wx-config" - newbin "${FILESDIR}"/wxrc-${WXWRAP_VER} wxrc \ - || die "Failed installing wxrc" - - keepdir /var/lib/wxwidgets - keepdir /usr/share/bakefile/presets -} - -pkg_postinst() { - if [[ ! -e ${ROOT}/var/lib/wxwidgets/current ]]; then - echo 'WXCONFIG="none"' > "${ROOT}"/var/lib/wxwidgets/current - fi - - echo - elog "By default the system wxWidgets profile is set to \"none\"." - elog - elog "It is unnecessary to change this unless you are doing development work" - elog "with wxGTK outside of portage. The package manager ignores the profile" - elog "setting altogether." - echo -} diff --git a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild b/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild deleted file mode 100644 index ee785f422268b..0000000000000 --- a/app-eselect/eselect-wxwidgets/eselect-wxwidgets-20131230.ebuild +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -WXWRAP_VER=1.3 - -DESCRIPTION="Eselect module and wrappers for wxWidgets" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="https://dev.gentoo.org/~dirtyepic/dist/wxwidgets.eselect-${PV}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND="app-admin/eselect" -S="${WORKDIR}" - -src_install() { - insinto /usr/share/eselect/modules - newins "${S}"/wxwidgets.eselect-${PV} wxwidgets.eselect - - insinto /usr/share/aclocal - newins "${FILESDIR}"/wxwin.m4-3.0 wxwin.m4 - - newbin "${FILESDIR}"/wx-config-${WXWRAP_VER} wx-config - newbin "${FILESDIR}"/wxrc-${WXWRAP_VER} wxrc - - keepdir /var/lib/wxwidgets - keepdir /usr/share/bakefile/presets -} - -pkg_postinst() { - if [[ ! -e ${ROOT}/var/lib/wxwidgets/current ]]; then - echo 'WXCONFIG="none"' > "${ROOT}"/var/lib/wxwidgets/current - fi - - echo - elog "This eselect module only controls the version of wxGTK used when" - elog "building packages outside of portage. If you are not doing development" - elog "with wxWidgets or bakefile you will never need to use it." - echo -} diff --git a/app-eselect/eselect-wxwidgets/files/wx-config-1.3 b/app-eselect/eselect-wxwidgets/files/wx-config-1.3 deleted file mode 100644 index 30481921fb0fc..0000000000000 --- a/app-eselect/eselect-wxwidgets/files/wx-config-1.3 +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# $Id$ -# -# /usr/bin/wx-config -# -# a lame wx-config wrapper (bugs to wxwidgets@gentoo.org) - -_wxerror() { - cat >&2 <<- EOF - An error occurred while calling wx-config: - - ${1} - - Please use \`eselect wxwidgets\` to select an available profile and try again. - EOF - exit 1 -} - -if [ -n "${WX_ECLASS_CONFIG}" ]; then - ${WX_ECLASS_CONFIG} "$@" - exit 0 -else - if [ -e /var/lib/wxwidgets/current ]; then - . /var/lib/wxwidgets/current - else - _wxerror "Cannot find the wxWidgets profile configuration ( /var/lib/wxwidgets/current )" - fi - - [ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected" - - if [ -x /usr/lib/wx/config/${WXCONFIG} ]; then - /usr/lib/wx/config/${WXCONFIG} "$@" - else - _wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )" - fi - exit 0 -fi - diff --git a/app-eselect/eselect-wxwidgets/files/wxrc-1.3 b/app-eselect/eselect-wxwidgets/files/wxrc-1.3 deleted file mode 100644 index 543013bbd82a9..0000000000000 --- a/app-eselect/eselect-wxwidgets/files/wxrc-1.3 +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# $Id$ -# -# /usr/bin/wxrc -# -# a lame wxrc wrapper (bugs to wxwidgets@gentoo.org) - -_wxerror() { - cat >&2 <<- EOF - An error occurred while calling wxrc: - - ${1} - - Please use \`eselect wxwidgets\` to select an available profile and try again. - EOF - exit 1 -} - -if [ -n "${WX_ECLASS_CONFIG}" ]; then - $(${WX_ECLASS_CONFIG} --utility=wxrc) "$@" - exit 0 -else - if [ -e /var/lib/wxwidgets/current ]; then - . /var/lib/wxwidgets/current - else - _wxerror "Cannot find the wxWidgets profile configuration ( /var/lib/wxwidgets/current )" - fi - - [ -z "${WXCONFIG}" -o "${WXCONFIG}" = none ] && _wxerror "No profile currently selected" - - if [ -x /usr/lib/wx/config/${WXCONFIG} ]; then - $(/usr/lib/wx/config/${WXCONFIG} --utility=wxrc) "$@" - else - _wxerror "Cannot find wxWidgets profile ( ${WXCONFIG} )" - fi - exit 0 -fi - diff --git a/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9 b/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9 deleted file mode 100644 index 4c01ae41bc4a3..0000000000000 --- a/app-eselect/eselect-wxwidgets/files/wxwin.m4-2.9 +++ /dev/null @@ -1,1063 +0,0 @@ -dnl --------------------------------------------------------------------------- -dnl Author: wxWidgets development team, -dnl Francesco Montorsi, -dnl Bob McCown (Mac-testing) -dnl Creation date: 24/11/2001 -dnl RCS-ID: $Id$ -dnl --------------------------------------------------------------------------- - -dnl =========================================================================== -dnl Table of Contents of this macro file: -dnl ------------------------------------- -dnl -dnl SECTION A: wxWidgets main macros -dnl - WX_CONFIG_OPTIONS -dnl - WX_CONFIG_CHECK -dnl - WXRC_CHECK -dnl - WX_STANDARD_OPTIONS -dnl - WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS -dnl - WX_DETECT_STANDARD_OPTION_VALUES -dnl -dnl SECTION B: wxWidgets-related utilities -dnl - WX_LIKE_LIBNAME -dnl - WX_ARG_ENABLE_YESNOAUTO -dnl - WX_ARG_WITH_YESNOAUTO -dnl -dnl SECTION C: messages to the user -dnl - WX_STANDARD_OPTIONS_SUMMARY_MSG -dnl - WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN -dnl - WX_STANDARD_OPTIONS_SUMMARY_MSG_END -dnl - WX_BOOLOPT_SUMMARY -dnl -dnl The special "WX_DEBUG_CONFIGURE" variable can be set to 1 to enable extra -dnl debug output on stdout from these macros. -dnl =========================================================================== - - -dnl --------------------------------------------------------------------------- -dnl Macros for wxWidgets detection. Typically used in configure.in as: -dnl -dnl AC_ARG_ENABLE(...) -dnl AC_ARG_WITH(...) -dnl ... -dnl WX_CONFIG_OPTIONS -dnl ... -dnl ... -dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1]) -dnl if test "$wxWin" != 1; then -dnl AC_MSG_ERROR([ -dnl wxWidgets must be installed on your system -dnl but wx-config script couldn't be found. -dnl -dnl Please check that wx-config is in path, the directory -dnl where wxWidgets libraries are installed (returned by -dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or -dnl equivalent variable and wxWidgets version is 2.3.4 or above. -dnl ]) -dnl fi -dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" -dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" -dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" -dnl -dnl LIBS="$LIBS $WX_LIBS" -dnl -dnl If you want to support standard --enable-debug/unicode/shared options, you -dnl may do the following: -dnl -dnl ... -dnl AC_CANONICAL_SYSTEM -dnl -dnl # define configure options -dnl WX_CONFIG_OPTIONS -dnl WX_STANDARD_OPTIONS([debug,unicode,shared,toolkit,wxshared]) -dnl -dnl # basic configure checks -dnl ... -dnl -dnl # we want to always have DEBUG==WX_DEBUG and UNICODE==WX_UNICODE -dnl WX_DEBUG=$DEBUG -dnl WX_UNICODE=$UNICODE -dnl -dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS -dnl WX_CONFIG_CHECK([2.8.0], [wxWin=1],,[html,core,net,base],[$WXCONFIG_FLAGS]) -dnl WX_DETECT_STANDARD_OPTION_VALUES -dnl -dnl # write the output files -dnl AC_CONFIG_FILES([Makefile ...]) -dnl AC_OUTPUT -dnl -dnl # optional: just to show a message to the user -dnl WX_STANDARD_OPTIONS_SUMMARY_MSG -dnl -dnl --------------------------------------------------------------------------- - - -dnl --------------------------------------------------------------------------- -dnl WX_CONFIG_OPTIONS -dnl -dnl adds support for --wx-prefix, --wx-exec-prefix, --with-wxdir and -dnl --wx-config command line options -dnl --------------------------------------------------------------------------- - -AC_DEFUN([WX_CONFIG_OPTIONS], -[ - AC_ARG_WITH(wxdir, - [ --with-wxdir=PATH Use uninstalled version of wxWidgets in PATH], - [ wx_config_name="$withval/wx-config" - wx_config_args="--inplace"]) - AC_ARG_WITH(wx-config, - [ --with-wx-config=CONFIG wx-config script to use (optional)], - wx_config_name="$withval" ) - AC_ARG_WITH(wx-prefix, - [ --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)], - wx_config_prefix="$withval", wx_config_prefix="") - AC_ARG_WITH(wx-exec-prefix, - [ --with-wx-exec-prefix=PREFIX - Exec prefix where wxWidgets is installed (optional)], - wx_config_exec_prefix="$withval", wx_config_exec_prefix="") -]) - -dnl Helper macro for checking if wx version is at least $1.$2.$3, set's -dnl wx_ver_ok=yes if it is: -AC_DEFUN([_WX_PRIVATE_CHECK_VERSION], -[ - wx_ver_ok="" - if test "x$WX_VERSION" != x ; then - if test $wx_config_major_version -gt $1; then - wx_ver_ok=yes - else - if test $wx_config_major_version -eq $1; then - if test $wx_config_minor_version -gt $2; then - wx_ver_ok=yes - else - if test $wx_config_minor_version -eq $2; then - if test $wx_config_micro_version -ge $3; then - wx_ver_ok=yes - fi - fi - fi - fi - fi - fi -]) - -dnl --------------------------------------------------------------------------- -dnl WX_CONFIG_CHECK(VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND -dnl [, WX-LIBS [, ADDITIONAL-WX-CONFIG-FLAGS]]]]) -dnl -dnl Test for wxWidgets, and define WX_C*FLAGS, WX_LIBS and WX_LIBS_STATIC -dnl (the latter is for static linking against wxWidgets). Set WX_CONFIG_NAME -dnl environment variable to override the default name of the wx-config script -dnl to use. Set WX_CONFIG_PATH to specify the full path to wx-config - in this -dnl case the macro won't even waste time on tests for its existence. -dnl -dnl Optional WX-LIBS argument contains comma- or space-separated list of -dnl wxWidgets libraries to link against. If it is not specified then WX_LIBS -dnl and WX_LIBS_STATIC will contain flags to link with all of the core -dnl wxWidgets libraries. -dnl -dnl Optional ADDITIONAL-WX-CONFIG-FLAGS argument is appended to wx-config -dnl invocation command in present. It can be used to fine-tune lookup of -dnl best wxWidgets build available. -dnl -dnl Example use: -dnl WX_CONFIG_CHECK([2.6.0], [wxWin=1], [wxWin=0], [html,core,net] -dnl [--unicode --debug]) -dnl --------------------------------------------------------------------------- - -dnl -dnl Get the cflags and libraries from the wx-config script -dnl -AC_DEFUN([WX_CONFIG_CHECK], -[ - dnl do we have wx-config name: it can be wx-config or wxd-config or ... - if test x${WX_CONFIG_NAME+set} != xset ; then - WX_CONFIG_NAME=wx-config - fi - - if test "x$wx_config_name" != x ; then - WX_CONFIG_NAME="$wx_config_name" - fi - - dnl deal with optional prefixes - if test x$wx_config_exec_prefix != x ; then - wx_config_args="$wx_config_args --exec-prefix=$wx_config_exec_prefix" - WX_LOOKUP_PATH="$wx_config_exec_prefix/bin" - fi - if test x$wx_config_prefix != x ; then - wx_config_args="$wx_config_args --prefix=$wx_config_prefix" - WX_LOOKUP_PATH="$WX_LOOKUP_PATH:$wx_config_prefix/bin" - fi - if test "$cross_compiling" = "yes"; then - wx_config_args="$wx_config_args --host=$host_alias" - fi - - dnl don't search the PATH if WX_CONFIG_NAME is absolute filename - if test -x "$WX_CONFIG_NAME" ; then - AC_MSG_CHECKING(for wx-config) - WX_CONFIG_PATH="$WX_CONFIG_NAME" - AC_MSG_RESULT($WX_CONFIG_PATH) - else - AC_PATH_PROG(WX_CONFIG_PATH, $WX_CONFIG_NAME, no, "$WX_LOOKUP_PATH:$PATH") - fi - - if test "$WX_CONFIG_PATH" != "no" ; then - WX_VERSION="" - - min_wx_version=ifelse([$1], ,2.2.1,$1) - if test -z "$5" ; then - AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version]) - else - AC_MSG_CHECKING([for wxWidgets version >= $min_wx_version ($5)]) - fi - - dnl don't add the libraries ($4) to this variable as this would result in - dnl an error when it's used with --version below - WX_CONFIG_WITH_ARGS="$WX_CONFIG_PATH $wx_config_args $5" - - WX_VERSION=`$WX_CONFIG_WITH_ARGS --version 2>/dev/null` - wx_config_major_version=`echo $WX_VERSION | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - wx_config_minor_version=`echo $WX_VERSION | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - wx_config_micro_version=`echo $WX_VERSION | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - wx_requested_major_version=`echo $min_wx_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - wx_requested_minor_version=`echo $min_wx_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - wx_requested_micro_version=`echo $min_wx_version | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - - _WX_PRIVATE_CHECK_VERSION([$wx_requested_major_version], - [$wx_requested_minor_version], - [$wx_requested_micro_version]) - - if test -n "$wx_ver_ok"; then - AC_MSG_RESULT(yes (version $WX_VERSION)) - WX_LIBS=`$WX_CONFIG_WITH_ARGS --libs $4` - - dnl is this even still appropriate? --static is a real option now - dnl and WX_CONFIG_WITH_ARGS is likely to contain it if that is - dnl what the user actually wants, making this redundant at best. - dnl For now keep it in case anyone actually used it in the past. - AC_MSG_CHECKING([for wxWidgets static library]) - WX_LIBS_STATIC=`$WX_CONFIG_WITH_ARGS --static --libs $4 2>/dev/null` - if test "x$WX_LIBS_STATIC" = "x"; then - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(yes) - fi - - dnl starting with version 2.2.6 wx-config has --cppflags argument - wx_has_cppflags="" - if test $wx_config_major_version -gt 2; then - wx_has_cppflags=yes - else - if test $wx_config_major_version -eq 2; then - if test $wx_config_minor_version -gt 2; then - wx_has_cppflags=yes - else - if test $wx_config_minor_version -eq 2; then - if test $wx_config_micro_version -ge 6; then - wx_has_cppflags=yes - fi - fi - fi - fi - fi - - dnl starting with version 2.7.0 wx-config has --rescomp option - wx_has_rescomp="" - if test $wx_config_major_version -gt 2; then - wx_has_rescomp=yes - else - if test $wx_config_major_version -eq 2; then - if test $wx_config_minor_version -ge 7; then - wx_has_rescomp=yes - fi - fi - fi - if test "x$wx_has_rescomp" = x ; then - dnl cannot give any useful info for resource compiler - WX_RESCOMP= - else - WX_RESCOMP=`$WX_CONFIG_WITH_ARGS --rescomp` - fi - - if test "x$wx_has_cppflags" = x ; then - dnl no choice but to define all flags like CFLAGS - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4` - WX_CPPFLAGS=$WX_CFLAGS - WX_CXXFLAGS=$WX_CFLAGS - - WX_CFLAGS_ONLY=$WX_CFLAGS - WX_CXXFLAGS_ONLY=$WX_CFLAGS - else - dnl we have CPPFLAGS included in CFLAGS included in CXXFLAGS - WX_CPPFLAGS=`$WX_CONFIG_WITH_ARGS --cppflags $4` - WX_CXXFLAGS=`$WX_CONFIG_WITH_ARGS --cxxflags $4` - WX_CFLAGS=`$WX_CONFIG_WITH_ARGS --cflags $4` - - WX_CFLAGS_ONLY=`echo $WX_CFLAGS | sed "s@^$WX_CPPFLAGS *@@"` - WX_CXXFLAGS_ONLY=`echo $WX_CXXFLAGS | sed "s@^$WX_CFLAGS *@@"` - fi - - ifelse([$2], , :, [$2]) - - else - - if test "x$WX_VERSION" = x; then - dnl no wx-config at all - AC_MSG_RESULT(no) - else - AC_MSG_RESULT(no (version $WX_VERSION is not new enough)) - fi - - WX_CFLAGS="" - WX_CPPFLAGS="" - WX_CXXFLAGS="" - WX_LIBS="" - WX_LIBS_STATIC="" - WX_RESCOMP="" - - if test ! -z "$5"; then - - wx_error_message=" - The configuration you asked for $PACKAGE_NAME requires a wxWidgets - build with the following settings: - $5 - but such build is not available. - - To see the wxWidgets builds available on this system, please use - 'wx-config --list' command. To use the default build, returned by - 'wx-config --selected-config', use the options with their 'auto' - default values." - - fi - - wx_error_message=" - The requested wxWidgets build couldn't be found. - $wx_error_message - - If you still get this error, then check that 'wx-config' is - in path, the directory where wxWidgets libraries are installed - (returned by 'wx-config --libs' command) is in LD_LIBRARY_PATH - or equivalent variable and wxWidgets version is $1 or above." - - ifelse([$3], , AC_MSG_ERROR([$wx_error_message]), [$3]) - - fi - else - - WX_CFLAGS="" - WX_CPPFLAGS="" - WX_CXXFLAGS="" - WX_LIBS="" - WX_LIBS_STATIC="" - WX_RESCOMP="" - - ifelse([$3], , :, [$3]) - - fi - - AC_SUBST(WX_CPPFLAGS) - AC_SUBST(WX_CFLAGS) - AC_SUBST(WX_CXXFLAGS) - AC_SUBST(WX_CFLAGS_ONLY) - AC_SUBST(WX_CXXFLAGS_ONLY) - AC_SUBST(WX_LIBS) - AC_SUBST(WX_LIBS_STATIC) - AC_SUBST(WX_VERSION) - AC_SUBST(WX_RESCOMP) - - dnl need to export also WX_VERSION_MINOR and WX_VERSION_MAJOR symbols - dnl to support wxpresets bakefiles (we export also WX_VERSION_MICRO for completeness): - WX_VERSION_MAJOR="$wx_config_major_version" - WX_VERSION_MINOR="$wx_config_minor_version" - WX_VERSION_MICRO="$wx_config_micro_version" - AC_SUBST(WX_VERSION_MAJOR) - AC_SUBST(WX_VERSION_MINOR) - AC_SUBST(WX_VERSION_MICRO) -]) - -dnl --------------------------------------------------------------------------- -dnl Get information on the wxrc program for making C++, Python and xrs -dnl resource files. -dnl -dnl AC_ARG_ENABLE(...) -dnl AC_ARG_WITH(...) -dnl ... -dnl WX_CONFIG_OPTIONS -dnl ... -dnl WX_CONFIG_CHECK(2.6.0, wxWin=1) -dnl if test "$wxWin" != 1; then -dnl AC_MSG_ERROR([ -dnl wxWidgets must be installed on your system -dnl but wx-config script couldn't be found. -dnl -dnl Please check that wx-config is in path, the directory -dnl where wxWidgets libraries are installed (returned by -dnl 'wx-config --libs' command) is in LD_LIBRARY_PATH or -dnl equivalent variable and wxWidgets version is 2.6.0 or above. -dnl ]) -dnl fi -dnl -dnl WXRC_CHECK([HAVE_WXRC=1], [HAVE_WXRC=0]) -dnl if test "x$HAVE_WXRC" != x1; then -dnl AC_MSG_ERROR([ -dnl The wxrc program was not installed or not found. -dnl -dnl Please check the wxWidgets installation. -dnl ]) -dnl fi -dnl -dnl CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS" -dnl CXXFLAGS="$CXXFLAGS $WX_CXXFLAGS_ONLY" -dnl CFLAGS="$CFLAGS $WX_CFLAGS_ONLY" -dnl -dnl LDFLAGS="$LDFLAGS $WX_LIBS" -dnl --------------------------------------------------------------------------- - -dnl --------------------------------------------------------------------------- -dnl WXRC_CHECK([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl -dnl Test for wxWidgets' wxrc program for creating either C++, Python or XRS -dnl resources. The variable WXRC will be set and substituted in the configure -dnl script and Makefiles. -dnl -dnl Example use: -dnl WXRC_CHECK([wxrc=1], [wxrc=0]) -dnl --------------------------------------------------------------------------- - -dnl -dnl wxrc program from the wx-config script -dnl -AC_DEFUN([WXRC_CHECK], -[ - AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler]) - - if test "x$WX_CONFIG_NAME" = x; then - AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.]) - else - - AC_MSG_CHECKING([for wxrc]) - - if test "x$WXRC" = x ; then - dnl wx-config --utility is a new addition to wxWidgets: - _WX_PRIVATE_CHECK_VERSION(2,5,3) - if test -n "$wx_ver_ok"; then - WXRC=`$WX_CONFIG_WITH_ARGS --utility=wxrc` - fi - fi - - if test "x$WXRC" = x ; then - AC_MSG_RESULT([not found]) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT([$WXRC]) - ifelse([$1], , :, [$1]) - fi - - AC_SUBST(WXRC) - fi -]) - -dnl --------------------------------------------------------------------------- -dnl WX_LIKE_LIBNAME([output-var] [prefix], [name]) -dnl -dnl Sets the "output-var" variable to the name of a library named with same -dnl wxWidgets rule. -dnl E.g. for output-var=='lib', name=='test', prefix='mine', sets -dnl the $lib variable to: -dnl 'mine_gtk2ud_test-2.8' -dnl if WX_PORT=gtk2, WX_UNICODE=1, WX_DEBUG=1 and WX_RELEASE=28 -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_LIKE_LIBNAME], - [ - wx_temp="$2""_""$WX_PORT" - - dnl add the [u][d] string - if test "$WX_UNICODE" = "1"; then - wx_temp="$wx_temp""u" - fi - if test "$WX_DEBUG" = "1"; then - wx_temp="$wx_temp""d" - fi - - dnl complete the name of the lib - wx_temp="$wx_temp""_""$3""-$WX_VERSION_MAJOR.$WX_VERSION_MINOR" - - dnl save it in the user's variable - $1=$wx_temp - ]) - -dnl --------------------------------------------------------------------------- -dnl WX_ARG_ENABLE_YESNOAUTO/WX_ARG_WITH_YESNOAUTO -dnl -dnl Two little custom macros which define the ENABLE/WITH configure arguments. -dnl Macro arguments: -dnl $1 = the name of the --enable / --with feature -dnl $2 = the name of the variable associated -dnl $3 = the description of that feature -dnl $4 = the default value for that feature -dnl $5 = additional action to do in case option is given with "yes" value -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_ARG_ENABLE_YESNOAUTO], - [AC_ARG_ENABLE($1, - AC_HELP_STRING([--enable-$1], [$3 (default is $4)]), - [], [enableval="$4"]) - - dnl Show a message to the user about this option - AC_MSG_CHECKING([for the --enable-$1 option]) - if test "$enableval" = "yes" ; then - AC_MSG_RESULT([yes]) - $2=1 - $5 - elif test "$enableval" = "no" ; then - AC_MSG_RESULT([no]) - $2=0 - elif test "$enableval" = "auto" ; then - AC_MSG_RESULT([will be automatically detected]) - $2="auto" - else - AC_MSG_ERROR([ - Unrecognized option value (allowed values: yes, no, auto) - ]) - fi - ]) - -AC_DEFUN([WX_ARG_WITH_YESNOAUTO], - [AC_ARG_WITH($1, - AC_HELP_STRING([--with-$1], [$3 (default is $4)]), - [], [withval="$4"]) - - dnl Show a message to the user about this option - AC_MSG_CHECKING([for the --with-$1 option]) - if test "$withval" = "yes" ; then - AC_MSG_RESULT([yes]) - $2=1 - $5 - dnl NB: by default we don't allow --with-$1=no option - dnl since it does not make much sense ! - elif test "$6" = "1" -a "$withval" = "no" ; then - AC_MSG_RESULT([no]) - $2=0 - elif test "$withval" = "auto" ; then - AC_MSG_RESULT([will be automatically detected]) - $2="auto" - else - AC_MSG_ERROR([ - Unrecognized option value (allowed values: yes, auto) - ]) - fi - ]) - - -dnl --------------------------------------------------------------------------- -dnl WX_STANDARD_OPTIONS([options-to-add]) -dnl -dnl Adds to the configure script one or more of the following options: -dnl --enable-[debug|unicode|shared|wxshared|wxdebug] -dnl --with-[gtk|msw|motif|x11|mac|mgl|dfb] -dnl --with-wxversion -dnl Then checks for their presence and eventually set the DEBUG, UNICODE, SHARED, -dnl PORT, WX_SHARED, WX_DEBUG, variables to one of the "yes", "no", "auto" values. -dnl -dnl Note that e.g. UNICODE != WX_UNICODE; the first is the value of the -dnl --enable-unicode option (in boolean format) while the second indicates -dnl if wxWidgets was built in Unicode mode (and still is in boolean format). -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_STANDARD_OPTIONS], - [ - - dnl the following lines will expand to WX_ARG_ENABLE_YESNOAUTO calls if and only if - dnl the $1 argument contains respectively the debug,unicode or shared options. - - dnl be careful here not to set debug flag if only "wxdebug" was specified - ifelse(regexp([$1], [\bdebug]), [-1],, - [WX_ARG_ENABLE_YESNOAUTO([debug], [DEBUG], [Build in debug mode], [auto])]) - - ifelse(index([$1], [unicode]), [-1],, - [WX_ARG_ENABLE_YESNOAUTO([unicode], [UNICODE], [Build in Unicode mode], [auto])]) - - ifelse(regexp([$1], [\bshared]), [-1],, - [WX_ARG_ENABLE_YESNOAUTO([shared], [SHARED], [Build as shared library], [auto])]) - - dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-toolkit since it's an option - dnl which must be able to accept the auto|gtk1|gtk2|msw|... values - ifelse(index([$1], [toolkit]), [-1],, - [ - AC_ARG_WITH([toolkit], - AC_HELP_STRING([--with-toolkit], - [Build against a specific wxWidgets toolkit (default is auto)]), - [], [withval="auto"]) - - dnl Show a message to the user about this option - AC_MSG_CHECKING([for the --with-toolkit option]) - if test "$withval" = "auto" ; then - AC_MSG_RESULT([will be automatically detected]) - TOOLKIT="auto" - else - TOOLKIT="$withval" - - dnl PORT must be one of the allowed values - if test "$TOOLKIT" != "gtk1" -a "$TOOLKIT" != "gtk2" -a \ - "$TOOLKIT" != "msw" -a "$TOOLKIT" != "motif" -a \ - "$TOOLKIT" != "x11" -a "$TOOLKIT" != "mac" -a \ - "$TOOLKIT" != "mgl" -a "$TOOLKIT" != "dfb" ; then - AC_MSG_ERROR([ - Unrecognized option value (allowed values: auto, gtk1, gtk2, msw, motif, x11, mac, mgl, dfb) - ]) - fi - - AC_MSG_RESULT([$TOOLKIT]) - fi - ]) - - dnl ****** IMPORTANT ******* - dnl Unlike for the UNICODE setting, you can build your program in - dnl shared mode against a static build of wxWidgets. Thus we have the - dnl following option which allows these mixtures. E.g. - dnl - dnl ./configure --disable-shared --with-wxshared - dnl - dnl will build your library in static mode against the first available - dnl shared build of wxWidgets. - dnl - dnl Note that's not possible to do the viceversa: - dnl - dnl ./configure --enable-shared --without-wxshared - dnl - dnl Doing so you would try to build your library in shared mode against a static - dnl build of wxWidgets. This is not possible (you would mix PIC and non PIC code) ! - dnl A check for this combination of options is in WX_DETECT_STANDARD_OPTION_VALUES - dnl (where we know what 'auto' should be expanded to). - dnl - dnl If you try to build something in ANSI mode against a UNICODE build - dnl of wxWidgets or in RELEASE mode against a DEBUG build of wxWidgets, - dnl then at best you'll get ton of linking errors ! - dnl ************************ - - ifelse(index([$1], [wxshared]), [-1],, - [ - WX_ARG_WITH_YESNOAUTO( - [wxshared], [WX_SHARED], - [Force building against a shared build of wxWidgets, even if --disable-shared is given], - [auto], [], [1]) - ]) - - dnl Just like for SHARED and WX_SHARED it may happen that some adventurous - dnl peoples will want to mix a wxWidgets release build with a debug build of - dnl his app/lib. So, we have both DEBUG and WX_DEBUG variables. - ifelse(index([$1], [wxdebug]), [-1],, - [ - WX_ARG_WITH_YESNOAUTO( - [wxdebug], [WX_DEBUG], - [Force building against a debug build of wxWidgets, even if --disable-debug is given], - [auto], [], [1]) - ]) - - dnl WX_ARG_WITH_YESNOAUTO cannot be used for --with-wxversion since it's an option - dnl which accepts the "auto|2.6|2.7|2.8|2.9|3.0" etc etc values - ifelse(index([$1], [wxversion]), [-1],, - [ - AC_ARG_WITH([wxversion], - AC_HELP_STRING([--with-wxversion], - [Build against a specific version of wxWidgets (default is auto)]), - [], [withval="auto"]) - - dnl Show a message to the user about this option - AC_MSG_CHECKING([for the --with-wxversion option]) - if test "$withval" = "auto" ; then - AC_MSG_RESULT([will be automatically detected]) - WX_RELEASE="auto" - else - - wx_requested_major_version=`echo $withval | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\1/'` - wx_requested_minor_version=`echo $withval | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).*/\2/'` - - dnl both vars above must be exactly 1 digit - if test "${#wx_requested_major_version}" != "1" -o \ - "${#wx_requested_minor_version}" != "1" ; then - AC_MSG_ERROR([ - Unrecognized option value (allowed values: auto, 2.6, 2.7, 2.8, 2.9, 3.0) - ]) - fi - - WX_RELEASE="$wx_requested_major_version"".""$wx_requested_minor_version" - AC_MSG_RESULT([$WX_RELEASE]) - fi - ]) - - if test "$WX_DEBUG_CONFIGURE" = "1"; then - echo "[[dbg]] DEBUG: $DEBUG, WX_DEBUG: $WX_DEBUG" - echo "[[dbg]] UNICODE: $UNICODE, WX_UNICODE: $WX_UNICODE" - echo "[[dbg]] SHARED: $SHARED, WX_SHARED: $WX_SHARED" - echo "[[dbg]] TOOLKIT: $TOOLKIT, WX_TOOLKIT: $WX_TOOLKIT" - echo "[[dbg]] VERSION: $VERSION, WX_RELEASE: $WX_RELEASE" - fi - ]) - - -dnl --------------------------------------------------------------------------- -dnl WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS -dnl -dnl Sets the WXCONFIG_FLAGS string using the SHARED,DEBUG,UNICODE variable values -dnl which are different from "auto". -dnl Thus this macro needs to be called only once all options have been set. -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_CONVERT_STANDARD_OPTIONS_TO_WXCONFIG_FLAGS], - [ - if test "$WX_SHARED" = "1" ; then - WXCONFIG_FLAGS="--static=no " - elif test "$WX_SHARED" = "0" ; then - WXCONFIG_FLAGS="--static=yes " - fi - - if test "$WX_DEBUG" = "1" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=yes " - elif test "$WX_DEBUG" = "0" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--debug=no " - fi - - dnl The user should have set WX_UNICODE=UNICODE - if test "$WX_UNICODE" = "1" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=yes " - elif test "$WX_UNICODE" = "0" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--unicode=no " - fi - - if test "$TOOLKIT" != "auto" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--toolkit=$TOOLKIT " - fi - - if test "$WX_RELEASE" != "auto" ; then - WXCONFIG_FLAGS="$WXCONFIG_FLAGS""--version=$WX_RELEASE " - fi - - dnl strip out the last space of the string - WXCONFIG_FLAGS=${WXCONFIG_FLAGS% } - - if test "$WX_DEBUG_CONFIGURE" = "1"; then - echo "[[dbg]] WXCONFIG_FLAGS: $WXCONFIG_FLAGS" - fi - ]) - - -dnl --------------------------------------------------------------------------- -dnl _WX_SELECTEDCONFIG_CHECKFOR([RESULTVAR], [STRING], [MSG] -dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) -dnl -dnl Outputs the given MSG. Then searches the given STRING in the wxWidgets -dnl additional CPP flags and put the result of the search in WX_$RESULTVAR -dnl also adding the "yes" or "no" message result to MSG. -dnl --------------------------------------------------------------------------- -AC_DEFUN([_WX_SELECTEDCONFIG_CHECKFOR], - [ - if test "$$1" = "auto" ; then - - dnl The user does not have particular preferences for this option; - dnl so we will detect the wxWidgets relative build setting and use it - AC_MSG_CHECKING([$3]) - - dnl set WX_$1 variable to 1 if the $WX_SELECTEDCONFIG contains the $2 - dnl string or to 0 otherwise. - dnl NOTE: 'expr match STRING REGEXP' cannot be used since on Mac it - dnl doesn't work; we use 'expr STRING : REGEXP' instead - WX_$1=$(expr "$WX_SELECTEDCONFIG" : ".*$2.*") - - if test "$WX_$1" != "0"; then - WX_$1=1 - AC_MSG_RESULT([yes]) - ifelse([$4], , :, [$4]) - else - WX_$1=0 - AC_MSG_RESULT([no]) - ifelse([$5], , :, [$5]) - fi - else - - dnl Use the setting given by the user - WX_$1=$$1 - fi - ]) - -dnl --------------------------------------------------------------------------- -dnl WX_DETECT_STANDARD_OPTION_VALUES -dnl -dnl Detects the values of the following variables: -dnl 1) WX_RELEASE -dnl 2) WX_UNICODE -dnl 3) WX_DEBUG -dnl 4) WX_SHARED (and also WX_STATIC) -dnl 5) WX_PORT -dnl from the previously selected wxWidgets build; this macro in fact must be -dnl called *after* calling the WX_CONFIG_CHECK macro. -dnl -dnl Note that the WX_VERSION_MAJOR, WX_VERSION_MINOR symbols are already set -dnl by WX_CONFIG_CHECK macro -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_DETECT_STANDARD_OPTION_VALUES], - [ - dnl IMPORTANT: WX_VERSION contains all three major.minor.micro digits, - dnl while WX_RELEASE only the major.minor ones. - WX_RELEASE="$WX_VERSION_MAJOR""$WX_VERSION_MINOR" - if test $WX_RELEASE -lt 26 ; then - - AC_MSG_ERROR([ - Cannot detect the wxWidgets configuration for the selected wxWidgets build - since its version is $WX_VERSION < 2.6.0; please install a newer - version of wxWidgets. - ]) - fi - - dnl The wx-config we are using understands the "--selected_config" - dnl option which returns an easy-parseable string ! - WX_SELECTEDCONFIG=$($WX_CONFIG_WITH_ARGS --selected_config) - - if test "$WX_DEBUG_CONFIGURE" = "1"; then - echo "[[dbg]] Using wx-config --selected-config" - echo "[[dbg]] WX_SELECTEDCONFIG: $WX_SELECTEDCONFIG" - fi - - - dnl we could test directly for WX_SHARED with a line like: - dnl _WX_SELECTEDCONFIG_CHECKFOR([SHARED], [shared], - dnl [if wxWidgets was built in SHARED mode]) - dnl but wx-config --selected-config DOES NOT outputs the 'shared' - dnl word when wx was built in shared mode; it rather outputs the - dnl 'static' word when built in static mode. - if test $WX_SHARED = "1"; then - STATIC=0 - elif test $WX_SHARED = "0"; then - STATIC=1 - elif test $WX_SHARED = "auto"; then - STATIC="auto" - fi - - dnl Now set the WX_UNICODE, WX_DEBUG, WX_STATIC variables - _WX_SELECTEDCONFIG_CHECKFOR([UNICODE], [unicode], - [if wxWidgets was built with UNICODE enabled]) - _WX_SELECTEDCONFIG_CHECKFOR([DEBUG], [debug], - [if wxWidgets was built in DEBUG mode]) - _WX_SELECTEDCONFIG_CHECKFOR([STATIC], [static], - [if wxWidgets was built in STATIC mode]) - - dnl init WX_SHARED from WX_STATIC - if test "$WX_STATIC" != "0"; then - WX_SHARED=0 - else - WX_SHARED=1 - fi - - AC_SUBST(WX_UNICODE) - AC_SUBST(WX_DEBUG) - AC_SUBST(WX_SHARED) - - dnl detect the WX_PORT to use - if test "$TOOLKIT" = "auto" ; then - - dnl The user does not have particular preferences for this option; - dnl so we will detect the wxWidgets relative build setting and use it - AC_MSG_CHECKING([which wxWidgets toolkit was selected]) - - WX_GTKPORT1=$(expr "$WX_SELECTEDCONFIG" : ".*gtk1.*") - WX_GTKPORT2=$(expr "$WX_SELECTEDCONFIG" : ".*gtk2.*") - WX_MSWPORT=$(expr "$WX_SELECTEDCONFIG" : ".*msw.*") - WX_MOTIFPORT=$(expr "$WX_SELECTEDCONFIG" : ".*motif.*") - WX_OSXCOCOAPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_cocoa.*") - WX_OSXCARBONPORT=$(expr "$WX_SELECTEDCONFIG" : ".*osx_carbon.*") - WX_X11PORT=$(expr "$WX_SELECTEDCONFIG" : ".*x11.*") - WX_MGLPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mgl.*") - WX_DFBPORT=$(expr "$WX_SELECTEDCONFIG" : ".*dfb.*") - - WX_PORT="unknown" - if test "$WX_GTKPORT1" != "0"; then WX_PORT="gtk1"; fi - if test "$WX_GTKPORT2" != "0"; then WX_PORT="gtk2"; fi - if test "$WX_MSWPORT" != "0"; then WX_PORT="msw"; fi - if test "$WX_MOTIFPORT" != "0"; then WX_PORT="motif"; fi - if test "$WX_OSXCOCOAPORT" != "0"; then WX_PORT="osx_cocoa"; fi - if test "$WX_OSXCARBONPORT" != "0"; then WX_PORT="osx_carbon"; fi - if test "$WX_X11PORT" != "0"; then WX_PORT="x11"; fi - if test "$WX_MGLPORT" != "0"; then WX_PORT="mgl"; fi - if test "$WX_DFBPORT" != "0"; then WX_PORT="dfb"; fi - - dnl NOTE: backward-compatible check for wx2.8; in wx2.9 the mac - dnl ports are called 'osx_cocoa' and 'osx_carbon' (see above) - WX_MACPORT=$(expr "$WX_SELECTEDCONFIG" : ".*mac.*") - if test "$WX_MACPORT" != "0"; then WX_PORT="mac"; fi - - dnl check at least one of the WX_*PORT has been set ! - - if test "$WX_PORT" = "unknown" ; then - AC_MSG_ERROR([ - Cannot detect the currently installed wxWidgets port ! - Please check your 'wx-config --cxxflags'... - ]) - fi - - AC_MSG_RESULT([$WX_PORT]) - else - - dnl Use the setting given by the user - if test -z "$TOOLKIT" ; then - WX_PORT=$TOOLKIT - else - dnl try with PORT - WX_PORT=$PORT - fi - fi - - AC_SUBST(WX_PORT) - - if test "$WX_DEBUG_CONFIGURE" = "1"; then - echo "[[dbg]] Values of all WX_* options after final detection:" - echo "[[dbg]] WX_DEBUG: $WX_DEBUG" - echo "[[dbg]] WX_UNICODE: $WX_UNICODE" - echo "[[dbg]] WX_SHARED: $WX_SHARED" - echo "[[dbg]] WX_RELEASE: $WX_RELEASE" - echo "[[dbg]] WX_PORT: $WX_PORT" - fi - - dnl Avoid problem described in the WX_STANDARD_OPTIONS which happens when - dnl the user gives the options: - dnl ./configure --enable-shared --without-wxshared - dnl or just do - dnl ./configure --enable-shared - dnl but there is only a static build of wxWidgets available. - if test "$WX_SHARED" = "0" -a "$SHARED" = "1"; then - AC_MSG_ERROR([ - Cannot build shared library against a static build of wxWidgets ! - This error happens because the wxWidgets build which was selected - has been detected as static while you asked to build $PACKAGE_NAME - as shared library and this is not possible. - Use the '--disable-shared' option to build $PACKAGE_NAME - as static library or '--with-wxshared' to use wxWidgets as shared library. - ]) - fi - - dnl now we can finally update the DEBUG,UNICODE,SHARED options - dnl to their final values if they were set to 'auto' - if test "$DEBUG" = "auto"; then - DEBUG=$WX_DEBUG - fi - if test "$UNICODE" = "auto"; then - UNICODE=$WX_UNICODE - fi - if test "$SHARED" = "auto"; then - SHARED=$WX_SHARED - fi - if test "$TOOLKIT" = "auto"; then - TOOLKIT=$WX_PORT - fi - - dnl in case the user needs a BUILD=debug/release var... - if test "$DEBUG" = "1"; then - BUILD="debug" - elif test "$DEBUG" = "0" -o "$DEBUG" = ""; then - BUILD="release" - fi - - dnl respect the DEBUG variable adding the optimize/debug flags - dnl NOTE: the CXXFLAGS are merged together with the CPPFLAGS so we - dnl don't need to set them, too - if test "$DEBUG" = "1"; then - CXXFLAGS="$CXXFLAGS -g -O0" - CFLAGS="$CFLAGS -g -O0" - else - CXXFLAGS="$CXXFLAGS -O2" - CFLAGS="$CFLAGS -O2" - fi - ]) - -dnl --------------------------------------------------------------------------- -dnl WX_BOOLOPT_SUMMARY([name of the boolean variable to show summary for], -dnl [what to print when var is 1], -dnl [what to print when var is 0]) -dnl -dnl Prints $2 when variable $1 == 1 and prints $3 when variable $1 == 0. -dnl This macro mainly exists just to make configure.ac scripts more readable. -dnl -dnl NOTE: you need to use the [" my message"] syntax for 2nd and 3rd arguments -dnl if you want that m4 avoid to throw away the spaces prefixed to the -dnl argument value. -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_BOOLOPT_SUMMARY], - [ - if test "x$$1" = "x1" ; then - echo $2 - elif test "x$$1" = "x0" ; then - echo $3 - else - echo "$1 is $$1" - fi - ]) - -dnl --------------------------------------------------------------------------- -dnl WX_STANDARD_OPTIONS_SUMMARY_MSG -dnl -dnl Shows a summary message to the user about the WX_* variable contents. -dnl This macro is used typically at the end of the configure script. -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG], - [ - echo - echo " The wxWidgets build which will be used by $PACKAGE_NAME $PACKAGE_VERSION" - echo " has the following settings:" - WX_BOOLOPT_SUMMARY([WX_DEBUG], [" - DEBUG build"], [" - RELEASE build"]) - WX_BOOLOPT_SUMMARY([WX_UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) - WX_BOOLOPT_SUMMARY([WX_SHARED], [" - SHARED mode"], [" - STATIC mode"]) - echo " - VERSION: $WX_VERSION" - echo " - PORT: $WX_PORT" - ]) - - -dnl --------------------------------------------------------------------------- -dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN, WX_STANDARD_OPTIONS_SUMMARY_MSG_END -dnl -dnl Like WX_STANDARD_OPTIONS_SUMMARY_MSG macro but these two macros also gives info -dnl about the configuration of the package which used the wxpresets. -dnl -dnl Typical usage: -dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN -dnl echo " - Package setting 1: $SETTING1" -dnl echo " - Package setting 2: $SETTING1" -dnl ... -dnl WX_STANDARD_OPTIONS_SUMMARY_MSG_END -dnl -dnl --------------------------------------------------------------------------- -AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_BEGIN], - [ - echo - echo " ----------------------------------------------------------------" - echo " Configuration for $PACKAGE_NAME $PACKAGE_VERSION successfully completed." - echo " Summary of main configuration settings for $PACKAGE_NAME:" - WX_BOOLOPT_SUMMARY([DEBUG], [" - DEBUG build"], [" - RELEASE build"]) - WX_BOOLOPT_SUMMARY([UNICODE], [" - UNICODE mode"], [" - ANSI mode"]) - WX_BOOLOPT_SUMMARY([SHARED], [" - SHARED mode"], [" - STATIC mode"]) - ]) - -AC_DEFUN([WX_STANDARD_OPTIONS_SUMMARY_MSG_END], - [ - WX_STANDARD_OPTIONS_SUMMARY_MSG - echo - echo " Now, just run make." - echo " ----------------------------------------------------------------" - echo - ]) - - -dnl --------------------------------------------------------------------------- -dnl Deprecated macro wrappers -dnl --------------------------------------------------------------------------- - -AC_DEFUN([AM_OPTIONS_WXCONFIG], [WX_CONFIG_OPTIONS]) -AC_DEFUN([AM_PATH_WXCONFIG], [ - WX_CONFIG_CHECK([$1],[$2],[$3],[$4],[$5]) -]) - - From 147dcadf0497c70d25d02c40d3dfbd7b067a5d0c Mon Sep 17 00:00:00 2001 From: Tobias Klausmann Date: Fri, 11 Sep 2015 16:44:58 +0200 Subject: [PATCH 03/10] dev-lang/php: add alpha keyword Gentoo-Bug: 559612 Package-Manager: portage-2.2.20.1 --- dev-lang/php/php-5.6.13.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-lang/php/php-5.6.13.ebuild b/dev-lang/php/php-5.6.13.ebuild index 95211077836ff..9a3c14028589f 100644 --- a/dev-lang/php/php-5.6.13.ebuild +++ b/dev-lang/php/php-5.6.13.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { From c84a2dc6b538aee6fefa9e3ca410d3a5a8a86bd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 11 Sep 2015 16:43:20 +0200 Subject: [PATCH 04/10] app-eselect/eselect-mpost: Remove old Package-Manager: portage-2.2.20.1 --- .../eselect-mpost/eselect-mpost-0.1.ebuild | 28 ---- .../eselect-mpost/eselect-mpost-0.2.ebuild | 29 ---- .../eselect-mpost/files/mpost.eselect-0.1 | 153 ------------------ .../eselect-mpost/files/mpost.eselect-0.2 | 148 ----------------- 4 files changed, 358 deletions(-) delete mode 100644 app-eselect/eselect-mpost/eselect-mpost-0.1.ebuild delete mode 100644 app-eselect/eselect-mpost/eselect-mpost-0.2.ebuild delete mode 100644 app-eselect/eselect-mpost/files/mpost.eselect-0.1 delete mode 100644 app-eselect/eselect-mpost/files/mpost.eselect-0.2 diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.1.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.1.ebuild deleted file mode 100644 index ae08b7f1f27e8..0000000000000 --- a/app-eselect/eselect-mpost/eselect-mpost-0.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils - -DESCRIPTION="mpost module for eselect" -HOMEPAGE="https://www.gentoo.org/proj/en/eselect/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd" - -IUSE="" -DEPEND="" -# Depend on texlive-core-2008 that allows usage of this module, otherwise it -# will not work so nicely. -RDEPEND=">=app-admin/eselect-1.0.5 - >=app-text/texlive-core-2008" - -src_install() { - local MODULEDIR="/usr/share/eselect/modules" - local MODULE="mpost" - dodir ${MODULEDIR} - insinto ${MODULEDIR} - newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect || die "failed to install" -} diff --git a/app-eselect/eselect-mpost/eselect-mpost-0.2.ebuild b/app-eselect/eselect-mpost/eselect-mpost-0.2.ebuild deleted file mode 100644 index ac09044af519c..0000000000000 --- a/app-eselect/eselect-mpost/eselect-mpost-0.2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils - -DESCRIPTION="mpost module for eselect" -HOMEPAGE="https://www.gentoo.org/proj/en/eselect/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="" - -DEPEND="" -# Depend on texlive-core-2008 that allows usage of this module, otherwise it -# will not work so nicely. -RDEPEND=">=app-admin/eselect-1.2.3 - >=app-text/texlive-core-2008" - -src_install() { - local MODULEDIR="/usr/share/eselect/modules" - local MODULE="mpost" - dodir ${MODULEDIR} - insinto ${MODULEDIR} - newins "${FILESDIR}/${MODULE}.eselect-${PVR}" ${MODULE}.eselect \ - || die "failed to install" -} diff --git a/app-eselect/eselect-mpost/files/mpost.eselect-0.1 b/app-eselect/eselect-mpost/files/mpost.eselect-0.1 deleted file mode 100644 index 1fb3cf939071b..0000000000000 --- a/app-eselect/eselect-mpost/files/mpost.eselect-0.1 +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manage /usr/bin/mpost implementations" -MAINTAINER="ml@gentoo.org" -SVN_DATE='$Date: 2015/03/31 16:51:56 $' -VERSION=$(svn_date_to_version "${SVN_DATE}" ) - -# find a list of mpost symlink targets, best first -find_targets() { - local f - for f in "${ROOT}"/usr/bin/mpost-*; do - if [[ -f ${f} ]] ; then - echo "${f##*/mpost-}" - fi - done | sort -} - -# find version number of currently symlinked version -identify_target() { - local f - f="$(canonicalise "${ROOT}"/usr/bin/mpost)" - echo "${f##*/mpost-}" -} - -# try to remove the mpost symlink -remove_symlinks() { - rm -f "${ROOT}"/usr/bin/mpost &>/dev/null -} - -# set the mpost symlink -set_symlinks() { - local target="${1}" targets - if is_number "${target}" && [[ ${target} -ge 1 ]] ; then - targets=( $(find_targets ) ) - target=${targets[$(( ${target} - 1 ))]} - fi - if [[ -f "${ROOT}/usr/bin/mpost-${target}" ]] ; then - remove_symlinks - ln -s "mpost-${target}" "${ROOT}/usr/bin/mpost" || \ - die "Could not set ${target} /usr/bin/mpost symlink" - echo "Updating TeX formats" - [ -z "${ROOT}" ] && fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, mpost may not work properly." - else - die -q "Target \"${target}\" doesn't appear to be valid!" - fi -} - -### show action ### - -describe_show() { - echo "Show the current mpost version" -} - -do_show() { - [[ -z "${@}" ]] || die -q "Too many parameters" - - write_list_start "Current mpost verson:" - if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then - write_kv_list_entry "$(identify_target)" "" - elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then - write_kv_list_entry "(not a symlink)" "" - else - write_kv_list_entry "(unset)" "" - fi -} - -### list action ### - -describe_list() { - echo "List available mpost versions" -} - -do_list() { - [[ -z "${@}" ]] || die -q "Too many parameters" - - local i targets current - targets=( $(find_targets ) ) - current=$(identify_target) - if [[ -n ${targets[@]} ]] ; then - for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do - [[ ${targets[${i}]} == ${current} ]] && \ - targets[${i}]="${targets[${i}]} $(highlight '*' )" - done - write_list_start "Available mpost versions:" - write_numbered_list "${targets[@]}" - else - write_kv_list_entry "(none found)" "" - fi -} - -### set action ### - -describe_set() { - echo "Set a new mpost version" -} - -describe_set_options() { - echo "target : Target version number or index from 'list' action" -} - -describe_set_parameters() { - echo "" -} - -do_set() { - if [[ -z "${1}" ]] ; then - die -q "You didn't give me a version number" - - elif [[ -n "${2}" ]] ; then - die -q "Too many parameters" - - elif [[ -L "${ROOT}/usr/bin/mpost" ]] ; then - if ! remove_symlinks ; then - die -q "Can't remove existing version symlink" - elif ! set_symlinks "${1}" ; then - die -q "Can't set new version" - fi - - elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then - die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually" - else - set_symlinks "${1}" || die -q "Can't set new version" - fi -} - -### update action ### - -describe_update() { - echo "Automatically update the mpost version number" -} - -describe_update_options() { - echo "--if-unset : Do not override currently selected version" -} - -do_update() { - [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \ - die -q "Usage error" - - if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then - [[ ${1} == "--if-unset" ]] && return - remove_symlinks || die -q "Can't remove existing symlink" - fi - if [[ -e "${ROOT}/usr/bin/mpost" ]] ; then - die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually" - elif ! [[ -z $(find_targets ) ]] ; then - set_symlinks 1 || die -q "Can't set a new version" - fi -} - -# vim: set ft=eselect : diff --git a/app-eselect/eselect-mpost/files/mpost.eselect-0.2 b/app-eselect/eselect-mpost/files/mpost.eselect-0.2 deleted file mode 100644 index 0824045c0f881..0000000000000 --- a/app-eselect/eselect-mpost/files/mpost.eselect-0.2 +++ /dev/null @@ -1,148 +0,0 @@ -# -*-eselect-*- vim: ft=eselect -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manage /usr/bin/mpost implementations" -MAINTAINER="ml@gentoo.org" -SVN_DATE='$Date: 2015/03/31 16:51:56 $' -VERSION=$(svn_date_to_version "${SVN_DATE}" ) - -# find a list of mpost symlink targets, best first -find_targets() { - local f - for f in "${ROOT}"/usr/bin/mpost-*; do - if [[ -f ${f} ]] ; then - echo "${f##*/mpost-}" - fi - done | sort -} - -# find version number of currently symlinked version -identify_target() { - local f - f="$(canonicalise "${ROOT}"/usr/bin/mpost)" - echo "${f##*/mpost-}" -} - -# try to remove the mpost symlink -remove_symlinks() { - rm -f "${ROOT}"/usr/bin/mpost &>/dev/null -} - -# set the mpost symlink -set_symlinks() { - local target="${1}" targets - if is_number "${target}" && [[ ${target} -ge 1 ]] ; then - targets=( $(find_targets ) ) - target=${targets[$(( ${target} - 1 ))]} - fi - if [[ -f "${ROOT}/usr/bin/mpost-${target}" ]] ; then - remove_symlinks - ln -s "mpost-${target}" "${ROOT}/usr/bin/mpost" || \ - die "Could not set ${target} /usr/bin/mpost symlink" - echo "Updating TeX formats" - [ -z "${ROOT}" ] && fmtutil-sys --all &>/dev/null || write_warning_msg "Could not update TeX formats for some reason, mpost may not work properly." - else - die -q "Target \"${target}\" doesn't appear to be valid!" - fi -} - -### show action ### - -describe_show() { - echo "Show the current mpost version" -} - -do_show() { - [[ -z "${@}" ]] || die -q "Too many parameters" - - write_list_start "Current mpost verson:" - if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then - write_kv_list_entry "$(identify_target)" "" - elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then - write_kv_list_entry "(not a symlink)" "" - else - write_kv_list_entry "(unset)" "" - fi -} - -### list action ### - -describe_list() { - echo "List available mpost versions" -} - -do_list() { - [[ -z "${@}" ]] || die -q "Too many parameters" - - local i targets current - targets=( $(find_targets ) ) - current=$(identify_target) - for (( i = 0; i < ${#targets[@]}; i++ )); do - [[ ${targets[i]} = ${current} ]] \ - && targets[i]=$(highlight_marker "${targets[i]}") - done - write_list_start "Available mpost versions:" - write_numbered_list -m "(none found)" "${targets[@]}" -} - -### set action ### - -describe_set() { - echo "Set a new mpost version" -} - -describe_set_options() { - echo "target : Target version number or index from 'list' action" -} - -describe_set_parameters() { - echo "" -} - -do_set() { - if [[ -z "${1}" ]] ; then - die -q "You didn't give me a version number" - - elif [[ -n "${2}" ]] ; then - die -q "Too many parameters" - - elif [[ -L "${ROOT}/usr/bin/mpost" ]] ; then - if ! remove_symlinks ; then - die -q "Can't remove existing version symlink" - elif ! set_symlinks "${1}" ; then - die -q "Can't set new version" - fi - - elif [[ -e "${ROOT}/usr/bin/mpost" ]] ; then - die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually" - else - set_symlinks "${1}" || die -q "Can't set new version" - fi -} - -### update action ### - -describe_update() { - echo "Automatically update the mpost version number" -} - -describe_update_options() { - echo "--if-unset : Do not override currently selected version" -} - -do_update() { - [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \ - die -q "Usage error" - - if [[ -L "${ROOT}/usr/bin/mpost" ]] ; then - [[ ${1} == "--if-unset" ]] && return - remove_symlinks || die -q "Can't remove existing symlink" - fi - if [[ -e "${ROOT}/usr/bin/mpost" ]] ; then - die -q "${ROOT}/usr/bin/mpost seems to be from an old ebuild, please remove manually" - elif ! [[ -z $(find_targets ) ]] ; then - set_symlinks 1 || die -q "Can't set a new version" - fi -} From 5ae2ebdfa8f63a608fa2c2bc67477b39bbce87b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 11 Sep 2015 16:44:23 +0200 Subject: [PATCH 05/10] app-eselect/eselect-unison: Remove missed unused files Package-Manager: portage-2.2.20.1 --- .../eselect-unison/files/unison.eselect-0.1 | 152 ------------------ .../eselect-unison/files/unison.eselect-0.2 | 147 ----------------- 2 files changed, 299 deletions(-) delete mode 100644 app-eselect/eselect-unison/files/unison.eselect-0.1 delete mode 100644 app-eselect/eselect-unison/files/unison.eselect-0.2 diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.1 b/app-eselect/eselect-unison/files/unison.eselect-0.1 deleted file mode 100644 index 6baa01264da4e..0000000000000 --- a/app-eselect/eselect-unison/files/unison.eselect-0.1 +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manage /usr/bin/unison versions" -MAINTAINER="ml@gentoo.org" -SVN_DATE='$Date: 2015/03/31 16:57:32 $' -VERSION=$(svn_date_to_version "${SVN_DATE}" ) - -# find a list of unison symlink targets, best first -find_targets() { - local f - for f in "${ROOT}"/usr/bin/unison-[0-9]*; do - if [[ -f ${f} ]] ; then - echo "${f##*/unison-}" - fi - done | tac -} - -# find version number of currently symlinked version -identify_target() { - local f - f="$(canonicalise "${ROOT}"/usr/bin/unison)" - echo "${f##*/unison-}" -} - -# try to remove the unison symlink -remove_symlinks() { - rm -f "${ROOT}"/usr/bin/unison &>/dev/null -} - -# set the unison symlink -set_symlinks() { - local target="${1}" targets - if is_number "${target}" && [[ ${target} -ge 1 ]] ; then - targets=( $(find_targets ) ) - target=${targets[$(( ${target} - 1 ))]} - fi - if [[ -f "${ROOT}/usr/bin/unison-${target}" ]] ; then - remove_symlinks - ln -s "unison-${target}" "${ROOT}/usr/bin/unison" || \ - die "Could not set ${target} /usr/bin/unison symlink" - else - die -q "Target \"${target}\" doesn't appear to be valid!" - fi -} - -### show action ### - -describe_show() { - echo "Show the current unison version" -} - -do_show() { - [[ -z "${@}" ]] || die -q "Too many parameters" - - write_list_start "Current unison verson:" - if [[ -L "${ROOT}/usr/bin/unison" ]] ; then - write_kv_list_entry "$(identify_target)" "" - elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then - write_kv_list_entry "(not a symlink)" "" - else - write_kv_list_entry "(unset)" "" - fi -} - -### list action ### - -describe_list() { - echo "List available unison versions" -} - -do_list() { - [[ -z "${@}" ]] || die -q "Too many parameters" - - local i targets current - targets=( $(find_targets ) ) - current=$(identify_target) - if [[ -n ${targets[@]} ]] ; then - for (( i = 0 ; i < ${#targets[@]} ; i = i + 1 )) ; do - [[ ${targets[${i}]} == ${current} ]] && \ - targets[${i}]="${targets[${i}]} $(highlight '*' )" - done - write_list_start "Available unison versions:" - write_numbered_list "${targets[@]}" - else - write_kv_list_entry "(none found)" "" - fi -} - -### set action ### - -describe_set() { - echo "Set a new unison version" -} - -describe_set_options() { - echo "target : Target version number or index from 'list' action" -} - -describe_set_parameters() { - echo "" -} - -do_set() { - if [[ -z "${1}" ]] ; then - die -q "You didn't give me a version number" - - elif [[ -n "${2}" ]] ; then - die -q "Too many parameters" - - elif [[ -L "${ROOT}/usr/bin/unison" ]] ; then - if ! remove_symlinks ; then - die -q "Can't remove existing version symlink" - elif ! set_symlinks "${1}" ; then - die -q "Can't set new version" - fi - - elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then - die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually" - - else - set_symlinks "${1}" || die -q "Can't set new version" - fi -} - -### update action ### - -describe_update() { - echo "Automatically update the unison version number" -} - -describe_update_options() { - echo "--if-unset : Do not override currently selected version" -} - -do_update() { - [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \ - die -q "Usage error" - - if [[ -L "${ROOT}/usr/bin/unison" ]] ; then - [[ ${1} == "--if-unset" ]] && return - remove_symlinks || die -q "Can't remove existing symlink" - fi - if [[ -e "${ROOT}/usr/bin/unison" ]] ; then - die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually" - elif ! [[ -z $(find_targets ) ]] ; then - set_symlinks 1 || die -q "Can't set a new version" - fi -} - -# vim: set ft=eselect : diff --git a/app-eselect/eselect-unison/files/unison.eselect-0.2 b/app-eselect/eselect-unison/files/unison.eselect-0.2 deleted file mode 100644 index 62cc128c0ec76..0000000000000 --- a/app-eselect/eselect-unison/files/unison.eselect-0.2 +++ /dev/null @@ -1,147 +0,0 @@ -# -*-eselect-*- vim: ft=eselect -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manage /usr/bin/unison versions" -MAINTAINER="ml@gentoo.org" -SVN_DATE='$Date: 2015/03/31 16:57:32 $' -VERSION=$(svn_date_to_version "${SVN_DATE}" ) - -# find a list of unison symlink targets, best first -find_targets() { - local f - for f in "${ROOT}"/usr/bin/unison-[0-9]*; do - if [[ -f ${f} ]] ; then - echo "${f##*/unison-}" - fi - done | tac -} - -# find version number of currently symlinked version -identify_target() { - local f - f="$(canonicalise "${ROOT}"/usr/bin/unison)" - echo "${f##*/unison-}" -} - -# try to remove the unison symlink -remove_symlinks() { - rm -f "${ROOT}"/usr/bin/unison &>/dev/null -} - -# set the unison symlink -set_symlinks() { - local target="${1}" targets - if is_number "${target}" && [[ ${target} -ge 1 ]] ; then - targets=( $(find_targets ) ) - target=${targets[$(( ${target} - 1 ))]} - fi - if [[ -f "${ROOT}/usr/bin/unison-${target}" ]] ; then - remove_symlinks - ln -s "unison-${target}" "${ROOT}/usr/bin/unison" || \ - die "Could not set ${target} /usr/bin/unison symlink" - else - die -q "Target \"${target}\" doesn't appear to be valid!" - fi -} - -### show action ### - -describe_show() { - echo "Show the current unison version" -} - -do_show() { - [[ -z "${@}" ]] || die -q "Too many parameters" - - write_list_start "Current unison verson:" - if [[ -L "${ROOT}/usr/bin/unison" ]] ; then - write_kv_list_entry "$(identify_target)" "" - elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then - write_kv_list_entry "(not a symlink)" "" - else - write_kv_list_entry "(unset)" "" - fi -} - -### list action ### - -describe_list() { - echo "List available unison versions" -} - -do_list() { - [[ $# -eq 0 ]] || die -q "Too many parameters" - - local i targets current - targets=( $(find_targets ) ) - current=$(identify_target) - for (( i = 0; i < ${#targets[@]}; i++ )); do - [[ ${targets[i]} = ${current} ]] \ - && targets[i]=$(highlight_marker "${targets[i]}") - done - write_list_start "Available unison versions:" - write_numbered_list -m "(none found)" "${targets[@]}" -} - -### set action ### - -describe_set() { - echo "Set a new unison version" -} - -describe_set_options() { - echo "target : Target version number or index from 'list' action" -} - -describe_set_parameters() { - echo "" -} - -do_set() { - if [[ -z "${1}" ]] ; then - die -q "You didn't give me a version number" - - elif [[ -n "${2}" ]] ; then - die -q "Too many parameters" - - elif [[ -L "${ROOT}/usr/bin/unison" ]] ; then - if ! remove_symlinks ; then - die -q "Can't remove existing version symlink" - elif ! set_symlinks "${1}" ; then - die -q "Can't set new version" - fi - - elif [[ -e "${ROOT}/usr/bin/unison" ]] ; then - die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually" - - else - set_symlinks "${1}" || die -q "Can't set new version" - fi -} - -### update action ### - -describe_update() { - echo "Automatically update the unison version number" -} - -describe_update_options() { - echo "--if-unset : Do not override currently selected version" -} - -do_update() { - [[ -z "${1}" ]] || ( [[ -z "${2}" ]] && [[ "${1}" == "--if-unset" ]] ) || \ - die -q "Usage error" - - if [[ -L "${ROOT}/usr/bin/unison" ]] ; then - [[ ${1} == "--if-unset" ]] && return - remove_symlinks || die -q "Can't remove existing symlink" - fi - if [[ -e "${ROOT}/usr/bin/unison" ]] ; then - die -q "${ROOT}/usr/bin/unison seems to be from an old ebuild, please remove manually" - elif ! [[ -z $(find_targets ) ]] ; then - set_symlinks 1 || die -q "Can't set a new version" - fi -} From 70dbd7e39fa38a4e19112a823f0a4041723a44ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 11 Sep 2015 16:45:33 +0200 Subject: [PATCH 06/10] app-eselect/eselect-xvmc: Remove old Package-Manager: portage-2.2.20.1 --- .../eselect-xvmc/eselect-xvmc-0.3.ebuild | 20 -- .../files/eselect-xvmc-0.3.eselect | 189 ------------------ 2 files changed, 209 deletions(-) delete mode 100644 app-eselect/eselect-xvmc/eselect-xvmc-0.3.ebuild delete mode 100644 app-eselect/eselect-xvmc/files/eselect-xvmc-0.3.eselect diff --git a/app-eselect/eselect-xvmc/eselect-xvmc-0.3.ebuild b/app-eselect/eselect-xvmc/eselect-xvmc-0.3.ebuild deleted file mode 100644 index 18ac768489019..0000000000000 --- a/app-eselect/eselect-xvmc/eselect-xvmc-0.3.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manages XvMC implementations" -HOMEPAGE="https://www.gentoo.org/" -SRC_URI="" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" -IUSE="" - -DEPEND="" -RDEPEND=">=app-admin/eselect-1.0.10" - -src_install() { - insinto /usr/share/eselect/modules - newins "${FILESDIR}"/${P}.eselect xvmc.eselect || die "newins failed" -} diff --git a/app-eselect/eselect-xvmc/files/eselect-xvmc-0.3.eselect b/app-eselect/eselect-xvmc/files/eselect-xvmc-0.3.eselect deleted file mode 100644 index 4f3cdccb91707..0000000000000 --- a/app-eselect/eselect-xvmc/files/eselect-xvmc-0.3.eselect +++ /dev/null @@ -1,189 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Manage the XvMC implementation used by your system" -MAINTAINER="cardoe@gentoo.org" -SVN_DATE='$Date: 2015/03/31 16:58:41 $' -VERSION=$(svn_date_to_version "${SVN_DATE}" ) - -XVMCLIBS=( -"libXvMCNVIDIA_dynamic.so.1" -"libXvMC.so.1" -"libviaXvMC.so.1" -"libviaXvMCPro.so.1" -"libchromeXvMC.so.1" -"libchromeXvMCPro.so.1" -"libXvMCVIA.so" -"libXvMCVIAPro.so" -"libI810XvMC.so.1" -"/usr/lib/libIntelXvMC.so" -"libAMDXvBA.so.1" ) -XVMCPRETTY=( -"nvidia" -"xorg-x11" -"via" -"via-pro" -"openchrome" -"openchrome-pro" -"unichrome" -"unichrome-pro" -"intel-i815" -"intel-i915" -"ati" ) - -get_implementation_indices() { - local ret n - for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do - [[ -e "${ROOT}/usr/lib/${XVMCLIBS[n]}" ]] && ret+=($n) - done - - echo ${ret[@]} -} - -get_current_implementation_index() { - local n - if [[ -f "${ROOT}/etc/X11/XvMCConfig" ]]; then - local current=$(< "${ROOT}/etc/X11/XvMCConfig") - for (( n = 0; n < ${#XVMCLIBS[@]}; ++n )); do - if [[ "${XVMCLIBS[n]}" = "${current}" ]]; then - echo "${n}" - return - fi - done - fi - - echo "-1" -} - -set_new_implementation() { - echo -n "Switching to ${XVMCPRETTY[$1]} XvMC implementation..." - touch "${ROOT}/etc/X11/XvMCConfig" 2>&1 > /dev/null - if [[ $? -eq 0 ]]; then - echo "${XVMCLIBS[$1]}" > "${ROOT}/etc/X11/XvMCConfig" - chmod 644 "${ROOT}/etc/X11/XvMCConfig" - chown 0:0 "${ROOT}/etc/X11/XvMCConfig" - echo " done" - else - echo " failed!" - echo "Insufficient privileges" - fi -} - -### list action - -## {{{ list stuff -describe_list() { - echo "List Available XvMC implementations" -} - -do_list() { - local output n - local avail=( $(get_implementation_indices) ) - local current=$(get_current_implementation_index) - write_list_start "Available XvMC implementations ( $(highlight '*') is current ):" - - if (( ${#avail[@]} )) ; then - for n in "${avail[@]}" ; do - output[n]="${XVMCPRETTY[n]}" - [[ ${current} -eq ${n} ]] && \ - output[n]+=" $(highlight '*')" - done - write_numbered_list "${output[@]}" - else - write_kv_list_entry "(none found)" "" - fi - - return 0 -} -## }}} - -### show action - -## {{{ show stuff -describe_show() { - echo "Print the current XvMC implementation." -} - -do_show() { - local current=$(get_current_implementation_index) - write_list_start "Current XvMC implementation:" - - if [[ ${current} -ne -1 ]]; then - echo "${XVMCPRETTY[current]}" - return 0 - else - echo "(none)" - return 2 - fi -} -## }}} - -### set action - -## {{{ set stuff -describe_set() { - echo "Select the XvMC implementation" -} - -describe_set_parameters() { - echo "" -} - -describe_set_options() { - echo " : XvMC implementation to activate" - echo "--use-old : If an implementation is already set, use that one instead" -} - -do_set() { - local current=$(get_current_implementation_index) - local avail=( $(get_implementation_indices) ) - local n new action - - while [[ ${#@} -gt 0 ]]; do - local opt=${1} - shift - case ${opt} in - --use-old) - if [[ ${current} -gt -1 ]]; then - (( ${current} < ${#XVMCPRETTY[@]} )) && action="old-implementation" - fi - ;; - *) - [[ -z ${action} ]] && action="set-implementation" - - if is_number ${opt} ; then - new=${avail[opt - 1]} - if [[ -z ${new} ]]; then - die -q "Unrecognized option: ${opt}" - fi - elif has ${opt} ${XVMCPRETTY[@]}; then - for (( n = 0; n < ${#XVMCPRETTY[@]}; ++n )); do - [[ "${XVMCPRETTY[n]}" = "${opt}" ]] && new=${n} - done - else - die -q "Unrecognized option: ${opt}" - fi - ;; - esac - done - - case ${action} in - old-implementation) - set_new_implementation ${current} - return $? - ;; - set-implementation) - if [[ -n ${new} ]]; then - set_new_implementation ${new} - return $? - else - die -q "Please specify an implementation to set" - fi - ;; - *) - die -q "Invalid usage of set action." - esac -} - -# vim: ts=4 sw=4 noet fdm=marker From f3cc2c3c55b0aa7d4f2021defdf5e031ead82c6b Mon Sep 17 00:00:00 2001 From: Maxim Koltsov Date: Fri, 11 Sep 2015 17:46:27 +0300 Subject: [PATCH 07/10] media-tv/kodi: don't enable texturepacker by default Enabling it causes build failure due to missing giflib-5, see referenced bug. Gentoo-Bug: 558678 Package-Manager: portage-2.2.20.1 --- media-tv/kodi/kodi-15.1.ebuild | 2 +- media-tv/kodi/kodi-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media-tv/kodi/kodi-15.1.ebuild b/media-tv/kodi/kodi-15.1.ebuild index 80d676586fbd8..aae07df3afe4b 100644 --- a/media-tv/kodi/kodi-15.1.ebuild +++ b/media-tv/kodi/kodi-15.1.ebuild @@ -34,7 +34,7 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/" LICENSE="GPL-2" SLOT="0" -IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X" +IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X" REQUIRED_USE=" rsxs? ( X ) udisks? ( dbus ) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 3ac121968807a..ff61848248fdf 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -34,7 +34,7 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/" LICENSE="GPL-2" SLOT="0" -IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X" +IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X" REQUIRED_USE=" rsxs? ( X ) udisks? ( dbus ) From bf38f33960bd0341da5e0cb26ff56121da29c785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 11 Sep 2015 16:49:17 +0200 Subject: [PATCH 08/10] app-eselect/eselect-php: Remove old Package-Manager: portage-2.2.20.1 --- app-eselect/eselect-php/Manifest | 1 - .../eselect-php/eselect-php-0.6.2.ebuild | 24 --------- .../eselect-php/eselect-php-0.7.1-r1.ebuild | 49 ------------------- .../eselect-php/eselect-php-0.7.1-r2.ebuild | 49 ------------------- .../eselect-php/eselect-php-0.7.1-r3.ebuild | 48 ------------------ .../eselect-php/eselect-php-0.7.1.ebuild | 45 ----------------- .../files/70_mod_php5.conf-apache2 | 14 ------ app-eselect/eselect-php/files/php-fpm.init | 47 ------------------ 8 files changed, 277 deletions(-) delete mode 100644 app-eselect/eselect-php/eselect-php-0.6.2.ebuild delete mode 100644 app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild delete mode 100644 app-eselect/eselect-php/eselect-php-0.7.1-r2.ebuild delete mode 100644 app-eselect/eselect-php/eselect-php-0.7.1-r3.ebuild delete mode 100644 app-eselect/eselect-php/eselect-php-0.7.1.ebuild delete mode 100644 app-eselect/eselect-php/files/70_mod_php5.conf-apache2 delete mode 100644 app-eselect/eselect-php/files/php-fpm.init diff --git a/app-eselect/eselect-php/Manifest b/app-eselect/eselect-php/Manifest index c6bba4ca91bf4..27a9d1f6ede4e 100644 --- a/app-eselect/eselect-php/Manifest +++ b/app-eselect/eselect-php/Manifest @@ -1,2 +1 @@ -DIST eselect-php-0.6.2.bz2 1454 SHA256 c4eecb73aaf50538a8eaf8afb0d52b3666b45ef19e5f26f7998682bac56566c4 SHA512 cb2639ddf97c77336195db57a9a5021200693ee4f1382d7ed6cda22a27f5b0f76be88abf376e13245a72223c12065d019e0537494f934f9cbe40e0fdcbfe2b22 WHIRLPOOL 523f3a0c30705599ee91c5ce0a691c140226a18c0a1ba73df4a0f9835a92644748a0f0ed73f1ea101de65cf270947f054a8feeb3c36609f644f8682d611aaa11 DIST eselect-php-0.7.1.bz2 2251 SHA256 10aa400e2d08bc71989366993f12ddb546a0ea29f191c40e37beba1d11d7abd7 SHA512 a6b4c1475dda9f368d799db7658c50cef7d6f71482a53a186fb1394e7ea1fff3c0ef123c82b7ca4d1e45aadb0a034d36f213fc9450766878a60d28639761cb3d WHIRLPOOL a4e45492068616ff30fd888b0cc64441a6eb6e6656e0107d00bd2cf15360dce15052d4d62089ab89d43e6bb36e126529aa101c70e8bd94a9fc916a5369463e3b diff --git a/app-eselect/eselect-php/eselect-php-0.6.2.ebuild b/app-eselect/eselect-php/eselect-php-0.6.2.ebuild deleted file mode 100644 index 3502548d19d8d..0000000000000 --- a/app-eselect/eselect-php/eselect-php-0.6.2.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="http://olemarkus.org/~olemarkus/gentoo/eselect-php-${PV}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86" -IUSE="" - -DEPEND=">=app-admin/eselect-1.2.4 - !app-admin/php-toolkit" -RDEPEND="${DEPEND}" - -src_install() { - mv eselect-php-${PV} php.eselect - insinto /usr/share/eselect/modules/ - doins php.eselect -} diff --git a/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild b/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild deleted file mode 100644 index 30a8496589893..0000000000000 --- a/app-eselect/eselect-php/eselect-php-0.7.1-r1.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit depend.apache systemd - -DESCRIPTION="PHP eselect module" -HOMEPAGE="https://www.gentoo.org" -SRC_URI="https://dev.gentoo.org/~olemarkus/eselect-php/eselect-php-${PV}.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="fpm apache2" - -DEPEND=">=app-admin/eselect-1.2.4 - ! - # Load the module first - - LoadModule php5_module modules/libphp5.so - - - # Set it to handle the files - - AddHandler application/x-httpd-php .php .php5 .phtml - AddHandler application/x-httpd-php-source .phps - - - DirectoryIndex index.php index.phtml - diff --git a/app-eselect/eselect-php/files/php-fpm.init b/app-eselect/eselect-php/files/php-fpm.init deleted file mode 100644 index a186d83478c54..0000000000000 --- a/app-eselect/eselect-php/files/php-fpm.init +++ /dev/null @@ -1,47 +0,0 @@ -#!/sbin/runscript - -set_phpvars() { - PHPSLOT=${SVCNAME#php-fpm-} - [ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)" - - PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf" - PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid" -} - -extra_commands="depend" -extra_started_commands="reload" - -depend() { - need net - use apache2 lighttpd nginx -} - -start() { - ebegin "Starting PHP FastCGI Process Manager" - set_phpvars - start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \ - /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}" - local i=0 - local timeout=5 - while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do - sleep 1 - i=$(($i + 1)) - done - - [ $timeout -gt $i ] - eend $? -} - -stop() { - ebegin "Stopping PHP FastCGI Process Manager" - set_phpvars - start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID} - eend $? -} - -reload() { - ebegin "Reloading PHP FastCGI Process Manager" - set_phpvars - [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID}) - eend $? -} From c63c7222bb3a5750c034a4ca33235cf5a927326f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Fri, 11 Sep 2015 16:50:43 +0200 Subject: [PATCH 09/10] app-eselect/eselect-mesa: Remove old Package-Manager: portage-2.2.20.1 --- app-eselect/eselect-mesa/Manifest | 1 - .../eselect-mesa/eselect-mesa-0.0.9.ebuild | 31 ------------------- 2 files changed, 32 deletions(-) delete mode 100644 app-eselect/eselect-mesa/eselect-mesa-0.0.9.ebuild diff --git a/app-eselect/eselect-mesa/Manifest b/app-eselect/eselect-mesa/Manifest index 41ee5d513d75e..5dcaace078f7a 100644 --- a/app-eselect/eselect-mesa/Manifest +++ b/app-eselect/eselect-mesa/Manifest @@ -1,2 +1 @@ DIST eselect-mesa-0.0.10.tar.gz 2214 SHA256 736c4360902ddf78d02c6153e558164f3e09cfe74953ae15b74c6ca1647aca7c SHA512 c039ca769a436ccb5a7f0271532d3bc988f29ba31784fc74d1a4dd230e4f9c6db7ef3b9b40a1341202d9641eca9278a73c74e13091f2370065dca7d3707d91c3 WHIRLPOOL 7687b1abab31ccd6a4cad4b585fad0d31b3b7a22e64e3169309824e3cf410ddfd92e8974085d3d01e5deaa884c14964e7af3468ab11b0f2a705657e46091a19e -DIST eselect-mesa-0.0.9.tar.gz 2217 SHA256 27adf2beff6f7cbd54004e4c27f9ac869e8c7bc72cb83c32acfbccf4119b2494 SHA512 3e00f7e0cc122c15d0c6878b3a3a006e8a8c032c81570fa31143c7e5e8feddc69afdb4f19207f6bc0755172b7cc5e96bcd4093d65218a387af30cfdf230abbf0 WHIRLPOOL bcbcdfdcf17808548ed31fb60fe4f16f26c2e88ab121a4f8a12a5b6c44b9faeb32736fd760e5acbbd90f5afadfcb63798f0f6c46a51540014c967ccf34ec43b7 diff --git a/app-eselect/eselect-mesa/eselect-mesa-0.0.9.ebuild b/app-eselect/eselect-mesa/eselect-mesa-0.0.9.ebuild deleted file mode 100644 index fd2b5ee86cad2..0000000000000 --- a/app-eselect/eselect-mesa/eselect-mesa-0.0.9.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 - -DESCRIPTION="Utility to change the Mesa OpenGL driver being used" -HOMEPAGE="https://www.gentoo.org/" - -SRC_URI="mirror://gentoo/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="" - -DEPEND="" -RDEPEND=">=app-admin/eselect-1.2.4 - >=app-shells/bash-4" - -src_install() { - insinto /usr/share/eselect/modules - doins mesa.eselect || die -} - -pkg_postinst() { - if has_version ">=media-libs/mesa-7.9" && \ - ! [ -f "${EROOT}"/usr/share/mesa/eselect-mesa.conf ]; then - eerror "Rebuild media-libs/mesa for ${PN} to work." - fi -} From d50ec538d086d91022ae3e3657ce972191e5de69 Mon Sep 17 00:00:00 2001 From: Tobias Klausmann Date: Fri, 11 Sep 2015 16:50:54 +0200 Subject: [PATCH 10/10] dev-libs/libgpg-error: add alpha keyword Gentoo-Bug: 552938 Package-Manager: portage-2.2.20.1 --- dev-libs/libgpg-error/libgpg-error-1.19.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild index 3fe734b0aa028..6be5be302322f 100644 --- a/dev-libs/libgpg-error/libgpg-error-1.19.ebuild +++ b/dev-libs/libgpg-error/libgpg-error-1.19.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="GPL-2 LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="common-lisp nls static-libs" RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )