clean up

Package-Manager: portage-2.1.3.19

6 files changed, 19 insertions, 355 deletions

diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog
index 593367cb8777..91f9d897954a 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.64 2008/01/03 21:14:28 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.65 2008/01/04 06:57:47 opfer Exp $
+
+  04 Jan 2008; Christian Faulhammer <opfer@gentoo.org>
+  -gnuplot-4.0-r2.ebuild, -gnuplot-4.2.2.ebuild:
+  clean up
 
   03 Jan 2008; Brent Baude <ranger@gentoo.org> gnuplot-4.2.2-r1.ebuild:
   Marking gnuplot-4.2.2-r1 ppc64 for bug 189672
diff --git a/sci-visualization/gnuplot/Manifest b/sci-visualization/gnuplot/Manifest
index 32e1ab316bcf..9c64b3a80cec 100644
--- a/sci-visualization/gnuplot/Manifest
+++ b/sci-visualization/gnuplot/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gnuplot-4.0-filled-arrow.patch 1349 RMD160 99c620fda889773a4814726e339e51095924a38b SHA1 8a32dfc108e1a82fd013899a194f9a31e1e0ac0a SHA256 aa3adb859e5ed943d948e8817e24b9f3e391411684ca4bdea5485374d976e652
 MD5 7af7e5f057531526e6c3447bf18c2ed8 files/gnuplot-4.0-filled-arrow.patch 1349
 RMD160 99c620fda889773a4814726e339e51095924a38b files/gnuplot-4.0-filled-arrow.patch 1349
@@ -22,34 +25,26 @@ AUX pdflib-6-compat.patch 560 RMD160 cb89ecb654a425925b34398a36cb83332fd438e2 SH
 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.2.tar.gz 2832174 RMD160 7364d283718d89c05652d7c25a841154caa2efd8 SHA1 991db8024f04e8cad300804bc2661e358fdcf348 SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91
-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.2-r1.ebuild 5323 RMD160 186dbd698e3a308ae4bdb4e83e649d475304c1f4 SHA1 31c391fdda954b97ab876b9cf241302f6976b737 SHA256 9893aa729d26fea4321f3eaa1197fa5c17851301a8893a050434a465cbefc95d
 MD5 a140681fd295ac2462fee9fb4cb970bc gnuplot-4.2.2-r1.ebuild 5323
 RMD160 186dbd698e3a308ae4bdb4e83e649d475304c1f4 gnuplot-4.2.2-r1.ebuild 5323
 SHA256 9893aa729d26fea4321f3eaa1197fa5c17851301a8893a050434a465cbefc95d gnuplot-4.2.2-r1.ebuild 5323
-EBUILD gnuplot-4.2.2.ebuild 5259 RMD160 d133ab88288613869f254274265ef11a7004facb SHA1 34b9239878778dc22d14aa6f192ad6dcfc3149c0 SHA256 0d3c5843e79f39df1db4e96592a24bd787afb05554eed74fcb8fa994c604ca7e
-MD5 93eccb9713d9bb0a88b0f21fd52ed3dc gnuplot-4.2.2.ebuild 5259
-RMD160 d133ab88288613869f254274265ef11a7004facb gnuplot-4.2.2.ebuild 5259
-SHA256 0d3c5843e79f39df1db4e96592a24bd787afb05554eed74fcb8fa994c604ca7e gnuplot-4.2.2.ebuild 5259
-MISC ChangeLog 16168 RMD160 d859017076add18fc89520a7322e0dbc17f8db56 SHA1 bd33ab5f2d57189967b73cd3621c16a8e28a2fc1 SHA256 ebaa4c070f71d020abecb6189a515ffc22eea54ac817f533166cf6a3a2f54f2b
-MD5 3b89da430ea4e8b5ebf0ca87cffba2b4 ChangeLog 16168
-RMD160 d859017076add18fc89520a7322e0dbc17f8db56 ChangeLog 16168
-SHA256 ebaa4c070f71d020abecb6189a515ffc22eea54ac817f533166cf6a3a2f54f2b ChangeLog 16168
+MISC ChangeLog 16283 RMD160 d2110f921ef634978b6f5a326c956fa8195a44e6 SHA1 414f6dce440416a1b76664dc93888e2fee2ef570 SHA256 3c8814bb2fe4e2f6136ed52231d0fe3f4a0fe6016fed21eb86b52693228319e9
+MD5 36cb2377ea320ede502f8af21bf3fe53 ChangeLog 16283
+RMD160 d2110f921ef634978b6f5a326c956fa8195a44e6 ChangeLog 16283
+SHA256 3c8814bb2fe4e2f6136ed52231d0fe3f4a0fe6016fed21eb86b52693228319e9 ChangeLog 16283
 MISC metadata.xml 217 RMD160 638a2f8a6696aef0ba64892bf3cd428a888546a3 SHA1 695d81d47b7947c020b99d5df45ad09930645c0a SHA256 28facc7a36b103a2edeb955f3dde1230ae5d5c8d02b786e1b39141b8c7341d9e
 MD5 1ffd0cc3bc54695ef54f05ac7ed4efef metadata.xml 217
 RMD160 638a2f8a6696aef0ba64892bf3cd428a888546a3 metadata.xml 217
 SHA256 28facc7a36b103a2edeb955f3dde1230ae5d5c8d02b786e1b39141b8c7341d9e metadata.xml 217
-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 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
 MD5 e5c3d8415e0636858d249fde0731f3f0 files/digest-gnuplot-4.2.2-r1 244
 RMD160 3f2e986756041f0a37c0864b14d0cc41388135c5 files/digest-gnuplot-4.2.2-r1 244
 SHA256 ab25cb4ca0103199010d2d93c5b0744047b8e1616674b0c2087246949b59ad2c files/digest-gnuplot-4.2.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHfdj3NQqtfCuFneMRAm4gAJ9g2KaxYgd7h0XUWYiY283hrzI55wCfamG9
+Qz8dUGDtNeYX51uPEvKMzFA=
+=7H9M
+-----END PGP SIGNATURE-----
diff --git a/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r2 b/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r2
deleted file mode 100644
index 81d4b623b0c0..000000000000
--- a/sci-visualization/gnuplot/files/digest-gnuplot-4.0-r2
+++ /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.2 b/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2
deleted file mode 100644
index d690e826678a..000000000000
--- a/sci-visualization/gnuplot/files/digest-gnuplot-4.2.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b9dd34e8210a65336b19ee408766a66f gnuplot-4.2.2.tar.gz 2832174
-RMD160 7364d283718d89c05652d7c25a841154caa2efd8 gnuplot-4.2.2.tar.gz 2832174
-SHA256 756f8a058f2743d0ca739a14bd43cda40d6fd9cc14bb50f4d30d92d538478a91 gnuplot-4.2.2.tar.gz 2832174
diff --git a/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild b/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild
deleted file mode 100644
index 85b8a55abec7..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.0-r2.ebuild
+++ /dev/null
@@ -1,143 +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-r2.ebuild,v 1.12 2007/08/25 14:28:40 vapier 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
-	epatch "${FILESDIR}"/${P}-filled-arrow.patch
-	epatch "${FILESDIR}"/${P}-libggi.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.2.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild
deleted file mode 100644
index 412c8e30b0b5..000000000000
--- a/sci-visualization/gnuplot/gnuplot-4.2.2.ebuild
+++ /dev/null
@@ -1,186 +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.2.ebuild,v 1.14 2007/12/11 09:58:13 vapier 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 app-xemacs/texinfo )
-	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"
-
-latex_rehash() {
-	if has_version '>=app-text/tetex-3' || has_version '>=app-text/ptex-3.1.8' ; 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}"
-	epatch "${FILESDIR}"/${PN}-4.2.0-libggi.patch
-}
-
-src_compile() {
-	# See bug #156427.
-	if use tetex ; then
-		sed -i \
-			-e 's/TEXMFLOCAL/TEXMFSITE/g' share/LaTeX/Makefile.in || die "sed failed"
-	else
-		sed -i \
-			-e '/^SUBDIRS/ s/LaTeX//' share/LaTeX/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
-
-	TEMACS=no
-	use xemacs && TEMACS=xemacs
-	use emacs && TEMACS=emacs
-	EMACS=${TEMACS} 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 "make 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
-	use tetex && latex_rehash
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-	use tetex && latex_rehash
-}