Fix parallel make when monodoc is installed. Monodoc is automagic, so drop doc useflag.

Package-Manager: portage-2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64

4 files changed, 28 insertions, 16 deletions

diff --git a/dev-dotnet/gtk-sharp/ChangeLog b/dev-dotnet/gtk-sharp/ChangeLog
index 4d20013f4f3b..3648aa1a0ea0 100644
--- a/dev-dotnet/gtk-sharp/ChangeLog
+++ b/dev-dotnet/gtk-sharp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-dotnet/gtk-sharp
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.81 2008/11/19 23:29:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/ChangeLog,v 1.82 2008/11/23 21:02:03 loki_val Exp $
+
+  23 Nov 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/gtk-sharp-2.12.0-doc-parallelmake.patch, gtk-sharp-2.12.6.ebuild:
+  Fix parallel make when monodoc is installed. Monodoc is automagic, so drop
+  doc useflag.
 
 *gtk-sharp-2.12.6 (19 Nov 2008)
 
diff --git a/dev-dotnet/gtk-sharp/Manifest b/dev-dotnet/gtk-sharp/Manifest
index 1d0dd45ffbed..03d78da393ef 100644
--- a/dev-dotnet/gtk-sharp/Manifest
+++ b/dev-dotnet/gtk-sharp/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gtk-sharp-2.12.0-doc-parallelmake.patch 495 RMD160 c8eaba7fa0b60a400f8a3497fb144ac8e8e7c095 SHA1 9a7ce34d53b8c9031234de43c8e4d7b37adad583 SHA256 7a23fe2862662b300a403a4c51dabf4434de81469e0ba4dd24ae63a294109543
 AUX gtk-sharp-2.12.0-noautomagic.patch 1336 RMD160 af13c7e2b7f9dea2b4071e00a15ca824529d759f SHA1 a93222665f650abc2afd6020d8b3f7492d55c0aa SHA256 9e9d1523b70859e1450f0c1088e39050711ee0f1760047cd02e6a7c8cbd866b1
 AUX gtk-sharp-2.12.0-parallelmake.patch 3331 RMD160 e7e76fdff7140d8d7b86a8f090e809423a4e2f53 SHA1 227bf898cf23fd70dcc83389a660ceea39842995 SHA256 b91519acbe57beff4d6cc0f8a1face8f024470daab3512fab87c5c2c95a15744
 AUX gtk-sharp-2.12.0-respect-choices.patch 3718 RMD160 0b33964d4c553470d61ef31e26e608132b5ec792 SHA1 0649543ce49dde24eced06ff03a376820aab5fe0 SHA256 de8ec0bc3a737ecc5bb6f55bcfdf8fe566a681fa252290cbd2f02b0b0d279bd1
@@ -15,14 +13,7 @@ DIST gtk-sharp-2.8.2.tar.gz 2167942 RMD160 90b450617b1a817047a948ef28d45077cb3f9
 EBUILD gtk-sharp-1.0.10.ebuild 1570 RMD160 21279eeb34cb1607001ed39cccb34355ccd74ba1 SHA1 fdbb9f5d94c385d678621219b76178ac1a91fe89 SHA256 acee58945af14518942f0597d8480d14ad660796351b8463f9d8a87f06154304
 EBUILD gtk-sharp-2.10.0.ebuild 1698 RMD160 ad3cf1f0789a2090380862c9b73e6fca9912b0d1 SHA1 f3e8ee3ab3a07fb1fcbce0a1f3728a32192876fb SHA256 8b947cdc73cd49da353c64e52b1cfe4eea72fdeb653567835f2127bcc554faca
 EBUILD gtk-sharp-2.10.2.ebuild 1421 RMD160 7b0363f3ecbd9757877ff3ca0a136d36b233f0ea SHA1 9227c73a18c4075b41f7621d2099e5d76079f8b4 SHA256 fd08873ad9e67048504958bdbafe91223e659d0df068334e2cab3ee3dfbded95
-EBUILD gtk-sharp-2.12.6.ebuild 1400 RMD160 9ecb2fdddf4234cf1dde7b5b3b0c5465a5135145 SHA1 fdeb17180d1f17e1b19a49ea76985559b03298bc SHA256 8136bc8760024acf81b333b87135e1402f1abf10dcbae1232972afd45ff572cc
+EBUILD gtk-sharp-2.12.6.ebuild 1444 RMD160 f0193f91cbf6e723b43b98405c1d33adc2a85a6a SHA1 6876588f229c6567039dd98b66adf21f0f222167 SHA256 cc8a6bd6bd8f158bc3613a0419c9f49ce7fad8d1d1a001be920ec68535a2c57e
 EBUILD gtk-sharp-2.8.2.ebuild 1895 RMD160 934eff5f5eabe0b0c3488691a9492e04b4bd5f0d SHA1 5a3a9954702bb92486f23be7fb3d7a4ca6da0ff7 SHA256 cb01fbf1b74f23d0ecab3d60e660a4516fe2f78f61cac641b6b2a3f02983047c
-MISC ChangeLog 17531 RMD160 bd9b59adb40f65bf633b2b9a7393ab3d6112266b SHA1 cedee6fece219fa6c8a47464f182b4d72bc67583 SHA256 c04a70c1cbd522f38ef8a9207fd1a2f3bcc4d22142194ec92b318b3f3a4ca5e2
+MISC ChangeLog 17751 RMD160 6ef4f5e0eb7651c3526c7c8a22c0b5413e291de5 SHA1 7b293f73a220bddc35b79bbbeed54a56dc6658bb SHA256 b933c7f89a8e3ea276d7435d7ff32b6faa732580daf240e2a4beff1c1c7e69a6
 MISC metadata.xml 482 RMD160 1cb7dc6159f8a7c406fda6c4fb11cbae342efc08 SHA1 3ef7a90f0cf6fd1ce97e24aac5667c535eb1ba3c SHA256 1925f223cb1a5389ce0910d60f34306c836d40af4797e2d749ba6f869f75eddb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkkkoXMACgkQAiZjviIA2Xic4gCgxvSTLFy+BcorOmMdm65R3Qda
-0FMAoKorqw7cnNDLVgUuoU6pIleOMmAZ
-=H/Qw
------END PGP SIGNATURE-----
diff --git a/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch
new file mode 100644
index 000000000000..3046e55f64ed
--- /dev/null
+++ b/dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch
@@ -0,0 +1,15 @@
+Index: doc/Makefile.am
+===================================================================
+--- doc/Makefile.am	(revision 118618)
++++ doc/Makefile.am	(working copy)
+@@ -32,7 +32,9 @@
+ 
+ assemble: gtk-sharp-docs.zip gtk-sharp-docs.tree
+ 
+-gtk-sharp-docs.zip gtk-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
++gtk-sharp-docs.tree: gtk-sharp-docs.zip
++
++gtk-sharp-docs.zip: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+ 	$(MDASSEMBLER) --ecma $(srcdir)/en -o gtk-sharp-docs
+ 
+ get-assemblies:
diff --git a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
index 760233453cbc..c1a8febea8ff 100644
--- a/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
+++ b/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild,v 1.1 2008/11/19 23:29:44 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild,v 1.2 2008/11/23 21:02:03 loki_val Exp $
 
 EAPI="1"
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnome/sources/${PN}/${PV%.*}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
-IUSE="doc +glade"
+IUSE="+glade"
 
 RDEPEND=">=dev-lang/mono-1.1.9
 		glade? ( >=gnome-base/libglade-2.3.6 )
@@ -21,7 +21,7 @@ RDEPEND=">=dev-lang/mono-1.1.9
 		!<dev-dotnet/glade-sharp-9999"
 DEPEND="${RDEPEND}
 		>=dev-util/pkgconfig-0.19
-		doc? ( >=dev-util/monodoc-1.1.8 )"
+		>=dev-util/monodoc-1.1.8"
 
 RESTRICT="test"
 
@@ -31,6 +31,7 @@ src_unpack() {
 
 	# Upstream bug #421063
 	epatch "${FILESDIR}/${PN}-2.12.0-parallelmake.patch"
+	epatch "${FILESDIR}/${PN}-2.12.0-doc-parallelmake.patch"
 	# Upstream bug #443174
 	epatch "${FILESDIR}/${PN}-2.12.0-respect-choices.patch"
 	# Upstream bug #443180