Fix automagic dependency on pdflib, bug 356005.

Package-Manager: portage-2.1.9.40/cvs/Linux x86_64

4 files changed, 14 insertions, 13 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 56b245c81cef..3f8f3c09ca8e 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,11 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.147 2011/02/22 07:36:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.148 2011/02/22 12:05:48 ulm Exp $
 
   22 Feb 2011; Ulrich Mueller <ulm@gentoo.org> gnuplot-4.2.6-r1.ebuild,
   gnuplot-4.4.2.ebuild:
   Don't link against media-libs/pdflib, because it would violate clause 2.1 of
-  the PDFLite license.
+  the PDFLite license. Configure --without-pdf, bug 356005.
 
   21 Feb 2011; Ulrich Mueller <ulm@gentoo.org> -gnuplot-4.2.6.ebuild,
   gnuplot-4.2.6-r1.ebuild, -gnuplot-4.4.0.ebuild, gnuplot-4.4.2.ebuild:
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index d4795444ad17..6a864ffbc096 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -9,14 +9,14 @@ AUX gnuplot-gentoo-version.patch 2079 RMD160 394bee0853cb9343864342a2a11a4453af3
 DIST gnuplot-4.2.5-lua-term.patch.bz2 26660 RMD160 981db04276ce51ece9b95076856b9811de872e3d SHA1 845fffa290d66e51ce5924d020a1d9b3bf354986 SHA256 32f39b4eb14e41f22fc911c73adf740e38af0819315ee102449ad4e572ab1b7f
 DIST gnuplot-4.2.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a76 SHA1 d11fdde8218bee98597ee836cbc17e4bf6093b70 SHA256 81fbc2eb6077bd6abfe98c5c82aae14a2c970473ee4c2c37743ff3b1e2aa8e82
 DIST gnuplot-4.4.2.tar.gz 3299690 RMD160 077d6d353e0370d1f8463693380030722f5789af SHA1 35666be22e877ade5e272199d3d81555c141cef5 SHA256 37e8c8d4838fb84a3ad97a6c4823f086b929cb18d6613a2d0e8227ce0d4de9e4
-EBUILD gnuplot-4.2.6-r1.ebuild 6175 RMD160 21f5446abc6a032b123264571279a50e25baa982 SHA1 20d34791d28974342f14ff0f101b59568d96fd85 SHA256 ad162282df190e5bfffda2ed98a003d911a481928fd663246b7702d9ce03ae2c
-EBUILD gnuplot-4.4.2.ebuild 5952 RMD160 1d30ed9b1e425ddcc7c4ea376b83354267f08910 SHA1 67dfac5bfa956094eecb7e6e49f84e79d980ef7d SHA256 f32aa4d442086fc1fc7e19acb592f9a5cc92e9ac03e9594e6e76ae131bf4760e
-MISC ChangeLog 27980 RMD160 6b1a8558541412d9da3dc427cdcfa25be7958fc3 SHA1 3e8306bc5acf710de79a33bedb27dd6174c14abb SHA256 4125950e7d6bf4e03ff0eea8d15e5dfe57beda9dd48188c38de3d1d69478fafb
+EBUILD gnuplot-4.2.6-r1.ebuild 6179 RMD160 158d4e5792b4c7c6bc18972b71899f4eb7299a63 SHA1 fc3dc7780c03127e89ff5da76ab0519078e6176d SHA256 b0ff53a3c30fb642c0c16d6d4a5fbe4dde00da33d65e94bb0fc79b6d88eeb59a
+EBUILD gnuplot-4.4.2.ebuild 5914 RMD160 955a1971ab8ee3ec99d723b0d70813e54bddea5c SHA1 2ec37bf2c85516d277fe077bc03d4810b937e109 SHA256 a2a0b5d3c5f0b5269ba4605ea7083f69655008b67ea02a3695bbea132f678ae2
+MISC ChangeLog 28017 RMD160 2ad87aa5f00ae827375783f6350b3f0686d00dce SHA1 3877bcb2ce4740e283602ba394648e5afc3b1c6d SHA256 b222beade8ab747bab9dfe060d08e20e0a0baee8edc5bdb6a122a77200b80e6a
 MISC metadata.xml 404 RMD160 7c05f336a5561bb8b6dfa4ac1f70889c0c6d3f5c SHA1 a8ae16bc80aedbedbfa575b538bf95b71ce4c319 SHA256 dfacaf36a82a2dd67ea22d03f8c6c56bd4bd60588e9187c8a8e0988ae10a3a3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1jaOwACgkQOeoy/oIi7uzoigCgvPEG11VhnVEd58bKjciSCAQx
-2OkAoKjxParsb6P5qqWD70qiMUCreIgF
-=Q/qq
+iEYEARECAAYFAk1jqB4ACgkQOeoy/oIi7uxyeACgsWHohZ2jiT5my/SMMNw9ySGl
+G44An0bzDIpQvFN7kptA0EmrCJ1Avdsk
+=46j0
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
index 98b0cf07d9ca..21872d2237ee 100644
--- a/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild,v 1.5 2011/02/22 07:36:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.6-r1.ebuild,v 1.6 2011/02/22 12:05:48 ulm Exp $
 
 EAPI=2
 
@@ -72,13 +72,14 @@ src_configure() {
 	fi
 
 	local myconf
-	myconf="--with-gihdir=/usr/share/${PN}/gih --without-lisp-files"
+	myconf="${myconf} --without-lisp-files"
+	myconf="${myconf} --without-pdf"
+	myconf="${myconf} --with-gihdir=/usr/share/${PN}/gih"
 	myconf="${myconf} $(use_with X x)"
 	myconf="${myconf} $(use_with svga linux-vga)"
 	myconf="${myconf} $(use_with gd)"
 	myconf="${myconf} $(use_enable wxwidgets)"
 	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
-	#myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
 	myconf="${myconf} $(use_with lua)"
 	myconf="${myconf} $(use_with doc tutorial)"
 	myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild
index 38de07afe12b..cc704ca6048f 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild,v 1.10 2011/02/22 07:36:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild,v 1.11 2011/02/22 12:05:48 ulm Exp $
 
 EAPI=3
 
@@ -68,6 +68,7 @@ src_configure() {
 
 	local myconf
 	myconf="${myconf} --without-lisp-files"
+	myconf="${myconf} --without-pdf"
 	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
 	myconf="${myconf} $(use_with cairo)"
 	myconf="${myconf} $(use_with doc tutorial)"
@@ -75,7 +76,6 @@ src_configure() {
 	myconf="${myconf} $(use_with ggi ggi ${EPREFIX}/usr/$(get_libdir))"
 	myconf="${myconf} $(use_with ggi xmi ${EPREFIX}/usr/$(get_libdir))"
 	myconf="${myconf} $(use_with lua)"
-	#myconf="${myconf} $(use_with pdf pdf "${EPREFIX}"/usr/$(get_libdir))"
 	myconf="${myconf} $(use_with plotutils plot "${EPREFIX}"/usr/$(get_libdir))"
 	myconf="${myconf} $(use_with svga linux-vga)"
 	myconf="${myconf} $(use_enable thin-splines)"