summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-11-23 21:02:03 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-11-23 21:02:03 +0000
commit4858a38f669a580870fd908a5209a8170e1ae00d (patch)
tree0321012c060a8b68385b16ac292a686d39479901 /dev-dotnet/gtk-sharp
parentVersion bump for rhel5 based kernels. Dropped prevent-gcc-smartness.patch as ... (diff)
downloadgentoo-2-4858a38f669a580870fd908a5209a8170e1ae00d.tar.gz
gentoo-2-4858a38f669a580870fd908a5209a8170e1ae00d.tar.bz2
gentoo-2-4858a38f669a580870fd908a5209a8170e1ae00d.zip
Fix parallel make when monodoc is installed. Monodoc is automagic, so drop doc useflag.
(Portage version: 2.2_rc14/cvs/Linux 2.6.28-rc4 x86_64)
Diffstat (limited to 'dev-dotnet/gtk-sharp')
-rw-r--r--dev-dotnet/gtk-sharp/ChangeLog7
-rw-r--r--dev-dotnet/gtk-sharp/files/gtk-sharp-2.12.0-doc-parallelmake.patch15
-rw-r--r--dev-dotnet/gtk-sharp/gtk-sharp-2.12.6.ebuild7
3 files changed, 25 insertions, 4 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/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