build-time-specific (no revbump): fixing warnings (which sometimes seem to be fatal) regarding to missing function prototypes because of _GNU_SOURCE being defined too late (bug 230809)

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.24-gentoo-r5 x86_64

3 files changed, 16 insertions, 12 deletions

diff --git a/dev-lang/php/ChangeLog b/dev-lang/php/ChangeLog
index 4dbcf2680656..06bb2b3be40f 100644
--- a/dev-lang/php/ChangeLog
+++ b/dev-lang/php/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/php
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.278 2008/07/17 13:54:24 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/ChangeLog,v 1.279 2008/07/19 14:33:44 hoffie Exp $
+
+  19 Jul 2008; Christian Hoffmann <hoffie@gentoo.org> php-5.2.6-r5.ebuild:
+  build-time-specific (no revbump): fixing warnings (which sometimes seem to
+  be fatal) regarding to missing function prototypes because of _GNU_SOURCE
+  being defined too late (bug 230809)
 
 *php-5.2.6-r5 (17 Jul 2008)
 
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 25142803b8e5..78d543935192 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -18,7 +18,7 @@ DIST php-patchset-5.2.5-r1.tar.bz2 15350 RMD160 777f77e351ed024952f2adf323261db2
 DIST php-patchset-5.2.6-r0.tar.bz2 10713 RMD160 408d25f1c28c582c5053c4eaf21c02e63e420d52 SHA1 b6b3b3c5d69288352a27075dddc2e00c87360d04 SHA256 161c9febd0f14fe8fa64f58016c2cf52ae39105f40c0735098218c122debed56
 DIST php-patchset-5.2.6-r1.tar.bz2 10979 RMD160 c731963f64ffeabca23d6ab01836373317af085a SHA1 f092ecb20e3f7831b8cbe26f166d70097faf485a SHA256 e19e9a3ba69085fd9dc59805a726a1be893969ed01684445fd915ceba2476689
 DIST php-patchset-5.2.6-r2.tar.bz2 15621 RMD160 baee575d1e4c67eede70ceeb3a8119df2062c0cc SHA1 f3b57129e1e0ca56a61cceed2f7bbe796334cf43 SHA256 f49be3db0c4eb09918c1797eb304a91a0ef56fdd1db0c6d47504b785f718e995
-DIST php-patchset-5.2.6-r4.tar.bz2 16199 RMD160 b5f2954613a70ee88c5d1621f6148aeb1c824841 SHA1 93a9b62f9617f8b22e9f908a00ffbb2b3d2a5ac3 SHA256 a99cdcf0b3bf22c8983ede69cca64cbd8e8ba8fba38f92581c8489c5dd99f8ff
+DIST php-patchset-5.2.6-r5.tar.bz2 16481 RMD160 e4f8545ac6004de4a76188c5280e251e3716d06f SHA1 ad938cf834071e2d41006da4a2844925e8d0c562 SHA256 ac9e98d839aa2898a1a175b4e77665f5dbcc9c0a56ba7b468266622fa1f6a7ab
 DIST php-patchset-5.2.6_rc4-r0.tar.bz2 6889 RMD160 b154a8aa1f08970d3116b38b18830712cd007acb SHA1 4c75dd30cbc80106611f9fc2417be90870796ad3 SHA256 5f36ef96713f0bc8921515d8fb0d5929bb20abbaa3fe4a1e025a67ee5fb56055
 DIST suhosin-patch-4.4.8-0.9.6.patch.gz 22246 RMD160 01b59d520b987de1995bce7ab74f5d92ece2a89f SHA1 0354436d109ae3872949fb436d45e9534355cb1c SHA256 eff5b6ed79dd76c59bd63ac591f778266c2d518cfab2cede716637cf8fc99630
 DIST suhosin-patch-5.2.5-0.9.6.2.patch.gz 23157 RMD160 25863ad76bea4a8e5bf50bd916835b5d9324452c SHA1 1102e2e1de922b5199462100a7bbbb7cef5c3f58 SHA256 fd77ccdeb90c83af7492876dda17518de95dd74a5b6feecc5a1bd2c8e322ab53
@@ -29,15 +29,15 @@ EBUILD php-4.4.8.ebuild 13382 RMD160 17daef3621eff68c2f5e73f456e33eb8e57272bd SH
 EBUILD php-5.2.5-r1.ebuild 13997 RMD160 e9d8fb469d0e80011f756173029e058279a17bd3 SHA1 225b5ef6e2bb57fe102e6e2e42903913bb3cd898 SHA256 7b05895d96560cdc24b90310169a7da1034d53d8640dd3ba77a07546ae7ea7ab
 EBUILD php-5.2.6-r1.ebuild 15278 RMD160 f53b3bc7850482612b93e3c3ea84281ea973ba9c SHA1 e2f39c7c3184da46d37e36bcde4753073a81f4c3 SHA256 cd878246c44ada41e04ebdfc85a70c1a6de1ac5df0df164f006a73aba966acd4
 EBUILD php-5.2.6-r2.ebuild 15416 RMD160 0b9f4cf6fdcaf1a11eee238738b06faf8d81295f SHA1 8d7d6ee0deeab16f4e85105526a9dfcd2127623d SHA256 f4cd7d8238b753a83ff3c8fa1ebb2e7b48882401a1c0bc2479cd444e3c6cb1f8
-EBUILD php-5.2.6-r5.ebuild 15525 RMD160 8ac7d0402a3c5a5879bdbc33db48a82c8c447e57 SHA1 e9bf4bdd0d2b206b4df3808fe0e4c53167d0d095 SHA256 f487bdd48b107fdd922ed53b5c943a9562f90574eeda4e58818112fcc2cc3a06
+EBUILD php-5.2.6-r5.ebuild 15453 RMD160 a5ce20d1d197a9636ddc9f4fb0866cdfb70e3fea SHA1 6fc9cc801be3fba60873f0db81239c96225894cf SHA256 ab57dc1cc0bbdfec4dfe456bd66b2dd16e6336b6626584e0e2f80f419a681064
 EBUILD php-5.2.6.ebuild 15292 RMD160 f6157ccdaffbf24252e4d07e26ffa55cb46f3ff9 SHA1 dd479cc008ae5aee86a29e4eeb2297daadb60f3a SHA256 47285d81ade0c4323c862924251b1fdc4b34e29f461759a471494d96c9be422e
 EBUILD php-5.2.6_rc4.ebuild 14591 RMD160 10095304f21234059dff4b237f25c7d4eb1e4ad5 SHA1 1050e2ba6e1140f92e054ed8db201e499923cc13 SHA256 5bb2b6ecf9cb535c42983110cf3d5ea2ed99377cf53dca4330b1d8c6c8057d88
-MISC ChangeLog 49669 RMD160 31aeea5c994611f626688f1d1c7db89658d598e3 SHA1 1f02e2d744f4da6a91c6e4bcba6b2aad846e27ab SHA256 764d3c9f52a0fec5729b070e89539cda6f884dd5d6e01ed9d0aaf135106b203d
+MISC ChangeLog 49936 RMD160 1a9b4465211303dcce38e8c87e5bca591383f594 SHA1 26029a40883cb2fb547a0a310e3bfe9cfeef3b43 SHA256 2c22f86e154de33e737fd78a3b9aefc2918f593762fac033475d0ae345bccaa4
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkiA7K8ACgkQV6E0EIywUuUKNQCgra2AzskTylvOhv0/pbIRo0L8
-4q0AnRPicyUoNqUKCk8K3Y1o9DP4DviI
-=Qvya
+iEYEARECAAYFAkiB+08ACgkQV6E0EIywUuU68QCfdqUSvOkDEELq990XOYaarQzl
+8fYAoLo1NagUBW8gRylCxxnViL6/e+58
+=CtY7
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/php/php-5.2.6-r5.ebuild b/dev-lang/php/php-5.2.6-r5.ebuild
index 77bca8ec7ff6..67af697e99fc 100644
--- a/dev-lang/php/php-5.2.6-r5.ebuild
+++ b/dev-lang/php/php-5.2.6-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r5.ebuild,v 1.1 2008/07/17 13:54:24 hoffie Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/php/php-5.2.6-r5.ebuild,v 1.2 2008/07/19 14:33:44 hoffie Exp $
 
 CGI_SAPI_USE="discard-path force-cgi-redirect"
 APACHE2_SAPI_USE="concurrentmodphp threads"
@@ -20,7 +20,7 @@ MY_PHP_P="php-${MY_PHP_PV}"
 PHP_PACKAGE="1"
 
 # php patch settings, general
-PHP_PATCHSET_REV="4"
+PHP_PATCHSET_REV="5"
 SUHOSIN_PATCH="suhosin-patch-5.2.6-0.9.6.2-r1.patch.gz"
 MULTILIB_PATCH="${MY_PHP_PV}/opt/multilib-search-path.patch"
 # php patch settings, ebuild specific
@@ -169,9 +169,6 @@ src_unpack() {
 		ext/standard/tests/file/006_error.phpt \
 		ext/standard/tests/file/touch.phpt
 
-	# Workaround for autoconf-2.62 behaviour change, bug 217392
-	sed -re 's:(#ifdef HAVE_CONFIG_H.*):#define _GNU_SOURCE\n\1:' -i ext/posix/posix.c
-
 	# REMOVING BROKEN TESTS:
 	# removing this test as it has been broken for ages and is not easily
 	# fixable (depends on a lot of factors)
@@ -194,6 +191,8 @@ src_unpack() {
 }
 
 src_compile() {
+	# bug 217392 (autconf-2.62 behavior changes)
+	append-flags -D_GNU_SOURCE
 	if use fastbuild && [[ -n "${FASTBUILD_PATCH}" ]] ; then
 		src_compile_fastbuild
 	else