| 1 |
commit: d350f925022b7c5dfd657a41a142aa8b55bb8cf6 |
| 2 |
Author: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 22 17:02:54 2018 +0000 |
| 4 |
Commit: Brian Evans <grknight <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 22 17:03:53 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d350f925 |
| 7 |
|
| 8 |
dev-php/ming-php: Fix errors on src_prepare wrt eclass changes |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/651160 |
| 11 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 12 |
|
| 13 |
dev-php/ming-php/files/ming-php-54.patch | 4 ++-- |
| 14 |
dev-php/ming-php/ming-php-0.4.7.ebuild | 25 +++++++++++-------------- |
| 15 |
dev-php/ming-php/ming-php-0.4.8.ebuild | 23 ++++++++++------------- |
| 16 |
3 files changed, 23 insertions(+), 29 deletions(-) |
| 17 |
|
| 18 |
diff --git a/dev-php/ming-php/files/ming-php-54.patch b/dev-php/ming-php/files/ming-php-54.patch |
| 19 |
index 45036df73eb..79e16740680 100644 |
| 20 |
--- a/dev-php/ming-php/files/ming-php-54.patch |
| 21 |
+++ b/dev-php/ming-php/files/ming-php-54.patch |
| 22 |
@@ -1,5 +1,5 @@ |
| 23 |
---- ming.c.orig 2015-01-19 21:46:35.299042679 -0500 |
| 24 |
-+++ ming.c 2015-01-19 21:52:00.566380663 -0500 |
| 25 |
+--- a/ming.c 2015-01-19 21:46:35.299042679 -0500 |
| 26 |
++++ b/ming.c 2015-01-19 21:52:00.566380663 -0500 |
| 27 |
@@ -370,7 +370,7 @@ |
| 28 |
|
| 29 |
input = newSWFInput_file(file); |
| 30 |
|
| 31 |
diff --git a/dev-php/ming-php/ming-php-0.4.7.ebuild b/dev-php/ming-php/ming-php-0.4.7.ebuild |
| 32 |
index 39946c8462e..3c335f1e51c 100644 |
| 33 |
--- a/dev-php/ming-php/ming-php-0.4.7.ebuild |
| 34 |
+++ b/dev-php/ming-php/ming-php-0.4.7.ebuild |
| 35 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 36 |
PHP_EXT_NAME=ming |
| 37 |
MY_P="${PHP_EXT_NAME}-${PV//./_}" |
| 38 |
USE_PHP="php5-6" |
| 39 |
-PHP_EXT_S="libming-${MY_P}/php_ext" |
| 40 |
+PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext" |
| 41 |
inherit flag-o-matic php-ext-source-r3 |
| 42 |
|
| 43 |
DESCRIPTION="PHP extension for the ming Flash movie generation library" |
| 44 |
@@ -22,22 +22,19 @@ RDEPEND="media-libs/ming" |
| 45 |
DEPEND="${RDEPEND}" |
| 46 |
|
| 47 |
S="${WORKDIR}/libming-${MY_P}" |
| 48 |
+PATCHES=( "${FILESDIR}/ming-php-54.patch" ) |
| 49 |
|
| 50 |
src_prepare() { |
| 51 |
- local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) |
| 52 |
- for slot in $(php_get_slots); do |
| 53 |
- cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ |
| 54 |
- die "Failed to copy config.m4 to target" |
| 55 |
- rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" |
| 56 |
- # Fix for SYMYLINK_LIB=no |
| 57 |
- [[ ${libdir} != 'lib' ]] && \ |
| 58 |
- sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ |
| 59 |
+ local libdir=$(get_libdir) |
| 60 |
+ cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \ |
| 61 |
+ die "Failed to copy config.m4 to target" |
| 62 |
+ rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" |
| 63 |
+ # Fix for SYMYLINK_LIB=no |
| 64 |
+ if [[ ${libdir} != 'lib' ]] ; then |
| 65 |
+ sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \ |
| 66 |
|| die "Failed to update lib directory" |
| 67 |
- php_init_slot_env ${slot} |
| 68 |
- eapply -p0 "${FILESDIR}/ming-php-54.patch" |
| 69 |
- eapply_user |
| 70 |
- php-ext-source-r3_phpize |
| 71 |
- done |
| 72 |
+ fi |
| 73 |
+ php-ext-source-r3_src_prepare |
| 74 |
} |
| 75 |
|
| 76 |
src_configure() { |
| 77 |
|
| 78 |
diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild |
| 79 |
index b729af51dad..13db203b5ab 100644 |
| 80 |
--- a/dev-php/ming-php/ming-php-0.4.8.ebuild |
| 81 |
+++ b/dev-php/ming-php/ming-php-0.4.8.ebuild |
| 82 |
@@ -6,7 +6,7 @@ EAPI=6 |
| 83 |
PHP_EXT_NAME=ming |
| 84 |
MY_P="${PHP_EXT_NAME}-${PV//./_}" |
| 85 |
USE_PHP="php5-6 php7-0 php7-1 php7-2" |
| 86 |
-PHP_EXT_S="libming-${MY_P}/php_ext" |
| 87 |
+PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext" |
| 88 |
inherit flag-o-matic php-ext-source-r3 |
| 89 |
|
| 90 |
DESCRIPTION="PHP extension for the ming Flash movie generation library" |
| 91 |
@@ -26,19 +26,16 @@ S="${WORKDIR}/libming-${MY_P}" |
| 92 |
DOCS=( ) |
| 93 |
|
| 94 |
src_prepare() { |
| 95 |
- local slot orig_s="${PHP_EXT_S}" libdir=$(get_libdir) |
| 96 |
- for slot in $(php_get_slots); do |
| 97 |
- cp "${FILESDIR}/php_ext-config.m4" "${WORKDIR}/${slot}/config.m4" || \ |
| 98 |
- die "Failed to copy config.m4 to target" |
| 99 |
- rm "${WORKDIR}/${slot}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" |
| 100 |
- # Fix for SYMYLINK_LIB=no |
| 101 |
- [[ ${libdir} != 'lib' ]] && \ |
| 102 |
- sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${WORKDIR}/${slot}/config.m4" \ |
| 103 |
+ local libdir=$(get_libdir) |
| 104 |
+ cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \ |
| 105 |
+ die "Failed to copy config.m4 to target" |
| 106 |
+ rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" |
| 107 |
+ # Fix for SYMYLINK_LIB=no |
| 108 |
+ if [[ ${libdir} != 'lib' ]] ; then |
| 109 |
+ sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \ |
| 110 |
|| die "Failed to update lib directory" |
| 111 |
- php_init_slot_env ${slot} |
| 112 |
- eapply_user |
| 113 |
- php-ext-source-r3_phpize |
| 114 |
- done |
| 115 |
+ fi |
| 116 |
+ php-ext-source-r3_src_prepare |
| 117 |
} |
| 118 |
|
| 119 |
src_configure() { |
Archives