diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-03-23 04:19:44 +0000 |
| commit | c5283d322accc6097afec74eab24550829788bab (patch) | |
| tree | b99ce668128d82a026eaa31461643f9173f9b77b /dev-libs/ossp-uuid | |
| parent | 5510d9d7d1c93c2ea71a2bd6f0666168808d5dd6 (diff) | |
gentoo resync : 23.03.2018
Diffstat (limited to 'dev-libs/ossp-uuid')
| -rw-r--r-- | dev-libs/ossp-uuid/Manifest | 2 | ||||
| -rw-r--r-- | dev-libs/ossp-uuid/ossp-uuid-1.6.2-r6.ebuild | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/dev-libs/ossp-uuid/Manifest b/dev-libs/ossp-uuid/Manifest index 140c24c2838d..4f7e5855968f 100644 --- a/dev-libs/ossp-uuid/Manifest +++ b/dev-libs/ossp-uuid/Manifest @@ -11,5 +11,5 @@ AUX ossp-uuid-1.6.2-uuid-preserve-m-option-status-in-v-option-handling.patch 253 AUX uuid-1.6.2-php54.patch 6096 BLAKE2B fcfc58f1c1e1e7b00b669a212d6154db0c2512da137c1cf43efc6703c0e7cbe3623cff2a30607e971f25a8bdd59fb5fc18b7532397ecf7cfbc9ce05e98011069 SHA512 6e3919ffa87e2bb16487761e1b33c0096c8db51bf49e6ba82c3c8f7275d2585c7a7196651a679827c547d8d73ce3739b9f44e44d3f3866aca10ded520547c527 DIST uuid-1.6.2.tar.gz 397048 BLAKE2B 2240c2e19a09c7b7df0428fc316b46a69b3476ec852321f1ca43c0688b73da647cebf06e8efd8a89f55c11108ef4b9627a33ae1ec235cdda1ac7922389903c3c SHA512 16c7e016ce08d7679cc6ee7dec43a886a8c351960acdde99f8f9b590c7232d521bc6e66e4766d969d22c3f835dcc2814fdecc44eef1cd11e7b9b0f9c41b5c03e EBUILD ossp-uuid-1.6.2-r4.ebuild 2780 BLAKE2B 8d9477201e7115689ce78730fb57a71a26809b8f8ae42081cc7bd6a04445c6f7f007d3a3659034db79b4cfa215e65d9899deaf368366cdb80608589265934962 SHA512 2f36c1de9803540f124372dfbc5ba82cb8e31a7b168cda04a43c95b24c265ec4386794b00d44d6d24d9f1a98876bbceae94c459daf3cee559b1670b78d718721 -EBUILD ossp-uuid-1.6.2-r6.ebuild 3035 BLAKE2B 80310233cbce7cffa89ee66a9a937086bda8cc57254a5e24ceb0e0292416fde5776d719fd815fb43c196f22cc50f41f4d28498db21bf4e9fc972ce17f8109fd7 SHA512 80fab0f830a8f1e89dabb62790af5b412b4ffaf91ea8d76ffbd18e6b514018e0660f067b08df59b88db39bba6b72f05f41c00cc610f2bc990de4a044f005c5ab +EBUILD ossp-uuid-1.6.2-r6.ebuild 3035 BLAKE2B 833e8ebacca2ed01e5da0c8e5ab3a14d712b8b5d23df6d9f25999a9117bf41ad38884d757c339a91b41a0f5640ba72ef8c709bab78f39e1c1b0ae2d5b9fa6d97 SHA512 016fb7fe17d4073f7b8363a5fdd644309336c09822404be1108d07642f94bc639f8cba29d66609e84f8b2fec0d83272da763cdfaa1a37ef9defb96c8a0f98356 MISC metadata.xml 248 BLAKE2B 491e9ad2de37296d9a80e8149cc62db2e8fbf8c8fea001ff675c244f9f61740ee1dbceef0b5f467b88ad105f9be751fc99420eff8429f4a1dbb4a00e2b763e6e SHA512 ceeb1d27ec5afa7cd117c05220a5191629c08a008f5640050fab3deb9610d48610a314cff6f1a73577b3e771c3015e14fbc6273377cad6c559f277982f1b0b80 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 } |