clean up

Package-Manager: portage-2.1.4.5

4 files changed, 9 insertions, 392 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index fe3698b20d36..de44d2fb6e6f 100644
--- a/sci-visualization/gnuplot/ChangeLog
+++ b/sci-visualization/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-visualization/gnuplot
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.86 2008/11/28 12:43:38 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.87 2008/12/07 23:39:45 fauli Exp $
+
+  07 Dec 2008; Christian Faulhammer <fauli@gentoo.org>
+  -gnuplot-4.2.2-r1.ebuild, -gnuplot-4.2.4.ebuild:
+  clean up
 
   28 Nov 2008; Christian Faulhammer <fauli@gentoo.org> metadata.xml:
   Change my email address
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 2747f8c05e9c..f893d1cd5336 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -5,19 +5,16 @@ AUX gnuplot-4.2.0-libggi.patch 2437 RMD160 ef60c994bf2b34ca42a7e487a1fec89c01eb1
 AUX gnuplot-4.2.2-disable_texi_generation.patch 646 RMD160 ac2ed0785f72a6cc96ec10685f116a631ed80b78 SHA1 4d162a108fa2429d7aea49a416babc9b01124297 SHA256 922441e35ad4daefad70e3e2f7f1fe15b96f97d0b281f005eb70cd3130ad8f68
 AUX gnuplot-4.2.3-app-defaults.patch 1906 RMD160 dab9814a3e7178941fe68373870e8fcd6db9ee36 SHA1 10015c3efd632fa35adb3c70e62035226efb096b SHA256 99386dfe58188401a6e16d24ddd38026b687d8a3b22b14c2d9cd54e4b2c80697
 AUX gnuplot-4.2.3-disable-texhash.patch 601 RMD160 c11abb16a063190e1e92dc35ad8539138dacba60 SHA1 774db0406e61816769f18ddcafea7164655ae0f2 SHA256 db1b442628e2378459ec1627d93763ce5ca45f3510436fb68cd78460333012d6
-DIST gnuplot-4.2.2.tar.gz 2832174 RMD160 7364d283718d89c05652d7c25a841154caa2efd8 SHA1 991db8024f04e8cad300804bc2661e358fdcf348 SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91
 DIST gnuplot-4.2.3.tar.gz 2840611 RMD160 b4692db884c9da2f0d160f33f53c3d2aba65f36e SHA1 9f6239ef69ac5a6d68f40dc797f8a0b35b80f491 SHA256 4aae09bf99ab2642308b0042eb18b75bc18ff33969a7431bba60b09cc2f600f4
 DIST gnuplot-4.2.4.tar.gz 2904358 RMD160 88acf7561a74116aece627f9b5e41e0726daee75 SHA1 4226b959493a37bc5a1f40a3b165ffd9e1b9d202 SHA256 2a20701410a21307c404a9d10ad9fdf699bb92fa0a919797213208d80b080913
-EBUILD gnuplot-4.2.2-r1.ebuild 5158 RMD160 442c819f61991a8a8cbdd75580f0e5f104a3eca5 SHA1 2bd01833889569b706829e8135f351753d42765f SHA256 fbde8c23eef98d14346526b9275da2f0c530d4866676a234c29f384d6435c37a
 EBUILD gnuplot-4.2.3-r2.ebuild 5556 RMD160 8961303ee184486de6b312e1339ae496ba5b9fed SHA1 fb13248ee00cbf50a4da32c4ab100861c4f26475 SHA256 c586da60336e43a892d700b360ce53a26001c3e23e88a48b593516fc2fbd9afc
 EBUILD gnuplot-4.2.4-r1.ebuild 5491 RMD160 d62f464ec680fa05d5a8a52f414e1ec71c50b137 SHA1 7aa3b8a0cd034ac2834bb055955d0c230915a71c SHA256 85efe0a2750986582642050701759ad17574207c3ad27c02883fd3de19688682
-EBUILD gnuplot-4.2.4.ebuild 5521 RMD160 fc83bc6ebc859d68d4879eeec4060220757fc4de SHA1 d8b7c82d9f644a80eb205f5917593998b5413e14 SHA256 1ab7e03e76674b848db1bfc3b61d9a4522eff263e5bc67f5dac1386cf668475b
-MISC ChangeLog 19480 RMD160 eabbe75f12715eeba1626fd14a54ad371fd113f5 SHA1 73fa6528cde0555754c2fd84afcec893d2216d5a SHA256 76fe4d213257fd951b5eb9dfff4c8882faa13c2acba4601dd651b160c4a1b361
+MISC ChangeLog 19598 RMD160 bfcb55a3d880616f6ce9c84f23a685c78814557a SHA1 b814b8746f7010fad2c244a311ee21e03a8e86fe SHA256 e17fcae3710ef95412b8fcdbf29a5c3b5a7ffa75ca2053a49b537a42fdb3b603
 MISC metadata.xml 276 RMD160 e483cc8bf15032c360e7c83a04c850fe67c915d4 SHA1 7f571a7603bc9d49086f5181aa5f83807abfedec SHA256 9c5313580d15c16ca5683dd218fcbc228528cb4a65d430b37e3f61e7543f54f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkk7uzMACgkQ67wieSYcaxdumQCgljfCo/6tyWJq7QK8i7+Ua63C
-pH8AnA3l7f4lg+woIE5e38s2Wr0CMMsV
-=oT3a
+iEYEARECAAYFAkk8XtYACgkQNQqtfCuFneMHvACdE62j/nt5rVCPd0WT+tScXvIe
+QvUAoJwrlL8PQEEg3seD99Oz8ZwxQCiF
+=fTV2
 -----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild
deleted file mode 100644
index fae45daa9e23..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.2-r1.ebuild,v 1.14 2008/04/24 12:11:00 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 latex pdf plotutils readline svga wxwindows X xemacs"
-RESTRICT="wxwindows? ( test )"
-
-RDEPEND="
-	xemacs? ( virtual/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/latex-base
-		virtual/ghostscript )
-	latex? ( virtual/latex-base )
-	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"
-
-latex_rehash() {
-	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' || has_version 'app-text/texlive'; then
-		texmf-update
-	else
-		texconfig rehash
-	fi
-}
-
-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}"
-	# not sane enough for upstream, but we will keep it
-	epatch "${FILESDIR}"/${PN}-4.2.0-libggi.patch
-	# Texinfo source is already shipped, so separate preparation not needed
-	# and error-prone, see bug 194216
-	epatch "${FILESDIR}"/${P}-disable_texi_generation.patch
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# See bug #156427.
-	if use latex ; then
-		sed -i \
-			-e 's/TEXMFLOCAL/TEXMFSITE/g' share/LaTeX/Makefile.in || die
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/Makefile.in || die
-	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
-
-	TEMACS=no
-	use xemacs && TEMACS=xemacs
-	use emacs && TEMACS=emacs
-	EMACS=${TEMACS} econf ${myconf} || die
-	emake || die
-
-	if use doc ; then
-		cd docs
-		emake pdf || die
-		cd ../tutorial
-		emake pdf || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die
-		emake DESTDIR="${D}" install || die
-		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/lib/xemacs/site-packages/${PN}" || die
-		emake DESTDIR="${D}" install || 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
-	use latex && latex_rehash
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && latex_rehash
-}
diff --git a/sci-visualization/gnuplot/gnuplot-4.2.4.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.4.ebuild
deleted file mode 100644
index aa8e08fd9eef..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.4.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.4.ebuild,v 1.2 2008/10/28 07:34:17 ulm Exp $
-
-inherit autotools elisp-common eutils 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 latex pdf plotutils readline svga wxwindows X xemacs"
-RESTRICT="wxwindows? ( test )"
-
-RDEPEND="
-	xemacs? ( virtual/xemacs app-xemacs/texinfo app-xemacs/xemacs-base )
-	emacs? ( virtual/emacs !app-emacs/gnuplot-mode )
-	pdf? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/latex-base
-		virtual/ghostscript )
-	latex? ( virtual/latex-base )
-	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=50${PN}-gentoo.el
-TEXMF=/usr/share/texmf-site
-
-latex_rehash() {
-	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' || has_version 'app-text/texlive'; then
-		texmf-update
-	else
-		texconfig rehash
-	fi
-}
-
-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}"
-	# Texinfo source is already shipped, so separate preparation not needed
-	# and error-prone, see bug 194216
-	epatch "${FILESDIR}"/${PN}-4.2.2-disable_texi_generation.patch
-	# Don't store resource files in deprecated location, reported upstream:
-	# http://sourceforge.net/tracker/index.php?func=detail&aid=1953742&group_id=2055&atid=102055
-	epatch "${FILESDIR}"/${PN}-4.2.3-app-defaults.patch
-	# Disable texhash to prevent sandbox violation, bug 201871
-	epatch "${FILESDIR}"/${PN}-4.2.3-disable-texhash.patch
-
-	eautoreconf
-}
-
-src_compile() {
-	# Prevent access violations, see bug 201871
-	VARTEXFONTS="${T}/fonts"
-
-	# See bug #156427.
-	if use latex ; then
-		sed -i -e "s:\`kpsexpand.*\`:${TEXMF}/tex/latex/${PN}:" \
-			share/LaTeX/Makefile.in || die
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/Makefile.in || die
-	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))"
-	myconf="${myconf} $(use_with doc tutorial)"
-
-	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
-
-	TEMACS=no
-	use xemacs && TEMACS=xemacs
-	use emacs && TEMACS=emacs
-	EMACS=${TEMACS} econf ${myconf} || die
-	emake || die
-
-	if use doc ; then
-		cd docs
-		emake pdf || die
-		cd ../tutorial
-		emake pdf || die
-	fi
-}
-
-src_install () {
-	emake DESTDIR="${D}" install || die
-
-	if use emacs; then
-		cd lisp
-		einfo "Configuring gnuplot-mode for GNU Emacs..."
-		EMACS="emacs" econf --with-lispdir="${SITELISP}/${PN}" || die
-		emake DESTDIR="${D}" install || die
-		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/lib/xemacs/site-packages/${PN}" || die
-		emake DESTDIR="${D}" install || 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
-	use latex && latex_rehash
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use latex && latex_rehash
-}