Fix LDFLAGS usage.

Package-Manager: portage-2.1.2.2

5 files changed, 43 insertions, 13 deletions

diff --git a/dev-php5/pecl-mcve/ChangeLog b/dev-php5/pecl-mcve/ChangeLog
index 96fcd114095c..00e04a22b9ac 100644
--- a/dev-php5/pecl-mcve/ChangeLog
+++ b/dev-php5/pecl-mcve/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php5/pecl-mcve
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mcve/ChangeLog,v 1.18 2007/03/18 00:13:10 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mcve/ChangeLog,v 1.19 2007/03/19 13:16:19 chtekk Exp $
+
+*pecl-mcve-5.2.2-r1 (19 Mar 2007)
+
+  19 Mar 2007; Luca Longinotti <chtekk@gentoo.org>
+  +files/pecl-mcve-5.2.2-ldflagsfix.patch, -pecl-mcve-5.2.2.ebuild,
+  +pecl-mcve-5.2.2-r1.ebuild:
+  Fix wrong LDFLAGS usage.
 
   18 Mar 2007; Luca Longinotti <chtekk@gentoo.org> pecl-mcve-5.2.0.ebuild,
   pecl-mcve-5.2.2.ebuild:
diff --git a/dev-php5/pecl-mcve/Manifest b/dev-php5/pecl-mcve/Manifest
index f4e4b2fbcc52..4421ee5aee04 100644
--- a/dev-php5/pecl-mcve/Manifest
+++ b/dev-php5/pecl-mcve/Manifest
@@ -1,17 +1,21 @@
+AUX pecl-mcve-5.2.2-ldflagsfix.patch 324 RMD160 b4d889d82dc9a094e699557d16e5ba446ed87713 SHA1 a2066750c177a4fafd7681c1682ca6febe50c68c SHA256 5c0e6e424f28ab2ce92082eb5cb933b3b5a2acb20284c527bf162246f9a1607c
+MD5 7d3fe9173c01aff999d8f7b992fbfa37 files/pecl-mcve-5.2.2-ldflagsfix.patch 324
+RMD160 b4d889d82dc9a094e699557d16e5ba446ed87713 files/pecl-mcve-5.2.2-ldflagsfix.patch 324
+SHA256 5c0e6e424f28ab2ce92082eb5cb933b3b5a2acb20284c527bf162246f9a1607c files/pecl-mcve-5.2.2-ldflagsfix.patch 324
 DIST mcve-5.2.0.tgz 19094 RMD160 b16039a74d0cde228c88b2cdfe81356bfca758eb SHA1 3ffc15055a4bf1a47d37f079b6d09a45160e44a3 SHA256 0a6507dbdd2559aea1ef89355d1813a8f43d44a528b4640d5cdf03047a0ee084
 DIST mcve-5.2.2.tgz 19360 RMD160 8a31f322b80d3df1f1e1022b7fb9a575f3141469 SHA1 d886605b949281a339a76da9085736b87de7f4c6 SHA256 d5de4e8bf046f59d5b68354af792ff1bd123dcddec4bdf5a60e6e42a4df1964f
 EBUILD pecl-mcve-5.2.0.ebuild 752 RMD160 31c2fd850f123f2da5481c66979d5fd49071d7f2 SHA1 6c637a5785d8247063b1051c25094bd967260e73 SHA256 0115ff776e2d60a9c132f4fd63d2fe2dcfb30da00e7e6c112da7c8a5e0dc4f9f
 MD5 d86948895aa6cb7a495565cd826ea4dc pecl-mcve-5.2.0.ebuild 752
 RMD160 31c2fd850f123f2da5481c66979d5fd49071d7f2 pecl-mcve-5.2.0.ebuild 752
 SHA256 0115ff776e2d60a9c132f4fd63d2fe2dcfb30da00e7e6c112da7c8a5e0dc4f9f pecl-mcve-5.2.0.ebuild 752
-EBUILD pecl-mcve-5.2.2.ebuild 762 RMD160 8cb2ba178f2314d7b3ad4114183ecef90c9f8d9d SHA1 f2a30f1ec84ecd7834dfc7a5e24ce9d38cc418b5 SHA256 1a5119dec58878510d2dd109bc685a8419b45d2ff480efb722f512c0ec9b5b21
-MD5 eddaede3556e58ea7ee4258ca6691384 pecl-mcve-5.2.2.ebuild 762
-RMD160 8cb2ba178f2314d7b3ad4114183ecef90c9f8d9d pecl-mcve-5.2.2.ebuild 762
-SHA256 1a5119dec58878510d2dd109bc685a8419b45d2ff480efb722f512c0ec9b5b21 pecl-mcve-5.2.2.ebuild 762
-MISC ChangeLog 2285 RMD160 790a5b29a1c4d60776a5ab37194c41fd5b5b7560 SHA1 677f1fddd6842c015687a4e738b3a9277886940f SHA256 3b4e08f78097026c8712952836d0b39fe379220fa49a7581ed77931fabf68cd9
-MD5 35899e8ad2395851c341d79d654df896 ChangeLog 2285
-RMD160 790a5b29a1c4d60776a5ab37194c41fd5b5b7560 ChangeLog 2285
-SHA256 3b4e08f78097026c8712952836d0b39fe379220fa49a7581ed77931fabf68cd9 ChangeLog 2285
+EBUILD pecl-mcve-5.2.2-r1.ebuild 925 RMD160 c282c27ac2f81831c2cb305d14fca4f3ce9d43a9 SHA1 f5ba052a8dec7c909f6ba1186f365aed8483555e SHA256 eb4dc9a641152eb55e502d0b2ded0b806c6e616e45c3bd2788dedb976bfa526a
+MD5 2559c1063a57355bf29053709cd82a82 pecl-mcve-5.2.2-r1.ebuild 925
+RMD160 c282c27ac2f81831c2cb305d14fca4f3ce9d43a9 pecl-mcve-5.2.2-r1.ebuild 925
+SHA256 eb4dc9a641152eb55e502d0b2ded0b806c6e616e45c3bd2788dedb976bfa526a pecl-mcve-5.2.2-r1.ebuild 925
+MISC ChangeLog 2497 RMD160 449ca54f48b5f9f5917a5b7e6ffab98bf2049899 SHA1 0bcd7532ed996970719fd5d1746a497c0ba28db2 SHA256 bf896eaf801dce33cab024e9d5bde31473e24faad5c34ccfa9e43c8b2deb4a8f
+MD5 a9c16318b164b0275c9b672256b628a9 ChangeLog 2497
+RMD160 449ca54f48b5f9f5917a5b7e6ffab98bf2049899 ChangeLog 2497
+SHA256 bf896eaf801dce33cab024e9d5bde31473e24faad5c34ccfa9e43c8b2deb4a8f ChangeLog 2497
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -19,6 +23,6 @@ SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata
 MD5 c9e3837b1a193a00ac11704d8821c737 files/digest-pecl-mcve-5.2.0 220
 RMD160 876212d367dae65ece3665d5a68e154586470449 files/digest-pecl-mcve-5.2.0 220
 SHA256 8dc3e917a2bad0063cf942ebc50b39c5afa93c1831def565b7c7a5aa3c1a5377 files/digest-pecl-mcve-5.2.0 220
-MD5 d1e5db59dce22faaa7ce6a8c60dd75c5 files/digest-pecl-mcve-5.2.2 220
-RMD160 f8ce30ac1e4fcc39ec0bbd5686b5b2e25bbc53ee files/digest-pecl-mcve-5.2.2 220
-SHA256 f2891c18259117718f9d356e22872191c7e48a82522f827dee610db5418ec36d files/digest-pecl-mcve-5.2.2 220
+MD5 d1e5db59dce22faaa7ce6a8c60dd75c5 files/digest-pecl-mcve-5.2.2-r1 220
+RMD160 f8ce30ac1e4fcc39ec0bbd5686b5b2e25bbc53ee files/digest-pecl-mcve-5.2.2-r1 220
+SHA256 f2891c18259117718f9d356e22872191c7e48a82522f827dee610db5418ec36d files/digest-pecl-mcve-5.2.2-r1 220
diff --git a/dev-php5/pecl-mcve/files/digest-pecl-mcve-5.2.2 b/dev-php5/pecl-mcve/files/digest-pecl-mcve-5.2.2-r1
index e8c642bc5474..e8c642bc5474 100644
--- a/dev-php5/pecl-mcve/files/digest-pecl-mcve-5.2.2
+++ b/dev-php5/pecl-mcve/files/digest-pecl-mcve-5.2.2-r1
diff --git a/dev-php5/pecl-mcve/files/pecl-mcve-5.2.2-ldflagsfix.patch b/dev-php5/pecl-mcve/files/pecl-mcve-5.2.2-ldflagsfix.patch
new file mode 100644
index 000000000000..ffe503fb6e97
--- /dev/null
+++ b/dev-php5/pecl-mcve/files/pecl-mcve-5.2.2-ldflagsfix.patch
@@ -0,0 +1,10 @@
+--- config.m4	2007-03-19 14:10:07.000000000 +0100
++++ config.m4	2007-03-19 14:10:50.000000000 +0100
+@@ -166,7 +166,6 @@
+     LIBM_CFLAGS="$LIBM_CFLAGS -I$krb5headers"
+   fi
+   CFLAGS="$CFLAGS $LIBM_CFLAGS"
+-  LDFLAGS="$CFLAGS $LIBM_LDFLAGS"
+ 
+   PHP_NEW_EXTENSION(mcve, mcve.c, $ext_shared)
+   PHP_SUBST(MCVE_SHARED_LIBADD)
diff --git a/dev-php5/pecl-mcve/pecl-mcve-5.2.2.ebuild b/dev-php5/pecl-mcve/pecl-mcve-5.2.2-r1.ebuild
index fcb034eb2ce7..4f911ee82591 100644
--- a/dev-php5/pecl-mcve/pecl-mcve-5.2.2.ebuild
+++ b/dev-php5/pecl-mcve/pecl-mcve-5.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mcve/pecl-mcve-5.2.2.ebuild,v 1.3 2007/03/18 00:13:10 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php5/pecl-mcve/pecl-mcve-5.2.2-r1.ebuild,v 1.1 2007/03/19 13:16:19 chtekk Exp $
 
 PHP_EXT_NAME="mcve"
 PHP_EXT_INI="yes"
@@ -26,6 +26,15 @@ pkg_setup() {
 	require_php_with_use ssl
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix incorrect LDFLAGS usage in config.m4
+	# (breaks concurrentmodphp)
+	epatch "${FILESDIR}/${P}-ldflagsfix.patch"
+}
+
 src_compile() {
 	my_conf="--with-mcve --with-openssl-dir=/usr"
 	php-ext-pecl-r1_src_compile