Don't link against media-libs/pdflib.

(Portage version: 2.1.9.40/cvs/Linux x86_64)

3 files changed, 12 insertions, 9 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/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)"