fix bug #323721

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/dev-php5/php-gtk/ChangeLog b/dev-php5/php-gtk/ChangeLog
index 0ffa0139544aae502f68a5c54cabb7e25a6496e9..7995e9ae07cdcf5e5606e72c39f82b504482c146 100644 (file)
--- a/dev-php5/php-gtk/ChangeLog
+++ b/dev-php5/php-gtk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-php5/php-gtk
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.20 2010/06/11 18:13:09 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/ChangeLog,v 1.21 2010/06/21 16:56:05 mabi Exp $
+
+  21 Jun 2010; <mabi@gentoo.org> php-gtk-2.0.1-r3.ebuild:
+  run phpize after applying patches (bug #323721)
 
 *php-gtk-2.0.1-r3 (11 Jun 2010)
 

diff --git a/dev-php5/php-gtk/Manifest b/dev-php5/php-gtk/Manifest
index b0b9c9296233f779edab34c11ce15c428568d7a0..905710a9b0def4857cbddb75a9b1bb8f427f44e8 100644 (file)
--- a/dev-php5/php-gtk/Manifest
+++ b/dev-php5/php-gtk/Manifest
@@ -8,6 +8,6 @@ DIST php_gtk_manual-20071130_ja.tar.bz2 873089 RMD160 f34e2887a4890877b1582113fd
 DIST php_gtk_manual-20071130_pt_BR.tar.bz2 940444 RMD160 37fd4a08f8aadeec338481fd61d4f8c2bc831adc SHA1 b3cd5ce5e9e9c4ec5ab6db7b55063ce8f8ffd7eb SHA256 7dfecfafbc2f3e796f5deafbce5e389eba2877e453b3fd9fd69e3fc5c33df083
 DIST php_gtk_manual-20071130_zh_CN.tar.bz2 869165 RMD160 3b3b51f3c4e1ca9827fc238e86e59a2b64d40d9e SHA1 091215691890cf8b51c2fea962fca18f8c845e05 SHA256 2c242e78b0de5253edafdc0df852cc32b2c9fa49878fa494dfe5e1df10790ae2
 EBUILD php-gtk-2.0.1-r2.ebuild 3535 RMD160 4affc17b172c8bbf1afe8fa83c5329b5ce988d7b SHA1 e5bb55b91e26d7337428c61db3259e7a3d2e2c73 SHA256 b365546b09d30978af37775a84d7ecb1ba74aac2cbbe2b7259cc9b47f9432ec8
-EBUILD php-gtk-2.0.1-r3.ebuild 3219 RMD160 5b47d6835b7c950359ba7b4247b8ba2efdcc12d4 SHA1 00b142c5db457acad733cefed75f4e4c566bc7fa SHA256 94ec0f2a773a120228c72b743a1467d363c5fa1a3c1974c9d3148898333ccda7
-MISC ChangeLog 4127 RMD160 7d254c29fc406208b855e54ead85c4a706bc6dc0 SHA1 c5a0847f3a673c80e8f9e422288f92cd60476274 SHA256 9021237f2f49e15064c20ae9f95bb939a3328ee48bd67c63823d379748d3d719
+EBUILD php-gtk-2.0.1-r3.ebuild 3208 RMD160 da2337ee50545ea13f9c3cb20a742528a038df3f SHA1 537114550ece93f7e06870c5f3a2807bc9794f8f SHA256 17aaab454cf7c224f53c4ed084ab784f7c262b77e11cd0de64a8dd21331113fe
+MISC ChangeLog 4236 RMD160 33ca59e78c418d6bfb43ca01413d067879574277 SHA1 73cba52684cc7bc0938ad70e2f7f3c5d04960657 SHA256 1fe9131d5a8de67f0df54a1b04f956a4b2c5c8a5b687891114f1d2a53633e37c
 MISC metadata.xml 561 RMD160 70336718c05f32cd7fa2d0f6c68c03a9e9174011 SHA1 3636adffca1aea7f969d7d797f7b033fc94726e0 SHA256 1ef6b61cbf37cee3ab157d5841d6abe860f52282129b5109d3d8c4ddd48c23fd

diff --git a/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild b/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild
index 44e8766b5435751de47d377db90b37372e6f6699..faab7836697ae4791e1d9b488b65fe57e97178b9 100644 (file)
--- a/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild
+++ b/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild,v 1.1 2010/06/11 18:13:09 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/php-gtk/php-gtk-2.0.1-r3.ebuild,v 1.2 2010/06/21 16:56:05 mabi Exp $
 
 EAPI="2"
 
@@ -48,18 +48,6 @@ DEPEND="${RDEPEND}
 src_unpack() {
        unpack ${P}.tar.gz
 
-       cd "${S}"
-       # see bug 232538 for details:
-       # this is needed so that autoconf can find the m4 gtk files (non-standard
-       # location)
-       export AT_M4DIR="${S}"
-       # phpize will invoke autoconf/autoheader (which will fail); we are replacing
-       # these calls with dummies as we call eautoreconf shortly afterwards
-       # anyway
-       export PHP_AUTOCONF="true"
-       export PHP_AUTOHEADER="true"
-       php-ext-source-r1_phpize
-
        cd "${WORKDIR}"
        for lang in ${LANGS} ; do
                if use doc && use linguas_${lang} ; then
@@ -78,6 +66,17 @@ src_prepare() {
 
        # depends on newer gtkhtml
        epatch "${FILESDIR}"/${PN}-2.0.1-gtkhtml314.patch
+
+       # see bug 232538 for details:
+       # this is needed so that autoconf can find the m4 gtk files (non-standard
+       # location)
+       export AT_M4DIR="${S}"
+       # phpize will invoke autoconf/autoheader (which will fail); we are replacing
+       # these calls with dummies as we call eautoreconf shortly afterwards
+       # anyway
+       export PHP_AUTOCONF="true"
+       export PHP_AUTOHEADER="true"
+       php-ext-source-r1_phpize
 }
 
 src_compile() {