sci-visualization/gnuplot: Drop old

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

5 files changed, 39 insertions, 560 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index a7183cc9ba96..fad5f7377bb3 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # 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.226 2013/09/26 17:29:53 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.227 2013/09/27 07:55:53 jlec Exp $
+
+  27 Sep 2013; Justin Lecher <jlec@gentoo.org> -gnuplot-4.4.4-r1.ebuild,
+  -gnuplot-4.6.1.ebuild, metadata.xml:
+  Drop old
 
   26 Sep 2013; Agostino Sarubbo <ago@gentoo.org> gnuplot-4.6.3.ebuild:
   Stable for arm, wrt bug #484288
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index b49da4c62e52..5f311a96aa24 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -4,29 +4,25 @@ Hash: SHA512
 AUX gnuplot-4.4.4-tikz.patch 578 SHA256 aaf803a66e57c7e069dc5aba8ec91dc3038c224c10d8624368c1b505ef34e4f6 SHA512 7362e5b0a064ba9eefc46f2ef9861652bcf34f6fcb0cbd452130cb11a3fbbc65a0ada232042d85f2769fb522224b9e2f5d41624e92503f22463c67215c5dd3c6 WHIRLPOOL 00dd326c9b1cb47886505bcf1831300c3e70bce40702e9910af7c38242d9ff4efc2697e46a141bc5e7157eaa8b6586bce52ef525bcf85b28e1e90e8b12d4fe95
 AUX gnuplot-4.6.2-gdversion.patch 877 SHA256 03b128ed38869a9547565c6ba3509eb6af71f9551cb1c1f7cee1d5cc81ccced1 SHA512 7654866896bb5c38734156fb2ba802b4381f5109e49f808aca5e1ea4f7a3333db5603f6891c3c6d8027e8e08472614965f683f1adc6795eb649a257325155b34 WHIRLPOOL 30e03d55291ef1355212017fb127d70f53415b194cd2e483090173b248e99fc886b15f67e884ad99fb2cd7182add4b9488c0f6b0758489f712c2876a1661e039
 AUX gnuplot-4.6.3-eldoc.patch 749 SHA256 b5aa370051e384bc463ac671c70c0a062eef22553e8cda053185e200d8cda054 SHA512 7cfb9c472f9bddc698163393ff4c070ffb3abf02bb1b644050ee0f2f54b4c9828c0722c0a44bc65264e5bcffea54cd1cad729d50a15888ee1539bc685ea50bd4 WHIRLPOOL 145ea0651a248af3e2d56f8c60e41c36f94e8236ae9458b8055512f4ac88ff7f26a1af51a6b5d22a73b2775d9d857d5516e381695abfc55660e4a3369e67c088
-DIST gnuplot-4.4.4.tar.gz 3328278 SHA256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd SHA512 5781a1cb569bb4e4471be87f563c761a28a8a927c32c58e65e296152869951d2f5f16a437af3988ba83212ea2aaf641176c9863d6f5f3e629d86a927c41e75ba WHIRLPOOL c5e04c1a9ae7aa6c3f91e535d004cd75ae2ffa2bda5a6f284fa475286e34606c6e7970d83f80fd00e359da4b81f34526b2f02c2a305d7d982840b30a1e8cecd5
-DIST gnuplot-4.6.1.tar.gz 4959670 SHA256 f4bf99907d0fea7db90b6e50147f1730b5bde2fbb93d9e58478b6b94409eebc6 SHA512 a6a05da6708a7f5629d8356901e93ab622d4a3a6325e050fc1f8dce652e6061164783a98ff5cbc2dede65f6f0cb5be6a1ab2fcaeb778f6879215bae7056bd3ed WHIRLPOOL fa72b52a181ee9f7599c3646c4303ebcc21c0ecae51f7e9024356108f6f6539cfbc91e52e787fbf6d782aff8e1e94d9fec02f05c6bf754c6368eaca947e6bb6c
 DIST gnuplot-4.6.3.tar.gz 4973116 SHA256 df5ffafa25fb32b3ecc0206a520f6bca8680e6dcc961efd30df34c0a1b7ea7f5 SHA512 8bb7af550c0847e65e041bd5bb6dc8cd3cee1e43a5306a7f9af0b5c82067bbe24a7f19c93914c88e4f08f2eee509773964e574e415710bbf99501e0cd3dad7e7 WHIRLPOOL 0566a93ad6af7813c8ebcbde00cb305cd037250959e25e43d93c7bb6313552851d59b70a5d02eae18449d1e18591e2e91ebdf9aac71d443f985fbb77493572f5
 DIST gnuplot.info-4.6.2.tar.xz 182168 SHA256 73307153e8f525cce04d8c2c09ef28e422f21cd216d019f7aef8dbe71b6cc1bd SHA512 805e11933addefde41a15287e96bff9f4e307bbffbabe4bf1a9c49663a688702d9e738750d4ca6db475c9c09c0b6a14589b7e18392161610709e8864c626d4ff WHIRLPOOL bc16e1b6a798e214516aba413b3843045b0489038943dec6511722fed1eba772ba1067a8cdcada216afa903de5744c0722fa9f856a74d8f8e68fa27016704e53
-EBUILD gnuplot-4.4.4-r1.ebuild 6635 SHA256 919cc230c0f26a0e12442d0185cbcf794cd0699307153f84d8f89186129b0217 SHA512 6dad45b149a3fd5ec095bd7abbe9bc2c273eaf1abc5977d9a92a22b3a57d19dd87e3e401f971013a34706f697ce9041bae410b35d3a09e646fc24ea0509ac775 WHIRLPOOL c8f4fc801a4af68307a0df0e066718b16647ff7faae39545603eb88eeeac65545e1ae668c88049d8e4308169b788f40c5e832de2684802a96ab92111a1e641dc
-EBUILD gnuplot-4.6.1.ebuild 7512 SHA256 776c7af4f1d94d7c02bcfdc1f64381655286fd98888f50f490d0bc4f11bfba85 SHA512 e1e79282a9ab17de9f77ce7550950f20424bc79a6c5cce044064e998112626d33d1ddbab60a093feab86bd35e3b1b52bd0f1c2566e2d4a5471c4281a25768ad1 WHIRLPOOL b9b0362579b27153205b73551517e3616f17b1c45aecb06e13d3f10e6c7668d18996d52faa0b3f1606e70c0863ba700ad019430fa7427fa1aebc764f777d024f
 EBUILD gnuplot-4.6.3.ebuild 7037 SHA256 98556ab87a9790f321a800e190da56aba4072d8805cfa1ff3e682cb796504693 SHA512 5ad8a7d6fd0172cc1781aa5a778d3bdf907aeae5bbae005245ad1dc781ac2f7510a24b72d15849f2b4c15474fc62a881551626e51088cc6d55432abf7cb7e46b WHIRLPOOL cbd9dced48cca9b34266e05d795a8160d02f5ed547ef8d066f0114979e7bcc139bb4af57d13d1b3b312177493edccb50d5745fe5d26a2375673f0c371ea6bfbd
-MISC ChangeLog 38506 SHA256 728fcb172a4c783ad8ef805be4d8a318512496c57213371e01f9e9a3f43f3073 SHA512 2481a70d53e4c19db405c7482285430b83a8a8d2884c34d317f9465a014d2cbea03f3f207c1eef0f317f387124218db55cf7b076ecdec018cb06291f4ee88b82 WHIRLPOOL d9421e0fedf28b46ccc4bdc258dff2bb8ce5584a4748c57dff9b8bb83961fe30d67ded3b20f35f4257ab3e8ea782d22ec32f9c0c009098af79bed6c2de82f57d
-MISC metadata.xml 974 SHA256 0fdd09afff7d6bc87078d6c09ededb60856891f130a733a0294c72e773a35f25 SHA512 feddb2b2bcf1e41c961a30c25edba081076c8703d3186f79728a7c0d496f400b3f5c1d876307325d41a4a59d19a4b27580293d57d8d5717ee23fed30a4e131d7 WHIRLPOOL 17525529c6fd42a91373324d0c5b1bfbe8528d04bd2c3b6d50b311b60c2db2d21bc3871f7ea520e119c911863a0cfa80375de5702965035cfaf0073d03610143
+MISC ChangeLog 38631 SHA256 117f1f10918176e724442ffc7002ffd46a62ccaf91726b4fc26cf768bac5c9c1 SHA512 99acb3013a2de630f32acdb369721682c3411980dbacf69c190ee12bb040ae8aa07c727478220938f98ef7fad745be81e9f21e9bfc33d58b47a127d2e159a415 WHIRLPOOL c868f714e6d7f53a2708e325b3e8a45799ebbbdc987a8dddc5004c49f85c1d4ecf666f59179d39f38fdcb7c78dc840481502335d8fd31508ccd39a0cc9322fb7
+MISC metadata.xml 1011 SHA256 e70915c9ca263af29a8a4ed487f4e8693518dc9dc060ee3907b85869e84af3a4 SHA512 181a761a17a116db150c9cf9345ac311b823c34e340e367f338b697c661aa6fd14303fd47aafec629fb9cccd1af17cc61099f55bb032aa79b21c110ffa9ac5da WHIRLPOOL 25fe2556cb5e13fe35b6612d1306751f2c6c982bea8c76b32ee7255cad3c90b51348248bdfe3378330e7de083a8fb1cd842db3e9cbad731cf0cbd34bea9e5c2a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.21 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSRG4/AAoJELp701BxlEWfu2AP/2S9TmtMaqR1QA4ZuJ7vWcKI
-o8apqlAinZUJ0sj+Dl37tfooT/YQCbUqwuogxbeHQysuEJFizWcM4TeujmMPkWM5
-Ns0JjTbzw604dh7YaSXICwl8ilrHsO6AU3UI5TSnwAlgdiQN9d29Yp3YopCxk0dx
-eInCKd3CSFP0vQJUaXL3uCBeFDxj9gxcPtjVUFjjqP4xGE6axl1M3JuR+5qNbVWK
-SNZMsfkrd1zgPLLj3lp986QH0v1HJRd1LF8IgcH3U+Z+Bp9V8ZPwV6OtYgQQEweS
-EPEweWtvfmGde7zDTGBWMvaC/z70hmltah92EjBmiQ0Xg9i1qy+FvahqYiTs4AAA
-mJIgooHwUp1af+RvWw0WRsAHrGEFbxsB5h1n+N7YzbWTyQFpE7R9/GitWYLzzwaQ
-ezvUhqaQQkr7BnCQm5u5cKoCuv66ifg40ZD8KO34sVmSK2FttYPW007nffFU8z5c
-eBxLqbo2CXEaCYuyuXV/4fMiSiRfVXcODoMp8K/SAKR67crpcK02XBRqzH0HBGxx
-cpGFtkAQmW1pCTpJum91uKtcB/PcMGSmLfT/mPB+2kP/sah46yTg1NPO2xnKLlxw
-KZAZ4ekFT+HvBbvAi7S5cwMb0jetStrrxh8MihuFtd21qrRzf9PFNx83JcNigXzd
-jY6i9IVbr2n6UrqdRgGf
-=4L8x
+iQIcBAEBCgAGBQJSRToKAAoJELnU8jG9FVirwkUP/2w1bZrK+iN9TDPjC0WaPDi3
+/Xkjg+TEm1HvHw6XO9Dr3vU4F02SnHQVqIIzmE6Mt44Gngr18rZ5V4s8hZDBTHL9
+4l9RGRt7em2GeIGusmn662dmXUJOCxXN27GYAYOQDyRBLVOVFKSSHDnssq7HX9zZ
+ShaBK2ZvfSJToyERdEVrm53yaSJrhe2Fe6KJfgLgYeq5GlLsxq2ASFgysKd+D9Vs
+ZYwK1S6DIzgBoYcFtsVCHMfHZDAV/oX6vW562oCwXC/lQf+BPLaDXS9DGIHoBJUO
+B+qpttMs0HTfPXcBIiXdO3dhGfToq81SeoOnACmGaDV/yu5SOTz9iOdKMJ1/Ma37
+f3uBrMAkIIBXTDnuFdgjmihIlOpjwEEf/i/IFIlWpBbITQtGaQ7C/JCLsho3+ELd
+JF/xAdvhKl19QYoSICH9tv31iI2BJi7DRdZituTZxiERZ6bVKeMdD1b0qjEXZCA3
+DDK4JvP9NySQ42oDDN/XGBQ/rz/eOe9H+Mx42lp33LcbYF9Ijl2oeRuTc3PbepZN
+3YaE1K3/keUKQJHWU+k1WVhIjoibxGGmAHx0a5oZIqR5s1/b9t3oAg2UL8WeiyR6
++07NjjO3sOGFIossDRIhSEluKcBdkDUO+1Tmatfox+lmPxYn/km5NrUt20vszlNh
+zQeVA4ePrUaE3t2vfWgu
+=OrBT
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
deleted file mode 100644
index ba7ea8d52e75..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.4-r1.ebuild,v 1.11 2012/05/21 19:26:29 xarthisius Exp $
-
-EAPI=4
-
-inherit elisp-common multilib wxwidgets eutils
-
-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-4-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"
-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 examples +gd ggi latex lua plotutils readline svga thin-splines wxwidgets X xemacs"
-RESTRICT="wxwidgets? ( test )"
-
-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-5.2 )
-	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 )
-	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 ) )"
-
-S="${WORKDIR}/${MY_P}"
-
-GP_VERSION="${PV%.*}"
-E_SITEFILE="50${PN}-gentoo.el"
-TEXMF="${EPREFIX}/usr/share/texmf-site"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-tikz.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
-}
-
-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} --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 ${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)"
-	use readline \
-		&& myconf="${myconf} --with-readline=gnu" \
-		|| myconf="${myconf} --with-readline=builtin"
-
-	econf ${myconf} \
-		DIST_CONTACT="http://bugs.gentoo.org/" \
-		EMACS=$(usev emacs || usev xemacs || echo no)
-
-	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"
-
-	# 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
-
-	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
-}
-
-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.ebuild b/sci-visualization/gnuplot/gnuplot-4.6.1.ebuild
deleted file mode 100644
index 60bbe5ed5b91..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.6.1.ebuild
+++ /dev/null
@@ -1,272 +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.ebuild,v 1.14 2013/03/02 23:27:51 hwoarang Exp $
-
-EAPI=4
-
-inherit elisp-common 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="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
-
-	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+=" In 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+=" For 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 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 -j1 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*
-	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
-
-	readme.gentoo_create_doc
-}
-
-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/metadata.xml b/sci-visualization/gnuplot/metadata.xml
index 1fae4efa30f8..206d84db0152 100644
--- a/sci-visualization/gnuplot/metadata.xml
+++ b/sci-visualization/gnuplot/metadata.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>ulm@gentoo.org</email>
-  <name>Ulrich Müller</name>
-</maintainer>
-<maintainer>
-  <email>ottxor@gentoo.org</email>
-  <name>Christoph Junghans</name>
-</maintainer>
-<longdescription>
+  <herd>sci</herd>
+  <maintainer>
+    <email>ulm@gentoo.org</email>
+    <name>Ulrich Müller</name>
+  </maintainer>
+  <maintainer>
+    <email>ottxor@gentoo.org</email>
+    <name>Christoph Junghans</name>
+  </maintainer>
+  <longdescription>
   Gnuplot is a command-driven interactive function plotting program.
   It can be used to plot functions and data points in both two- and
   three-dimensional plots in many different formats. It is designed
   primarily for the visual display of scientific data.
 </longdescription>
-<use>
-  <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
+  <use>
+    <flag name="gd">Add support for <pkg>media-libs/gd</pkg>.
     Needed for GIF, JPEG, and PNG image output.</flag>
-  <flag name="thin-splines">Enable thin plate splines</flag>
-  <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
-</use>
-<upstream>
-	<remote-id type="sourceforge">gnuplot</remote-id>
-</upstream>
+    <flag name="thin-splines">Enable thin plate splines</flag>
+    <flag name="bitmap">Enable dot-matrix printers and pbm terminal</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">gnuplot</remote-id>
+  </upstream>
 </pkgmetadata>