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

Move some comments from ebuilds to patches.
Package-Manager: portage-2.2_rc27/cvs/Linux i686

9 files changed, 58 insertions, 42 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/Manifest b/sci-visualization/gnuplot/Manifest
index e69ea1b98c79..34c39b2d91df 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -2,23 +2,24 @@
 Hash: SHA1
 
 AUX gnuplot-4.2.0-libggi.patch 2437 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1530 SHA1 dc566b4c6406c135e2505132fca598ea52da7b24 SHA256 7263c8b22a2c7691e4cae85be6ea284846e4c5d328c894d174221cb2ffd3b3d3
-AUX gnuplot-4.2.2-disable_texi_generation.patch 646 RMD160 ac2ed0785f72a6cc96ec10685f116a631ed80b78 SHA1 4d162a108fa2429d7aea49a416babc9b01124297 SHA256 922441e35ad4daefad70e3e2f7f1fe15b96f97d0b281f005eb70cd3130ad8f68
-AUX gnuplot-4.2.3-app-defaults.patch 1906 RMD160 dab9814a3e7178941fe68373870e8fcd6db9ee36 SHA1 10015c3efd632fa35adb3c70e62035226efb096b SHA256 99386dfe58188401a6e16d24ddd38026b687d8a3b22b14c2d9cd54e4b2c80697
-AUX gnuplot-4.2.3-disable-texhash.patch 601 RMD160 c11abb16a063190e1e92dc35ad8539138dacba60 SHA1 774db0406e61816769f18ddcafea7164655ae0f2 SHA256 db1b442628e2378459ec1627d93763ce5ca45f3510436fb68cd78460333012d6
+AUX gnuplot-4.2.2-disable_texi_generation.patch 763 RMD160 99368c05fe2907f445a49b4d0be782f0384f319e SHA1 17723d5e5a12eef274b6f9216c9a9cbbe05cba1e SHA256 87a3bed1e3be244a511f1cbeb9852484da59decdae75635ae900fbafe5db02f6
+AUX gnuplot-4.2.3-app-defaults.patch 2097 RMD160 d0764b54424cfec60b22e498b8624801559e3526 SHA1 bac7dd281e679a6c638f7ba1b211e13443221486 SHA256 91cab9715e99c5e394ac6e08f17ef8063d3f0b574e0404fc5e6b643b26fddaf3
+AUX gnuplot-4.2.3-disable-texhash.patch 677 RMD160 b299c7425e735ebad6afa1e2d154190fb2f3fdf8 SHA1 6e5f25a0283b2dd887738d8caee7c92d1905b1cc SHA256 af25fded8998eb48ea0b89f9ce0d5322721088c2b69a360ec7928a7f6115873e
+AUX gnuplot-4.2.5-configure-pkgconfig.patch 484 RMD160 d1d8031382b8062c393fa430eb69f74f68d93c64 SHA1 e749dbd1cf8047a6274182cc0e2317d3f1b09a2e SHA256 58d0c0106337c5f48ad2f75671566556c055eb58ee016c4a125dbc6fd434d1b6
 AUX gnuplot-gentoo-version.patch 2079 RMD160 394bee0853cb9343864342a2a11a4453af30e22e SHA1 337c0b3b329965c01d75decf49a7ef678e3d46a9 SHA256 c6c1b8a6ccc9d8aeaa12d178f5e91653d4f7f5f9c49eae1feb1ec3f7267670e1
 DIST gnuplot-4.2.3.tar.gz 2840611 RMD160 b4692db884c9da2f0d160f33f53c3d2aba65f36e SHA1 9f6239ef69ac5a6d68f40dc797f8a0b35b80f491 SHA256 4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4
 DIST gnuplot-4.2.4.tar.gz 2904358 RMD160 88acf7561a74116aece627f9b5e41e0726daee75 SHA1 4226b959493a37bc5a1f40a3b165ffd9e1b9d202 SHA256 2a20701410a21307c404a9d10ad9fdf699bb92fa0a919797213208d80b080913
 DIST gnuplot-4.2.5-lua-term.patch.bz2 26660 RMD160 981db04276ce51ece9b95076856b9811de872e3d SHA1 845fffa290d66e51ce5924d020a1d9b3bf354986 SHA256 32f39b4eb14e41f22fc911c73adf740e38af0819315ee102449ad4e572ab1b7f
 DIST gnuplot-4.2.5.tar.gz 2873303 RMD160 79ab74627d66c2eff6d69276c1556acca89ec6dd SHA1 e7ad6afc1ca7b39a512a18f2dc6f2bcda9bf9128 SHA256 89477ede06ca5a6cc814e123babadeda75bc52d89b078b92b79fba957caf11f8
-EBUILD gnuplot-4.2.3-r2.ebuild 5555 RMD160 1311b1f27caebc88e45ae2f91f643b99957e4c7c SHA1 a0c1e9769e9e82e95b19f1c8d2b48b96048610b9 SHA256 31499eae8e8faac7908f60a961c6e3cf642ee1aa2cc14d71c1cd94ca959716a4
-EBUILD gnuplot-4.2.4-r1.ebuild 5483 RMD160 a17a211ccc73681fed56a1fcd62bf69148e0c955 SHA1 a128429ecd7fd2e97f1a4e28bb87a566643dd43e SHA256 03ee6c395f3059ced50b7d8018aa93884288d8e16db982d3750d8765c7dfb305
-EBUILD gnuplot-4.2.5.ebuild 5869 RMD160 6cbc1d137486166956df0ffb6455970601705116 SHA1 529a392bf257c26109345dc571a0643ffdd1cfd8 SHA256 829f1bb4257372153d4640f065218bda0a014c75c4355d7cf15ba3bc374445ac
-MISC ChangeLog 21274 RMD160 1f6f197adc2c676fbfbe8cef8f7091fba48a467a SHA1 05b66e4d5e53b2a024e1c859f827e4119733e798 SHA256 5e688cf242626000e7cbd5286e310315cb8395a8585b4565c46525193c78cab8
+EBUILD gnuplot-4.2.3-r2.ebuild 5241 RMD160 8cacc098b0e71d84ea3bc2a2398275d47d9b2803 SHA1 98413ed83cd3f6de35455180cc648301a5af038f SHA256 47e77164b075c9750bc6e72df064c63f627a24acfb2a4550981a238a77cf3fb5
+EBUILD gnuplot-4.2.4-r1.ebuild 5172 RMD160 faf4f5e66d06f917a502d056aa83f048eaed4e71 SHA1 e2f0df686dfae05f7c162377dce1626044033269 SHA256 d49c646a9d4dd03133ff5ac2f232265b965909cdc953fc24252380f77ebc03a1
+EBUILD gnuplot-4.2.5.ebuild 5597 RMD160 2e53cc94c9e6f38707c43fa3192332a5a0f47f2b SHA1 2db1e05938c36338a08bdaf0ba40dc2e0de8b0e5 SHA256 49af4aacc5830b8835b140aacb595229e8bb19f533ca94a55a9c2b06edf0cd40
+MISC ChangeLog 21427 RMD160 1e7e1c80242923790f4567c62caae730ca68e36a SHA1 7f1f042d0642a1a6b0871879ea95f0add617becc SHA256 5558b0e7d1627c7dcd07222fe9563b1bf5f49cfe03b0183fd65bc4e84d19b391
 MISC metadata.xml 215 RMD160 ec20f35cba71ed779c37faff72797d5162aca3ab SHA1 365b4e7ba49bbe889a7755c256161fcbf1bfd6cd SHA256 3c0405bae8c54a7aa4c92bbb44941fc4243a8474a6209063fa6f24e1c85e8bb6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.9 (GNU/Linux)
 
-iEYEARECAAYFAknTunMACgkQOeoy/oIi7uwzRgCcChOBGl5qeTDOvNIemLulfemg
-hfsAoJpYeMYL3+eO28xY9egUxWNG6VfG
-=CBeu
+iEYEARECAAYFAknTzmIACgkQOeoy/oIi7uxNyACdGBtrils0rTg4HCsYOEiw1Kse
+AQwAn1kR7lMHp3ZDObfgJyls2XJDpbFn
+=tZPu
 -----END PGP SIGNATURE-----
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