diff options
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/Manifest.gz | bin | 41172 -> 41172 bytes | |||
| -rw-r--r-- | eclass/bitcoincore.eclass | 3 | ||||
| -rw-r--r-- | eclass/php-ext-source-r3.eclass | 36 | ||||
| -rw-r--r-- | eclass/vcs-snapshot.eclass | 3 |
4 files changed, 23 insertions, 19 deletions
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz Binary files differindex 856b221307d1..a1db57ef16f7 100644 --- a/eclass/Manifest.gz +++ b/eclass/Manifest.gz diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass index 22bc5db1df75..7336da2eec78 100644 --- a/eclass/bitcoincore.eclass +++ b/eclass/bitcoincore.eclass @@ -1,6 +1,9 @@ # Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # +# @DEAD +# Removal on 2018-04-19. +# # @ECLASS: bitcoincore.eclass # @MAINTAINER: # Luke Dashjr <luke_gentoo_bitcoin@dashjr.org> diff --git a/eclass/php-ext-source-r3.eclass b/eclass/php-ext-source-r3.eclass index dfcec487685b..0563d5af7652 100644 --- a/eclass/php-ext-source-r3.eclass +++ b/eclass/php-ext-source-r3.eclass @@ -11,7 +11,7 @@ inherit autotools -EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_install src_test +EXPORT_FUNCTIONS src_prepare src_configure src_compile src_install src_test case ${EAPI} in 6) ;; @@ -141,33 +141,33 @@ DEPEND="${DEPEND} # @ECLASS-VARIABLE: PHP_EXT_SKIP_PHPIZE # @DEFAULT_UNSET # @DESCRIPTION: -# By default, we run "phpize" in php-ext-source-r3_src_unpack(). Set +# By default, we run "phpize" in php-ext-source-r3_src_prepare(). Set # PHP_EXT_SKIP_PHPIZE="yes" in your ebuild if you do not want to run # phpize (and the autoreconf that becomes necessary afterwards). -# @FUNCTION: php-ext-source-r3_src_unpack +# @ECLASS-VARIABLE: PHP_EXT_SKIP_PATCHES +# @DEFAULT_UNSET # @DESCRIPTION: -# Runs the default src_unpack and then makes a copy for each PHP slot. -php-ext-source-r3_src_unpack() { - default - - local slot orig_s="${PHP_EXT_S}" - for slot in $(php_get_slots); do - cp --recursive --preserve "${orig_s}" "${WORKDIR}/${slot}" || \ - die "failed to copy sources from ${orig_s} to ${WORKDIR}/${slot}" - done -} - +# By default, we run default_src_prepare to PHP_EXT_S. +# Set PHP_EXT_SKIP_PATCHES="yes" in your ebuild if you +# want to apply patches yourself. # @FUNCTION: php-ext-source-r3_src_prepare # @DESCRIPTION: -# For each PHP slot, we initialize the environment, run the default -# src_prepare() for PATCHES/eapply_user support, and then call -# php-ext-source-r3_phpize. +# Runs the default src_prepare() for PATCHES/eapply_user() support (optional), +# and for each PHP slot, makes a copy of sources, initializes the environment, +# and calls php-ext-source-r3_phpize(). php-ext-source-r3_src_prepare() { + local slot orig_s="${PHP_EXT_S}" + if [[ "${PHP_EXT_SKIP_PATCHES}" != 'yes' ]] ; then + pushd "${orig_s}" > /dev/null || die + default + popd > /dev/null || die + fi for slot in $(php_get_slots); do + cp --recursive --preserve "${orig_s}" "${WORKDIR}/${slot}" || \ + die "failed to copy sources from ${orig_s} to ${WORKDIR}/${slot}" php_init_slot_env "${slot}" - default php-ext-source-r3_phpize done } diff --git a/eclass/vcs-snapshot.eclass b/eclass/vcs-snapshot.eclass index 3eff6995fae7..243d4a8a3185 100644 --- a/eclass/vcs-snapshot.eclass +++ b/eclass/vcs-snapshot.eclass @@ -67,7 +67,8 @@ vcs-snapshot_src_unpack() { # XXX: check whether the directory structure inside is # fine? i.e. if the tarball has actually a parent dir. mkdir "${destdir}" || die - tar -C "${destdir}" -x --strip-components 1 \ + # -o (--no-same-owner) to avoid restoring original owner + tar -C "${destdir}" -x -o --strip-components 1 \ -f "${DISTDIR}/${f}" || die ;; *) |