diff options
| author |   Brian Evans <grknight@gentoo.org> | 2018-03-12 20:51:49 -0400 |
|---|---|---|
| committer | Brian Evans <grknight@gentoo.org> | 2018-03-21 21:28:15 -0400 |
| commit | a6d7eea00e5d7f4e07a7c04b91cf6e999f4b6444 (patch) | |
| tree | d7dc32408cfd4e8ac28fe5b30966844d0b8e34dd /dev-libs/ossp-uuid | |
| parent | dev-php/maxmind-db-reader: Remove src_unpack as changes to eclass make it obs... (diff) | |
| download | gentoo-a6d7eea00e5d7f4e07a7c04b91cf6e999f4b6444.tar.gz gentoo-a6d7eea00e5d7f4e07a7c04b91cf6e999f4b6444.tar.bz2 gentoo-a6d7eea00e5d7f4e07a7c04b91cf6e999f4b6444.zip | |
dev-libs/ossp-uuid: Rearrange src_prepare for eclass changes
Skip patching in php-ext-source-r3 and handle them here
before copying to slots.
Diffstat (limited to 'dev-libs/ossp-uuid')
| -rw-r--r-- | dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild index 1d735746f34a..67d3db311450 100644 --- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild +++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild @@ -10,6 +10,7 @@ PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" PHP_EXT_S="${WORKDIR}/${MY_P}/php" PHP_EXT_OPTIONAL_USE="php" +PHP_EXT_SKIP_PATCHES="yes" USE_PHP="php5-6 php7-0 php7-1" GENTOO_DEPEND_ON_PERL="no" @@ -41,21 +42,18 @@ src_prepare() { "${FILESDIR}/${P}-fix-whatis-entries.patch" \ "${FILESDIR}/${P}-fix-data-uuid-from-string.patch" + eapply_user if use php; then - local slot - for slot in $(php_get_slots); do - php_init_slot_env ${slot} - eapply -p2 \ - "${FILESDIR}/${P}-gentoo-php.patch" \ - "${FILESDIR}/uuid-${PV}-php54.patch" \ - "${FILESDIR}/${P}-php70.patch" - done - + pushd "${PHP_EXT_S}" > /dev/null || die + eapply -p2 \ + "${FILESDIR}/${P}-gentoo-php.patch" \ + "${FILESDIR}/uuid-${PV}-php54.patch" \ + "${FILESDIR}/${P}-php70.patch" + popd > /dev/null || die php-ext-source-r3_src_prepare + #Remove call by reference which is error sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die - else - eapply_user fi } |