diff options
author | Stuart Shelton <stuart@shelton.me> | 2015-08-31 20:37:40 +0059 |
---|---|---|
committer | Stuart Shelton <stuart@shelton.me> | 2015-08-31 20:37:40 +0059 |
commit | 689bf298c846a876ebfa93d0646e8f9a3980eb2e (patch) | |
tree | efd64573f2a2c9c74250018d9090bb08309a00fd /eclass | |
parent | Add sys-kernel/raspberrypi-sources-4.1.9999, sys-kernel/raspberrypi-sources-4... (diff) | |
download | srcshelton-689bf298c846a876ebfa93d0646e8f9a3980eb2e.tar.gz srcshelton-689bf298c846a876ebfa93d0646e8f9a3980eb2e.tar.bz2 srcshelton-689bf298c846a876ebfa93d0646e8f9a3980eb2e.zip |
Update all ebulids and files with substituted git '$' values to enable tracking
Update ebulids as necessary to match new (and, retrieved via rsync, unversioned at a per-change level) upstream files
Diffstat (limited to 'eclass')
-rw-r--r-- | eclass/multilib.eclass | 2 | ||||
-rw-r--r-- | eclass/php-ext-source-r2.eclass | 21 | ||||
-rw-r--r-- | eclass/php-pear-lib-r1.eclass | 2 | ||||
-rw-r--r-- | eclass/php-pear-r1.eclass | 2 |
4 files changed, 14 insertions, 13 deletions
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index 241b79e6..bcc601a1 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/multilib.eclass,v 1.107 2015/05/26 14:25:16 ottxor Exp $ +# $Id: eb0ac1d24100d6a882f109a492b60fc4a0c186f0 $ # @ECLASS: multilib.eclass # @MAINTAINER: diff --git a/eclass/php-ext-source-r2.eclass b/eclass/php-ext-source-r2.eclass index a3e1ca5e..db1caf8a 100644 --- a/eclass/php-ext-source-r2.eclass +++ b/eclass/php-ext-source-r2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-ext-source-r2.eclass,v 1.36 2015/05/04 20:02:26 grknight Exp $ +# $Id: ad82feec6c323385b97a11f6ac83f442f111a7f0 $ # @ECLASS: php-ext-source-r2.eclass # @MAINTAINER: @@ -201,8 +201,9 @@ php-ext-source-r2_src_install() { for slot in $(php_get_slots); do php_init_slot_env ${slot} - # Let's put the default module away - insinto "${EXT_DIR}" + # Let's put the default module away. Strip $EPREFIX from + # $EXT_DIR before calling newins (which handles EPREFIX itself). + insinto "${EXT_DIR#$EPREFIX}" newins "modules/${PHP_EXT_NAME}.so" "${PHP_EXT_NAME}.so" || die "Unable to install extension" local doc @@ -227,12 +228,12 @@ php_get_slots() { php_init_slot_env() { libdir=$(get_libdir) - PHPIZE="/usr/${libdir}/${1}/bin/phpize" - PHPCONFIG="/usr/${libdir}/${1}/bin/php-config" - PHPCLI="/usr/${libdir}/${1}/bin/php" - PHPCGI="/usr/${libdir}/${1}/bin/php-cgi" + PHPIZE="${EPREFIX}/usr/${libdir}/${1}/bin/phpize" + PHPCONFIG="${EPREFIX}/usr/${libdir}/${1}/bin/php-config" + PHPCLI="${EPREFIX}/usr/${libdir}/${1}/bin/php" + PHPCGI="${EPREFIX}/usr/${libdir}/${1}/bin/php-cgi" PHP_PKG="$(best_version =dev-lang/php-${1:3}*)" - PHPPREFIX="/usr/${libdir}/${slot}" + PHPPREFIX="${EPREFIX}}/usr/${libdir}/${slot}" EXT_DIR="$(${PHPCONFIG} --extension-dir 2>/dev/null)" PHP_CURRENTSLOT=${1:3} @@ -249,7 +250,7 @@ php-ext-source-r2_buildinilist() { PHPINIFILELIST="" local x for x in ${PHPSAPILIST} ; do - if [[ -f "/etc/php/${x}-${1}/php.ini" ]] ; then + if [[ -f "${EPREFIX}/etc/php/${x}-${1}/php.ini" ]] ; then PHPINIFILELIST="${PHPINIFILELIST} etc/php/${x}-${1}/ext/${PHP_EXT_NAME}.ini" fi done @@ -291,7 +292,7 @@ php-ext-source-r2_createinifiles() { done # Add support for installing PHP files into a version dependant directory - PHP_EXT_SHARED_DIR="/usr/share/php/${PHP_EXT_NAME}" + PHP_EXT_SHARED_DIR="${EPREFIX}/usr/share/php/${PHP_EXT_NAME}" done } diff --git a/eclass/php-pear-lib-r1.eclass b/eclass/php-pear-lib-r1.eclass index bbd0b495..38b6d6a7 100644 --- a/eclass/php-pear-lib-r1.eclass +++ b/eclass/php-pear-lib-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-lib-r1.eclass,v 1.28 2015/02/11 02:53:18 grknight Exp $ +# $Id: 03440c8abe1ae9bdd662d05513f7b737d7c4f241 $ # @ECLASS: php-pear-lib-r1.eclass # @MAINTAINER: diff --git a/eclass/php-pear-r1.eclass b/eclass/php-pear-r1.eclass index 8e36913d..81a5dc15 100644 --- a/eclass/php-pear-r1.eclass +++ b/eclass/php-pear-r1.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/php-pear-r1.eclass,v 1.33 2015/02/11 02:53:18 grknight Exp $ +# $Id: c2610307c7138276161ea440c1be1b6a7f226e22 $ # @ECLASS: php-pear-r1.eclass # @MAINTAINER: |