new version and cleanup

9 files changed, 22 insertions, 120 deletions

diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 69c2beb9140a..6372c748d828 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,9 +1,14 @@
 # ChangeLog for dev-util/glade
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.14 2003/03/15 18:04:45 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.15 2003/04/12 18:06:03 foser Exp $
+
+*glade-2.0.0 (12 Apr 2003)
+
+  12 Apr 2003; foser <foser@gentoo.org> glade-2.0.0.ebuild :
+  First stable gtk2 version, updated deps and now uses gnome.org eclass
+  Fix SLOT to make more sense
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 
 *glade-1.1.3 (17 Nov 2002)
   17 Nov 2002; L. Boshell <leonardop@gentoo.org> : New version.
diff --git a/dev-util/glade/files/digest-glade-1.1.0-r1 b/dev-util/glade/files/digest-glade-1.1.0-r1
deleted file mode 100644
index 608cdc4647c2..000000000000
--- a/dev-util/glade/files/digest-glade-1.1.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da40a2c2a55e2e25dcc7f893cc896dd4 glade-1.1.0.tar.bz2 1550453
diff --git a/dev-util/glade/files/digest-glade-1.1.1 b/dev-util/glade/files/digest-glade-1.1.1
deleted file mode 100644
index 0d8ff3ba1400..000000000000
--- a/dev-util/glade/files/digest-glade-1.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ff809f2875ddc30f6ace8e3ccf1b2bd2 glade-1.1.1.tar.bz2 1546556
diff --git a/dev-util/glade/files/digest-glade-1.1.3 b/dev-util/glade/files/digest-glade-1.1.3
deleted file mode 100644
index 212219ccb51d..000000000000
--- a/dev-util/glade/files/digest-glade-1.1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 ceb1fb626e4fa676b8b458aa422c7d22 glade-1.1.3.tar.bz2 1636809
diff --git a/dev-util/glade/files/digest-glade-2.0.0 b/dev-util/glade/files/digest-glade-2.0.0
new file mode 100644
index 000000000000..b70f5107867c
--- /dev/null
+++ b/dev-util/glade/files/digest-glade-2.0.0
@@ -0,0 +1 @@
+MD5 16b685dca1064a950d9f506b669cf859 glade-2.0.0.tar.bz2 1723210
diff --git a/dev-util/glade/glade-0.6.4.ebuild b/dev-util/glade/glade-0.6.4.ebuild
index 383451261488..02b122cfacaa 100644
--- a/dev-util/glade/glade-0.6.4.ebuild
+++ b/dev-util/glade/glade-0.6.4.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.4.ebuild,v 1.10 2003/03/15 18:04:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.4.ebuild,v 1.11 2003/04/12 18:06:03 foser Exp $
 
 IUSE="nls gnome bonobo"
 
 inherit eutils
 
 S=${WORKDIR}/${P}
-DESCRIPTION="glade"
+DESCRIPTION="glade - GUI designer for GTK+/GNOME-1"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/${P}.tar.gz"
 HOMEPAGE="http://glade.gnome.org/"
 
-SLOT="0"
+SLOT="1"
 LICENSE="GPL-2"
 KEYWORDS="x86 sparc  ppc"
 
diff --git a/dev-util/glade/glade-1.1.0-r1.ebuild b/dev-util/glade/glade-1.1.0-r1.ebuild
deleted file mode 100644
index 914c3dd92a8c..000000000000
--- a/dev-util/glade/glade-1.1.0-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-1.1.0-r1.ebuild,v 1.7 2003/02/13 11:52:34 vapier Exp $
-
-IUSE="nls gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Glade is a GUI Builder. This release is for GTK+ 2 and GNOME 2."
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/glade/${P}.tar.bz2"
-HOMEPAGE="http://glade.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc "
-
-DEPEND="=x11-libs/gtk+-2*
-	=dev-libs/libxml2-2.4*
-	gnome? ( >=gnome-base/libgnomeui-1.117.1
-		>=gnome-base/libgnomecanvas-1.117.0
-		>=gnome-base/libbonoboui-1.117.0
-		>=gnome-base/libgnomeprint-1.114.0 
-		>=gnome-base/libgnomeprintui-1.114.0 )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )
-	>=app-text/scrollkeeper-0.2"
-
-src_compile() {
-	local myconf
-	use gnome || myconf="--disable-gnome"
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "$DEBUG" ]
-	then	
-		myconf="$myconf --enable-debug"
-	fi
-
-	econf \
-		--disable-gnome-db \
-		${myconf}  || die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}
diff --git a/dev-util/glade/glade-1.1.1.ebuild b/dev-util/glade/glade-1.1.1.ebuild
deleted file mode 100644
index 06cffdc023d6..000000000000
--- a/dev-util/glade/glade-1.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-1.1.1.ebuild,v 1.8 2003/02/13 11:52:39 vapier Exp $
-
-IUSE="nls gnome"
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Glade is a GUI Builder. This release is for GTK+ 2 and GNOME 2."
-SRC_URI="mirror://gnome/2.0.0/sources/glade/${P}.tar.bz2"
-HOMEPAGE="http://glade.gnome.org/"
-
-SLOT="1"
-LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc "
-
-DEPEND="=x11-libs/gtk+-2*
-	=dev-libs/libxml2-2.4*
-	gnome? ( >=gnome-base/libgnomeui-2.0.0
-		>=gnome-base/libgnomecanvas-2.0.0
-		>=gnome-base/libbonoboui-2.0.0
-		>=gnome-base/libgnomeprint-1.114.0 
-		>=gnome-base/libgnomeprintui-1.114.0 )"
-
-RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )
-	>=app-text/scrollkeeper-0.2"
-
-src_compile() {
-	local myconf
-	use gnome || myconf="--disable-gnome"
-	use nls || myconf="${myconf} --disable-nls"
-
-	if [ "$DEBUG" ]
-	then	
-		myconf="$myconf --enable-debug"
-	fi
-
-	econf \
-		--disable-gnome-db \
-		${myconf}  || die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}
diff --git a/dev-util/glade/glade-1.1.3.ebuild b/dev-util/glade/glade-2.0.0.ebuild
index 886d157a6ead..354c30f6a8eb 100644
--- a/dev-util/glade/glade-1.1.3.ebuild
+++ b/dev-util/glade/glade-2.0.0.ebuild
@@ -1,38 +1,35 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-1.1.3.ebuild,v 1.4 2003/02/27 11:37:14 spider Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-2.0.0.ebuild,v 1.1 2003/04/12 18:06:03 foser Exp $
 
-IUSE="nls gnome"
+# FIXME : we could probably enable gnomedb support
+inherit gnome.org
+
+IUSE="gnome"
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Glade is a GUI Builder. This release is for GTK+ 2 and GNOME 2."
-SRC_URI="mirror://gnome/sources/glade/1.1/${P}.tar.bz2"
 HOMEPAGE="http://glade.gnome.org/"
 
-SLOT="1"
+SLOT="2"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc "
+KEYWORDS="~x86 ~ppc ~sparc"
 
 DEPEND="=x11-libs/gtk+-2*
-	>=dev-libs/libxml2-2.4
+	>=dev-libs/libxml2-2.4.1
 	gnome? ( >=gnome-base/libgnomeui-2.0.0
 		>=gnome-base/libgnomecanvas-2.0.0
-		>=gnome-base/libbonoboui-2.0.0
-		>=gnome-base/libgnomeprint-1.114.0 
-		>=gnome-base/libgnomeprintui-1.114.0 )"
+		>=gnome-base/libbonoboui-2.0.0 )"
 
 RDEPEND="${DEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )
+	sys-devel/gettext
+	>=dev-util/intltool-0.11
 	>=app-text/scrollkeeper-0.2"
 
 src_compile() {
 	local myconf=""
 	
 	use gnome || myconf="--disable-gnome"
-	use nls   || myconf="${myconf} --disable-nls"
-
-	[ -n "$DEBUG" ] && myconf="$myconf --enable-debug"
 
 	econf \
 		--disable-gnome-db \