cleanup

4 files changed, 22 insertions, 73 deletions

diff --git a/app-misc/gtktalog/files/digest-gtktalog-0.99.16 b/app-misc/gtktalog/files/digest-gtktalog-0.99.16
deleted file mode 100644
index 92ab73b094fc..000000000000
--- a/app-misc/gtktalog/files/digest-gtktalog-0.99.16
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52453557244a588f8ecf5efa9568cdbc gtktalog-0.99.16.tar.bz2 995844
diff --git a/app-misc/gtktalog/gtktalog-0.99.16-r1.ebuild b/app-misc/gtktalog/gtktalog-0.99.16-r1.ebuild
index e77a61758fcb..b79e7f460087 100644
--- a/app-misc/gtktalog/gtktalog-0.99.16-r1.ebuild
+++ b/app-misc/gtktalog/gtktalog-0.99.16-r1.ebuild
@@ -1,38 +1,36 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.16-r1.ebuild,v 1.1 2002/03/27 21:39:34 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.16-r1.ebuild,v 1.2 2002/04/28 02:37:31 seemant Exp $
 
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
+SRC_URI="http://prdownloads.sourceforge.net/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://gtktalog.sourceforge.net"
 
 DEPEND=">=x11-libs/gtk+-1.2.10-r4
 	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=sys-libs/zlib-1.1.3
-	nls? ( sys-devel/gettext )"
+	>=sys-libs/zlib-1.1.3"
+
+RDEPEND="nls? ( sys-devel/gettext )"
 
 src_compile() {
 	local myconf
 
-	if [ -z "`use nls`" ] ; then
-        	myconf="--disable-nls"
-	fi
+	use nls || myconf="--disable-nls"
     
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --mandir=/usr/share/man				\
-		    --sysconfdir=/etc					\
-	            --enable-htmltitle					\
-		    --enable-mp3info					\
-		    --enable-aviinfo 					\
-	            --enable-mpeginfo					\
-		    --enable-modinfo					\
-		    --enable-catalog2					\
-                    --enable-catalog3					\
-		    $myconf || die
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--sysconfdir=/etc \
+		--enable-htmltitle \
+		--enable-mp3info \
+		--enable-aviinfo \
+		--enable-mpeginfo \
+		--enable-modinfo \
+		--enable-catalog2 \
+		--enable-catalog3 \
+		${myconf} || die
 
 	emake || die
 }
diff --git a/app-misc/gtktalog/gtktalog-0.99.16.ebuild b/app-misc/gtktalog/gtktalog-0.99.16.ebuild
deleted file mode 100644
index 7e88186fc59c..000000000000
--- a/app-misc/gtktalog/gtktalog-0.99.16.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.16.ebuild,v 1.1 2002/03/21 07:58:18 seemant Exp $
-
-A=${P}.tar.bz2
-S=${WORKDIR}/${P}
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
-HOMEPAGE="http://gtktalog.sourceforge.net"
-
-DEPEND=">=x11-libs/gtk+-1.2.10-r4
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=sys-libs/zlib-1.1.3
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ] ; then
-        	myconf="--disable-nls"
-	fi
-    
-	./configure --host=${CHOST}					\
-		    --prefix=/usr					\
-		    --sysconfdir=/etc					\
-	            --enable-htmltitle					\
-		    --enable-mp3info					\
-		    --enable-aviinfo 					\
-	            --enable-mpeginfo					\
-		    --enable-modinfo					\
-		    --enable-catalog2					\
-                    --enable-catalog3					\
-		    $myconf || die
-
-	emake || die
-}
-
-src_install () {
- 	# DESTDIR does not work for mo-files
-
-	make prefix=${D}/usr sysconfdir=${D}/etc install || die
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
-}
diff --git a/app-misc/gtktalog/gtktalog-0.99.19.ebuild b/app-misc/gtktalog/gtktalog-0.99.19.ebuild
index 98564e00bb04..3d683f445cff 100644
--- a/app-misc/gtktalog/gtktalog-0.99.19.ebuild
+++ b/app-misc/gtktalog/gtktalog-0.99.19.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.19.ebuild,v 1.1 2002/04/06 13:23:19 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.19.ebuild,v 1.2 2002/04/28 02:37:31 seemant Exp $
 
-A=${P}.tar.bz2
 S=${WORKDIR}/${P}
 DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://freesoftware.fsf.org/download/gtktalog/gtktalog/sources/${A}"
+SRC_URI="http://freesoftware.fsf.org/download/gtktalog/gtktalog/sources/${P}.tar.bz2"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
 
 DEPEND=">=x11-libs/gtk+-1.2.10-r4
@@ -17,9 +16,7 @@ DEPEND=">=x11-libs/gtk+-1.2.10-r4
 src_compile() {
 	local myconf
 
-	if [ -z "`use nls`" ] ; then
-        	myconf="--disable-nls"
-	fi
+	use nls || myconf="--disable-nls"
     
 	./configure --host=${CHOST}	\
 		--prefix=/usr \
@@ -33,7 +30,7 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		$myconf || die
+		${myconf} || die
 	emake || die
 }