Fix USE="wxwindows -lua" build issue, bug 233475 comment #9.

Move some comments from ebuilds to patches.
(Portage version: 2.2_rc27/cvs/Linux i686)

8 files changed, 47 insertions, 32 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index cfcaa6fef625..4eb750e59824 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,9 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.100 2009/04/01 19:01:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.101 2009/04/01 20:26:54 ulm Exp $
 
-  01 Apr 2009; Ulrich Mueller <ulm@gentoo.org> gnuplot-4.2.5.ebuild:
-  Add proper texlive dependency for ifxetex.sty.
+  01 Apr 2009; Ulrich Mueller <ulm@gentoo.org>
+  +files/gnuplot-4.2.5-configure-pkgconfig.patch, gnuplot-4.2.5.ebuild:
+  Add proper texlive dependency for ifxetex.sty. Fix USE="wxwindows -lua"
+  build issue, bug 233475 comment #9; thanks to Ottxor <kleiner_otti@gmx.de>.
 
 *gnuplot-4.2.5 (31 Mar 2009)
 
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
index 26b54e3bfb98..81d9eee90c86 100644
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.2-disable_texi_generation.patch
@@ -1,3 +1,7 @@
+http://bugs.gentoo.org/194216
+Texinfo source is already shipped, so separate preparation not needed
+and error-prone
+
 --- docs/Makefile.in	2007-10-30 20:35:47.000000000 +0100
 +++ docs/Makefile.in	2007-10-30 21:57:52.000000000 +0100
 @@ -348,16 +348,6 @@
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
index ac9a26135b0a..16e1b0122d78 100644
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch
@@ -1,3 +1,7 @@
+http://bugs.gentoo.org/219323
+Don't store resource files in deprecated location
+Reported upstream: http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
+
 --- gnuplot-4.2.3-orig/configure.in	2008-03-04 19:36:53.000000000 +0100
 +++ gnuplot-4.2.3/configure.in	2008-04-26 11:44:59.000000000 +0200
 @@ -1024,6 +1024,10 @@
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.3-disable-texhash.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.3-disable-texhash.patch
index 0d9b05636d00..2c0b0aae8ccd 100644
--- a/sci-visualization/gnuplot/files/gnuplot-4.2.3-disable-texhash.patch
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.3-disable-texhash.patch
@@ -1,3 +1,6 @@
+http://bugs.gentoo.org/201871
+Disable texhash to prevent sandbox violation
+
 --- gnuplot-4.2.3-orig/share/LaTeX/Makefile.am	2006-10-02 23:05:30.000000000 +0200
 +++ gnuplot-4.2.3/share/LaTeX/Makefile.am	2008-08-26 20:09:43.000000000 +0200
 @@ -11,8 +11,7 @@
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch
new file mode 100644
index 000000000000..7089de6a11ee
--- /dev/null
+++ b/sci-visualization/gnuplot/files/gnuplot-4.2.5-configure-pkgconfig.patch
@@ -0,0 +1,17 @@
+http://bugs.gentoo.org/233475#c9
+Fix build issue with USE=wxwindows
+Patch from upstream (did not make it into gnuplot-4.2.5)
+
+--- configure.in	8 May 2007 22:42:53 -0000	1.219
++++ configure.in	16 Jul 2007 21:58:43 -0000	1.220
+@@ -853,6 +853,10 @@
+   cp ${srcdir}/tutorial/eg3.dat tutorial
+ fi
+ 
++dnl explicit call to PKG_PROG_PKG_CONFIG because the first call to
++dnl PKG_CHECK_MODULES may not happen
++PKG_PROG_PKG_CONFIG
++
+ dnl  wxWidgets terminal
+ 
+ dnl wxWidgets terminal needs C++
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild
index 6e6b02c68ec8..457a8b1d5282 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild,v 1.11 2009/03/02 16:39:19 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild,v 1.12 2009/04/01 20:26:54 ulm Exp $
 
 inherit autotools elisp-common eutils multilib wxwidgets
 
@@ -61,14 +61,9 @@ src_unpack() {
 	cd "${S}"
 	# not sane enough for upstream, but we will keep it
 	epatch "${FILESDIR}"/${PN}-4.2.0-libggi.patch
-	# Texinfo source is already shipped, so separate preparation not needed
-	# and error-prone, see bug 194216
-	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch
-	# Don't store resource files in deprecated location, reported upstream:
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
-	epatch "${FILESDIR}"/${P}-app-defaults.patch
-	# Disable texhash to prevent sandbox violation, bug 201871
-	epatch "${FILESDIR}"/${P}-disable-texhash.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
+	epatch "${FILESDIR}"/${P}-app-defaults.patch #219323
+	epatch "${FILESDIR}"/${P}-disable-texhash.patch #201871
 
 	eautoreconf
 }
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild
index 72cd598396de..7ad68330b1c7 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild,v 1.12 2009/03/27 23:19:10 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.4-r1.ebuild,v 1.13 2009/04/01 20:26:54 ulm Exp $
 
 WX_GTK_VER="2.8"
 
@@ -62,14 +62,9 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	# Texinfo source is already shipped, so separate preparation not needed
-	# and error-prone, see bug 194216
-	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch
-	# Don't store resource files in deprecated location, reported upstream:
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
-	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch
-	# Disable texhash to prevent sandbox violation, bug 201871
-	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
+	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch #219323
+	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871
 
 	eautoreconf
 }
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild
index 91918f2756b0..a64878c74cc5 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild,v 1.2 2009/04/01 19:01:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.5.ebuild,v 1.3 2009/04/01 20:26:54 ulm Exp $
 
 EAPI=2
 WX_GTK_VER="2.8"
@@ -53,16 +53,11 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Texinfo source is already shipped, so separate preparation not needed
-	# and error-prone, see bug 194216
-	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch
-	# Don't store resource files in deprecated location, reported upstream:
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
-	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch
-	# Disable texhash to prevent sandbox violation, bug 201871
-	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch
-	# Support for lua/TikZ terminal
-	epatch "${WORKDIR}"/${P}-lua-term.patch
+	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch #194216
+	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch #219323
+	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch #201871
+	epatch "${WORKDIR}"/${P}-lua-term.patch #233475
+	epatch "${FILESDIR}"/${P}-configure-pkgconfig.patch #233475 c9
 	# Add Gentoo version identification since the licence requires it
 	epatch "${FILESDIR}"/${PN}-gentoo-version.patch