bumped to x86 and amd64 (both tested) and removed 4.0 ebuild

Package-Manager: portage-2.0.51-r15

5 files changed, 10 insertions, 113 deletions

diff --git a/media-gfx/gnuplot/ChangeLog b/media-gfx/gnuplot/ChangeLog
index 086abffc564b..316e2970f265 100644
--- a/media-gfx/gnuplot/ChangeLog
+++ b/media-gfx/gnuplot/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gnuplot
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.35 2005/02/02 23:13:54 j4rg0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/ChangeLog,v 1.36 2005/02/06 02:55:58 nerdboy Exp $
+
+  05 Feb 2005; Steve Arnold <nerdboy@gentoo.org> gnuplot-4.0-r1.ebuild,
+  -gnuplot-4.0.ebuild:
+  bumped to x86 and amd64 (both tested) and removed 4.0 ebuild as superfluous
 
   02 Feb 2005; Lina Pezzella <j4rg0n@gentoo.org> gnuplot-3.8j.ebuild:
   Unstable ppc-macos
diff --git a/media-gfx/gnuplot/Manifest b/media-gfx/gnuplot/Manifest
index 9163eb540e80..0cf785078c50 100644
--- a/media-gfx/gnuplot/Manifest
+++ b/media-gfx/gnuplot/Manifest
@@ -1,12 +1,10 @@
+MD5 006449c4ad37501c5aae11f557f1f129 ChangeLog 5277
 MD5 a945cf203f726632334f896aa6f066cd gnuplot-3.8j-r1.ebuild 2117
 MD5 a00c7ed2efb01552b140dc49d96fc899 gnuplot-3.8j.ebuild 2012
-MD5 6dc97fc897b3e5d6d6798a0053f90602 ChangeLog 5102
-MD5 d6561ff0e8bf554800501bc1be397154 gnuplot-4.0.ebuild 2556
 MD5 0d0ccbc08efef8b97818204479649574 metadata.xml 220
-MD5 0436914122d6f6fc3a02b0cd0de684c8 gnuplot-4.0-r1.ebuild 3927
+MD5 da3e7d5bdfdf772be669f52f4b88cf68 gnuplot-4.0-r1.ebuild 3925
 MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j 67
 MD5 4ca2057b57f07811b4da7bd8958d50c2 files/digest-gnuplot-3.8j-r1 67
-MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0 66
-MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0-r1 66
 MD5 d6d201e466142a8e19ab7a86da486dde files/gnuplot-3.8j-amd64.diff 329
 MD5 6bd90ea3b0173af9fe24085ca37fbfa3 files/header-order.patch 1692
+MD5 ca4f01c5e5b582017b2ff93ac26d650e files/digest-gnuplot-4.0-r1 66
diff --git a/media-gfx/gnuplot/files/digest-gnuplot-4.0 b/media-gfx/gnuplot/files/digest-gnuplot-4.0
deleted file mode 100644
index fe9dcb46f985..000000000000
--- a/media-gfx/gnuplot/files/digest-gnuplot-4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 66258443d9f93cc4f46b147dac33e63a gnuplot-4.0.0.tar.gz 2160918
diff --git a/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
index d79ed6d92f0e..ee5e87eee77f 100644
--- a/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
+++ b/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild,v 1.6 2005/01/30 08:29:54 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0-r1.ebuild,v 1.7 2005/02/06 02:55:58 nerdboy Exp $
 
 inherit eutils elisp-common
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
 LICENSE="gnuplot"
 
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~sparc ~ppc-macos ~ppc64"
+KEYWORDS="x86 amd64 ~sparc ~ppc-macos ~ppc64"
 IUSE="doc emacs gd ggi pdflib plotutils png readline svga X xemacs"
 
 DEPEND="
diff --git a/media-gfx/gnuplot/gnuplot-4.0.ebuild b/media-gfx/gnuplot/gnuplot-4.0.ebuild
deleted file mode 100644
index f095dca38b2b..000000000000
--- a/media-gfx/gnuplot/gnuplot-4.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gnuplot/gnuplot-4.0.ebuild,v 1.8 2005/01/02 06:45:19 j4rg0n Exp $
-
-inherit eutils
-
-MY_P="${P}.0"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Quick and useful plotting program"
-HOMEPAGE="http://www.gnuplot.info/"
-SRC_URI="mirror://sourceforge/gnuplot/${MY_P}.tar.gz"
-
-LICENSE="gnuplot"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE="X svga xemacs pdflib ggi png gd readline plotutils doc"
-
-DEPEND="
-	xemacs? ( virtual/xemacs )
-	pdflib? ( media-libs/pdflib )
-	ggi? ( media-libs/libggi )
-	png? ( media-libs/libpng )
-	gd? ( >=media-libs/gd-2 )
-	doc? ( virtual/tetex )
-	X? ( virtual/x11 )
-	svga? ( media-libs/svgalib )
-	readline? ( >=sys-libs/readline-4.2 )
-	plotutils? ( media-libs/plotutils )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/header-order.patch
-}
-
-src_compile() {
-	local myconf
-
-	myconf=""
-	#myconf=" --with-lasergnu"
-
-	use X \
-		&& myconf="${myconf} --with-x" \
-		|| myconf="${myconf} --without-x"
-
-	use svga \
-		&& myconf="${myconf} --with-linux-vga" \
-		|| myconf="${myconf} --without-linux-vga"
-
-	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"
-
-	use plotutils \
-		&& myconf="${myconf} --with-plot=/usr/lib" \
-		|| myconf="${myconf} --without-plot"
-
-	use png \
-		&& myconf="${myconf} --with-png=/usr/lib" \
-		|| myconf="${myconf} --without-png"
-
-	use gd \
-		&& myconf="${myconf} --with-gd" \
-		|| myconf="${myconf} --without-gd"
-
-	use pdflib \
-		&& myconf="${myconf} --with-pdf=/usr/lib" \
-		|| myconf="${myconf} --without-pdf"
-
-	use !xemacs && myconf="${myconf} --without-lisp-files"
-
-	econf \
-		--datadir=/usr/share/gnuplot \
-		${myconf} || die
-
-	cd ${S}
-	emake || die
-
-	if use doc ; then
-		cd docs
-		make pdf || die
-	fi
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-
-	dodoc BUGS ChangeLog Copyright FAQ INSTALL NEWS PATCHLEVEL PGPKEYS PORTING README* TODO VERSION
-	use doc && cp docs/gnuplot.pdf ${D}/usr/share/doc/gnuplot-4.0/
-	use doc && cp -a demo ${D}/usr/share/doc/gnuplot-4.0/demo
-}
-
-pkg_postinst() {
-	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
-}