change glibc to libc and clean up other horribly ugly ebuilds

3 files changed, 24 insertions, 48 deletions

diff --git a/app-misc/gtktalog/gtktalog-1.0.1.ebuild b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
index 8b544c769f79..cdc5ffaa9f85 100644
--- a/app-misc/gtktalog/gtktalog-1.0.1.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.1.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.1.ebuild,v 1.5 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.1.ebuild,v 1.6 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtktalog/gtktalog-1.0.2.ebuild b/app-misc/gtktalog/gtktalog-1.0.2.ebuild
index 96d8f86f9182..d7b45df86c85 100644
--- a/app-misc/gtktalog/gtktalog-1.0.2.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.2.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.2.ebuild,v 1.4 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.2.ebuild,v 1.5 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }
diff --git a/app-misc/gtktalog/gtktalog-1.0.3.ebuild b/app-misc/gtktalog/gtktalog-1.0.3.ebuild
index 5c418c858d3c..0f912f010e5b 100644
--- a/app-misc/gtktalog/gtktalog-1.0.3.ebuild
+++ b/app-misc/gtktalog/gtktalog-1.0.3.ebuild
@@ -1,30 +1,23 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.3.ebuild,v 1.4 2004/06/24 22:14:49 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-1.0.3.ebuild,v 1.5 2004/06/28 03:39:40 vapier Exp $
 
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
+DESCRIPTION="The GTK disk catalog"
 HOMEPAGE="http://www.freesoftware.fsf.org/gtktalog"
+SRC_URI="http://savannah.nongnu.org/download/${PN}/${PN}.pkg/${PV}/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="x86"
 IUSE="nls"
 
 RDEPEND="=x11-libs/gtk+-1.2*
 	>=gnome-base/gnome-libs-1.4.1.2-r1
 	>=sys-libs/zlib-1.1.4"
-
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )"
 
 src_compile() {
-	local myconf
-
-	use nls \
-		&& myconf="--enable-nls" \
-		|| myconf="--disable-nls"
-
 	econf \
 		--enable-htmltitle \
 		--enable-mp3info \
@@ -34,13 +27,12 @@ src_compile() {
 		--enable-ogginfo \
 		--enable-catalog2 \
 		--enable-catalog3 \
-		${myconf} || die "econf failed"
-
+		`use_enable nls` \
+		|| die "econf failed"
 	emake || die
 }
 
 src_install() {
-	einstall
-
-	dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+	einstall || die
+	dodoc AUTHORS BUGS ChangeLog NEWS README TODO
 }