new version, mark 1.7.2 x86 and cleanup

12 files changed, 49 insertions, 188 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 8afa5862d4d2..a55b7ea59451 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.13 2003/02/22 00:12:16 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.14 2003/05/13 21:23:39 foser Exp $
+
+*libgsf-1.8.0 (13 May 2003)
+
+  13 May 2003; foser <foser@gentoo.org> libgsf-1.8.0.ebuild :
+  New version, gnome2ify a bit more, fix dep bug
 
 *libgsf-1.7.2 (16 Feb 2003)
 
diff --git a/gnome-extra/libgsf/files/digest-libgsf-1.1.0 b/gnome-extra/libgsf/files/digest-libgsf-1.1.0
deleted file mode 100644
index 128195cef0c2..000000000000
--- a/gnome-extra/libgsf/files/digest-libgsf-1.1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d2d7a4205b1a42d688256989b993a367 libgsf-1.1.0.tar.bz2 180504
diff --git a/gnome-extra/libgsf/files/digest-libgsf-1.3.0 b/gnome-extra/libgsf/files/digest-libgsf-1.3.0
deleted file mode 100644
index a21c3e227ad5..000000000000
--- a/gnome-extra/libgsf/files/digest-libgsf-1.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 49bae0d52e91e98a0c635b595584aa8e libgsf-1.3.0.tar.bz2 211789
diff --git a/gnome-extra/libgsf/files/digest-libgsf-1.4.0 b/gnome-extra/libgsf/files/digest-libgsf-1.4.0
deleted file mode 100644
index 4c23c9635887..000000000000
--- a/gnome-extra/libgsf/files/digest-libgsf-1.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 069612df8e06efd269708d0c0cb86b88 libgsf-1.4.0.tar.bz2 231383
diff --git a/gnome-extra/libgsf/files/digest-libgsf-1.5.0 b/gnome-extra/libgsf/files/digest-libgsf-1.5.0
deleted file mode 100644
index c3aab3052b15..000000000000
--- a/gnome-extra/libgsf/files/digest-libgsf-1.5.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6f5413145356cde007d58251103290c1 libgsf-1.5.0.tar.bz2 236537
diff --git a/gnome-extra/libgsf/files/digest-libgsf-1.8.0 b/gnome-extra/libgsf/files/digest-libgsf-1.8.0
new file mode 100644
index 000000000000..5e83c808b179
--- /dev/null
+++ b/gnome-extra/libgsf/files/digest-libgsf-1.8.0
@@ -0,0 +1 @@
+MD5 104723ba800e47798819b4b94b269f74 libgsf-1.8.0.tar.bz2 259399
diff --git a/gnome-extra/libgsf/libgsf-1.1.0.ebuild b/gnome-extra/libgsf/libgsf-1.1.0.ebuild
deleted file mode 100644
index 47304e07dd4f..000000000000
--- a/gnome-extra/libgsf/libgsf-1.1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.1.0.ebuild,v 1.9 2003/02/13 12:22:35 vapier Exp $
-
-IUSE="gnome"
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="The GNOME Structured File Library"
-SRC_URI="mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 sparc  ppc"
-
-DEPEND=">=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23
-	>=sys-libs/zlib-1.1.4
-	gnome? ( >=gnome-base/libbonobo-2.0.0
-		>=gnome-base/gnome-vfs-2.0.1 )" 
-
-
-src_compile() {
-	local myconf 
-
-	if [ "`use gnome`" ]
-	then
-		# README lied it is --with-gnomevfs not --with-gnome-vfs
-		# building with-gnomevfs fails, disabling it
-		# stroke@gentoo.org
-		#
-		#myconf="--with-gnomevfs --with-bonobo"
-		myconf="--without-gnomevfs --with-bonobo"
-	else
-		myconf="--without-gnomevfs --without-bonobo"
-	fi
-
-	econf $myconf --with-zlib  || die
-	make || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		datadir=${D}/usr/share \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README
-}
diff --git a/gnome-extra/libgsf/libgsf-1.3.0.ebuild b/gnome-extra/libgsf/libgsf-1.3.0.ebuild
deleted file mode 100644
index 76d17715e920..000000000000
--- a/gnome-extra/libgsf/libgsf-1.3.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.3.0.ebuild,v 1.9 2003/02/13 12:22:43 vapier Exp $
-
-IUSE="gnome"
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="The GNOME Structured File Library"
-SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/${PN}/1.3/${P}.tar.bz2 mirror://gnome/2.0.0/sources/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 sparc  ppc"
-
-DEPEND=">=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23
-	>=sys-libs/zlib-1.1.4
-	gnome? ( >=gnome-base/libbonobo-2.0.0
-		>=gnome-base/gnome-vfs-2.0.1 )" 
-
-
-src_compile() {
-	local myconf 
-
-	use gnome &&  myconf="--with-gnome" || myconf="--without-gnome"
-	econf $myconf --with-zlib  || die
-	make || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		datadir=${D}/usr/share \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README
-}
diff --git a/gnome-extra/libgsf/libgsf-1.4.0.ebuild b/gnome-extra/libgsf/libgsf-1.4.0.ebuild
deleted file mode 100644
index 7007c22600f7..000000000000
--- a/gnome-extra/libgsf/libgsf-1.4.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.4.0.ebuild,v 1.2 2003/02/13 12:22:47 vapier Exp $
-
-inherit gnome.org
-
-S=${WORKDIR}/${P}
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="http://www.gnome.org/"
-
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~sparc ~ppc"
-
-DEPEND=">=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23
-	>=sys-libs/zlib-1.1.4
-	gnome? ( >=gnome-base/libbonobo-2.0.0
-		>=gnome-base/gnome-vfs-2.0.1 )" 
-
-
-src_compile() {
-	local myconf 
-
-	use gnome &&  myconf="--with-gnome" || myconf="--without-gnome"
-	econf $myconf --with-zlib  || die
-	make || die
-}
-
-src_install() {
-
-	make prefix=${D}/usr \
-		sysconfdir=${D}/etc \
-		localstatedir=${D}/var/lib \
-		datadir=${D}/usr/share \
-		install || die
-
-	dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README
-}
-
diff --git a/gnome-extra/libgsf/libgsf-1.5.0.ebuild b/gnome-extra/libgsf/libgsf-1.5.0.ebuild
deleted file mode 100644
index b68007c461ea..000000000000
--- a/gnome-extra/libgsf/libgsf-1.5.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.5.0.ebuild,v 1.4 2003/02/13 12:22:51 vapier Exp $
-
-inherit gnome2
-
-IUSE="gnome doc"
-S=${WORKDIR}/${P}
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="http://www.gnome.org/"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2"
-KEYWORDS="x86 ~sparc  ~ppc"
-
-RDEPEND=">=dev-libs/libxml2-2.4.23
-	 >=dev-libs/glib-2.0.4
-	 >=sys-libs/zlib-1.1.4
-	 gnome? ( >=gnome-base/libbonobo-2.0.0
-	  	>=gnome-base/gnome-vfs-2.0.1 )"
-
-DEPEND=">=dev-util/pkgconfig-0.9
-	doc?	( dev-util/gtk-doc )" 
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}/doc/
-
-	# little hack to fix bug 7570
-	cp Makefile.in Makefile.in.orig
-	sed -e "s:doc\$(TARGET_DIR):\$(TARGET_DIR):" \
-		Makefile.in.orig > Makefile.in
-}
-
-src_compile() {
-	local myconf 
-
-	use gnome && myconf="--with-gnome" || \
-		myconf="--without-gnome"
-
-	use doc && myconf="${myconf} --enable-gtk-doc" || \
-		myconf="${myconf} --disable-gtk-doc"
-
-	econf ${myconf} --with-zlib  || die
-	emake || die
-}
-
-DOCS="dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README"
diff --git a/gnome-extra/libgsf/libgsf-1.7.2.ebuild b/gnome-extra/libgsf/libgsf-1.7.2.ebuild
index 3244283ae6a4..99b408f5ed4b 100644
--- a/gnome-extra/libgsf/libgsf-1.7.2.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.7.2.ebuild,v 1.2 2003/02/16 03:59:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.7.2.ebuild,v 1.3 2003/05/13 21:23:39 foser Exp $
 
 inherit gnome2
 
@@ -10,7 +10,7 @@ DESCRIPTION="The GNOME Structured File Library"
 HOMEPAGE="http://www.gnome.org/"
 SLOT="0"
 LICENSE="GPL-2 LGPL-2"
-KEYWORDS="~x86 ~sparc  ~ppc"
+KEYWORDS="x86 ~sparc  ~ppc"
 
 RDEPEND=">=dev-libs/libxml2-2.4.16
 	 >=dev-libs/glib-2
diff --git a/gnome-extra/libgsf/libgsf-1.8.0.ebuild b/gnome-extra/libgsf/libgsf-1.8.0.ebuild
new file mode 100644
index 000000000000..f1d3263813e1
--- /dev/null
+++ b/gnome-extra/libgsf/libgsf-1.8.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.8.0.ebuild,v 1.1 2003/05/13 21:23:39 foser Exp $
+
+inherit gnome2
+
+IUSE="gnome doc"
+DESCRIPTION="The GNOME Structured File Library"
+HOMEPAGE="http://www.gnome.org/"
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="~x86 ~sparc  ~ppc"
+
+RDEPEND=">=dev-libs/libxml2-2.4.16
+	 >=dev-libs/glib-2
+	 >=sys-libs/zlib-1.1.4
+	 gnome? ( >=gnome-base/libbonobo-2
+	  	>=gnome-base/gnome-vfs-2 )"
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-0.9 )" 
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/doc/
+
+	# little hack to fix bug 7570
+	cp Makefile.in Makefile.in.orig
+	sed -e "s:doc\$(TARGET_DIR):\$(TARGET_DIR):" \
+		Makefile.in.orig > Makefile.in
+}
+
+use gnome \
+	&& G2CONF="${G2CONF} --with-gnome" \
+	|| G2CONF="${G2CONF} --without-gnome"
+
+G2CONF="${G2CONF} --with-gnome --with-zlib"
+
+DOCS="dodoc AUTHORS COPYING* ChangeLog INSTALL NEWS README"