1 |
commit: a6d7eea00e5d7f4e07a7c04b91cf6e999f4b6444 |
2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Mar 13 00:51:49 2018 +0000 |
4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 22 01:28:15 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6d7eea0 |
7 |
|
8 |
dev-libs/ossp-uuid: Rearrange src_prepare for eclass changes |
9 |
|
10 |
Skip patching in php-ext-source-r3 and handle them here |
11 |
before copying to slots. |
12 |
|
13 |
dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 20 +++++++++----------- |
14 |
1 file changed, 9 insertions(+), 11 deletions(-) |
15 |
|
16 |
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 |
17 |
index 1d735746f34..67d3db31145 100644 |
18 |
--- a/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild |
19 |
+++ b/dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild |
20 |
@@ -10,6 +10,7 @@ PHP_EXT_INI="yes" |
21 |
PHP_EXT_ZENDEXT="no" |
22 |
PHP_EXT_S="${WORKDIR}/${MY_P}/php" |
23 |
PHP_EXT_OPTIONAL_USE="php" |
24 |
+PHP_EXT_SKIP_PATCHES="yes" |
25 |
USE_PHP="php5-6 php7-0 php7-1" |
26 |
|
27 |
GENTOO_DEPEND_ON_PERL="no" |
28 |
@@ -41,21 +42,18 @@ src_prepare() { |
29 |
"${FILESDIR}/${P}-fix-whatis-entries.patch" \ |
30 |
"${FILESDIR}/${P}-fix-data-uuid-from-string.patch" |
31 |
|
32 |
+ eapply_user |
33 |
if use php; then |
34 |
- local slot |
35 |
- for slot in $(php_get_slots); do |
36 |
- php_init_slot_env ${slot} |
37 |
- eapply -p2 \ |
38 |
- "${FILESDIR}/${P}-gentoo-php.patch" \ |
39 |
- "${FILESDIR}/uuid-${PV}-php54.patch" \ |
40 |
- "${FILESDIR}/${P}-php70.patch" |
41 |
- done |
42 |
- |
43 |
+ pushd "${PHP_EXT_S}" > /dev/null || die |
44 |
+ eapply -p2 \ |
45 |
+ "${FILESDIR}/${P}-gentoo-php.patch" \ |
46 |
+ "${FILESDIR}/uuid-${PV}-php54.patch" \ |
47 |
+ "${FILESDIR}/${P}-php70.patch" |
48 |
+ popd > /dev/null || die |
49 |
php-ext-source-r3_src_prepare |
50 |
+ |
51 |
#Remove call by reference which is error |
52 |
sed -i -e 's/\&\$/\$/' -e '/?>/d' "${S}/php/uuid.php5" || die |
53 |
- else |
54 |
- eapply_user |
55 |
fi |
56 |
} |