New version 'n cleanup

8 files changed, 21 insertions, 89 deletions

diff --git a/app-misc/gtktalog/ChangeLog b/app-misc/gtktalog/ChangeLog
index c69a790b105a..4c4cbb92b2e9 100644
--- a/app-misc/gtktalog/ChangeLog
+++ b/app-misc/gtktalog/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/gtktalog
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/ChangeLog,v 1.8 2003/02/12 05:00:33 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/ChangeLog,v 1.9 2003/05/05 22:41:38 foser Exp $
+
+*gtktalog-1.0.1 (05 May 2003)
+
+  05 May 2003; foser <foser@gentoo.org> gtktalog-1.0.1 :
+  New version (#19332), some minor cleanups, mainly SRC_URI
 
 *gtktalog-1.0_rc2 (21 Aug 2002)
 
diff --git a/app-misc/gtktalog/files/digest-gtktalog-0.99.19 b/app-misc/gtktalog/files/digest-gtktalog-0.99.19
deleted file mode 100644
index 1b3051e2143a..000000000000
--- a/app-misc/gtktalog/files/digest-gtktalog-0.99.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 90ff0a0e8b80383237ef10fff636417a gtktalog-0.99.19.tar.bz2 1013179
diff --git a/app-misc/gtktalog/files/digest-gtktalog-0.99.20 b/app-misc/gtktalog/files/digest-gtktalog-0.99.20
deleted file mode 100644
index 814c77cef7b6..000000000000
--- a/app-misc/gtktalog/files/digest-gtktalog-0.99.20
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4865f235a1c0e0268cc3c9990fa1a4fe gtktalog-0.99.20.tar.bz2 1052419
diff --git a/app-misc/gtktalog/files/digest-gtktalog-1.0.1 b/app-misc/gtktalog/files/digest-gtktalog-1.0.1
new file mode 100644
index 000000000000..891c9fda3256
--- /dev/null
+++ b/app-misc/gtktalog/files/digest-gtktalog-1.0.1
@@ -0,0 +1 @@
+MD5 873529c15358c324fe6cb4f5df56d422 gtktalog-1.0.1.tar.bz2 1034951
diff --git a/app-misc/gtktalog/files/digest-gtktalog-1.0_rc2 b/app-misc/gtktalog/files/digest-gtktalog-1.0_rc2
deleted file mode 100644
index e2e06a109cdc..000000000000
--- a/app-misc/gtktalog/files/digest-gtktalog-1.0_rc2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 76dc8a86ae99e25e476c6785c4754b22 gtktalog-1.0rc2.tar.bz2 1103681
diff --git a/app-misc/gtktalog/gtktalog-0.99.19.ebuild b/app-misc/gtktalog/gtktalog-0.99.19.ebuild
deleted file mode 100644
index ffe5b34062d6..000000000000
--- a/app-misc/gtktalog/gtktalog-0.99.19.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.19.ebuild,v 1.9 2003/02/13 09:01:15 vapier Exp $
-
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://freesoftware.fsf.org/download/gtktalog/gtktalog/sources/${P}.tar.bz2"
-HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=sys-libs/zlib-1.1.4"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-	econf \
-		--enable-htmltitle \
-		--enable-mp3info \
-		--enable-aviinfo \
-		--enable-mpeginfo \
-		--enable-modinfo \
-		--enable-ogginfo \
-		--enable-catalog2 \
-		--enable-catalog3 \
-		${myconf}
-	emake || die
-}
-
-src_install() {
-	einstall
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
-}
diff --git a/app-misc/gtktalog/gtktalog-0.99.20.ebuild b/app-misc/gtktalog/gtktalog-0.99.20.ebuild
deleted file mode 100644
index 9f3b2b6f9f32..000000000000
--- a/app-misc/gtktalog/gtktalog-0.99.20.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.20.ebuild,v 1.9 2003/02/13 09:01:21 vapier Exp $
-
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://freesoftware.fsf.org/download/gtktalog/gtktalog/sources/${P}.tar.bz2"
-HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-IUSE="nls"
-
-DEPEND="=x11-libs/gtk+-1.2*
-	>=gnome-base/gnome-libs-1.4.1.2-r1
-	>=sys-libs/zlib-1.1.4"
-RDEPEND="nls? ( sys-devel/gettext )"
-
-src_compile() {
-	local myconf
-	use nls || myconf="--disable-nls"
-	econf \
-		--enable-htmltitle \
-		--enable-mp3info \
-		--enable-aviinfo \
-		--enable-mpeginfo \
-		--enable-modinfo \
-		--enable-ogginfo \
-		--enable-catalog2 \
-		--enable-catalog3 \
-		${myconf}
-	emake || die
-}
-
-src_install() {
-	einstall
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
-}
diff --git a/app-misc/gtktalog/gtktalog-1.0_rc2.ebuild b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
index f156839accb0..acc622fdf93e 100644
--- a/app-misc/gtktalog/gtktalog-1.0_rc2.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
@@ -1,27 +1,30 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0_rc2.ebuild,v 1.5 2003/02/13 09:01:27 vapier Exp $
-
-MY_P=${P/_/}
-S=${WORKDIR}/${MY_P}
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.1.ebuild,v 1.1 2003/05/05 22:41:38 foser Exp $
 
 DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://freesoftware.fsf.org/download/gtktalog/gtktalog/sources/${MY_P}.tar.bz2"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86"
+KEYWORDS="~x86"
 IUSE="nls"
 
-DEPEND="=x11-libs/gtk+-1.2*
+RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-RDEPEND="nls? ( sys-devel/gettext )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
 
 src_compile() {
 	local myconf
-	use nls || myconf="--disable-nls"
+
+	use nls \
+		&& myconf="--enable-nls" \
+		|| myconf="--disable-nls"
+
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -32,10 +35,12 @@ src_compile() {
 		--enable-catalog2 \
 		--enable-catalog3 \
 		${myconf}
+
 	emake || die
 }
 
 src_install() {
 	einstall
+
 	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
 }