summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Evans <grknight@gentoo.org>2018-03-22 13:02:54 -0400
committerBrian Evans <grknight@gentoo.org>2018-03-22 13:03:53 -0400
commitd350f925022b7c5dfd657a41a142aa8b55bb8cf6 (patch)
treeeefb019c8f0a1ba4a1b6956b9929a5fd4e0c31b5
parentapp-office/kmymoney: Fix python deps and eclass (diff)
downloadgentoo-d350f925022b7c5dfd657a41a142aa8b55bb8cf6.tar.gz
gentoo-d350f925022b7c5dfd657a41a142aa8b55bb8cf6.tar.bz2
gentoo-d350f925022b7c5dfd657a41a142aa8b55bb8cf6.zip
dev-php/ming-php: Fix errors on src_prepare wrt eclass changes
Closes: https://bugs.gentoo.org/651160 Package-Manager: Portage-2.3.24, Repoman-2.3.6
-rw-r--r--dev-php/ming-php/files/ming-php-54.patch4
-rw-r--r--dev-php/ming-php/ming-php-0.4.7.ebuild25
-rw-r--r--dev-php/ming-php/ming-php-0.4.8.ebuild23
3 files changed, 23 insertions, 29 deletions
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() {