#98534: ./configure can now find x11 in gentoo; patch thanks to basic <basic@mozdev.org>

(Portage version: 2.0.51.22-r1)

5 files changed, 36 insertions, 19 deletions

diff --git a/x11-plugins/wmblob/ChangeLog b/x11-plugins/wmblob/ChangeLog
index a526e3b2bf69..adfeb243857f 100644
--- a/x11-plugins/wmblob/ChangeLog
+++ b/x11-plugins/wmblob/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-plugins/wmblob
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/ChangeLog,v 1.5 2004/11/24 05:03:14 weeve Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/ChangeLog,v 1.6 2005/07/10 21:31:59 smithj Exp $
+
+  10 Jul 2005; Jonathan Smith <smithj@gentoo.org>
+  -files/gentoo-cflags.patch, +files/wmblob-configure-fixes.patch,
+  wmblob-1.0.1.ebuild:
+  #98534: ./configure can now find x11 in gentoo; patch thanks to basic
+  <basic@mozdev.org>
 
   23 Nov 2004; Jason Wever <weeve@gentoo.org> wmblob-1.0.1.ebuild:
   Added ~sparc keyword.
diff --git a/x11-plugins/wmblob/Manifest b/x11-plugins/wmblob/Manifest
index 75d5597de7c7..417951102827 100644
--- a/x11-plugins/wmblob/Manifest
+++ b/x11-plugins/wmblob/Manifest
@@ -1,6 +1,6 @@
 MD5 7d96f8a07104d557f9518ec819aad1de ChangeLog 767
 MD5 62ba71d3b2fa785a4cbd5d47fdbd0eb6 metadata.xml 165
-MD5 81949009ab89945049517466a1c7c9b5 wmblob-1.0.1.ebuild 1035
+MD5 299cad50b0f23200413abc0756266a41 wmblob-1.0.1.ebuild 1067
 MD5 18919b645c99104e0d245449a17f6507 files/digest-wmblob-1.0.1 65
-MD5 e14ebbd1f61de0db3f734809191ac824 files/gentoo-cflags.patch 316
 MD5 e071f5107eeb98d3da0d49f18691b92b files/wmblob.desktop 170
+MD5 00ea8a34d168a32d869970637704e9c7 files/wmblob-configure-fixes.patch 518
diff --git a/x11-plugins/wmblob/files/gentoo-cflags.patch b/x11-plugins/wmblob/files/gentoo-cflags.patch
deleted file mode 100644
index 6304c1f24681..000000000000
--- a/x11-plugins/wmblob/files/gentoo-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure	2004-07-18 00:39:44.704951200 +0200
-+++ configure	2004-07-18 00:40:42.536159520 +0200
-@@ -4473,7 +4473,7 @@
- 
- 
- # compiler flags
--CFLAGS="$CFLAGS -O2 -Wall"
-+CFLAGS="$CFLAGS $GENTOO_CFLAGS -Wall"
- 
-                               ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile"
- 
diff --git a/x11-plugins/wmblob/files/wmblob-configure-fixes.patch b/x11-plugins/wmblob/files/wmblob-configure-fixes.patch
new file mode 100644
index 000000000000..52ef1054643a
--- /dev/null
+++ b/x11-plugins/wmblob/files/wmblob-configure-fixes.patch
@@ -0,0 +1,21 @@
+--- configure.orig	2005-07-10 17:26:19.673044250 -0400
++++ configure	2005-07-10 17:28:20.964624500 -0400
+@@ -3368,7 +3368,9 @@
+ echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
+ fi
+ 
++if test "x$x_libraries" != "x"; then
+ LIBS="$LIBS -L$x_libraries"
++fi
+ 
+ # Checks for libraries.
+ 
+@@ -4473,7 +4475,7 @@
+ 
+ 
+ # compiler flags
+-CFLAGS="$CFLAGS -O2 -Wall"
++CFLAGS="$CFLAGS -O2 $GENTOO_CFLAGS -Wall"
+ 
+                               ac_config_files="$ac_config_files Makefile src/Makefile doc/Makefile"
+ 
diff --git a/x11-plugins/wmblob/wmblob-1.0.1.ebuild b/x11-plugins/wmblob/wmblob-1.0.1.ebuild
index 3982ab6149d6..ea77dece80d4 100644
--- a/x11-plugins/wmblob/wmblob-1.0.1.ebuild
+++ b/x11-plugins/wmblob/wmblob-1.0.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/wmblob-1.0.1.ebuild,v 1.5 2004/11/24 05:03:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/wmblob/wmblob-1.0.1.ebuild,v 1.6 2005/07/10 21:31:59 smithj Exp $
 
 inherit eutils
 
@@ -22,8 +22,9 @@ KEYWORDS="x86 ppc ~sparc"
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	# We patch the ./configure script to make it honour Gentoo CFLAGS
-	epatch ${FILESDIR}/gentoo-cflags.patch
+	# We patch the ./configure script to make it honour Gentoo CFLAGS and the
+	# X11 location
+	epatch ${FILESDIR}/${PN}-configure-fixes.patch
 }
 
 src_compile() {