[gentoo-commits] repo/gentoo:master commit in: dev-libs/ossp-uuid/

[Brian Evans]

commit:     a6d7eea00e5d7f4e07a7c04b91cf6e999f4b6444
Author:     Brian Evans <grknight <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 13 00:51:49 2018 +0000
Commit:     Brian Evans <grknight <AT> gentoo <DOT> org>
CommitDate: Thu Mar 22 01:28:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d7eea0

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.

 dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 20 +++++++++-----------
 1 file 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 1d735746f34..67d3db31145 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
 }