Dont add empty -I/-L flags for X #152408.

Package-Manager: portage-2.2_pre2

4 files changed, 41 insertions, 6 deletions

diff --git a/dev-games/ode/ChangeLog b/dev-games/ode/ChangeLog
index 036789cae821..55d6a1f22af5 100644
--- a/dev-games/ode/ChangeLog
+++ b/dev-games/ode/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/ode
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.45 2007/10/19 17:07:18 mr_bones_ Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ChangeLog,v 1.46 2008/02/24 09:45:27 vapier Exp $
+
+  24 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/ode-0.9-x-flags.patch, ode-0.9.ebuild:
+  Dont add empty -I/-L flags for X #152408.
 
 *ode-0.9 (19 Oct 2007)
 
diff --git a/dev-games/ode/Manifest b/dev-games/ode/Manifest
index bf45b4bfe8d1..fe945a268c7c 100644
--- a/dev-games/ode/Manifest
+++ b/dev-games/ode/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ode-0.6-flags.patch 734 RMD160 c673c5ff42e2872536e5d6a34c9276440b57a65a SHA1 e438b6b8ce3dfef534a93f18ceb82f94e048651d SHA256 09c2d22c12f606485cd89a0ecfdefed78714a4b5a94e720ecad505ec457c19d6
 AUX ode-0.8-flags.patch 983 RMD160 66caffe33e3a365ea7428b6971c0326f90ccb247 SHA1 55967c2228f63cb1dab42f9d4374cb0581fb0e32 SHA256 0d97aa182e9b62bccc30b56481aab5fa58db52f363031f8e1921b370f78c3d3a
 AUX ode-0.9-flags.patch 1223 RMD160 d0a552b32b84f5a8efcc182adb5fa20f1eee9c81 SHA1 aaefc81039eb9849d5479352db0c3cb90306e3cf SHA256 947a196431b5fe958c59f85022e40dac44baeff25ba03982cbab01d4b962432d
+AUX ode-0.9-x-flags.patch 562 RMD160 47447b2f4bfcb2a3b179cba55c8b470f1d55fc0f SHA1 01270307da19f5087b7beba038fd53aa74d93c3b SHA256 ff81e01492d696ea0eb88cf05860f98a27fcc277e07554b50fbe2959611c82ae
 DIST ode-src-0.8.zip 2005445 RMD160 43a299a61a5ce6ed757eefc2855cd05fe6ae2024 SHA1 8e8a956ecebfc9e1f5f76b4e0083147581d85abe SHA256 07d751fc92ca4c739d4e76e2fc01cda19374d126bd65a789529dd727d1ec3edb
 DIST ode-src-0.9.zip 2052825 RMD160 e999fef770d664a57ffb2f71bf5351fbd84d5b17 SHA1 3b39ce085c2dc77c3fad7abaa382ffc20d3780e5 SHA256 460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb
 EBUILD ode-0.8.ebuild 2136 RMD160 5ec433c758fd98327165891f63e4ebac3f10cb58 SHA1 b066c64d20cd16306441878a3a701464d1ced7c3 SHA256 617fe30d3f713ef072ac96cefaeb0ba5a312f70a883c5efbc6cb492e0572d24b
-EBUILD ode-0.9.ebuild 2461 RMD160 6e41b3bbf77bd255a13ed5238f0bcf46ad53aa3b SHA1 e41ea46d50344dc4d909a146a92cddef6ddbeabb SHA256 d379e4b23575d201f64c6f669bb6e2d8458fc1b105a03f70a92486a4371e3e21
-MISC ChangeLog 6265 RMD160 0a9f6fdad8d073d2eac373aab00817e5066472c4 SHA1 cb7f5cef89b62bc33cf6fe18ef8a01d57ec5ac5f SHA256 4eccc2ed42b1f39df79d589e8d9d4789e50acd9a4df4d6f9760d5fcc83503bcf
+EBUILD ode-0.9.ebuild 2499 RMD160 0f7701580d1d52c7af73915fb908b63cd2f62b41 SHA1 25c866a00dc07727b3ed10ee925da01fc9f0b034 SHA256 bd8ad095472c74f7bf049deb7da8f878cc5bfe5d0329a54a86d00546471542d0
+MISC ChangeLog 6405 RMD160 6bba70beb396d052eed4ecb23b371066421f330d SHA1 6f4186486b794dbb210b4b8d158a0de6a2e115d1 SHA256 c788c88db0beda810c7ba760c7a40a8a97a7c6bcbcfa76c31cb850b7a83c0707
 MISC metadata.xml 507 RMD160 fc35b374510850c6916d280578c4b9fad69d2f6a SHA1 2844b71e1f83503d096e912d5d61d6b69b296a99 SHA256 b8638b82f39c6329cfeeab46ec0a1cf325a28f880ce4b87e19b0586d41bd58de
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHwTy9j9hvisErhMIRAqrSAJ0SJmaYj7o+xz2vObeUc76X134iagCgzsmk
+Zz54n6lWQ2vCfWOsggGw6/w=
+=hUhx
+-----END PGP SIGNATURE-----
diff --git a/dev-games/ode/files/ode-0.9-x-flags.patch b/dev-games/ode/files/ode-0.9-x-flags.patch
new file mode 100644
index 000000000000..75aa4c4a51c9
--- /dev/null
+++ b/dev-games/ode/files/ode-0.9-x-flags.patch
@@ -0,0 +1,19 @@
+don't go adding emtpy -I/-L flags.  this has been fixed upstream.
+
+http://bugs.gentoo.org/152408
+
+--- configure.in
++++ configure.in
+@@ -10207,10 +10207,10 @@
+ 
+ dnl Check for AC_PATH_X variables
+-if test "X$x_includes" != "XNONE"; then
++if test "X$x_includes" != "XNONE" -a "X$x_includes" != "X"; then
+ 	CFLAGS="$CFLAGS -I$x_includes"
+ 	CXXFLAGS="$CXXFLAGS -I$x_includes"
+ fi
+-if test "X$x_libraries" != "XNONE"; then
++if test "X$x_libraries" != "XNONE" -a "X$x_libraries" != "X"; then
+ 	CFLAGS="$CFLAGS -L$x_libraries"
+ 	CXXFLAGS="$CXXFLAGS -L$x_libraries"
+ fi
diff --git a/dev-games/ode/ode-0.9.ebuild b/dev-games/ode/ode-0.9.ebuild
index be133c5ecb04..3ab1a9830006 100644
--- a/dev-games/ode/ode-0.9.ebuild
+++ b/dev-games/ode/ode-0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.9.ebuild,v 1.1 2007/10/19 17:07:18 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ode/ode-0.9.ebuild,v 1.2 2008/02/24 09:45:27 vapier Exp $
 
 inherit eutils autotools
 
@@ -30,6 +30,7 @@ src_unpack() {
 	cd "${S}"
 
 	epatch "${FILESDIR}"/${P}-flags.patch
+	epatch "${FILESDIR}"/${P}-x-flags.patch
 	eautoreconf
 
 	sed -i \