updated to new location

3 files changed, 26 insertions, 56 deletions

diff --git a/app-misc/gtktalog/files/digest-gtktalog-0.99.8 b/app-misc/gtktalog/files/digest-gtktalog-0.99.8
deleted file mode 100644
index 6497ef532374..000000000000
--- a/app-misc/gtktalog/files/digest-gtktalog-0.99.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c7bfbddf72d19b0f5990de057489cba gtktalog-0.99.8.tar.gz
diff --git a/app-misc/gtktalog/gtktalog-0.99.12.ebuild b/app-misc/gtktalog/gtktalog-0.99.12.ebuild
index 5ea250e3e205..d0aac4d06464 100644
--- a/app-misc/gtktalog/gtktalog-0.99.12.ebuild
+++ b/app-misc/gtktalog/gtktalog-0.99.12.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2000 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.12.ebuild,v 1.1 2001/09/27 09:33:56 hallski Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gtktalog/gtktalog-0.99.12.ebuild,v 1.2 2001/10/06 23:01:24 hallski Exp $
 
 A=${P}.tar.bz2
 S=${WORKDIR}/${P}
@@ -9,29 +9,37 @@ DESCRIPTION="The GTK disk catalog."
 SRC_URI="http://prdownloads.sourceforge.net/${PN}/${A}"
 HOMEPAGE="http://gtktalog.sourceforge.net"
 
-DEPEND=">=x11-libs/gtk+-1.2.0
-	>=gnome-base/gnome-libs-1.0.0
+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
-    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --host=${CHOST} \
-	            --enable-htmltitle --enable-mp3info --enable-aviinfo \
-	            --enable-mpeginfo --enable-modinfo --enable-catalog2
-                    --enable-catalog3 $myconf
-
-    try pmake
-
+	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
-    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-    dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
+ 	# 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.8.ebuild b/app-misc/gtktalog/gtktalog-0.99.8.ebuild
deleted file mode 100644
index f762b6c7c142..000000000000
--- a/app-misc/gtktalog/gtktalog-0.99.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2000 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.8.ebuild,v 1.1 2001/07/28 07:47:13 hallski Exp $
-
-A=${P}.tar.gz
-S=${WORKDIR}/${P}
-DESCRIPTION="The GTK disk catalog."
-SRC_URI="ftp://gtktalog.sourceforge.net/pub/gtktalog/gtktalog/tgz/${A}"
-HOMEPAGE="http://gtktalog.sourceforge.net"
-
-DEPEND=">=x11-libs/gtk+-1.2.0
-	>=gnome-base/gnome-libs-1.0.0
-	>=sys-libs/zlib-1.1.3
-	nls? ( sys-devel/gettext )"
-
-src_compile() {
-
-    local myconf
-    if [ -z "`use nls`" ] ; then
-        myconf="--disable-nls"
-    fi
-    try ./configure --prefix=/opt/gnome --sysconfdir=/etc/opt/gnome --host=${CHOST} \
-	            --enable-htmltitle --enable-mp3info --enable-aviinfo \
-	            --enable-mpeginfo --enable-modinfo --enable-catalog2
-                    --enable-catalog3 $myconf
-
-    try pmake
-
-}
-
-src_install () {
-    # DESTDIR does not work for mo-files
-    try make prefix=${D}/opt/gnome sysconfdir=${D}/etc/opt/gnome install
-    dodoc AUTHORS BUGS COPYING ChangeLog NEWS README TODO
-
-}