repoman'd

6 files changed, 31 insertions, 156 deletions

diff --git a/dev-util/glade/files/digest-glade-0.6.2 b/dev-util/glade/files/digest-glade-0.6.2
deleted file mode 100644
index f38f87b559c5..000000000000
--- a/dev-util/glade/files/digest-glade-0.6.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 261c9a48441d2a884654b11a79c220ee glade-0.6.2.tar.gz 2191537
diff --git a/dev-util/glade/files/digest-glade-1.1.0 b/dev-util/glade/files/digest-glade-1.1.0
deleted file mode 100644
index 608cdc4647c2..000000000000
--- a/dev-util/glade/files/digest-glade-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 da40a2c2a55e2e25dcc7f893cc896dd4 glade-1.1.0.tar.bz2 1550453
diff --git a/dev-util/glade/glade-0.6.2.ebuild b/dev-util/glade/glade-0.6.2.ebuild
deleted file mode 100644
index 6a6931c6073d..000000000000
--- a/dev-util/glade/glade-0.6.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.2.ebuild,v 1.11 2002/07/11 06:30:25 drobbins Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="glade"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/${P}.tar.gz"
-HOMEPAGE="http://glade.gnome.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-	bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext 
-	>=dev-util/intltool-0.11 )
-	>=app-text/scrollkeeper-0.2"
-
-src_compile() {
-	local myopts
-
-	if [ -z "`use gnome`" ]
-	then
-		myopts="--disable-gnome"
-	fi
-
-	if [ "`use bonobo`" ]
-	then
-		myopts="$myopts --with-bonobo"
-	else
-		myopts="$myopts --without-bonobo"
-	fi
-
-	if [ -z "`use nls`" ]
-	then
-		myopts="$myopts --disable-nls"
-	fi
-
-	if [ "$DEBUG" ]
-	then
-		myopts="$myopts --enable-debug"
-	fi
-
-	./configure --host=${CHOST} 					\
-		--prefix=/usr					\
-		--sysconfdir=/etc					\
-		--disable-gnome-db 					\
-		${myopts}  || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr 						\
-		sysconfdir=${D}/etc 					\
-		install || die
-
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}
diff --git a/dev-util/glade/glade-0.6.4.ebuild b/dev-util/glade/glade-0.6.4.ebuild
index c009f801da0f..e850799827ad 100644
--- a/dev-util/glade/glade-0.6.4.ebuild
+++ b/dev-util/glade/glade-0.6.4.ebuild
@@ -1,59 +1,50 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.4.ebuild,v 1.2 2002/07/11 06:30:25 drobbins Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-0.6.4.ebuild,v 1.3 2002/07/23 11:22:17 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="glade"
 SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/glade/${P}.tar.gz"
 HOMEPAGE="http://glade.gnome.org/"
 
-RDEPEND="=x11-libs/gtk+-1.2*
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+DEPEND="=x11-libs/gtk+-1.2*
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
 	bonobo? ( >=gnome-base/bonobo-1.0.9-r1 )"
 
-DEPEND="${RDEPEND}
+RDEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext 
-	>=dev-util/intltool-0.11 )
+		>=dev-util/intltool-0.11 )
 	>=app-text/scrollkeeper-0.2"
 
 src_compile() {
-	local myopts
+	local myconf
 
-	if [ -z "`use gnome`" ]
-	then
-		myopts="--disable-gnome"
-	fi
+	use gnome || myconf="--disable-gnome"
 
-	if [ "`use bonobo`" ]
-	then
-		myopts="$myopts --with-bonobo"
-	else
-		myopts="$myopts --without-bonobo"
-	fi
+	use bonobo \
+		&& myconf="${myconf} --with-bonobo" \
+		|| myconf="${myconf} --without-bonobo"
 
-	if [ -z "`use nls`" ]
-	then
-		myopts="$myopts --disable-nls"
-	fi
+	use nls || myconf="${myconf} --disable-nls"
 
 	if [ "$DEBUG" ]
 	then
-		myopts="$myopts --enable-debug"
+		myconf="${myconf} --enable-debug"
 	fi
 
-	./configure --host=${CHOST} 					\
-		--prefix=/usr					\
-		--sysconfdir=/etc					\
-		--disable-gnome-db 					\
-		${myopts}  || die
+	econf \
+		--disable-gnome-db \
+		${myconf}  || die
 
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr 						\
-		sysconfdir=${D}/etc 					\
-		install || die
+	einstall || die
 
 	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
 }
diff --git a/dev-util/glade/glade-1.1.0-r1.ebuild b/dev-util/glade/glade-1.1.0-r1.ebuild
index 27016973a3b3..c6f319de179f 100644
--- a/dev-util/glade/glade-1.1.0-r1.ebuild
+++ b/dev-util/glade/glade-1.1.0-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-1.1.0-r1.ebuild,v 1.1 2002/06/02 18:28:25 stroke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-1.1.0-r1.ebuild,v 1.2 2002/07/23 11:22:17 seemant Exp $
 
 S=${WORKDIR}/${P}
-SLOT="0"
 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"
 
-RDEPEND="=x11-libs/gtk+-2.0*
+DEPEND="=x11-libs/gtk+-2*
 	=dev-libs/libxml2-2.4*
 	gnome? ( >=gnome-base/libgnomeui-1.117.1
 		>=gnome-base/libgnomecanvas-1.117.0
@@ -19,33 +19,29 @@ RDEPEND="=x11-libs/gtk+-2.0*
 		>=gnome-base/libgnomeprint-1.114.0 
 		>=gnome-base/libgnomeprintui-1.114.0 )"
 
-DEPEND="${RDEPEND}
+RDEPEND="${DEPEND}
 	nls? ( sys-devel/gettext
 		>=dev-util/intltool-0.11 )
 	>=app-text/scrollkeeper-0.2"
 
 src_compile() {
-	local myopts
-	use gnome || myopts="--disable-gnome"
-	use nls || myopts="${myopts} --disable-nls"
+	local myconf
+	use gnome || myconf="--disable-gnome"
+	use nls || myconf="${myconf} --disable-nls"
 
 	if [ "$DEBUG" ]
 	then	
-		myopts="$myopts --enable-debug"
+		myconf="$myconf --enable-debug"
 	fi
 
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
+	econf \
 		--disable-gnome-db \
-		${myopts}  || die
+		${myconf}  || die
 
 	emake || die
 }
 
 src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		install || die
+	einstall || die
 	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
 }
diff --git a/dev-util/glade/glade-1.1.0.ebuild b/dev-util/glade/glade-1.1.0.ebuild
deleted file mode 100644
index 9cdeccb065b7..000000000000
--- a/dev-util/glade/glade-1.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-1.1.0.ebuild,v 1.3 2002/06/02 18:28:25 stroke Exp $
-
-S=${WORKDIR}/${P}
-SLOT="0"
-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/"
-
-LICENSE="GPL-2"
-
-RDEPEND="=x11-libs/gtk+-2.0*
-	=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-extra/libgnomeprint-1.114.0 
-		>=gnome-extra/libgnomeprintui-1.114.0 )"
-
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext
-		>=dev-util/intltool-0.11 )
-	>=app-text/scrollkeeper-0.2"
-
-src_compile() {
-	local myopts
-	use gnome || myopts="--disable-gnome"
-	use nls || myopts="${myopts} --disable-nls"
-
-	if [ "$DEBUG" ]
-	then	
-		myopts="$myopts --enable-debug"
-	fi
-
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--disable-gnome-db \
-		${myopts}  || die
-
-	emake || die
-}
-
-src_install() {
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		install || die
-	dodoc AUTHORS COPYING* FAQ NEWS README* TODO
-}