clean up

Package-Manager: portage-2.1.3.16

10 files changed, 13 insertions, 701 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index b65e1a03cdb2..303bac5e5788 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.51 2007/10/30 21:15:09 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.52 2007/10/31 06:57:11 opfer Exp $
+
+  31 Oct 2007; Christian Faulhammer <opfer@gentoo.org>
+  -gnuplot-4.0-r1.ebuild, -gnuplot-4.2.0.ebuild, -gnuplot-4.2.0-r1.ebuild,
+  -gnuplot-4.2.0-r2.ebuild:
+  clean up
 
 *gnuplot-4.2.2-r1 (30 Oct 2007)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index b4071d9a3271..9f1ba0f0b691 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -26,28 +26,11 @@ MD5 51225315add3dabcbbbde9e771bba24c files/pdflib-6-compat.patch 560
 RMD160 cb89ecb654a425925b34398a36cb83332fd438e2 files/pdflib-6-compat.patch 560
 SHA256 b1745ad75b58f081b7c9d5dc204f58f519b283aa116e2791c93128026b45700f files/pdflib-6-compat.patch 560
 DIST gnuplot-4.0.0.tar.gz 2160918 RMD160 7b1fc84c161c132c776269b6e9a49abd29251a18 SHA1 a862bc311724c263aa1ef1c646291d73dc37c978 SHA256 a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48
-DIST gnuplot-4.2.0.tar.gz 2836649 RMD160 1d31a40796f5c2474473afbe5c6d667d7d97c91c SHA1 867e010ba23346d472e0afdf997edeb6e5ddd585 SHA256 ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9
 DIST gnuplot-4.2.2.tar.gz 2832174 RMD160 7364d283718d89c05652d7c25a841154caa2efd8 SHA1 991db8024f04e8cad300804bc2661e358fdcf348 SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91
-EBUILD gnuplot-4.0-r1.ebuild 4005 RMD160 7fa9f67c2e9d392878aad4c02368e359b5bb8187 SHA1 764a4f99e643fc1e11a153a8062100d4928d464c SHA256 066fa1339d27e992038f978ecf957e1aa1bb8fae7ea1a75f81c2d65a14582583
-MD5 2385397c236d990cddaad8827753c3e9 gnuplot-4.0-r1.ebuild 4005
-RMD160 7fa9f67c2e9d392878aad4c02368e359b5bb8187 gnuplot-4.0-r1.ebuild 4005
-SHA256 066fa1339d27e992038f978ecf957e1aa1bb8fae7ea1a75f81c2d65a14582583 gnuplot-4.0-r1.ebuild 4005
 EBUILD gnuplot-4.0-r2.ebuild 4095 RMD160 43c417c795b8862c94078876c194f3ad401f2ab3 SHA1 86fa084283e0152f8274ebf20d4b37bffa37e6c5 SHA256 b67fef14ee8158edc9af2bccac7c43875b4c3fd1462b54ebf139b0fe5034072f
 MD5 f5e9609e7d10edcb2e3e9941557a9dfd gnuplot-4.0-r2.ebuild 4095
 RMD160 43c417c795b8862c94078876c194f3ad401f2ab3 gnuplot-4.0-r2.ebuild 4095
 SHA256 b67fef14ee8158edc9af2bccac7c43875b4c3fd1462b54ebf139b0fe5034072f gnuplot-4.0-r2.ebuild 4095
-EBUILD gnuplot-4.2.0-r1.ebuild 4899 RMD160 2018a971f30c049e061e3926b04924d60c5104e8 SHA1 9b04309a296579440467520ca0959dfb260d14d6 SHA256 2a9ce3c2b23fcffabafb2cfd33a5705947d6a0b71b6778cb82a8a1ddd4131a22
-MD5 d8ee455e2b1ec9e79ff0763c1256f31b gnuplot-4.2.0-r1.ebuild 4899
-RMD160 2018a971f30c049e061e3926b04924d60c5104e8 gnuplot-4.2.0-r1.ebuild 4899
-SHA256 2a9ce3c2b23fcffabafb2cfd33a5705947d6a0b71b6778cb82a8a1ddd4131a22 gnuplot-4.2.0-r1.ebuild 4899
-EBUILD gnuplot-4.2.0-r2.ebuild 4941 RMD160 d36caf62736d397ede774ef298ca2c794e7ac68e SHA1 ecced86f3ece335defd37cb6e3ed1a5541404eab SHA256 faf4986149e96c368209dc0d7c4ecbd9369bcf05f0826e8dc938097dde3a4716
-MD5 143ca8943bea7ef918956020ad5867ca gnuplot-4.2.0-r2.ebuild 4941
-RMD160 d36caf62736d397ede774ef298ca2c794e7ac68e gnuplot-4.2.0-r2.ebuild 4941
-SHA256 faf4986149e96c368209dc0d7c4ecbd9369bcf05f0826e8dc938097dde3a4716 gnuplot-4.2.0-r2.ebuild 4941
-EBUILD gnuplot-4.2.0.ebuild 4872 RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027 SHA1 29f49d28e0769a7493e97bbe696166acaac74afa SHA256 4144265d3b9f1cb4feb71bb3a0a5ecd040644ef2bcedec97677f539053191e9f
-MD5 835e17f9207a07b51deab21e7bbc756d gnuplot-4.2.0.ebuild 4872
-RMD160 6ef6ddd89fc6859a9dada1e7bc35497ad032b027 gnuplot-4.2.0.ebuild 4872
-SHA256 4144265d3b9f1cb4feb71bb3a0a5ecd040644ef2bcedec97677f539053191e9f gnuplot-4.2.0.ebuild 4872
 EBUILD gnuplot-4.2.2-r1.ebuild 5184 RMD160 6275e93e26968a775e83e2f86da7dcf382c778ee SHA1 4164618cc3c43a97b973cfea0ebf6c07c42e9ce0 SHA256 2f5ac501464bf52d79b222e020e0b1367c0dc428fb73d6213cb4091cc48da988
 MD5 37205868333e19049bf77c06cef8ca48 gnuplot-4.2.2-r1.ebuild 5184
 RMD160 6275e93e26968a775e83e2f86da7dcf382c778ee gnuplot-4.2.2-r1.ebuild 5184
@@ -56,29 +39,17 @@ EBUILD gnuplot-4.2.2.ebuild 5258 RMD160 3c232dca60fa5de13f7af8bb0cef7862e3c8e9ea
 MD5 5b57267407ab2ad70759f445d1c5d8fc gnuplot-4.2.2.ebuild 5258
 RMD160 3c232dca60fa5de13f7af8bb0cef7862e3c8e9ea gnuplot-4.2.2.ebuild 5258
 SHA256 896c71b483f3aca5752e9e9d24ed10e0f9bee98d392376f1b14fbc05da6a24dd gnuplot-4.2.2.ebuild 5258
-MISC ChangeLog 14343 RMD160 223ea3c44f9ace75590d2990b8553411dceb09bb SHA1 e929399291384d175b9bd7238d6b9ea351210dfc SHA256 8181d05c496ad783f65193022d43eb75750cb5a4aea89f7c7b082fe06f4bc787
-MD5 4832f60d67564e829f6868ea763b7b74 ChangeLog 14343
-RMD160 223ea3c44f9ace75590d2990b8553411dceb09bb ChangeLog 14343
-SHA256 8181d05c496ad783f65193022d43eb75750cb5a4aea89f7c7b082fe06f4bc787 ChangeLog 14343
+MISC ChangeLog 14513 RMD160 fb91f3ac85584aa91587536cd13805a204d590d7 SHA1 bd7d02a2753cc7edcaca15a9c782e95cd2178a20 SHA256 dfd06cf6205c1e672f891419d75a7a2d196202d67fa2aa3547d8d84c4e12ef4d
+MD5 7cf2d73312386d9a58f474f882926a7b ChangeLog 14513
+RMD160 fb91f3ac85584aa91587536cd13805a204d590d7 ChangeLog 14513
+SHA256 dfd06cf6205c1e672f891419d75a7a2d196202d67fa2aa3547d8d84c4e12ef4d ChangeLog 14513
 MISC metadata.xml 281 RMD160 9578b17bd8b0f05da3044064822e531912d1817c SHA1 709ef0382fe7ec2d3746554f452ebd91bc0014f0 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511
 MD5 bd00d3bd41c122c9fc97c6aaaa7e468a metadata.xml 281
 RMD160 9578b17bd8b0f05da3044064822e531912d1817c metadata.xml 281
 SHA256 702dd681c8877369b1ee1553a05fccbbb8633cb96c893f28a4dbcb5492d74511 metadata.xml 281
-MD5 1bd5edeb7318abbd217b4a92aa9837f7 files/digest-gnuplot-4.0-r1 244
-RMD160 12aef3c42457f843088cb4a3de4c07d33b8bda4f files/digest-gnuplot-4.0-r1 244
-SHA256 911f90b2bf05ec39c8895c5391d384465266d4a5357e1b95259ef2ab05656610 files/digest-gnuplot-4.0-r1 244
 MD5 1bd5edeb7318abbd217b4a92aa9837f7 files/digest-gnuplot-4.0-r2 244
 RMD160 12aef3c42457f843088cb4a3de4c07d33b8bda4f files/digest-gnuplot-4.0-r2 244
 SHA256 911f90b2bf05ec39c8895c5391d384465266d4a5357e1b95259ef2ab05656610 files/digest-gnuplot-4.0-r2 244
-MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0 244
-RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0 244
-SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0 244
-MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0-r1 244
-RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0-r1 244
-SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0-r1 244
-MD5 46bf95697418c0c80329a089d6e9738d files/digest-gnuplot-4.2.0-r2 244
-RMD160 1dce5fef245bd7df3e9ee4e50fc2cda367c211ee files/digest-gnuplot-4.2.0-r2 244
-SHA256 67b29005a738bc6ea31297b4881661ef3534c7e58e8a7b926fb925877d64497c files/digest-gnuplot-4.2.0-r2 244
 MD5 e5c3d8415e0636858d249fde0731f3f0 files/digest-gnuplot-4.2.2 244
 RMD160 3f2e986756041f0a37c0864b14d0cc41388135c5 files/digest-gnuplot-4.2.2 244
 SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/digest-gnuplot-4.2.2 244
@@ -88,7 +59,7 @@ SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHJ57kNQqtfCuFneMRArYHAJsGjlsNmy4yTaYDiWWOtQ2LDxiSYwCeOXuG
-i6M1TjxmZWqBNBaBf7cp09I=
-=7n7w
+iD8DBQFHKCdNNQqtfCuFneMRAtjAAJsGSB3GleXDlgSA47srgv4tPJ9ccgCglqnK
+G10ov5u2lmD0+7Nnf+fqzoc=
+=nnWm
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r1 b/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r1
deleted file mode 100644
index 81d4b623b0c0..000000000000
--- a/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 66258443d9f93cc4f46b147dac33e63a gnuplot-4.0.0.tar.gz 2160918
-RMD160 7b1fc84c161c132c776269b6e9a49abd29251a18 gnuplot-4.0.0.tar.gz 2160918
-SHA256 a77ad7cb08b2551dacbaa0bb02e561fddb6b9f4a0f3d45eb1c38be219955ea48 gnuplot-4.0.0.tar.gz 2160918
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0
deleted file mode 100644
index b03e262c595c..000000000000
--- a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f688a578ddb4c376fd7d91ce444a0745 gnuplot-4.2.0.tar.gz 2836649
-RMD160 1d31a40796f5c2474473afbe5c6d667d7d97c91c gnuplot-4.2.0.tar.gz 2836649
-SHA256 ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9 gnuplot-4.2.0.tar.gz 2836649
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r1 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r1
deleted file mode 100644
index b03e262c595c..000000000000
--- a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f688a578ddb4c376fd7d91ce444a0745 gnuplot-4.2.0.tar.gz 2836649
-RMD160 1d31a40796f5c2474473afbe5c6d667d7d97c91c gnuplot-4.2.0.tar.gz 2836649
-SHA256 ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9 gnuplot-4.2.0.tar.gz 2836649
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r2 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r2
deleted file mode 100644
index b03e262c595c..000000000000
--- a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.0-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 f688a578ddb4c376fd7d91ce444a0745 gnuplot-4.2.0.tar.gz 2836649
-RMD160 1d31a40796f5c2474473afbe5c6d667d7d97c91c gnuplot-4.2.0.tar.gz 2836649
-SHA256 ede70fb18f05935f0186ae7514e5f77e09d7eab94a4f9cff82ddb48dbcbe20e9 gnuplot-4.2.0.tar.gz 2836649
diff --git a/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild
deleted file mode 100644
index 46440957559e..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.0-r1.ebuild,v 1.8 2007/07/22 06:49:01 dberkholz Exp $
-
-inherit eutils elisp-common
-
-MY_P="${P}.0"
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-
-LICENSE="gnuplot"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 s390 sparc x86"
-IUSE="doc emacs gd ggi pdf plotutils png readline svga X xemacs"
-
-DEPEND="
-	xemacs? ( virtual/xemacs )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	png? ( media-libs/libpng )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/tetex )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )"
-
-S=${WORKDIR}/${MY_P}
-
-E_SITEFILE="50gnuplot-gentoo.el"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/header-order.patch
-	epatch ${FILESDIR}/pdflib-6-compat.patch
-}
-
-src_compile() {
-	local 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_with plotutils plot /usr/lib)"
-	myconf="${myconf} $(use_with png png /usr/lib)"
-	myconf="${myconf} $(use_with pdf pdf /usr/lib)"
-
-	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \
-		|| myconf="${myconf} --without-ggi"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
-		|| myconf="${myconf} --with-readline"
-
-	myconf="${myconf} --without-lisp-files"
-
-	# This is a hack to avoid sandbox violations when using the Linux console.
-	# Creating the DVI and PDF tutorials require /dev/svga to build the
-	# example plots.
-	addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	econf ${myconf} || die
-	emake || die
-
-	if use doc ; then
-		cd docs
-		make pdf || die
-		cd ../tutorial
-		make pdf || die
-	fi
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for emacs..."
-		EMACS="emacs" lispdir="/usr/share/emacs/site-lisp/${PN}" econf || die
-		make DESTDIR=${D} install || die
-		make clean
-		cd ..
-
-		# Gentoo emacs site-lisp configuration
-		string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")"
-		echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE}
-		sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE}
-		elisp-site-file-install ${E_SITEFILE}
-	fi
-
-	if use xemacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for xemacs..."
-		EMACS="xemacs" lispdir="/usr/lib/xemacs/site-packages/${PN}" econf || die
-		make DESTDIR=${D} install || {
-			ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
-			ewarn "I need xemacs-base to be installed before I can compile"
-			ewarn "the gnuplot-mode lisp files for xemacs successfully."
-			ewarn "Please try re-emerging me after app-xemacs/xemacs-base"
-			ewarn "has been successfuly emerged."
-			die
-			}
-		cd ..
-	fi
-
-	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
-
-	if use doc; then
-		# Demo files
-		insinto /usr/share/${PN}/demo
-		doins demo/*
-		# Manual
-		insinto /usr/share/doc/${PF}/manual
-		doins docs/gnuplot.pdf
-		# Tutorial
-		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/{tutorial.dvi,tutorial.pdf}
-		# Documentation for making PostScript files
-		insinto /usr/share/doc/${PF}/psdoc
-		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use svga ; then
-		einfo "In order to enable ordinary users to use SVGA console graphics"
-		einfo "gnuplot needs to be set up as setuid root.  Please note that"
-		einfo "this is usually considered to be a security hazard."
-		einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.0-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.0-r1.ebuild
deleted file mode 100644
index 92a7cd898317..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.0-r1.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r1.ebuild,v 1.3 2007/07/24 20:08:57 lavajoe Exp $
-
-inherit eutils elisp-common wxwidgets
-
-MY_P="${P/_/.}"
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-
-LICENSE="gnuplot"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
-IUSE="doc emacs gd ggi tetex pdf plotutils png readline svga wxwindows X xemacs"
-
-RDEPEND="
-	xemacs? ( virtual/xemacs )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	png? ( media-libs/libpng )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/tetex )
-	tetex? ( virtual/tetex )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )
-	wxwindows? ( =x11-libs/wxGTK-2.6*
-		>=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-E_SITEFILE="50gnuplot-gentoo.el"
-
-pkg_setup() {
-	if use gd && ! built_with_use media-libs/gd png; then
-		eerror "media-libs/gd needs to be built with PNG support"
-		die "please rebuilt media-libs/gd with USE=png"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-libggi.patch
-}
-
-src_compile() {
-	# See bug #156427.
-	if use tetex ; then
-		sed -i \
-			-e 's/TEXMFLOCAL/TEXTMFSITE/g' share/Makefile.in || die "sed failed"
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || die "sed failed"
-	fi
-
-	if use wxwindows ; then
-		WX_GTK_VER="2.6"
-		need-wxwidgets unicode
-	fi
-
-	local 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 wxwindows wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/lib)"
-	myconf="${myconf} $(use_with png png /usr/lib)"
-	myconf="${myconf} $(use_with pdf pdf /usr/lib)"
-
-	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \
-		|| myconf="${myconf} --without-ggi"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
-		|| myconf="${myconf} --with-readline"
-
-	myconf="${myconf} --without-lisp-files"
-
-	# This is a hack to avoid sandbox violations when using the Linux console.
-	# Creating the DVI and PDF tutorials require /dev/svga to build the
-	# example plots.
-	addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd docs
-		make pdf || die "pdf doc creation failed"
-		cd ../tutorial
-		make pdf || die "pdf tutorial failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="/usr/share/emacs/site-lisp/${PN}" || die "econf Emacs files faild"
-		make DESTDIR="${D}" install || die "make install Emacs files failed"
-		make clean
-		cd ..
-
-		# Gentoo emacs site-lisp configuration
-		string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")"
-		echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE}
-		sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE}
-		elisp-site-file-install ${E_SITEFILE}
-	fi
-
-	if use xemacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for XEmacs..."
-		EMACS="xemacs" econf --with-lispdir="/usr/lib/xemacs/site-packages/${PN}" || die
-		make DESTDIR="${D}" install || {
-			ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
-			ewarn "I need xemacs-base to be installed before I can compile"
-			ewarn "the gnuplot-mode lisp files for xemacs successfully."
-			ewarn "Please try re-emerging me after app-xemacs/xemacs-base"
-			ewarn "has been successfuly emerged."
-			die
-			}
-		cd ..
-	fi
-
-	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
-
-	if use doc; then
-		# Demo files
-		insinto /usr/share/${PN}/demo
-		doins demo/*
-		# Manual
-		insinto /usr/share/doc/${PF}/manual
-		doins docs/gnuplot.pdf
-		# Tutorial
-		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/{tutorial.dvi,tutorial.pdf}
-		# Documentation for making PostScript files
-		insinto /usr/share/doc/${PF}/psdoc
-		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use svga ; then
-		einfo "In order to enable ordinary users to use SVGA console graphics"
-		einfo "gnuplot needs to be set up as setuid root.  Please note that"
-		einfo "this is usually considered to be a security hazard."
-		einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild
deleted file mode 100644
index 0ea7e0d0c172..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0-r2.ebuild,v 1.8 2007/10/04 00:03:32 opfer Exp $
-
-inherit eutils elisp-common multilib wxwidgets
-
-MY_P="${P/_/.}"
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-
-LICENSE="gnuplot"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc64 ~s390 sparc x86 ~x86-fbsd"
-IUSE="doc emacs gd ggi tetex pdf plotutils readline svga wxwindows X xemacs"
-
-RDEPEND="
-	xemacs? ( virtual/xemacs )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/tetex )
-	tetex? ( virtual/tetex )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )
-	wxwindows? ( =x11-libs/wxGTK-2.6*
-		>=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-E_SITEFILE="50gnuplot-gentoo.el"
-
-pkg_setup() {
-	if use gd && ! built_with_use media-libs/gd png; then
-		eerror "media-libs/gd needs to be built with PNG support"
-		die "please rebuilt media-libs/gd with USE=png"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-libggi.patch
-}
-
-src_compile() {
-	# See bug #156427.
-	if use tetex ; then
-		sed -i \
-			-e 's/TEXMFLOCAL/TEXMFSITE/g' share/Makefile.in || die "sed failed"
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || die "sed failed"
-	fi
-
-	if use wxwindows ; then
-		WX_GTK_VER="2.6"
-		need-wxwidgets unicode
-	fi
-
-	local 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 wxwindows wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/$(get_libdir))"
-	myconf="${myconf} $(use_with pdf pdf /usr/$(get_libdir))"
-
-	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/$(get_libdir)
-		--with-xmi=/usr/$(get_libdir)" \
-		|| myconf="${myconf} --without-ggi"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
-		|| myconf="${myconf} --with-readline"
-
-	myconf="${myconf} --without-lisp-files"
-
-	# This is a hack to avoid sandbox violations when using the Linux console.
-	# Creating the DVI and PDF tutorials require /dev/svga to build the
-	# example plots.
-	addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd docs
-		emake pdf || die "pdf doc creation failed"
-		cd ../tutorial
-		emake pdf || die "pdf tutorial failed"
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die "econf Emacs files faild"
-		emake DESTDIR="${D}" install || die "make install Emacs files failed"
-		emake clean
-		cd ..
-
-		# Gentoo emacs site-lisp configuration
-		string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")"
-		echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE}
-		sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE}
-		elisp-site-file-install ${E_SITEFILE}
-	fi
-
-	if use xemacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for XEmacs..."
-		EMACS="xemacs" econf --with-lispdir="/usr/$(get_libdir)/xemacs/site-packages/${PN}" || die
-		emake DESTDIR="${D}" install || {
-			ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
-			ewarn "I need xemacs-base to be installed before I can compile"
-			ewarn "the gnuplot-mode lisp files for xemacs successfully."
-			ewarn "Please try re-emerging me after app-xemacs/xemacs-base"
-			ewarn "has been successfuly emerged."
-			die
-			}
-		cd ..
-	fi
-
-	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
-
-	if use doc; then
-		# Demo files
-		insinto /usr/share/${PN}/demo
-		doins demo/*
-		# Manual
-		insinto /usr/share/doc/${PF}/manual
-		doins docs/gnuplot.pdf
-		# Tutorial
-		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/{tutorial.dvi,tutorial.pdf}
-		# Documentation for making PostScript files
-		insinto /usr/share/doc/${PF}/psdoc
-		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-
-	if ! use X; then
-		# see bug 194527
-		rm -rf "${D}/usr/$(get_libdir)/X11"
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use svga ; then
-		einfo "In order to enable ordinary users to use SVGA console graphics"
-		einfo "gnuplot needs to be set up as setuid root.  Please note that"
-		einfo "this is usually considered to be a security hazard."
-		einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild
deleted file mode 100644
index 9b5307737f64..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.0.ebuild,v 1.5 2007/07/15 02:36:19 mr_bones_ Exp $
-
-inherit eutils elisp-common wxwidgets
-
-MY_P="${P/_/.}"
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-
-LICENSE="gnuplot"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="doc emacs gd ggi tetex pdf plotutils png readline svga wxwindows X xemacs"
-
-RDEPEND="
-	xemacs? ( virtual/xemacs )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	png? ( media-libs/libpng )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/tetex )
-	tetex? ( virtual/tetex )
-	X? ( x11-libs/libXaw )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )
-	wxwindows? ( =x11-libs/wxGTK-2.6*
-		>=x11-libs/cairo-0.9
-		>=x11-libs/pango-1.10.3
-		>=x11-libs/gtk+-2.8 )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-
-E_SITEFILE="50gnuplot-gentoo.el"
-
-pkg_setup() {
-	if use gd && ! built_with_use media-libs/gd png; then
-		eerror "media-libs/gd needs to be built with PNG support"
-		die "please rebuilt media-libs/gd with USE=png"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-libggi.patch
-}
-
-src_compile() {
-	# See bug #156427.
-	if use tetex ; then
-		sed -i \
-			-e 's/TEXMFLOCAL/TEXTMFSITE/g' share/Makefile.in || die "sed failed"
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/Makefile.in || die "sed failed"
-	fi
-
-	if use wxwindows ; then
-		WX_GTK_VER="2.6"
-		need-wxwidgets unicode
-	fi
-
-	local 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 wxwindows wxwidgets)"
-	myconf="${myconf} $(use_with plotutils plot /usr/lib)"
-	myconf="${myconf} $(use_with png png /usr/lib)"
-	myconf="${myconf} $(use_with pdf pdf /usr/lib)"
-
-	use ggi \
-		&& myconf="${myconf} --with-ggi=/usr/lib --with-xmi=/usr/lib" \
-		|| myconf="${myconf} --without-ggi"
-
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu --enable-history-file" \
-		|| myconf="${myconf} --with-readline"
-
-	myconf="${myconf} --without-lisp-files"
-
-	# This is a hack to avoid sandbox violations when using the Linux console.
-	# Creating the DVI and PDF tutorials require /dev/svga to build the
-	# example plots.
-	addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-
-	if use doc ; then
-		cd docs
-		make pdf || die "pdf doc creation failed"
-		cd ../tutorial
-		make pdf || die "pdf tutorial failed"
-	fi
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" lispdir="/usr/share/emacs/site-lisp/${PN}" econf || die "econf Emacs files faild"
-		make DESTDIR="${D}" install || die "make install Emacs files failed"
-		make clean
-		cd ..
-
-		# Gentoo emacs site-lisp configuration
-		string="(add-to-list 'load-path \"/usr/share/emacs/site-lisp/${PN}\")"
-		echo -e ";;; Gnuplot site-lisp configuration\n\n${string}\n" > ${E_SITEFILE}
-		sed '/^;; move/,+4 d' lisp/dotemacs >> ${E_SITEFILE}
-		elisp-site-file-install ${E_SITEFILE}
-	fi
-
-	if use xemacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for XEmacs..."
-		EMACS="xemacs" lispdir="/usr/lib/xemacs/site-packages/${PN}" econf || die
-		make DESTDIR=${D} install || {
-			ewarn "Compiling/installing gnuplot-mode for xemacs has failed."
-			ewarn "I need xemacs-base to be installed before I can compile"
-			ewarn "the gnuplot-mode lisp files for xemacs successfully."
-			ewarn "Please try re-emerging me after app-xemacs/xemacs-base"
-			ewarn "has been successfuly emerged."
-			die
-			}
-		cd ..
-	fi
-
-	dodoc BUGS ChangeLog FAQ NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
-
-	if use doc; then
-		# Demo files
-		insinto /usr/share/${PN}/demo
-		doins demo/*
-		# Manual
-		insinto /usr/share/doc/${PF}/manual
-		doins docs/gnuplot.pdf
-		# Tutorial
-		insinto /usr/share/doc/${PF}/tutorial
-		doins tutorial/{tutorial.dvi,tutorial.pdf}
-		# Documentation for making PostScript files
-		insinto /usr/share/doc/${PF}/psdoc
-		doins docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	if use svga ; then
-		einfo "In order to enable ordinary users to use SVGA console graphics"
-		einfo "gnuplot needs to be set up as setuid root.  Please note that"
-		einfo "this is usually considered to be a security hazard."
-		einfo "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}