From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- dev-php/ming-php/Manifest | 6 +++--- dev-php/ming-php/files/ming-php-54.patch | 4 ++-- dev-php/ming-php/ming-php-0.4.7.ebuild | 25 +++++++++++-------------- dev-php/ming-php/ming-php-0.4.8.ebuild | 23 ++++++++++------------- 4 files changed, 26 insertions(+), 32 deletions(-) (limited to 'dev-php/ming-php') diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest index 47ffb38a7502..349b383190a8 100644 --- a/dev-php/ming-php/Manifest +++ b/dev-php/ming-php/Manifest @@ -1,7 +1,7 @@ -AUX ming-php-54.patch 17283 BLAKE2B 9508565a0663a359bed955ecedf502df8e7c3c67afed7a94723383ce0c7cb232752ae4ef420e32fc44b488bd8f3905ee1b71a83b13f18286ec5d3de987c6ee25 SHA512 4661cc5ac6abf8bbaaf12669379c8db011c27233e2e5625d2d18ed5dd969685f6446d0d08b0a162fecbaea5a91a62c799238385d02db4c414dde1ed6b3a88643 +AUX ming-php-54.patch 17282 BLAKE2B 9f17a2ee92252ca2ff4bf29e4412a4493b49d4eb918772d6c931b0417ae84e22a7b138f76da989ae36a1d7f6f212e606d8232959242e86ea3515adc3ad405d3b SHA512 79aeea313bbc2b17e170998df37a0e526125ba7752533ca312f18bf31cc66ea79d6fcffd84dfccb9c7714c16345a1cb0f3107914f6ecad01702ad550145391e7 AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f387160133312b96f5a8101cea87125d03eafbfdef7ede77b2a85dd0b32d428e6c78019a4a3d2c84f9cd05 SHA512 88e3eb6f42c38d66c050c3e6c956e239861b8c17ed7f7c4867be00b06c9b48b806af3254bd8fbd4c7349a4ff41981bfcb1c7256d671dc5b8bf6d0089d8bf62cc DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0 -EBUILD ming-php-0.4.7.ebuild 1441 BLAKE2B 91917ba6f913620bbea05084f9e4c62426429355ced51bf60cd5ec88fc8fb317304aeb7cabe6783c5cf2493b996f104d68a7619e4734aa2ab347e2fd58fa0885 SHA512 f2c8e1c7a2174ec9e9a91facac0185fcca06df8c9475970612dc391f964803c84bb7b62d521217a865be0dc58ff47f334c647c51663e11bdb61c0f6690443ccd -EBUILD ming-php-0.4.8.ebuild 1505 BLAKE2B 456da6d7f0e6b49236419c036975a3768744a2871298ace4c044ee779e61be85f097b6570324ec9468781e0b1f2679434a1813d55f7c40f2375478b25f4c8e78 SHA512 bf590ef7dfd9cacc97690bcccb8f5b41a9d6e07330acca31bb5c39519ee01da9ca8c722a100a37155c9b99c1955bd28af05ec739923046bc367034e9201eefb3 +EBUILD ming-php-0.4.7.ebuild 1332 BLAKE2B 4eb3cb1d05c52660df43e15e172154564754261cc0630669f212c31a5d551fd389966bac27becca64e5ab531a8039feb5b2cd214bd970ef21a5772f1410ad648 SHA512 0793f4410f866ae8fbe38e083c5c0a828d9e0d643aeeb1973d9b644854e336fbe3fa2f812e4a26948474af242ba7bf202c3f8dbfb4c3ad1ca63f74c4a10c3b28 +EBUILD ming-php-0.4.8.ebuild 1397 BLAKE2B d1babc9387be09e585356e7c20cdbe1417ba5500b4c88947011b00dfec05125c5cb26a47d2a035962fc76274bc355ff5fcb1b5c414a4c9b2248ae9fb1c2f7971 SHA512 00f5109e2106c534f2c10b52f5dec7e2375c86ec2dbda6f4140f4a88ad11088035d22950e77e20ea59a4c41b374ca7f22eb543d08d8aab65546d953e37c2089d MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4 diff --git a/dev-php/ming-php/files/ming-php-54.patch b/dev-php/ming-php/files/ming-php-54.patch index 45036df73eb4..79e167406800 100644 --- a/dev-php/ming-php/files/ming-php-54.patch +++ b/dev-php/ming-php/files/ming-php-54.patch @@ -1,5 +1,5 @@ ---- ming.c.orig 2015-01-19 21:46:35.299042679 -0500 -+++ ming.c 2015-01-19 21:52:00.566380663 -0500 +--- a/ming.c 2015-01-19 21:46:35.299042679 -0500 ++++ b/ming.c 2015-01-19 21:52:00.566380663 -0500 @@ -370,7 +370,7 @@ input = newSWFInput_file(file); diff --git a/dev-php/ming-php/ming-php-0.4.7.ebuild b/dev-php/ming-php/ming-php-0.4.7.ebuild index 39946c8462e5..3c335f1e51c2 100644 --- a/dev-php/ming-php/ming-php-0.4.7.ebuild +++ b/dev-php/ming-php/ming-php-0.4.7.ebuild @@ -6,7 +6,7 @@ EAPI=6 PHP_EXT_NAME=ming MY_P="${PHP_EXT_NAME}-${PV//./_}" USE_PHP="php5-6" -PHP_EXT_S="libming-${MY_P}/php_ext" +PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext" inherit flag-o-matic php-ext-source-r3 DESCRIPTION="PHP extension for the ming Flash movie generation library" @@ -22,22 +22,19 @@ RDEPEND="media-libs/ming" DEPEND="${RDEPEND}" S="${WORKDIR}/libming-${MY_P}" +PATCHES=( "${FILESDIR}/ming-php-54.patch" ) src_prepare() { - local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) - for slot in $(php_get_slots); do - cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ - die "Failed to copy config.m4 to target" - rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" - # Fix for SYMYLINK_LIB=no - [[ ${libdir} != 'lib' ]] && \ - sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ + local libdir=$(get_libdir) + cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \ + die "Failed to copy config.m4 to target" + rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" + # Fix for SYMYLINK_LIB=no + if [[ ${libdir} != 'lib' ]] ; then + sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \ || die "Failed to update lib directory" - php_init_slot_env ${slot} - eapply -p0 "${FILESDIR}/ming-php-54.patch" - eapply_user - php-ext-source-r3_phpize - done + fi + php-ext-source-r3_src_prepare } src_configure() { diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild index b729af51dadb..13db203b5ab9 100644 --- a/dev-php/ming-php/ming-php-0.4.8.ebuild +++ b/dev-php/ming-php/ming-php-0.4.8.ebuild @@ -6,7 +6,7 @@ EAPI=6 PHP_EXT_NAME=ming MY_P="${PHP_EXT_NAME}-${PV//./_}" USE_PHP="php5-6 php7-0 php7-1 php7-2" -PHP_EXT_S="libming-${MY_P}/php_ext" +PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext" inherit flag-o-matic php-ext-source-r3 DESCRIPTION="PHP extension for the ming Flash movie generation library" @@ -26,19 +26,16 @@ S="${WORKDIR}/libming-${MY_P}" DOCS=( ) src_prepare() { - local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) - for slot in $(php_get_slots); do - cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ - die "Failed to copy config.m4 to target" - rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" - # Fix for SYMYLINK_LIB=no - [[ ${libdir} != 'lib' ]] && \ - sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ + local libdir=$(get_libdir) + cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \ + die "Failed to copy config.m4 to target" + rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" + # Fix for SYMYLINK_LIB=no + if [[ ${libdir} != 'lib' ]] ; then + sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \ || die "Failed to update lib directory" - php_init_slot_env ${slot} - eapply_user - php-ext-source-r3_phpize - done + fi + php-ext-source-r3_src_prepare } src_configure() { -- cgit v1.2.3