Updated patch that fixes the destination folder for gtk-doc stuff

4 files changed, 47 insertions, 11 deletions

diff --git a/gnome-extra/libgsf/ChangeLog b/gnome-extra/libgsf/ChangeLog
index 9c6b11291bc4..ddd3f05b58b4 100644
--- a/gnome-extra/libgsf/ChangeLog
+++ b/gnome-extra/libgsf/ChangeLog
@@ -1,13 +1,17 @@
 # ChangeLog for gnome-extra/libgsf
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.31 2004/05/14 02:59:48 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/ChangeLog,v 1.32 2004/05/21 06:57:01 leonardop Exp $
+
+  21 May 2004; L. Boshell <leonardop@gentoo.org> libgsf-1.9.0.ebuild,
+  files/libgsf-1.9.0-gtkdoc_fixes.patch:
+  Updated patch that fixes the destination folder for gtk-doc material.
 
   13 May 2004; Stephen P. Becker <geoman@gentoo.org> libgsf-1.8.2.ebuild:
   Stable on mips.
 
 *libgsf-1.9.0 (05 May 2004)
 
-  05 May 2004; foser <foser@gentoo.org> libgsf-1.9.0.ebuild :
+  05 May 2004; foser <foser@gentoo.org> libgsf-1.9.0.ebuild:
   New release
 
   20 Mar 2004; L. Boshell <leonardop@gentoo.org> libgsf-1.8.2.ebuild,
diff --git a/gnome-extra/libgsf/Manifest b/gnome-extra/libgsf/Manifest
index d88f2572fca4..b3cac29a11e3 100644
--- a/gnome-extra/libgsf/Manifest
+++ b/gnome-extra/libgsf/Manifest
@@ -1,11 +1,12 @@
-MD5 165e8f0cf7e72e7a9fe6bb4eda10bae1 libgsf-1.8.2.ebuild 976
-MD5 2aaf1f9b18e57bf9c0e6c78fb3d735ad libgsf-1.9.0.ebuild 918
-MD5 783580767efa8d390b44670a7cbd5e0c libgsf-1.6.0.ebuild 1158
+MD5 1394817ae7d3699414f3e4e02332836e ChangeLog 3931
+MD5 73b0f5995779d807bf5f4615bca2da75 libgsf-1.9.0.ebuild 958
 MD5 ffe68816f7989591d599c5a73bde183c libgsf-1.8.1.ebuild 1017
-MD5 07653f0d7ac0bdf4ff9c5eb5a650e646 ChangeLog 3745
+MD5 783580767efa8d390b44670a7cbd5e0c libgsf-1.6.0.ebuild 1158
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 165e8f0cf7e72e7a9fe6bb4eda10bae1 libgsf-1.8.2.ebuild 976
 MD5 9bb1a07d9b94f96998a19f49544066cf files/libgsf-1.8.2-gtkdoc_fix.patch 830
-MD5 ec1b3e9e3fc3f4373d56d58ca0335f3d files/digest-libgsf-1.6.0 65
 MD5 d0ce1181cf5d820cd7630c65aefe3025 files/digest-libgsf-1.8.1 65
 MD5 b5115c032d14e47d1895c04bc07ae06b files/digest-libgsf-1.8.2 65
 MD5 b6358f064a77a6797a70a56a7f601b7e files/digest-libgsf-1.9.0 65
+MD5 ec1b3e9e3fc3f4373d56d58ca0335f3d files/digest-libgsf-1.6.0 65
+MD5 d975c673fd2f44d6fc627e041b827658 files/libgsf-1.9.0-gtkdoc_fixes.patch 968
diff --git a/gnome-extra/libgsf/files/libgsf-1.9.0-gtkdoc_fixes.patch b/gnome-extra/libgsf/files/libgsf-1.9.0-gtkdoc_fixes.patch
new file mode 100644
index 000000000000..4caa3850357e
--- /dev/null
+++ b/gnome-extra/libgsf/files/libgsf-1.9.0-gtkdoc_fixes.patch
@@ -0,0 +1,32 @@
+diff -NurdB libgsf-1.9.0-orig/doc/Makefile.in libgsf-1.9.0/doc/Makefile.in
+--- libgsf-1.9.0-orig/doc/Makefile.in	2004-05-21 01:24:35.000000000 -0500
++++ libgsf-1.9.0/doc/Makefile.in	2004-05-21 01:28:29.000000000 -0500
+@@ -173,7 +173,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 ()" 
+@@ -188,8 +188,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 = \
+@@ -231,7 +231,7 @@
+ #
+ GPATH = $(srcdir)
+ 
+-TARGET_DIR = $(HTML_DIR)
++TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
+ 
+ EXTRA_DIST = \
+ 	$(content_files)		\
diff --git a/gnome-extra/libgsf/libgsf-1.9.0.ebuild b/gnome-extra/libgsf/libgsf-1.9.0.ebuild
index 343a1926f814..ed50c5a357ba 100644
--- a/gnome-extra/libgsf/libgsf-1.9.0.ebuild
+++ b/gnome-extra/libgsf/libgsf-1.9.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.9.0.ebuild,v 1.1 2004/05/05 12:13:13 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgsf/libgsf-1.9.0.ebuild,v 1.2 2004/05/21 06:57:01 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -25,12 +25,11 @@ DEPEND="${RDEPEND}
 	doc? ( >=dev-util/gtk-doc-0.9 )"
 
 src_unpack() {
-
 	unpack ${A}
-
 	cd ${S}
-	epatch ${FILESDIR}/${PN}-1.8.2-gtkdoc_fix.patch
 
+	# Fix doc building and destination folder
+	epatch ${FILESDIR}/${P}-gtkdoc_fixes.patch
 }
 
 G2CONF="${G2CONF} $(use_with gnome)"