Don't link against media-libs/pdflib.

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

4 files changed, 18 insertions, 15 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index aeed3fa81349..56b245c81cef 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +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.146 2011/02/21 17:29:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.147 2011/02/22 07:36:11 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.
 
   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 03c8e0ba69fa..d4795444ad17 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 6206 RMD160 86fb468d00541538c0f20b17d84f836f27546068 SHA1 a1f4bc33492f15e9067b4c01361715551b86daae SHA256 336d1f0653992bd3447ffba8d448f9a5de928f8dd47964f754a453346b88d9ca
-EBUILD gnuplot-4.4.2.ebuild 5982 RMD160 3e09a6d12e3c9eea70bfd711992906846bc2dca8 SHA1 324fa3ecde91f940f7c9a209931764795a728ab2 SHA256 192e80e06a6c87a452055925f7a6861345436856054d13048883884de86d6ed4
-MISC ChangeLog 27781 RMD160 42f5fb29c6b2d8f474e009130b825342e890566d SHA1 598bd5b8316773323c53eab70c940694006393bc SHA256 da1123de3c969d8793ed224bec140a4ed863d602928bc92744950c6dd35838a1
+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
 MISC metadata.xml 404 RMD160 7c05f336a5561bb8b6dfa4ac1f70889c0c6d3f5c SHA1 a8ae16bc80aedbedbfa575b538bf95b71ce4c319 SHA256 dfacaf36a82a2dd67ea22d03f8c6c56bd4bd60588e9187c8a8e0988ae10a3a3b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1iooYACgkQOeoy/oIi7uxZewCcCje5/Wr57N3dtf4Plq3B6TJu
-jY0AoKBciipc8G90asfwWVrn4ZFVNzpT
-=/5UN
+iEYEARECAAYFAk1jaOwACgkQOeoy/oIi7uzoigCgvPEG11VhnVEd58bKjciSCAQx
+2OkAoKjxParsb6P5qqWD70qiMUCreIgF
+=Q/qq
 -----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 a2ee0bd45e72..98b0cf07d9ca 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.4 2011/02/21 17:29:42 ulm Exp $
+# $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 $
 
 EAPI=2
 
@@ -15,13 +15,12 @@ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz
 LICENSE="gnuplot GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc emacs +gd ggi latex lua pdf plotutils readline svga wxwidgets X xemacs"
+IUSE="doc emacs +gd ggi latex lua plotutils readline svga wxwidgets X xemacs"
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="
 	xemacs? ( app-editors/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
 	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
 	lua? ( >=dev-lang/lua-5.1 )
 	ggi? ( media-libs/libggi )
 	gd? ( >=media-libs/gd-2[png] )
@@ -79,7 +78,7 @@ src_configure() {
 	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 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 5af221e73170..38de07afe12b 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.9 2011/02/21 17:29:42 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.2.ebuild,v 1.10 2011/02/22 07:36:11 ulm Exp $
 
 EAPI=3
 
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 LICENSE="gnuplot GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga thin-splines wxwidgets X xemacs"
+IUSE="cairo doc emacs +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
 
 RESTRICT="wxwidgets? ( test )"
 
@@ -29,7 +29,6 @@ RDEPEND="!app-emacs/gnuplot-mode
 		lua? ( dev-tex/pgf
 			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
 	lua? ( dev-lang/lua )
-	pdf? ( media-libs/pdflib )
 	plotutils? ( media-libs/plotutils )
 	readline? ( sys-libs/readline )
 	svga? ( media-libs/svgalib )
@@ -76,7 +75,7 @@ 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 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)"