imported prefix changes and keyworded for linux prefix

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 24 insertions, 20 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 9bb13eded3f2..e827928f6c3d 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.136 2010/03/14 14:37:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.137 2010/06/15 15:48:53 jlec Exp $
+
+  15 Jun 2010; Justin Lecher <jlec@gentoo.org> gnuplot-4.4.0.ebuild:
+  imported prefix changes and keyworded for linux prefix
 
 *gnuplot-4.4.0 (14 Mar 2010)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index df5a0ca82ae0..6ffc7df85969 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -11,13 +11,13 @@ DIST gnuplot-4.2.6.tar.gz 2936753 RMD160 3b1726e5327b17bb7b528198e62a12b9fe3e5a7
 DIST gnuplot-4.4.0.tar.gz 3291622 RMD160 ed15fd44d32b0bf610f52b99e2c36cd160cb08a6 SHA1 04a2eede7b2af8e64144aa8ffede6535b7a043b5 SHA256 00de2c54a05920a5d2dc68f668990b0b84a96105d92a932d91600dd53f156b2a
 EBUILD gnuplot-4.2.6-r1.ebuild 6204 RMD160 3e43bcfdc92da126c8baa002f51b5ea4632dae7b SHA1 9517b1eb59a4f55e71036ef37a1efac8dd1a06ff SHA256 2b37220b8fd1040e2cfcf22a15b616a05dedde80f0c1fcd365c5e95e8a387904
 EBUILD gnuplot-4.2.6.ebuild 5914 RMD160 ef9ec032fc6fbd0e37f40af650253b30c0e22972 SHA1 07bbd67f34458b6352f3ee9e54961863064f0f18 SHA256 21146a73c0073094628393d4aef879b26174d05b43a9a1fd7bd78e5207135a34
-EBUILD gnuplot-4.4.0.ebuild 5806 RMD160 e443be2a624e7e6a7b69e6ef3c68755148a4743d SHA1 8a7dbdcb940fa74fc271207b97b3747c7417d907 SHA256 67a01cd368e6384fddeae846a23b22c52d2fe1c52a1410ef2c1f496262bc6c80
-MISC ChangeLog 26612 RMD160 4b1f39aeef6075ed7e21cbf306c4e07d1f0b91e7 SHA1 8441aff5aca8e82356a55460d2b7e9d01ca0eefa SHA256 c2d4570e36bb545000fb1706150622b55ca256368f2fc2901538a77f583f1d6b
+EBUILD gnuplot-4.4.0.ebuild 5985 RMD160 c751102b224e9379c281d177b88f0b507bc53840 SHA1 2ed03e03a28fa8340497de0a201b69cbaa254223 SHA256 d907b4685ca196a0c886b8990898ded9c07587731bc4dc1ab64eba253f2d98e6
+MISC ChangeLog 26740 RMD160 b3a5601d5fe3178dafb3f55209dc6fe613adc74c SHA1 3b960735ecc62f1ac6fe6021f51857fd73ea44ac SHA256 1c1c205bad366dad598bae501fa59954a237617f80559c381570e31fc5b1aa61
 MISC metadata.xml 404 RMD160 7c05f336a5561bb8b6dfa4ac1f70889c0c6d3f5c SHA1 a8ae16bc80aedbedbfa575b538bf95b71ce4c319 SHA256 dfacaf36a82a2dd67ea22d03f8c6c56bd4bd60588e9187c8a8e0988ae10a3a3b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
+Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkuc9MIACgkQOeoy/oIi7uxi8wCeKMxjKTh7q2TaGksW1agdonot
-dYQAoJnpHbSFDl45FeRkT86ARUuxSyKW
-=DM44
+iEYEARECAAYFAkwXoOwACgkQgAnW8HDreRa6lgCfQcODSCZV5iH2979BOOhh/S1z
+vOkAn0rHPAsd9ce21/2+SBppxlGnuQBx
+=cmU0
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild
index ac9586f79cd0..e89230db29c0 100644
--- a/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild
+++ b/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2010 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: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.0.ebuild,v 1.2 2010/06/15 15:48:53 jlec Exp $
 
-EAPI=2
+EAPI="3"
 
 inherit elisp-common multilib wxwidgets
 
@@ -13,8 +13,9 @@ 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"
+KEYWORDS="~alpha ~amd64 ~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"
+
 RESTRICT="wxwidgets? ( test )"
 
 RDEPEND="!app-emacs/gnuplot-mode
@@ -48,7 +49,7 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}"
 GP_VERSION="${PV%.*}"
 E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="/usr/share/texmf-site"
+TEXMF="${EPREFIX}/usr/share/texmf-site"
 
 src_prepare() {
 	# Add special version identification as required by provision 2
@@ -72,11 +73,11 @@ src_configure() {
 	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 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)"
 	myconf="${myconf} $(use_enable wxwidgets)"
@@ -91,13 +92,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
 }
 
@@ -149,7 +150,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}
@@ -167,8 +168,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