add nasty workaround for bug #177107

Package-Manager: portage-2.1.3_rc9

4 files changed, 57 insertions, 12 deletions

diff --git a/gnome-base/gnome-vfs/ChangeLog b/gnome-base/gnome-vfs/ChangeLog
index ab0126eeb0c0..2fa7a3686b06 100644
--- a/gnome-base/gnome-vfs/ChangeLog
+++ b/gnome-base/gnome-vfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-vfs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.255 2007/07/08 05:03:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/ChangeLog,v 1.256 2007/07/30 06:51:04 compnerd Exp $
+
+  30 Jul 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch, gnome-vfs-2.18.1.ebuild:
+  Use a nasty workaround to disable gtk-doc for bug #177107
 
   08 Jul 2007; Michael Sterrett <mr_bones_@gentoo.org>
   gnome-vfs-2.16.3.ebuild, gnome-vfs-2.16.3-r1.ebuild,
diff --git a/gnome-base/gnome-vfs/Manifest b/gnome-base/gnome-vfs/Manifest
index bba0917c72a7..9d9a98287f06 100644
--- a/gnome-base/gnome-vfs/Manifest
+++ b/gnome-base/gnome-vfs/Manifest
@@ -26,6 +26,10 @@ AUX gnome-vfs-2.16.3-fbsd.patch 3720 RMD160 128799939e920ca62495b5a4c1983705f68e
 MD5 a1de5f16eaaffd076c5a9dca1edf9066 files/gnome-vfs-2.16.3-fbsd.patch 3720
 RMD160 128799939e920ca62495b5a4c1983705f68e68d2 files/gnome-vfs-2.16.3-fbsd.patch 3720
 SHA256 1b13abce546b66ad9ee51a452eae11ec709155daf21df5645974b3e43aa8d258 files/gnome-vfs-2.16.3-fbsd.patch 3720
+AUX gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856 RMD160 373f6eddf1385f98ae2b5423c7994e1aa01c1354 SHA1 f420c7dc4c5e52883e22ce507daecdcdb4813f38 SHA256 f001773ae69346a5e09746f308bda8f4f2c2383ee889d69b342367bee288db5b
+MD5 8baa9af4bd2aad66e8e0d9e4e04eb9bf files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856
+RMD160 373f6eddf1385f98ae2b5423c7994e1aa01c1354 files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856
+SHA256 f001773ae69346a5e09746f308bda8f4f2c2383ee889d69b342367bee288db5b files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch 856
 DIST gnome-vfs-2.14.2.tar.bz2 1816194 RMD160 e0a67e3576d72a86c898208a93ad8ee52f72f870 SHA1 ffd2e5f229495f55587d8499e5f2b8b8a76e5448 SHA256 15da9d174d2373826a6921c8af2aac18aa64c6d93ac201903c9fb432e142bba7
 DIST gnome-vfs-2.16.3.tar.bz2 1900424 RMD160 9600bb4f4630d48600c1469fa5077d8e969a10cc SHA1 a4c97179e2c4abf8cfcf236e56f7d328feaef89b SHA256 657df4d40dd1c8cbc9a266b9f38fea36019ef8a917eafcd3c38c840b8e9c7777
 DIST gnome-vfs-2.18.0.1.tar.bz2 1830575 RMD160 6bcf6283fa73942e945e49bf1ad4b5995760a2a0 SHA1 d0dd9d3a73ecc88ab1645fc563c1ff708d5e0d11 SHA256 9e881e9f9ea4fb8d1d55c804b55829ac3b349b0b8a5c11e66dee44898acc3227
@@ -46,14 +50,14 @@ EBUILD gnome-vfs-2.18.0.1.ebuild 2486 RMD160 1cdc18321d6b6960288435dd5677b904999
 MD5 faf789e24b48770f9415fffd31ec2c23 gnome-vfs-2.18.0.1.ebuild 2486
 RMD160 1cdc18321d6b6960288435dd5677b9049999704e gnome-vfs-2.18.0.1.ebuild 2486
 SHA256 3ad07478f4d96823f3eb06ebf9131a84852ade6e635a19746305907f6183207d gnome-vfs-2.18.0.1.ebuild 2486
-EBUILD gnome-vfs-2.18.1.ebuild 2379 RMD160 aeed3939d1cece30df988779cfe1a4edca2c88a8 SHA1 24e6ba3a0c5fcf3628dab88f0259fad9222dc7ab SHA256 80f4a7d04e3d77853a4da9cde581e848ee553a7b650120777372703c83b250bb
-MD5 fae70b73094330226abe7ae901eb6278 gnome-vfs-2.18.1.ebuild 2379
-RMD160 aeed3939d1cece30df988779cfe1a4edca2c88a8 gnome-vfs-2.18.1.ebuild 2379
-SHA256 80f4a7d04e3d77853a4da9cde581e848ee553a7b650120777372703c83b250bb gnome-vfs-2.18.1.ebuild 2379
-MISC ChangeLog 32921 RMD160 5aef186e22e27d8a06d604ff03a44c83979aee2d SHA1 e210bed35959d447c6084955d9081ba44573289a SHA256 96b55530b308aa19900a02d954ec3863c346d6e7b9cb68d147a62873b610e128
-MD5 ad8c040cbc015a16aaa9c987f9c27fd4 ChangeLog 32921
-RMD160 5aef186e22e27d8a06d604ff03a44c83979aee2d ChangeLog 32921
-SHA256 96b55530b308aa19900a02d954ec3863c346d6e7b9cb68d147a62873b610e128 ChangeLog 32921
+EBUILD gnome-vfs-2.18.1.ebuild 2459 RMD160 861be11c276d3126e654dc48f8c601c924844e97 SHA1 ac8dd65ea1d846059cb67d8961910698e37b21bb SHA256 a2794a4ce5d3ee0599aa980f4c782bb2265d52a28563ff501630d32c691c1a33
+MD5 eacf4611dca142ac2f0677be5cf95f3e gnome-vfs-2.18.1.ebuild 2459
+RMD160 861be11c276d3126e654dc48f8c601c924844e97 gnome-vfs-2.18.1.ebuild 2459
+SHA256 a2794a4ce5d3ee0599aa980f4c782bb2265d52a28563ff501630d32c691c1a33 gnome-vfs-2.18.1.ebuild 2459
+MISC ChangeLog 33114 RMD160 4432e48b7b13f34a9aa5ec22a749968d74db0d82 SHA1 48238969b0d8b31070ec05babe0349d7da8b48a0 SHA256 6822df302e12ed8e48e0952a2c587ec02b20deed6fc88fd18e4fca10747fee64
+MD5 85b031968a2f363c000cfa2d636abca3 ChangeLog 33114
+RMD160 4432e48b7b13f34a9aa5ec22a749968d74db0d82 ChangeLog 33114
+SHA256 6822df302e12ed8e48e0952a2c587ec02b20deed6fc88fd18e4fca10747fee64 ChangeLog 33114
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/gnome-base/gnome-vfs/files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch b/gnome-base/gnome-vfs/files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch
new file mode 100644
index 000000000000..2cca0269cdc4
--- /dev/null
+++ b/gnome-base/gnome-vfs/files/gnome-vfs-2.18.1-drop-gtk-doc-check.patch
@@ -0,0 +1,35 @@
+--- configure.in	2007-07-30 00:18:01.000000000 -0500
++++ configure.in	2007-07-30 00:37:03.000000000 -0500
+@@ -1245,8 +1245,14 @@
+ dnl *** Checks for gtk-doc ***
+ dnl **************************
+ 
++dnl Crazy hack for dropping the dep on gtk-doc
++AC_DEFUN(GTK_DOC_CHECK, [])
+ GTK_DOC_CHECK([1.0])
+ 
++dnl Crazy hack for dropping the dep on gtk-doc
++AM_CONDITIONAL(ENABLE_GTK_DOC, 0, [])
++AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, 0, [])
++
+ dnl ******************************
+ dnl *** End checks for gtk-doc ***
+ dnl ******************************
+--- Makefile.am	2007-07-30 00:31:41.000000000 -0500
++++ Makefile.am	2007-07-30 00:33:55.000000000 -0500
+@@ -7,11 +7,14 @@
+ 	daemon					\
+ 	schemas					\
+ 	devel-docs				\
+-	doc					\
+ 	programs				\
+ 	test					\
+ 	po
+ 
++if ENABLE_GTK_DOC
++SUBDIRS += doc
++endif
++
+ EXTRA_DIST =					\
+ 	HACKING					\
+ 	MAINTAINERS 				\
diff --git a/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild b/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild
index 1fdd884d7f00..b190f56a2bcd 100644
--- a/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild
+++ b/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild,v 1.2 2007/07/08 05:03:55 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-vfs/gnome-vfs-2.18.1.ebuild,v 1.3 2007/07/30 06:51:04 compnerd Exp $
 
 WANT_AUTOMAKE=1.8
 inherit eutils gnome2 autotools
@@ -40,10 +40,10 @@ RDEPEND=">=gnome-base/gconf-2
 	avahi? ( >=net-dns/avahi-0.6 )"
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/gtk-doc-1
 	gnome-base/gnome-common
 	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.9"
+	>=dev-util/pkgconfig-0.9
+	doc? ( >=dev-util/gtk-doc-1 )"
 PDEPEND="hal? ( >=gnome-base/gnome-mount-0.4 )"
 
 DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
@@ -85,6 +85,8 @@ src_unpack() {
 	# Fix for crashes running programs via sudo
 	epatch "${FILESDIR}"/${PN}-2.16.0-no-dbus-crash.patch
 
+	use doc || epatch "${FILESDIR}/${PN}-2.18.1-drop-gtk-doc-check.patch"
+
 	eautoreconf
 	intltoolize --force
 }