Remove deps on phpconfutils and php-common-r1

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

5 files changed, 24 insertions, 16 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index fe0e3e94bf76..2ac0a2f600b8 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.511 2011/09/03 17:20:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.512 2011/09/16 07:02:56 olemarkus Exp $
+
+  16 Sep 2011; Ole Markus With <olemarkus@gentoo.org>
+  files/eblits/src_configure-v3.eblit, files/eblits/src_install-v3.eblit,
+  php-5.4.0_alpha3.ebuild:
+  Remove deps on phpconfutils and php-common-r1
 
   03 Sep 2011; Raúl Porcel <armin76@gentoo.org> php-5.3.8.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #372745
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index ae2e26a099b3..c1209af57dcb 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -15,11 +15,11 @@ AUX eblits/src_compile-v1.eblit 1283 RMD160 83fbb374e2dfaa9d164e6b32b57c268ed06b
 AUX eblits/src_configure-snapshots.eblit 10639 RMD160 b46a407286aa32077662fa4f75345466681943bd SHA1 3375592869e274a9668a9e7c20ae4046d1e11244 SHA256 ee92ea71f6c766f6f10fda63aab36885265c95e245e8107fb2e9c10573f6e2ba
 AUX eblits/src_configure-v1.eblit 10979 RMD160 c20ce6476380cf1b355f1c957f8e0bfdf166e220 SHA1 bd2f51283e01bf838bbb1946a9879ac337c6e90c SHA256 dc769b7c5846248fdd5d1a930a3e9b614d550bfcc78f09ecd1c08607796f0206
 AUX eblits/src_configure-v2.eblit 10855 RMD160 27c70744216912e79707c6861bc7d00a379d690a SHA1 7629d985421b756aa57bcce51d378ff14db675c8 SHA256 cd3002b6c9bd91dc9d7471e416cc631247fb2ad9d7b68981b26a3f83f84c916a
-AUX eblits/src_configure-v3.eblit 6507 RMD160 1b003b6f31f1efd9599883f1344c28944230176c SHA1 067bdc7786d0b554c60e79ba02797f508fd027da SHA256 3f4fa75765a3e58871c2068d33c127c0adbae90275a3b029611bd6c3cc897f8f
+AUX eblits/src_configure-v3.eblit 6616 RMD160 95b389d83f86dc262a698d9f3a3cc35ccf5ffe27 SHA1 ffe459b9d763681180b4955cabfd1d8d3726fa2d SHA256 fad5767d67d14a0b03e9ad3bc4abe300d8772f905c07fae60a4431e40d9d7ac6
 AUX eblits/src_configure-v521.eblit 10844 RMD160 90513f59b5f17d680004d3e74581d9eedc8af490 SHA1 a369e2cf7816799f7e2bead8b6eccc2115d0ecdc SHA256 ad875ca45e9ad975c0d7a3cbedc27c5035aa048d7aa935221a15e47cbca63c3d
 AUX eblits/src_install-v1.eblit 5146 RMD160 24127823735939101dcb00585a5ed69adedffed2 SHA1 36ab2648abaae12d1a86c97db82cd2ea86497b2d SHA256 3bddd375764b0ed00cb30e65036c67f96c56ea0ebfd70bcdc61b7465d1500d36
 AUX eblits/src_install-v2.eblit 5302 RMD160 a6e89565235f6baf14ee38326f94a0ed39f54183 SHA1 83b461036b1fd7170e3966399f4110a2e9363f41 SHA256 466e7350126a2c27814c693c7c7fcc45ee53eb4d267846d5b27a02c377b5407d
-AUX eblits/src_install-v3.eblit 4264 RMD160 42860228c8b3bd46593d3ece4346137fa5e00757 SHA1 83b8544b75b18a0a9c780019ebdb11299605959f SHA256 41a044474b486196502182257273d50b278e91588186802186555b86fe9b8d61
+AUX eblits/src_install-v3.eblit 4199 RMD160 3dcf1550790deb8eaf70b64be579cba32b1000df SHA1 dab9603c4940233949feb1839a1b990070529396 SHA256 fb210f93a5c1d8794cc0d76d0e66ab92efffc5acaf5243574a26e2a4432da9b5
 AUX eblits/src_prepare-snapshots.eblit 2238 RMD160 d82ee01ee6cc6bae7b7199296e32bcac093f2fae SHA1 deebebf641b935e4fdcda63f3f9ce9df01bdb037 SHA256 411ce9d56008461da4592dcf623fcff40c33aac479d13544f84cc974c5c232ea
 AUX eblits/src_prepare-v2.eblit 2604 RMD160 379dbca3e2ae8c1f09f608220ec9c98d099cb792 SHA1 42afae4e07633535ecea49817f5badd559f10ff1 SHA256 fe7534260fb81a012b8021b5d555756ce8733ad192bf51cedd94f12963811790
 AUX eblits/src_prepare-v3.eblit 2649 RMD160 5f01f42eef528535866c3b5ade0ded592d1ffd48 SHA1 1bdc640ab548f4e8b78acc305fdd6ceab225daf8 SHA256 7ea3a5351fabeb050161e64c09b98ff945bbdb8b4d1a7fb83d6b4645f277b486
@@ -51,13 +51,17 @@ EBUILD php-5.3.6-r1.ebuild 9538 RMD160 e7365ce71f94f06b5732d497b9fc94b93f12945d
 EBUILD php-5.3.6.ebuild 9794 RMD160 9be2d19b4cfc93aa0f6920958f7868198b254427 SHA1 ab4f7dfd77ce61441901e4ae6834c6563a1bf96c SHA256 f97847b13e3f5a09f686006401f816ba823850541da4d2ab58a9c7289651809e
 EBUILD php-5.3.7_rc5.ebuild 9586 RMD160 11d58a882bf84a1774972c681e966843be5b9848 SHA1 0ff0dd39b93d07a0f71d9f5347b71a4924469a50 SHA256 36254b1d768560550d4a38b5d24c7ddfe7a1c3ff5376a4de8bfc3e2a63e35a02
 EBUILD php-5.3.8.ebuild 9598 RMD160 3939461700878f93866114ab290b89218668ff28 SHA1 7d8a45f88145b501c07434b6f2d73a4e62298e01 SHA256 d25b65288ffbd417ad3746f4d0114245c481b18ae363a1e9dde4a9fec13ec6d7
-EBUILD php-5.4.0_alpha3.ebuild 8532 RMD160 ce493599d94ac424c07a7969b70effacced85811 SHA1 69ac3e3419877599be62f2117f0915c0a27990ff SHA256 7a070e5e99d1d14f6cac93c986574f4fdaac9ce16b2fb4c9d6133634b32a7b68
-MISC ChangeLog 86809 RMD160 cf1521a9e0156d5d8bc38746a968e099047f8075 SHA1 d99fc619cd9372b0d56dfb142297ff3459235959 SHA256 9fee8ad27644476a669a7dde0160dbbe6bf125b5418920fd2eaf54bb9245ab16
+EBUILD php-5.4.0_alpha3.ebuild 8505 RMD160 9dcb8ab8fa4f161a18a00b94a9916c1c633b2a9b SHA1 b453ab4e22b97dc9a666aef259c40219799ad819 SHA256 b8b625360a4843790bd72af5a6a9a2e1891e2a481e6c4ba6d2d0a389ffa0592b
+MISC ChangeLog 87015 RMD160 9d287c882b048550c23342636179c0e901e4112d SHA1 fce42708e45ff79b8f58b9f3ae11ba07717fba18 SHA256 b4c3cc0dea02c75f2a95afbec22672b05132fcf9fc3cf499926ee13dfed03efe
 MISC metadata.xml 2075 RMD160 e2eb44e39169dc2ff8e099d670a222e7102b1aea SHA1 9cebbc373dc8441aa0374132a3b5d87df6d37ffc SHA256 3d8bc9305be300ef7ef92d18ba5476927ec90a5b6d43c2408936229590ff5ac5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5iYcsACgkQuQc30/atMkAVfACdHBU/KPAbsn3Gy1XPBwZ0cggY
-INoAoJEiTY6ke0HiLfORRxpsV/GW7w4u
-=nXKn
+iQEcBAEBAgAGBQJOcvTfAAoJEGurSuXEqSv1pLEH/jhlb3HolsJHZVz2e20h8fPM
+ftzn1Jk4AtjfxX+4zHfncqyOH3LLUH7grsUpD35V67vS9/N0+ssVIlCdnULyYjGA
+g/ba79eQwpMAcDtkXG5Y9vfZfskyVS/vGaUN2spr2IYOqKGcIxIEJC4CUeOkFQ6U
+H4G3dof1eZrOdFmvRs7KNryBewXhE3zyOZYSDFN+BMok/TNeRyL8wC8TdTrHaJNI
+pwFMRX6P9xvOvBfvgiA3IhFY8kE28j1RCjDH52d24KLjIXkHYG8Ds2dwqqU3uRz0
+k+4moxGnnn/xHINc9IE1BU5ZUepgsyqBm7iYGshSNtOBbmraZj4vgJKBV+/3hHE=
+=Gya4
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/files/eblits/src_configure-v3.eblit b/dev-lang/php/files/eblits/src_configure-v3.eblit
index c99ed8888f68..a08d83955515 100644
--- a/dev-lang/php/files/eblits/src_configure-v3.eblit
+++ b/dev-lang/php/files/eblits/src_configure-v3.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.4 2011/08/22 13:32:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_configure-v3.eblit,v 1.5 2011/09/16 07:02:57 olemarkus Exp $
 
 eblit-php-src_configure() {
     addpredict /usr/share/snmp/mibs/.index
@@ -214,7 +214,9 @@ eblit-php-src_configure() {
 	my_conf="${my_conf} --with-pcre-regex=/usr --with-pcre-dir=/usr"
 
 	# Catch CFLAGS problems
-	php_check_cflags
+    # Fixes bug #14067.
+    # Changed order to run it in reverse for bug #32022 and #12021.
+    replace-cpu-flags "k6*" "i586"
 
 	# Support user-passed configuration parameters
 	my_conf="${my_conf} ${EXTRA_ECONF:-}"
diff --git a/dev-lang/php/files/eblits/src_install-v3.eblit b/dev-lang/php/files/eblits/src_install-v3.eblit
index 19e4b89a359f..316d42b4cf41 100644
--- a/dev-lang/php/files/eblits/src_install-v3.eblit
+++ b/dev-lang/php/files/eblits/src_install-v3.eblit
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.2 2011/07/20 12:41:38 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/files/eblits/src_install-v3.eblit,v 1.3 2011/09/16 07:02:57 olemarkus Exp $
 
 eblit-php-src_install() {
 	# see bug #324739 for what happens when we don't have that
@@ -26,9 +26,6 @@ eblit-php-src_install() {
 
 	local extension_dir="$("${D}/${PHP_DESTDIR}/bin/php-config" --extension-dir)"
 
-	# Generate the USE file for PHP
-	phpconfutils_generate_usefile
-
 	# Create the directory where we'll put version-specific php scripts
 	keepdir /usr/share/php${PHP_MV}
 
diff --git a/dev-lang/php/php-5.4.0_alpha3.ebuild b/dev-lang/php/php-5.4.0_alpha3.ebuild
index a3deba1c4eaa..fd54a561102e 100644
--- a/dev-lang/php/php-5.4.0_alpha3.ebuild
+++ b/dev-lang/php/php-5.4.0_alpha3.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_alpha3.ebuild,v 1.1 2011/08/08 16:15:47 olemarkus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.4.0_alpha3.ebuild,v 1.2 2011/09/16 07:02:56 olemarkus Exp $
 
 EAPI=4
 
-inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use phpconfutils php-common-r1 libtool
+inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool
 
 SUHOSIN_VERSION=""
 FPM_VERSION="builtin"