Remove old.

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

5 files changed, 15 insertions, 770 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 3a3c8c6e034b..951f4f854b78 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,13 +1,14 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.211 2013/03/26 07:35:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.212 2013/03/26 08:37:19 ulm Exp $
 
 *gnuplot-4.6.2-r1 (26 Mar 2013)
 
-  26 Mar 2013; Ulrich Müller <ulm@gentoo.org> +gnuplot-4.6.2-r1.ebuild,
+  26 Mar 2013; Ulrich Müller <ulm@gentoo.org> -gnuplot-4.6.0.ebuild,
+  -gnuplot-4.6.1-r1.ebuild, -gnuplot-4.6.2.ebuild, +gnuplot-4.6.2-r1.ebuild,
   +files/gnuplot-4.6.2-gdversion.patch:
   Update test for GD version, bug 462996. Thanks to Bernardo Costa
-  <bernardofpc@gmail.com> for the bug report and the patch.
+  <bernardofpc@gmail.com> for the bug report and the patch. Remove old.
 
 *gnuplot-4.6.2 (17 Mar 2013)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 1cddd0becbd8..1f89c072dbba 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -5,28 +5,24 @@ AUX gnuplot-4.4.4-tikz.patch 578 SHA256 aaf803a66e57c7e069dc5aba8ec91dc3038c224c
 AUX gnuplot-4.6.1-eldoc.patch 1077 SHA256 0b8ce02df0ba67de1002e6d6ea753c1f4b5c1d2783091cfd26daf61317eec975 SHA512 97347e6223a3f13ed6857896b60dedff03eb632a87a9728c41b41833eef528655459cb2b5469fe9c521795d406ad69ab3eb1d6a2dd921579d15cc8d649b552af WHIRLPOOL 3a1826e1a848fa84bf1d60abecf4371d4f101c83cfd418184284166b8d51ae884ce4e64632bfdd7e079eeb4e7ad79c408c76f9b0f9cde915582158bb24390749
 AUX gnuplot-4.6.2-gdversion.patch 877 SHA256 03b128ed38869a9547565c6ba3509eb6af71f9551cb1c1f7cee1d5cc81ccced1 SHA512 7654866896bb5c38734156fb2ba802b4381f5109e49f808aca5e1ea4f7a3333db5603f6891c3c6d8027e8e08472614965f683f1adc6795eb649a257325155b34 WHIRLPOOL 30e03d55291ef1355212017fb127d70f53415b194cd2e483090173b248e99fc886b15f67e884ad99fb2cd7182add4b9488c0f6b0758489f712c2876a1661e039
 DIST gnuplot-4.4.4.tar.gz 3328278 SHA256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd SHA512 5781a1cb569bb4e4471be87f563c761a28a8a927c32c58e65e296152869951d2f5f16a437af3988ba83212ea2aaf641176c9863d6f5f3e629d86a927c41e75ba WHIRLPOOL c5e04c1a9ae7aa6c3f91e535d004cd75ae2ffa2bda5a6f284fa475286e34606c6e7970d83f80fd00e359da4b81f34526b2f02c2a305d7d982840b30a1e8cecd5
-DIST gnuplot-4.6.0.tar.gz 5017694 SHA256 6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be SHA512 a4358c20577f978215a22db041f4d369ab69a88624b2fe831d2a1124fffb84d4dafa7f0f5a8bfdb388c663073570adb084949195c6eebd0f11f9b0ac4485debc WHIRLPOOL a892cf9061b1ca1e47f51294bbc08494f8725a9b1cb4f413d68d99a158f11fcf718aec3bc8a21c132f596f4ab39a9b4e541f3cca1933de9670912cdd32364ef4
 DIST gnuplot-4.6.1.tar.gz 4959670 SHA256 f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6 SHA512 a6a05da6708a7f5629d8356901e93ab622d4a3a6325e050fc1f8dce652e6061164783a98ff5cbc2dede65f6f0cb5be6a1ab2fcaeb778f6879215bae7056bd3ed WHIRLPOOL fa72b52a181ee9f7599c3646c4303ebcc21c0ecae51f7e9024356108f6f6539cfbc91e52e787fbf6d782aff8e1e94d9fec02f05c6bf754c6368eaca947e6bb6c
 DIST gnuplot-4.6.2.tar.gz 4969701 SHA256 978b01bbd288c4c5f6d6572cae3aa8bc73b429629ef4400f71856bb5d2251818 SHA512 d7b8f8dcc95aa15ddb7506fcf6f2e8147df81a9b50777250c86cba62823c57dd8ccce67b467ffc044349283936e69fd67742586ef4ea4d0ce8afebd87fae8af5 WHIRLPOOL 63b4da71042d42e7b79075270b4fb5f7258588958a718f3516bd660cbe64addbfe9b532f71364c6c00ecd7760c79f3e023ad199433f53fc668ef2988846ff48c
 EBUILD gnuplot-4.4.4-r1.ebuild 6635 SHA256 919cc230c0f26a0e12442d0185cbcf794cd0699307153f84d8f89186129b0217 SHA512 6dad45b149a3fd5ec095bd7abbe9bc2c273eaf1abc5977d9a92a22b3a57d19dd87e3e401f971013a34706f697ce9041bae410b35d3a09e646fc24ea0509ac775 WHIRLPOOL c8f4fc801a4af68307a0df0e066718b16647ff7faae39545603eb88eeeac65545e1ae668c88049d8e4308169b788f40c5e832de2684802a96ab92111a1e641dc
-EBUILD gnuplot-4.6.0.ebuild 7452 SHA256 50fbf6ac2239ea825b1574dba40bfb06f94d02bee7e8115729f5dd67e014eb9d SHA512 342f8076c99c764963300b1a91751bb9c8e686cc5dace795b7bff18206b9fe8e7486259a2154b3868aa956437a4d655b5a72360a0f86a5b3aad57e77e2b1a810 WHIRLPOOL e3b6020034718535e3eda34d09858ae66ccee0aa593d720f472d485b5de1e6171c9a3d4dba0f026059e7a080f3610050da0f06a276780e7f2e352dfea3531de1
-EBUILD gnuplot-4.6.1-r1.ebuild 6683 SHA256 cc31bc3e4ad01e388b0c1e5dd6b6942cc5f8550d85673705d382744fb6ca058d SHA512 5e4ce9250250f22a6df24a9fd39cf972c065fb21d5b88516e5351e03d1831504acb7ed0e3f0b637ba5ec57633286454a8a6ea0cd825273c6fc461ea25482cb03 WHIRLPOOL 159cc2d08073964787a4305776f8dd93845822fcdaee5cdca3a230ae5e27c490ed599217a862118fd3a4b3e2d46723752f01a4e1aa0213a7bf9893bd3a80d1db
 EBUILD gnuplot-4.6.1.ebuild 7512 SHA256 776c7af4f1d94d7c02bcfdc1f64381655286fd98888f50f490d0bc4f11bfba85 SHA512 e1e79282a9ab17de9f77ce7550950f20424bc79a6c5cce044064e998112626d33d1ddbab60a093feab86bd35e3b1b52bd0f1c2566e2d4a5471c4281a25768ad1 WHIRLPOOL b9b0362579b27153205b73551517e3616f17b1c45aecb06e13d3f10e6c7668d18996d52faa0b3f1606e70c0863ba700ad019430fa7427fa1aebc764f777d024f
 EBUILD gnuplot-4.6.2-r1.ebuild 6757 SHA256 a36c8a6ef3f611a504a80f4752fc33d329e0be95ed29daefe8d023653e2f2f6a SHA512 76d53834f1f1d8c73803e8fab91a9f12800991a7e962853532416f188ae16bfa003fcd0084c1910b15d6602ff968bb25acadb02275c49551dcbfc1922671b953 WHIRLPOOL c489d3ffe35c3fc34ec401add3bdd8626dc4804e89a184f36011980762560b00c94580906516a1d1ef018e867d305609559dc6abd420021bf32692cf5966d1c1
-EBUILD gnuplot-4.6.2.ebuild 6687 SHA256 94ab11bf2a29cccb78e9cfe7fe261f84e282a0a1cffbace9f7fd42d1ec864b86 SHA512 693cf8ff67e42a3c58ba0c66c36a2147fe85f2d5dd7a084b9ca22f13a0af63b10fa69a19ac37e83fecd53c599a42e0cd15e6826d2d2b9b1e1ecb6a9a9610c34e WHIRLPOOL 9860b68d0308b26eb40807c0e9f1821cda4b7e71f6caa421313753490d41f468381f7d8790c593c97a774cfd296a67a886bef1a66231d0d3a56d789be70ff952
-MISC ChangeLog 36772 SHA256 634514ab8802e053fcb7cf0380f15b944e46557a8bacd982c0dbe7460ddc7024 SHA512 3618b1c862a52cb4a7f6045d935233c4b31d1034c0b9a45e9e7f1c4ba1e775cef73c523244fec7bbf0321da281b5ec86dee88aefaef3a8e4d40e8c1ed698ee70 WHIRLPOOL aff8cb68c0fd6b88d1f7ee3ae9714ddf8234bf061a4340bfb49b3f72ced35d99f9251e1ddae4fbf63775491dc7e407e93535663dbaf254147873ed4d145cc9fa
+MISC ChangeLog 36858 SHA256 38fbfa12501ef2d9a8147739f615b5ffe649971e4b2ec9e53a4ff7bbae50e21a SHA512 cfb061084b49cfc20ab2ad0de0d6e39008a50db98051cc2c59a70e2a1876511471d3fcd6cb3f1c9f4cb0f8c960367e0e6161cd6b09e543a84a806bb291110f0a WHIRLPOOL 033ba9359ad9b370d9b9e1fd11845bf4a4d1f22c12e03ece7b1abed9e304d5389866d360d9a5a9a71e1844888710a8f8a7350b3d18712223799f1c564d694ae3
 MISC metadata.xml 974 SHA256 0fdd09afff7d6bc87078d6c09ededb60856891f130a733a0294c72e773a35f25 SHA512 feddb2b2bcf1e41c961a30c25edba081076c8703d3186f79728a7c0d496f400b3f5c1d876307325d41a4a59d19a4b27580293d57d8d5717ee23fed30a4e131d7 WHIRLPOOL 17525529c6fd42a91373324d0c5b1bfbe8528d04bd2c3b6d50b311b60c2db2d21bc3871f7ea520e119c911863a0cfa80375de5702965035cfaf0073d03610143
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQGcBAEBCAAGBQJRUU/uAAoJEJQzkH1pP7W4bscMAI3/b/vzQlMaddYH5+jD7Gum
-tiSD1QHrFFhG2psH3Wl6RjQjS38B0i4wcMmCxEY/vfvUd9TcjQiAI+79rFD4mRkS
-6lOqmdHkEAgI9k2cN9Va1NMfNwdJcfoSvMVN98DQgj+Nz2g3Jyze4YU4cXK+oLDl
-yfwsJIgA1SDuo0rELklNFLvf1SHys/3mnywA2U4kx1W9Fhx+X7L0PwwjJtuEWlib
-hzL6ifYK4NWOcbhSC9WBL1ZvCEUelu0K1QVb2gdeR4U/k1sTOJ1MIGyiDFj2UTq1
-7ATVgevWpHvUZd0eEX8EFlIWEjupk+q37Nv3jHeNOXdVhuzFww2+QUHzAA88NdQy
-jMjbIYMQEwcL3UcK7h/1MMc6PlV/7J8HHeSjNZFCGgWPBelquCB9G0AG5jQilsb7
-oF+ygRNSuR9u9drihgEdeRlnDVLhNmEQoohnyGYroSoIh2diFmsQhDZEPDV7qelW
-L11o467OsicC7q5x2vQd1SCwhySWKK9kBX/ZzrgkOw==
-=1E//
+iQGcBAEBCAAGBQJRUV5XAAoJEJQzkH1pP7W4/TEMAJXYYgxMsRlOTMR6+y0XJaab
+PxYlqeMcK8kaVgwG0sSsAu251R0ZeDeRaT6iOlXQMVf80H1ASGdPvTvs68v9ZM3R
+bfTb7b+bsR6zl2KkzRzfTGBHp9LD241ABcWWM4DV/qUp3gAWII8BiczsRNGzb8CH
+6BpAJX2/HeDCdyrTG8YHpkrBEAvvpwvHJ0BLJROaRBOtxgX8zy9FsS1HODoVs3pB
+Mu3JbpyOHzl+IgL0yMxhQPzakWDKNTnCpyfyA2of/YqLlmTjI7iMrsnoj7SbBkvw
+eyvGhKYX0lpi7sE1WmvI7ncY51zscKhdnbY0UCBEoD60Oe73WQ1LuMVTqvArI9XF
+0zF5s8ok3PO995RJYJe87cAzAd4u0AtQ0CYR+aVm2Tx0i3M+woCDRnC0v0dTiP1l
+0fCvKbc7SFz6OkuYByztE/OlfKR3gjNgMmS642dL3RHJUCgrpby6nVYv1geHn0j6
+tV5k3LYYFPaH7NXRrWJDujymkX+khYMbxfwuv5Twxw==
+=IlBq
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild
deleted file mode 100644
index 19a268c11cb4..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.0.ebuild,v 1.6 2013/03/02 23:27:51 hwoarang Exp $
-
-EAPI=4
-
-inherit elisp-common flag-o-matic multilib wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-4-6-stable"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-	SRC_URI=""
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-fi
-
-LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
-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="bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	emacs? ( virtual/emacs )
-	gd? ( media-libs/gd[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	lua? ( dev-lang/lua )
-	plotutils? ( media-libs/plotutils )
-	qt4? ( >=dev-qt/qtcore-4.5:4
-		>=dev-qt/qtgui-4.5:4
-		>=dev-qt/qtsvg-4.5:4 )
-	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 )
-	X? ( x11-libs/libXaw )
-	xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-
-if [[ -z ${PV%%*9999} ]]; then
-	# The live ebuild always needs an Emacs for building of gnuplot.texi
-	DEPEND="${DEPEND}
-	!emacs? ( !xemacs? ( || ( virtual/emacs app-xemacs/texinfo ) ) )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	if [[ -z ${PV%%*9999} ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-		eautoreconf
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	# hacky workaround
-	# Please hack the buildsystem if you like
-	if use prefix && use qt4; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
-	fi
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	if use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	local myconf
-	myconf="${myconf} --without-lisp-files"
-	myconf="${myconf} --without-pdf"
-	myconf="${myconf} --enable-stats" #extra command save to be enabled
-	myconf="${myconf} --with-texdir=${TEXMF}/tex/latex/${PN}"
-	myconf="${myconf} $(use_with bitmap bitmap-terminals)"
-	myconf="${myconf} $(use_with cairo)"
-	myconf="${myconf} $(use_with doc tutorial)"
-	myconf="${myconf} $(use_with gd)"
-	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 plotutils plot "${EPREFIX}"/usr/$(get_libdir))"
-	myconf="${myconf} $(use_with svga linux-vga)"
-	myconf="${myconf} $(use_enable thin-splines)"
-	myconf="${myconf} $(use_enable wxwidgets)"
-	myconf="${myconf} $(use_with X x)"
-	myconf="${myconf} $(use_enable qt4 qt)"
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu" \
-		|| myconf="${myconf} --with-readline=builtin"
-
-	local emacs=$(usev emacs || usev xemacs || echo no)
-	if [[ -z ${PV%%*9999} && ${emacs} = no ]]; then
-		# Live ebuild needs an Emacs to build gnuplot.texi
-		if has_version virtual/emacs; then emacs=emacs
-		elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
-	fi
-
-	econf ${myconf} \
-		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS=${emacs}
-
-	if use xemacs; then
-		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="${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="${EPREFIX}${SITELISP}/${PN}" EMACS=emacs
-	fi
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake all info
-
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake
-	fi
-
-	if use emacs; then
-		cd "${S}/lisp"
-		emake
-	fi
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		cd "${S}/docs"
-		emake pdf
-		cd "${S}/tutorial"
-		emake pdf
-
-		if use emacs || use xemacs; then
-			cd "${S}/lisp"
-			emake pdf
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake DESTDIR="${D}" install
-	fi
-
-	if use emacs; then
-		cd "${S}/lisp"
-		emake DESTDIR="${D}" install
-		# info-look* is included with >=emacs-21
-		rm -f "${ED}${SITELISP}/${PN}"/info-look*
-
-		# Gentoo emacs site-lisp configuration
-		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' dotemacs >> ${E_SITEFILE} || die
-		elisp-site-file-install ${E_SITEFILE} || die
-	fi
-
-	cd "${S}"
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README* TODO
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
-	fi
-	if use doc; then
-		# Manual
-		dodoc docs/gnuplot.pdf
-		# Tutorial
-		dodoc tutorial/{tutorial.dvi,tutorial.pdf}
-		# FAQ
-		dodoc FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-
-	if use emacs || use xemacs; then
-		docinto emacs
-		dodoc lisp/ChangeLog lisp/README
-		use doc && dodoc lisp/gpelcard.pdf
-	fi
-}
-
-src_test() {
-	GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-
-	elog "Gnuplot no longer links against pdflib, see the ChangeLog for"
-	elog "details. You can use the \"pdfcairo\" terminal for PDF output."
-	use cairo || elog "It is available with USE=\"cairo\"."
-
-	if use svga; then
-		echo
-		elog "In order to enable ordinary users to use SVGA console graphics"
-		elog "gnuplot needs to be set up as setuid root. Please note that"
-		elog "this is usually considered to be a security hazard."
-		elog "As root, manually \"chmod u+s /usr/bin/gnuplot\"."
-	fi
-	if use gd; then
-		echo
-		elog "For font support in png/jpeg/gif output, you may have to"
-		elog "set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT environment"
-		elog "variables. See the FAQ file in /usr/share/doc/${PF}/"
-		elog "for more information."
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild
deleted file mode 100644
index 1f76f01b3b5b..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.1-r1.ebuild,v 1.5 2013/03/07 20:35:32 ottxor Exp $
-
-EAPI=5
-
-inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-4-6-stable"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-	SRC_URI=""
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-fi
-
-LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
-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="aqua bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	emacs? ( virtual/emacs )
-	!emacs? ( xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base ) )
-	gd? ( media-libs/gd[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	lua? ( dev-lang/lua )
-	plotutils? ( media-libs/plotutils )
-	qt4? ( >=dev-qt/qtcore-4.5:4
-		>=dev-qt/qtgui-4.5:4
-		>=dev-qt/qtsvg-4.5:4 )
-	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 )
-	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-
-if [[ -z ${PV%%*9999} ]]; then
-	# The live ebuild always needs an Emacs for building of gnuplot.texi
-	DEPEND="${DEPEND}
-	|| ( virtual/emacs app-xemacs/texinfo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-eldoc.patch"
-
-	if [[ -z ${PV%%*9999} ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-		eautoreconf
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	# hacky workaround
-	# Please hack the buildsystem if you like
-	if use prefix && use qt4; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
-	fi
-
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
-		SVGA console graphics, gnuplot needs to be set up as setuid root.
-		Please note that this is usually considered to be a security hazard.
-		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	if use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	tc-export CC CXX			#453174
-
-	local emacs lispdir
-	if use emacs; then
-		emacs=emacs
-		lispdir="${EPREFIX}${SITELISP}/${PN}"
-		use xemacs \
-			&& ewarn "USE flag \"xemacs\" ignored (superseded by \"emacs\")"
-	elif use xemacs; then
-		emacs=xemacs
-		lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}"
-	else
-		emacs=no
-		lispdir=""
-		if [[ -z ${PV%%*9999} ]]; then
-			# Live ebuild needs an Emacs to build gnuplot.texi
-			if has_version virtual/emacs; then emacs=emacs
-			elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
-		fi
-	fi
-
-	econf \
-		--without-pdf \
-		--with-texdir="${TEXMF}/tex/latex/${PN}" \
-		--with-readline=$(usex readline gnu builtin) \
-		--with-lispdir="${lispdir}" \
-		--with$([[ -z ${lispdir} ]] && echo out)-lisp-files \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_with doc tutorial) \
-		$(use_with gd) \
-		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with lua) \
-		"$(use_with plotutils plot "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with svga linux-vga) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_enable qt4 qt) \
-		$(use_enable thin-splines) \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS="${emacs}"
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake all info
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		emake -C docs pdf
-		emake -C tutorial pdf
-		use emacs || use xemacs && emake -C lisp pdf
-	fi
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install
-
-	if use emacs; then
-		# Gentoo Emacs site-lisp configuration
-		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE} || die
-		elisp-site-file-install ${E_SITEFILE} || die
-	fi
-
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-	readme.gentoo_create_doc
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
-	fi
-
-	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-
-	if use emacs || use xemacs; then
-		docinto emacs
-		dodoc lisp/ChangeLog lisp/README
-		use doc && dodoc lisp/gpelcard.pdf
-	fi
-}
-
-src_test() {
-	GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.6.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.2.ebuild
deleted file mode 100644
index cde054bff63a..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.6.2.ebuild
+++ /dev/null
@@ -1,239 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.6.2.ebuild,v 1.1 2013/03/17 23:01:03 ottxor Exp $
-
-EAPI=5
-
-inherit elisp-common eutils flag-o-matic multilib readme.gentoo toolchain-funcs wxwidgets
-
-DESCRIPTION="Command-line driven interactive plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-
-if [[ -z ${PV%%*9999} ]]; then
-	inherit autotools cvs
-	ECVS_SERVER="gnuplot.cvs.sourceforge.net:/cvsroot/gnuplot"
-	ECVS_MODULE="gnuplot"
-	ECVS_BRANCH="branch-4-6-stable"
-	ECVS_USER="anonymous"
-	ECVS_CVS_OPTIONS="-dP"
-	MY_P="${PN}"
-	SRC_URI=""
-else
-	MY_P="${P/_/.}"
-	SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-fi
-
-LICENSE="gnuplot GPL-2 bitmap? ( free-noncomm )"
-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="aqua bitmap cairo doc emacs examples +gd ggi latex lua plotutils qt4 readline svga thin-splines wxwidgets X xemacs"
-
-RDEPEND="
-	cairo? (
-		x11-libs/cairo
-		x11-libs/pango )
-	emacs? ( virtual/emacs )
-	!emacs? ( xemacs? (
-		app-editors/xemacs
-		app-xemacs/xemacs-base ) )
-	gd? ( media-libs/gd[png] )
-	ggi? ( media-libs/libggi )
-	latex? (
-		virtual/latex-base
-		lua? (
-			dev-tex/pgf
-			>=dev-texlive/texlive-latexrecommended-2008-r2 ) )
-	lua? ( dev-lang/lua )
-	plotutils? ( media-libs/plotutils )
-	qt4? ( >=dev-qt/qtcore-4.5:4
-		>=dev-qt/qtgui-4.5:4
-		>=dev-qt/qtsvg-4.5:4 )
-	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 )
-	X? ( x11-libs/libXaw )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-
-if [[ -z ${PV%%*9999} ]]; then
-	# The live ebuild always needs an Emacs for building of gnuplot.texi
-	DEPEND="${DEPEND}
-	|| ( virtual/emacs app-xemacs/texinfo )"
-fi
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="lisp/50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-4.6.1-eldoc.patch"
-
-	if [[ -z ${PV%%*9999} ]]; then
-		local dir
-		for dir in config demo m4 term tutorial; do
-			emake -C "$dir" -f Makefile.am.in Makefile.am
-		done
-		eautoreconf
-	fi
-
-	# Add special version identification as required by provision 2
-	# of the gnuplot license
-	sed -i -e "1s/.*/& (Gentoo revision ${PR})/" PATCHLEVEL || die
-
-	# hacky workaround
-	# Please hack the buildsystem if you like
-	if use prefix && use qt4; then
-		append-ldflags -Wl,-rpath,"${EPREFIX}"/usr/$(get_libdir)/qt4
-	fi
-
-	DOC_CONTENTS='Gnuplot no longer links against pdflib, see the ChangeLog
-		for details. You can use the "pdfcairo" terminal for PDF output.'
-	use cairo || DOC_CONTENTS+=' It is available with USE="cairo".'
-	use svga && DOC_CONTENTS+='\n\nIn order to enable ordinary users to use
-		SVGA console graphics, gnuplot needs to be set up as setuid root.
-		Please note that this is usually considered to be a security hazard.
-		As root, manually "chmod u+s /usr/bin/gnuplot".'
-	use gd && DOC_CONTENTS+='\n\nFor font support in png/jpeg/gif output,
-		you may have to set the GDFONTPATH and GNUPLOT_DEFAULT_GDFONT
-		environment variables. See the FAQ file in /usr/share/doc/${PF}/
-		for more information.'
-}
-
-src_configure() {
-	if ! use latex; then
-		sed -i -e '/SUBDIRS/s/LaTeX//' share/Makefile.in || die
-	fi
-
-	if use wxwidgets; then
-		WX_GTK_VER="2.8"
-		need-wxwidgets unicode
-	fi
-
-	tc-export CC CXX			#453174
-
-	local emacs lispdir
-	if use emacs; then
-		emacs=emacs
-		lispdir="${EPREFIX}${SITELISP}/${PN}"
-		use xemacs \
-			&& ewarn "USE flag \"xemacs\" ignored (superseded by \"emacs\")"
-	elif use xemacs; then
-		emacs=xemacs
-		lispdir="${EPREFIX}/usr/lib/xemacs/site-packages/${PN}"
-	else
-		emacs=no
-		lispdir=""
-		if [[ -z ${PV%%*9999} ]]; then
-			# Live ebuild needs an Emacs to build gnuplot.texi
-			if has_version virtual/emacs; then emacs=emacs
-			elif has_version app-xemacs/texinfo; then emacs=xemacs; fi
-		fi
-	fi
-
-	econf \
-		--without-pdf \
-		--with-texdir="${TEXMF}/tex/latex/${PN}" \
-		--with-readline=$(usex readline gnu builtin) \
-		--with-lispdir="${lispdir}" \
-		--with$([[ -z ${lispdir} ]] && echo out)-lisp-files \
-		$(use_with bitmap bitmap-terminals) \
-		$(use_with cairo) \
-		$(use_with doc tutorial) \
-		$(use_with gd) \
-		"$(use_with ggi ggi "${EPREFIX}/usr/$(get_libdir)")" \
-		"$(use_with ggi xmi "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with lua) \
-		"$(use_with plotutils plot "${EPREFIX}/usr/$(get_libdir)")" \
-		$(use_with svga linux-vga) \
-		$(use_with X x) \
-		--enable-stats \
-		$(use_enable qt4 qt) \
-		$(use_enable thin-splines) \
-		$(use_enable wxwidgets) \
-		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS="${emacs}"
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# We believe that the following line is no longer needed.
-	# In case of problems file a bug report at bugs.gentoo.org.
-	#addwrite /dev/svga:/dev/mouse:/dev/tts/0
-
-	emake all info
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		emake -C docs pdf
-		emake -C tutorial pdf
-		use emacs || use xemacs && emake -C lisp pdf
-	fi
-}
-
-src_install () {
-	emake -j1 DESTDIR="${D}" install
-
-	if use emacs; then
-		# Gentoo Emacs site-lisp configuration
-		echo "(add-to-list 'load-path \"@SITELISP@\")" > ${E_SITEFILE}
-		sed '/^;; move/,+3 d' lisp/dotemacs >> ${E_SITEFILE} || die
-		elisp-site-file-install ${E_SITEFILE} || die
-	fi
-
-	dodoc BUGS ChangeLog NEWS PGPKEYS PORTING README*
-	newdoc term/PostScript/README README-ps
-	newdoc term/js/README README-js
-	use lua && newdoc term/lua/README README-lua
-	readme.gentoo_create_doc
-
-	if use examples; then
-		# Demo files
-		insinto /usr/share/${PN}/${GP_VERSION}
-		doins -r demo
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/Makefile*
-		rm -f "${ED}"/usr/share/${PN}/${GP_VERSION}/demo/binary*
-	fi
-
-	if use doc; then
-		# Manual, tutorial, FAQ
-		dodoc docs/gnuplot.pdf tutorial/{tutorial.dvi,tutorial.pdf} FAQ.pdf
-		# Documentation for making PostScript files
-		docinto psdoc
-		dodoc docs/psdoc/{*.doc,*.tex,*.ps,*.gpi,README}
-	fi
-
-	if use emacs || use xemacs; then
-		docinto emacs
-		dodoc lisp/ChangeLog lisp/README
-		use doc && dodoc lisp/gpelcard.pdf
-	fi
-}
-
-src_test() {
-	GNUTERM="unknown" default_src_test
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-	readme.gentoo_print_elog
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && texmf-update
-}