[sci-visualization/gnuplot] removed pdf use flag + bump to EAPI=3

(Portage version: 2.1.9.25/git/Linux i686, signed Manifest commit with key C2000586)

4 files changed, 51 insertions, 46 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 4d124d3eb..3b647c159 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,7 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  22 Feb 2011; Christoph Junghans <ottxor@gentoo.org> gnuplot-4.4.9999.ebuild,
+  gnuplot-4.5.9999.ebuild:
+  removed pdf use flag + bump to EAPI=3
+
   20 Mar 2010; Christoph Junghans <kleiner_otti@gmx.de>
   -files/gnuplot-4.2.2-disable_texi_generation.patch,
   -gnuplot-4.4.0_rc1.ebuild, -files/gnuplot-4.4.0_rc1-app-defaults.patch,
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index eb614b8ae..f5f1582bf 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,14 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-EBUILD gnuplot-4.4.9999.ebuild 6096 RMD160 4ce33c38b00494ae1dc0fcc60a9df007955597b1 SHA1 10e375439f337bd975934d03cce4b3d190bf8292 SHA256 75d32158ee16582b2d38cd99404c7ce3b825e5adb0f5fa4f01f36fd1fe0d6fa1
-EBUILD gnuplot-4.5.9999.ebuild 6155 RMD160 2c5ed2fbf7925c4804faa8f61f444b84c4884c1c SHA1 0617d3b17427acdb5a736f6016e75f74e40971c4 SHA256 93491a12da46c57b0c2c0ee5880924eee99c9093aa0f12fa88f08131e3850958
-MISC ChangeLog 3496 RMD160 a750db794b7c321ed689a65600c6cf33f12fc175 SHA1 582362799fc86ae43a0ebd40d0fc2d3d20fb70a2 SHA256 763cc9b9af4cd217d9dc711f2e06f1a04602604f56b4a258307d43380952f51a
+EBUILD gnuplot-4.4.9999.ebuild 6083 RMD160 944f1c43914001a5c99a0419f035db909eecc8f0 SHA1 2a954d14cbc90cc05d7d8f0476209c01e6ca2054 SHA256 86e09b3a58b3f02caaf27b04cad3768d22d340630a93c22901d8caa3685d2531
+EBUILD gnuplot-4.5.9999.ebuild 6195 RMD160 920bc94c28eee72ba72ce0ed8587d7513239d740 SHA1 cb752305767cbb9c34aa53670b9af60048d145b9 SHA256 7dfb7414bc0d91d9c338d08322fc394a6adeb44aa4c983ea0e4a5af1828c89f5
+MISC ChangeLog 3643 RMD160 a2f3cb147be59cf091d1e7ae95561e5b4fbf5693 SHA1 8c679708646415ea30e452d549d68f3c4199c0a5 SHA256 f0398a0bacabfcb707f6b5dfbb5ee0a91f2ab3fcaed7a59efc7920add2ab2270
 MISC metadata.xml 446 RMD160 3035af42611660e079b6ed2aae0f07163ace06fe SHA1 813fe7587bb177b6885b216bdfa81389e19b5838 SHA256 bb5246e7391bd900d4875ba67979200f114d0cc1be4ac4c83bcf75fe161abdff
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkuk+NAACgkQy0OE/ans1/lfUgCff9yq2sf49WNtjEynxrLOtNdO
-7agAn2O7kB5ge81IB5P4DMsaLA55ZvTi
-=3e5+
+iQEcBAEBAgAGBQJNZCylAAoJEOeBhlrCAAWGUzsH/i9CVbaUWN0TGvvyVT2xC7WI
+aHE4oiOopthps1MrwCjjUTx/IN+wOzuflPivDT2yvWkPBonurl3dr/Em/GbIKOpG
+qJs5yd2UYeA0jrJnOELJ76H7b512BrG9muLJ0gu1G9feK5LS9YwUcT+jYe/HGv8J
+xm6xLNJPiPScLVlq457dyN+Eae7UUA6IJGxn6jbVGZX1o/fK0kSAVdwZn8sK/KKU
+Dt8SshvOOWpUGyXKzHOD0cQy/dcCmwfknFkVfCY45rQTgcnD8WwHvdQE8lGQupfp
+0DJwvuiRLBI/DoC+VMeBfMSQU2hf/SWmi8hRhWs66W6cZlJLGae/J9E1Bjf+sm8=
+=KZQn
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
index 770a8876d..9c29c6190 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $
+# $Header: $
 
-EAPI=2
+EAPI=3
 
 inherit autotools cvs elisp-common multilib wxwidgets
 
@@ -17,14 +17,14 @@ ECVS_CVS_OPTIONS="-dP"
 
 LICENSE="gnuplot GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils readline svga thin-splines wxwidgets X xemacs"
+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 plotutils readline svga thin-splines wxwidgets X xemacs"
+
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="!app-emacs/gnuplot-mode
 	cairo? ( x11-libs/cairo
-		x11-libs/pango
-		>=x11-libs/gtk+-2.8 )
+		x11-libs/pango )
 	emacs? ( virtual/emacs )
 	gd? ( media-libs/gd[png] )
 	ggi? ( media-libs/libggi )
@@ -32,14 +32,13 @@ 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 )
 	wxwidgets? ( x11-libs/wxGTK:2.8[X]
 		x11-libs/cairo
 		x11-libs/pango
-		>=x11-libs/gtk+-2.8 )
+		>=x11-libs/gtk+-2.8:2 )
 	X? ( x11-libs/libXaw )
 	xemacs? ( app-editors/xemacs
 		app-xemacs/xemacs-base
@@ -52,7 +51,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
 	local dir
@@ -80,15 +79,15 @@ 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)"
 	myconf="${myconf} $(use_with gd)"
-	myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
+	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 /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with plotutils plot /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)"
 	myconf="${myconf} $(use_enable wxwidgets)"
@@ -103,13 +102,13 @@ src_configure() {
 		einfo "Configuring gnuplot-mode for XEmacs ..."
 		use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs
 		cd "${S}/lisp-xemacs"
-		econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
+		econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
 	fi
 
 	if use emacs; then
 		einfo "Configuring gnuplot-mode for GNU Emacs ..."
 		cd "${S}/lisp"
-		econf --with-lispdir="${SITELISP}/${PN}" EMACS=emacs
+		econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
 	fi
 }
 
@@ -161,7 +160,7 @@ src_install () {
 		cd "${S}/lisp"
 		emake DESTDIR="${D}" install || die
 		# info-look* is included with >=emacs-21
-		rm -f "${D}${SITELISP}/${PN}"/info-look*
+		rm -f "${ED}${SITELISP}/${PN}"/info-look*
 
 		# Gentoo emacs site-lisp configuration
 		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
@@ -179,8 +178,8 @@ src_install () {
 		# Demo files
 		insinto /usr/share/${PN}/${GP_VERSION}
 		doins -r demo || die
-		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
 		# Manual
 		dodoc docs/gnuplot.pdf
 		# Tutorial
diff --git a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
index 879865b82..7d4a5752b 100644
--- a/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.5.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.0.ebuild,v 1.1 2010/03/14 14:37:17 ulm Exp $
+# $Header: $
 
-EAPI=2
+EAPI=3
 
 inherit autotools cvs elisp-common multilib wxwidgets
 
@@ -17,14 +17,13 @@ ECVS_CVS_OPTIONS="-dP"
 
 LICENSE="gnuplot GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cairo doc emacs +gd ggi latex lua pdf plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
+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 plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="!app-emacs/gnuplot-mode
 	cairo? ( x11-libs/cairo
-		x11-libs/pango
-		>=x11-libs/gtk+-2.8 )
+		x11-libs/pango )
 	emacs? ( virtual/emacs )
 	gd? ( media-libs/gd[png] )
 	ggi? ( media-libs/libggi )
@@ -32,7 +31,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 )
 	qt4? ( >=x11-libs/qt-core-4.5
 		>=x11-libs/qt-gui-4.5
@@ -42,7 +40,7 @@ RDEPEND="!app-emacs/gnuplot-mode
 	wxwidgets? ( x11-libs/wxGTK:2.8[X]
 		x11-libs/cairo
 		x11-libs/pango
-		>=x11-libs/gtk+-2.8 )
+		>=x11-libs/gtk+-2.8:2 )
 	X? ( x11-libs/libXaw )
 	xemacs? ( app-editors/xemacs
 		app-xemacs/xemacs-base
@@ -55,7 +53,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}"
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
 	local dir
@@ -83,15 +81,15 @@ 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)"
 	myconf="${myconf} $(use_with gd)"
-	myconf="${myconf} $(use_with ggi ggi /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with ggi xmi /usr/$(get_libdir))"
+	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 /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with plotutils plot /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)"
 	myconf="${myconf} $(use_enable wxwidgets)"
@@ -107,13 +105,13 @@ src_configure() {
 		einfo "Configuring gnuplot-mode for XEmacs ..."
 		use emacs && cp -Rp lisp lisp-xemacs || ln -s lisp lisp-xemacs
 		cd "${S}/lisp-xemacs"
-		econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
+		econf --with-lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}" EMACS=xemacs
 	fi
 
 	if use emacs; then
 		einfo "Configuring gnuplot-mode for GNU Emacs ..."
 		cd "${S}/lisp"
-		econf --with-lispdir="${SITELISP}/${PN}" EMACS=emacs
+		econf --with-lispdir="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
 	fi
 }
 
@@ -165,7 +163,7 @@ src_install () {
 		cd "${S}/lisp"
 		emake DESTDIR="${D}" install || die
 		# info-look* is included with >=emacs-21
-		rm -f "${D}${SITELISP}/${PN}"/info-look*
+		rm -f "${ED}${SITELISP}/${PN}"/info-look*
 
 		# Gentoo emacs site-lisp configuration
 		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
@@ -183,8 +181,8 @@ src_install () {
 		# Demo files
 		insinto /usr/share/${PN}/${GP_VERSION}
 		doins -r demo || die
-		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${D}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
+		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
 		# Manual
 		dodoc docs/gnuplot.pdf
 		# Tutorial