Removed older ebuild. Updated dependencies and ebuild cleanup.

5 files changed, 16 insertions, 58 deletions

diff --git a/net-news/glitter/ChangeLog b/net-news/glitter/ChangeLog
index 389c64426a08..5ccd5d860d6a 100644
--- a/net-news/glitter/ChangeLog
+++ b/net-news/glitter/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-news/glitter
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/glitter/ChangeLog,v 1.7 2004/06/25 00:25:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/glitter/ChangeLog,v 1.8 2004/07/04 22:29:47 swegener Exp $
+
+  05 Jul 2004; Sven Wegener <swegener@gentoo.org> glitter-1.0-r1.ebuild,
+  -glitter-1.0.ebuild:
+  Removed older ebuild. Updated dependencies and ebuild cleanup.
 
   19 Jun 2004; Sven Wegener <swegener@gentoo.org> +metadata.xml:
   Added metadata.xml
diff --git a/net-news/glitter/Manifest b/net-news/glitter/Manifest
index acd7af6170b7..93ec74ac7e4d 100644
--- a/net-news/glitter/Manifest
+++ b/net-news/glitter/Manifest
@@ -1,7 +1,5 @@
-MD5 7d9c12ab6df9c65b69ad14bacc72e2b1 glitter-1.0.ebuild 835
-MD5 32044702cd8d9a9e536263b8786c344f glitter-1.0-r1.ebuild 838
-MD5 06c280b905f6c05beeb4004c032b2496 ChangeLog 914
+MD5 5da9225422e840526c4e310cf48c7e21 ChangeLog 1076
+MD5 b60e0259ead41408b2d7f606112b6bd6 glitter-1.0-r1.ebuild 653
 MD5 d4764f5c17f5e0b416f7ddf271c77d71 metadata.xml 161
-MD5 bdf86bd5578ca993d698f20928da3222 files/glitter-1.0-gary-perl58.patch 567
 MD5 df42e7744e7bac21b3d085918a16bf1b files/digest-glitter-1.0-r1 63
-MD5 df42e7744e7bac21b3d085918a16bf1b files/digest-glitter-1.0 63
+MD5 bdf86bd5578ca993d698f20928da3222 files/glitter-1.0-gary-perl58.patch 567
diff --git a/net-news/glitter/files/digest-glitter-1.0 b/net-news/glitter/files/digest-glitter-1.0
deleted file mode 100644
index 5d0b8509651c..000000000000
--- a/net-news/glitter/files/digest-glitter-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f3c04ec86060511aa45a326d96a17afa glitter-1.0.tar.gz 170318
diff --git a/net-news/glitter/glitter-1.0-r1.ebuild b/net-news/glitter/glitter-1.0-r1.ebuild
index d78e844ccb80..86c4b4fa9c9c 100644
--- a/net-news/glitter/glitter-1.0-r1.ebuild
+++ b/net-news/glitter/glitter-1.0-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/glitter/glitter-1.0-r1.ebuild,v 1.5 2004/06/25 00:25:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-news/glitter/glitter-1.0-r1.ebuild,v 1.6 2004/07/04 22:29:47 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="Glitter - a binary downloader for newsgroups"
 HOMEPAGE="http://www.mews.org.uk/glitter/"
@@ -10,26 +12,16 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc"
 IUSE=""
-DEPEND="gnome-base/gnome-libs"
+DEPEND="dev-lang/perl
+	gnome-base/gnome-libs"
 
 src_unpack() {
 	unpack ${A}
-	echo "Patching gary for use with perl 5.8"
-	cd ${S}; patch < ${FILESDIR}/${P}-gary-perl58.patch
-}
-
-src_compile() {
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc || die "./configure failed"
+	cd ${S}
 
-	emake || die
+	epatch ${FILESDIR}/${P}-gary-perl58.patch
 }
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install || die "make install failed"
 }
diff --git a/net-news/glitter/glitter-1.0.ebuild b/net-news/glitter/glitter-1.0.ebuild
deleted file mode 100644
index a9a86c793d52..000000000000
--- a/net-news/glitter/glitter-1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-news/glitter/glitter-1.0.ebuild,v 1.9 2004/06/25 00:25:09 agriffis Exp $
-
-DESCRIPTION="Glitter - a binary downloader for newsgroups"
-HOMEPAGE="http://www.mews.org.uk/glitter/"
-SRC_URI="http://www.mews.org.uk/glitter/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
-IUSE=""
-DEPEND="gnome-base/gnome-libs"
-
-src_unpack() {
-	unpack ${A}
-	echo "Patching gary for use with perl 5.8"
-	cd ${S}; patch < ${FILESDIR}/${P}-gary-perl58.patch
-}
-
-src_compile() {
-
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--infodir=/usr/share/info \
-		--mandir=/usr/share/man \
-		--sysconfdir=/etc || die "./configure failed"
-
-	emake || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-}