dev-lang/php: Move eautoreconf outside from eblits, inherit autotools

Package-Manager: portage-2.2.8-r1

4 files changed, 10 insertions, 8 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 4a99c5aa..b1804cf0 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -3,6 +3,10 @@
 # $Header: $
 
   04 Feb 2014; Bertrand Jacquin <beber@meleeweb.net>
+  files/eblits/src_prepare-v2.eblit, php-5.2.17.ebuild:
+  dev-lang/php: Move eautoreconf outside from eblits, inherit autotools
+
+  04 Feb 2014; Bertrand Jacquin <beber@meleeweb.net>
   +files/5.2.17/libxml-2.9.patch, metadata.xml, php-5.2.17.ebuild:
   dev-lang/php: Update to work with libxml 2.9.0, remove fdftk USE flag as app-
   text/fdftk is deprecated
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 7ab991f9..df8a6ce2 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -7,10 +7,10 @@ AUX eblits/common-v2.eblit 379 SHA256 8c15442b04b0216342ef6f2b8565cb3510f6850fe6
 AUX eblits/src_compile-v1.eblit 1283 SHA256 5ec76ae24304c5f803a615a98394c219018da1b1ce2018f92f6ac8c5becf6c99 WHIRLPOOL 2971e61a6932a7c2c19bb40b26f67d529560d08116c37d7b645dc008710d7cc8cd75dcc8feca95eeb556687910968dbe90b20554ad0ca97a624cd7f9c9221482
 AUX eblits/src_configure-v521.eblit 10844 SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d WHIRLPOOL 80e4f15c6dcee14634e52d454ee8d359d37eca711f19ae9f0d7c2534ddf8c45d406a1928a855fb92d0af3caed7f5f2986fc76fb40480debaa4788a64098a1a53
 AUX eblits/src_install-v2.eblit 5237 SHA256 860bf8ada8a4900d6a4bdd29bab3e65aff29ba8ddbbba4bec50d9d29c6990ca4 WHIRLPOOL 100fe0d603ae2105ad5897390c774d93b015f81651369d94ea187aa7e2d37dbbe0a64094dd66e7aad2de0ff7f869c1481c688bde9a8156bb659141ae1681f073
-AUX eblits/src_prepare-v2.eblit 2604 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790 WHIRLPOOL ad420b8c11e3093b24a4fac793170fba401e0fea293970aa6803c8ce13a1c4aaddc54b14def5ea42885a261aa3658eac44b08313dab8042bd5bba1fb441742e4
+AUX eblits/src_prepare-v2.eblit 2569 SHA256 0645b886cc7f5ac0446da7732f347f39b5102982ae21722ef084ebbbda9f0bba WHIRLPOOL e4851940e62f6a01b76c5a1a0c8a6699e5098d471a039dc6825d537674f1cfcad5f39cda10e487fb0b0d9b1e8e1695347518252f2d22907b4892a06cedb5fefc
 DIST php-5.2.17.tar.bz2 9092312 SHA256 e81beb13ec242ab700e56f366e9da52fd6cf18961d155b23304ca870e53f116c WHIRLPOOL 94657976927ff8d45dc17c2db59ac86a4320d6d7b2b6d5b43c4862060495a4011ad9b73d9b57ea4eb46a38418683ac2ff16e93fa10bd4ad5842c50accbac3536
 DIST php-patchset-5.2.17-r0.tar.bz2 8369 SHA256 fb159a02faf5120dd9bc620bd3f3094735f181aa6893273bb7dd29771b8b23b2 WHIRLPOOL 77aada53720272656d82d1e9fdade8e25fa6d7e409de546e9c3ac0d274308734a1d254665de97c54a8c14da79e49acdfb2bfb960fbd97bc24bc9db0bd8a348ac
 DIST suhosin-patch-5.2.16-0.9.7.patch.gz 23069 SHA256 aae115a318d80b3f32cedf876e7a8e4b932febb1b0c743c0b398003ebe122f91 WHIRLPOOL b3282acb99b48ad9edb89b45f12bf60b40bc9fd8d9bcf42a5402b8331e8d2e4a8fa52bd423c7a5fae2b7c1c93f0245d13019e6c85e1379d1749abb6d7f1a0a0c
-EBUILD php-5.2.17.ebuild 11537 SHA256 846a853810b7573163536b1b9fef63bea66e0d03930114e25e6ac345c99c1f78 WHIRLPOOL 231f9f31a22b3eaf4e52b75628e626796e0e69d5a26fd835494df2b5b832b0035f6f6eda1992080336cce7ef29447f2627b6d88b2bc676cc11409c70f208f8e5
-MISC ChangeLog 1247 SHA256 8bdee44837b7df76ea5ae26f794fbe1f5b1802df3c7e0cd0a5f3579ec3f321d7 WHIRLPOOL 7a634c79bc613a201a79f83812918f69ff58a716431fc0837a4802cb836c9011ee529bf4c53132cf5a1d1c08fe86e199e884d2ccde36bc6ebeb67b37735871b1
+EBUILD php-5.2.17.ebuild 11580 SHA256 11af509978912a0a15e9b10baa7645744bd785e16dbfa3cb90c1934723f3ac49 WHIRLPOOL a6cd7a32c0840f834ca2c118872a4b427d9f630746dfea7034537bf06b509cbd385106d19396de78cf8cb3334c1a95650c72ece60e58e4916a00301154f3e184
+MISC ChangeLog 1429 SHA256 bc66b58237861f19af41ffade52512173d173647ee96e1845ae272ced5217791 WHIRLPOOL 9219bd327137dab3e108d2784bdb52608a8ecd98d1860376e977280ef12c3849508ff2a12d4231d0109104e0162bd7990d375245e5e6be49cb9f787eaea95be7
 MISC metadata.xml 2622 SHA256 babdb0230e8097c0da21313b642965a48177f58ec11241aa1124906fd051d907 WHIRLPOOL 61bf714b5de3feaaa3e021e8d16b865c64069b083d9eb5179e554440cb4244ec333b9faf4ab0a2ccb3bcd68a3a0a5186688b493d1d5f22052e55ce7a1fed50c2
diff --git a/dev-lang/php/files/eblits/src_prepare-v2.eblit b/dev-lang/php/files/eblits/src_prepare-v2.eblit
index b6bd72ee..02b1ffe4 100644
--- a/dev-lang/php/files/eblits/src_prepare-v2.eblit
+++ b/dev-lang/php/files/eblits/src_prepare-v2.eblit
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_prepare-v2.eblit,v 1.3 2011/01/05 11:23:16 mabi Exp $
 
@@ -65,7 +65,4 @@ eblit-php-src_prepare() {
 			-e 's:^((m4_)?divert)[(]([0-9]*)[)]:\1(600\3):' \
 			$(grep -l divert $(find . -name '*.m4') configure.in) || die
 	fi
-	eautoreconf --force -W no-cross
 }
-
-
diff --git a/dev-lang/php/php-5.2.17.ebuild b/dev-lang/php/php-5.2.17.ebuild
index c4858b65..a020d640 100644
--- a/dev-lang/php/php-5.2.17.ebuild
+++ b/dev-lang/php/php-5.2.17.ebuild
@@ -7,7 +7,7 @@ EAPI=2
 PHPCONFUTILS_MISSING_DEPS="adabas birdstep db2 dbmaker empress empress-bcs esoob
 interbase msql oci8 sapdb solid"
 
-inherit eutils flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
+inherit autotools eutils flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
 
 #SUHOSIN_VERSION="$PV-0.9.7"
 SUHOSIN_VERSION="5.2.16-0.9.7"
@@ -328,6 +328,7 @@ src_prepare() {
 	epatch "${FILESDIR}/${PV}/libxml-2.9.patch"
 
 	eblit-run src_prepare v2
+	eautoreconf --force -W no-cross
 }
 src_configure() { eblit-run src_configure v521 ; }
 src_compile() { eblit-run src_compile v1 ; }