6 files changed, 9 insertions, 70 deletions
diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index e0569057c61a..67596d8e34b7 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.57 2005/08/20 08:39:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.58 2005/08/24 00:12:58 leonardop Exp $
+
+  24 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> libgsf-1.12.1.ebuild:
+  Stable on x86.
 
   20 Aug 2005; Fabian Groffen <grobian@gentoo.org> libgsf-1.12.1.ebuild:
   Marking ~ppc-macos
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index 80bfff6585b9..2c748b5dc874 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,11 +1,8 @@
-MD5 53e90ae9a6d5a21041be148e48f8c819 libgsf-1.12.0.ebuild 814
-MD5 f5b8d243a0a6c73820b0cadb12076aa4 libgsf-1.8.2.ebuild 969
+MD5 d4fb0c3e638cec936e8d57aa9e1351fd ChangeLog 6663
 MD5 75b2f000e52372eba18230955714832b libgsf-1.10.0.ebuild 812
-MD5 1f2384574f18c8f20c62deae17ef5b35 ChangeLog 6566
+MD5 53e90ae9a6d5a21041be148e48f8c819 libgsf-1.12.0.ebuild 814
+MD5 01ea05bbaf92ee6b4b7aaf880a6f1734 libgsf-1.12.1.ebuild 844
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 42361cc4505b243917e2ae006420d0aa libgsf-1.12.1.ebuild 843
 MD5 48ba00c01cd5336f9bb0c6e1050a8756 files/digest-libgsf-1.10.0 66
 MD5 51a6736b0f95c3ff2576bc0c63ca7ffc files/digest-libgsf-1.12.0 66
 MD5 8900cebbec415c5f3b8ac5d397dfd832 files/digest-libgsf-1.12.1 66
-MD5 9bb1a07d9b94f96998a19f49544066cf files/libgsf-1.8.2-gtkdoc_fix.patch 830
-MD5 b5115c032d14e47d1895c04bc07ae06b files/digest-libgsf-1.8.2 65
diff --git a/gnome-extra/libgsf/files/digest-libgsf-1.8.2 b/gnome-extra/libgsf/files/digest-libgsf-1.8.2
deleted file mode 100644
index 8cabe743a4f6..000000000000
--- a/gnome-extra/libgsf/files/digest-libgsf-1.8.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3a575469f9a2880d8ca78a70ddb93e78 libgsf-1.8.2.tar.bz2 330342
diff --git a/gnome-extra/libgsf/files/libgsf-1.8.2-gtkdoc_fix.patch b/gnome-extra/libgsf/files/libgsf-1.8.2-gtkdoc_fix.patch
deleted file mode 100644
index 06f0377498c8..000000000000
--- a/gnome-extra/libgsf/files/libgsf-1.8.2-gtkdoc_fix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -NurB libgsf-1.8.2-orig/doc/Makefile.in libgsf-1.8.2/doc/Makefile.in
---- libgsf-1.8.2-orig/doc/Makefile.in	2004-03-20 13:48:45.000000000 -0500
-+++ libgsf-1.8.2/doc/Makefile.in	2004-03-20 14:48:20.000000000 -0500
-@@ -112,7 +112,7 @@
- DOC_MAIN_SGML_FILE = gsf-docs.sgml
- 
- # The directory containing the source code. Relative to $(srcdir)
--DOC_SOURCE_DIR = ../gsf
-+DOC_SOURCE_DIR = ..
- 
- # Extra options to pass to gtkdoc-scangobj
- SCANGOBJ_OPTIONS = --type-init-func="g_type_init ()" 
-@@ -127,8 +127,8 @@
- FIXXREF_OPTIONS = 
- 
- # Used for dependencies
--HFILE_GLOB = $(top_srcdir)/gsf/*.h
--CFILE_GLOB = $(top_srcdir)/gsf/*.c
-+HFILE_GLOB = $(top_srcdir)/gsf/*.h $(top_srcdir)/gsf-gnome/*.h
-+CFILE_GLOB = $(top_srcdir)/gsf/*.c $(top_srcdir)/gsf-gnome/*.c
- 
- # Header files to ignore when scanning
- IGNORE_HFILES =  	biff-types.h
diff --git a/gnome-extra/libgsf/libgsf-1.12.1.ebuild b/gnome-extra/libgsf/libgsf-1.12.1.ebuild
index 6c71272c6684..184f0d7f898c 100644
--- a/gnome-extra/libgsf/libgsf-1.12.1.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.12.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.12.1.ebuild,v 1.2 2005/08/20 08:39:15 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.12.1.ebuild,v 1.3 2005/08/24 00:12:58 leonardop Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc x86"
 IUSE="bzip2 doc gnome static"
 
 RDEPEND=">=dev-libs/libxml2-2.4.16
diff --git a/gnome-extra/libgsf/libgsf-1.8.2.ebuild b/gnome-extra/libgsf/libgsf-1.8.2.ebuild
deleted file mode 100644
index 5b3351a29e03..000000000000
--- a/gnome-extra/libgsf/libgsf-1.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.8.2.ebuild,v 1.12 2005/01/17 12:57:58 gustavoz Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="The GNOME Structured File Library"
-HOMEPAGE="http://www.gnome.org/"
-
-IUSE="gnome doc"
-SLOT="0"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="x86 sparc ppc hppa amd64 alpha ia64 mips"
-
-# FIXME : should add optional bz2 support
-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
-	>=sys-apps/sed-4
-	doc? ( >=dev-util/gtk-doc-0.9 )"
-
-src_unpack() {
-	unpack ${A}
-	sed -e "s:doc\$(TARGET_DIR):\$(TARGET_DIR):" \
-		-i ${S}/doc/Makefile.in
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gtkdoc_fix.patch
-}
-
-G2CONF="${G2CONF} $(use_with gnome)"
-
-DOCS="AUTHORS COPYING* ChangeLog INSTALL NEWS README"