Remove intermediate version.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

3 files changed, 19 insertions, 256 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 1913b272d219..d6a82fb96bbb 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sci-visualization/gnuplot
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.171 2011/12/28 10:34:38 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.172 2012/01/17 07:11:57 ulm Exp $
+
+  17 Jan 2012; Ulrich Müller <ulm@gentoo.org> -gnuplot-4.4.4.ebuild:
+  Remove intermediate version.
 
 *gnuplot-4.4.4-r1 (28 Dec 2011)
 
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 9da374567572..6120625fa0d5 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -7,13 +7,22 @@ DIST gnuplot-4.4.3.tar.gz 3305912 RMD160 90290eb2b6b9404dc520080439bdee9056e61fc
 DIST gnuplot-4.4.4.tar.gz 3328278 RMD160 7e1d039c05c46fa38b53a3c4afbd328509da901d SHA1 d4f143eade1f8d8b27be44cbda431d37a71c6a31 SHA256 d228599d08d5f87bcb79af8af8bb432c77d942802b1643f920c7baaeaf1ddbfd
 EBUILD gnuplot-4.4.3-r1.ebuild 6822 RMD160 16cf62476b3ee217ddcda45c82e26977ad87c119 SHA1 405efe0aa3edf3e210324fcf36f7a67ac0389490 SHA256 46f55e88250d46f1f309a583ac982a4ee00e5128401e894a527c2b4355260f58
 EBUILD gnuplot-4.4.4-r1.ebuild 6626 RMD160 de93410aaec6229a14d12ddfad9ef2f4217cb9af SHA1 edea04b773835c5f62f7dc80a19552f9a4cd4f64 SHA256 a10056ac1a0f794efcd19777e29e09a5e258b8ef6f9cb36bdb4ca2ffeb39efdb
-EBUILD gnuplot-4.4.4.ebuild 6722 RMD160 2c63f1f97a845ae641c947bcd61bfb90cb9c9fae SHA1 1415611fd244b95e154800d0e8024de3f0b27f24 SHA256 24eb1b38df2c0c6ff483700e247ffeab1b10c2a95f60da2acdb7e4d78a48f12d
-MISC ChangeLog 31589 RMD160 5b7d4e5faf650cfff2ebb78a1c45ca0ad66b24b0 SHA1 06f5231f49b6a6b91a32e0b337f9425476091644 SHA256 a2febe789c114f289b3839878900d20646f789b9f943d3e506ae0dafa9e67dc6
+MISC ChangeLog 31691 RMD160 fade9d36d2700d69a6cfd13b42393ff5fa23eace SHA1 c34016eee539d192546909cf673f2892d4fa1fcd SHA256 836af5a1989145b8c9d7a981ed0460d5a33ccf8d38bbf7765bda1f77ae6a2c3e
 MISC metadata.xml 827 RMD160 e6b9c60a2d8ad33c3ed2c649ead9e836b1a54fdb SHA1 23524656ce50cf1b1b44fda522c79c6ce78afa1b SHA256 d98221cb62667b8e7eaafa41b3a89be5bf2b9fbfc958b3adde99150839403ea5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk768zcACgkQOeoy/oIi7uxRkwCeJwwZTBGLxRvFaddhmZAzzo+b
-sMwAnjR4vRHvjq+nff0aHZZMsy5eS3bP
-=dP0j
+iQIcBAEBAgAGBQJPFR96AAoJEDxpGckxwJCB1GcQAK3hGqSTBKcJJB7Q+pfqhDcz
+MQFTflnu7DyfbAF7WaPT4FIJ5BLklvadNmTZ0QuH1YC5Q8DmtGtIm7QPYru7IWqe
+bFjICH52FNIHfcfNgLHDMUesPIQ5SwOFKgRovYeQadrO/FPYihNR7Adja5sXmOxA
+MkZXhj4Zi2SLW3p/dWxaOGPVaUODIpDbtR7DBnxD9yH+Gr59jbew91L2OOJGkpNg
+dJEbuA+5WpZ0XEc95U2wBFPwVtSY8PJy8DJr5EVejDQyTDgkgHF/D1LsYyaQ5gtw
+auxw3x/MA/K5llQnERVFHqobglXzqsvYmmwH+m3umym6mfsOPm8aWbFCS7OMGoRL
+n2CtzzEbSNyXhN/7AnRs/kpt+C37gdhiUBeUnkpUHITK1ozGwNpkJZZQ2E7yL22K
+FOIrI9gsbfsaghUpk4jMgOjTDkExFi0GENt1JRewX2IAK5tPVhfb1K78BmL8lAvQ
+iQOZ8xFNUJc8kNPM1QHlN5SsPdRoUjM4Uws18veGXr2Q+tnC3fMgM4ALOgE3bSrG
+jM3XY2t4gQBKuJqw29s8ZeBZa/E/i36pYDjVJXfupOZF9EIk/eGtgjqcnO6y8O5k
+NdWutXRdlKvg6RA0WU5MEdmjS4W7st1/BDdeOTXYHK2eyb86QvfTRv8pQhQZk1pB
+Rmoekgk6mI9HU1sgxuK3
+=1EVG
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild b/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild
deleted file mode 100644
index 5c82dce23982..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild
+++ /dev/null
@@ -1,249 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.4.4.ebuild,v 1.1 2011/11/28 05:22:38 ottxor Exp $
-
-EAPI=3
-
-inherit elisp-common 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-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"
-
-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 )
-	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}
-	dev-util/pkgconfig
-	doc? (
-		virtual/latex-base
-		dev-texlive/texlive-latexextra
-		app-text/ghostscript-gpl )
-	!emacs? ( xemacs? ( app-xemacs/texinfo ) )"
-
-RESTRICT="wxwidgets? ( test )"
-
-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 || \
-				die "make -f Makefile.am.in Makefile.am in $dir failed"
-		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 || die
-
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake || die
-	fi
-
-	if use emacs; then
-		cd "${S}/lisp"
-		emake || die
-	fi
-
-	if use doc; then
-		# Avoid sandbox violation in epstopdf/ghostscript
-		addpredict /var/cache/fontconfig
-		cd "${S}/docs"
-		emake pdf || die
-		cd "${S}/tutorial"
-		emake pdf || die
-
-		if use emacs || use xemacs; then
-			cd "${S}/lisp"
-			emake pdf || die
-		fi
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if use xemacs; then
-		cd "${S}/lisp-xemacs"
-		emake DESTDIR="${D}" install || die
-	fi
-
-	if use emacs; then
-		cd "${S}/lisp"
-		emake DESTDIR="${D}" install || die
-		# 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 || die
-		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
-}