fix DEPEND problem (gnome2)

7 files changed, 12 insertions, 100 deletions

diff --git a/gnome-extra/gal/ChangeLog b/gnome-extra/gal/ChangeLog
index 5e5c9d2907d9..6567eb889218 100644
--- a/gnome-extra/gal/ChangeLog
+++ b/gnome-extra/gal/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gal
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.3 2002/05/13 22:10:07 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/ChangeLog,v 1.4 2002/05/26 15:14:56 azarah Exp $
+
+*gal-0.19.2-r1 (26 May 2002)
+
+  26 May 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  Fix DEPEND to properly depend on libglade-0.*.
 
 *gal-0.19.2 (13 May 2002)
 
diff --git a/gnome-extra/gal/files/digest-gal-0.19 b/gnome-extra/gal/files/digest-gal-0.19
deleted file mode 100644
index c33418a2cd19..000000000000
--- a/gnome-extra/gal/files/digest-gal-0.19
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af5481cc75c9d0872f5a9cbf79f396ad gal-0.19.tar.bz2 893300
diff --git a/gnome-extra/gal/files/digest-gal-0.19.1 b/gnome-extra/gal/files/digest-gal-0.19.1
deleted file mode 100644
index 78fffc5718e5..000000000000
--- a/gnome-extra/gal/files/digest-gal-0.19.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 442bee64ce3b165eb7cf84920e5940bb gal-0.19.1.tar.bz2 889015
diff --git a/gnome-extra/gal/files/digest-gal-0.19.2 b/gnome-extra/gal/files/digest-gal-0.19.2-r1
index 0f8801b0bea3..0f8801b0bea3 100644
--- a/gnome-extra/gal/files/digest-gal-0.19.2
+++ b/gnome-extra/gal/files/digest-gal-0.19.2-r1
diff --git a/gnome-extra/gal/gal-0.19.1.ebuild b/gnome-extra/gal/gal-0.19.1.ebuild
deleted file mode 100644
index 81ef6998fbca..000000000000
--- a/gnome-extra/gal/gal-0.19.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.19.1.ebuild,v 1.1 2002/05/09 21:10:54 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Application Libraries"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        >=dev-util/intltool-0.11
-	sys-devel/perl
-        >=gnome-base/gnome-vfs-1.0.2-r1
-	>=dev-libs/libunicode-0.4-r1
-        alsa? ( >=media-libs/alsa-lib-0.5.10 )
-	>=gnome-base/gnome-print-0.34
-	>=gnome-base/libglade-0.17-r1
-	>=dev-libs/libxml-1.8.16"
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST}	\
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		     ${myconf} || die
-
-	make || die # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib	\
-	     install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-
diff --git a/gnome-extra/gal/gal-0.19.ebuild b/gnome-extra/gal/gal-0.19.2-r1.ebuild
index 0a00fd2b88ba..ae0225eb0ccd 100644
--- a/gnome-extra/gal/gal-0.19.ebuild
+++ b/gnome-extra/gal/gal-0.19.2-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Maintainer: Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.19.ebuild,v 1.2 2002/03/26 23:51:09 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.19.2-r1.ebuild,v 1.1 2002/05/26 15:14:56 azarah Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="The Gnome Application Libraries"
@@ -9,13 +9,13 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://www.gnome.org/"
 
 DEPEND="nls? ( sys-devel/gettext )
-        >=dev-util/intltool-0.11
+	>=dev-util/intltool-0.11
 	sys-devel/perl
-        >=gnome-base/gnome-vfs-1.0.2-r1
+	>=gnome-base/gnome-vfs-1.0.2-r1
 	>=dev-libs/libunicode-0.4-r1
-        alsa? ( >=media-libs/alsa-lib-0.5.10 )
+	alsa? ( >=media-libs/alsa-lib-0.5.10 )
 	>=gnome-base/gnome-print-0.34
-	>=gnome-base/libglade-0.17-r1
+	=gnome-base/libglade-0*
 	>=dev-libs/libxml-1.8.16"
 
 src_compile() {
diff --git a/gnome-extra/gal/gal-0.19.2.ebuild b/gnome-extra/gal/gal-0.19.2.ebuild
deleted file mode 100644
index 68f7927bed7a..000000000000
--- a/gnome-extra/gal/gal-0.19.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Mikael Hallendal <hallski@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gal/gal-0.19.2.ebuild,v 1.1 2002/05/13 22:10:07 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="The Gnome Application Libraries"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-DEPEND="nls? ( sys-devel/gettext )
-        >=dev-util/intltool-0.11
-	sys-devel/perl
-        >=gnome-base/gnome-vfs-1.0.2-r1
-	>=dev-libs/libunicode-0.4-r1
-        alsa? ( >=media-libs/alsa-lib-0.5.10 )
-	>=gnome-base/gnome-print-0.34
-	>=gnome-base/libglade-0.17-r1
-	>=dev-libs/libxml-1.8.16"
-
-src_compile() {
-	local myconf
-
-	if [ -z "`use nls`" ]
-	then
-		myconf="--disable-nls"
-	fi
-
-	./configure --host=${CHOST}	\
-		    --prefix=/usr \
-		    --sysconfdir=/etc \
-		    --localstatedir=/var/lib \
-		     ${myconf} || die
-
-	make || die # Doesn't work with -j 4 (hallski)
-}
-
-src_install() {
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc \
-	     localstatedir=${D}/var/lib	\
-	     install || die
-
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-}
-