summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2009-12-27 03:27:26 +0000
committerNirbheek Chauhan <nirbheek@gentoo.org>2009-12-27 03:27:26 +0000
commit8ac46ba46c5da184135bb3acb3d021913d44e18c (patch)
tree987bf74daaa8a67a4b893927f7afcbc42f1e3f40 /gnome-extra
parentAdd dependency on doxygen for USE=doc (diff)
downloadgentoo-2-8ac46ba46c5da184135bb3acb3d021913d44e18c.tar.gz
gentoo-2-8ac46ba46c5da184135bb3acb3d021913d44e18c.tar.bz2
gentoo-2-8ac46ba46c5da184135bb3acb3d021913d44e18c.zip
Add patch for fixing parallel build failure with USE=doc, bug 293247 ; patch by Ed Catmur
(Portage version: 2.1.7.16/cvs/Linux i686)
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/polkit-gnome/ChangeLog8
-rw-r--r--gnome-extra/polkit-gnome/files/polkit-gnome-0.95-parallel-build-failure.patch15
-rw-r--r--gnome-extra/polkit-gnome/polkit-gnome-0.95.ebuild11
3 files changed, 31 insertions, 3 deletions
diff --git a/gnome-extra/polkit-gnome/ChangeLog b/gnome-extra/polkit-gnome/ChangeLog
index 0c080e457e34..94b43c39a616 100644
--- a/gnome-extra/polkit-gnome/ChangeLog
+++ b/gnome-extra/polkit-gnome/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for gnome-extra/polkit-gnome
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.2 2009/11/14 16:17:35 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/ChangeLog,v 1.3 2009/12/27 03:27:25 nirbheek Exp $
+
+ 27 Dec 2009; Nirbheek Chauhan <nirbheek@gentoo.org>
+ polkit-gnome-0.95.ebuild,
+ +files/polkit-gnome-0.95-parallel-build-failure.patch:
+ Add patch for fixing parallel build failure with USE=doc, bug 293247 ;
+ patch by Ed Catmur
*polkit-gnome-0.95 (14 Nov 2009)
diff --git a/gnome-extra/polkit-gnome/files/polkit-gnome-0.95-parallel-build-failure.patch b/gnome-extra/polkit-gnome/files/polkit-gnome-0.95-parallel-build-failure.patch
new file mode 100644
index 000000000000..246b60291c20
--- /dev/null
+++ b/gnome-extra/polkit-gnome/files/polkit-gnome-0.95-parallel-build-failure.patch
@@ -0,0 +1,15 @@
+Fix parallel build failure
+
+http://bugs.gentoo.org/show_bug.cgi?id=293247
+
+---
+--- docs/Makefile.am
++++ docs/Makefile.am
+@@ -61,6 +61,7 @@ FIXXREF_OPTIONS=
+
+ if ENABLE_GTK_DOC
+ include $(top_srcdir)/gtk-doc.make
++$(DOC_MAIN_SGML_FILE): sgml-build.stamp
+ else
+ CLEANFILES =
+ EXTRA_DIST = $(HTML_IMAGES)
diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.95.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.95.ebuild
index e4dfabcf7c81..8287fe1eca7a 100644
--- a/gnome-extra/polkit-gnome/polkit-gnome-0.95.ebuild
+++ b/gnome-extra/polkit-gnome/polkit-gnome-0.95.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.95.ebuild,v 1.2 2009/12/25 17:57:43 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/polkit-gnome/polkit-gnome-0.95.ebuild,v 1.3 2009/12/27 03:27:25 nirbheek Exp $
EAPI="2"
-inherit eutils gnome2
+inherit autotools eutils gnome2
DESCRIPTION="PolicyKit policies and configurations for the GNOME desktop"
HOMEPAGE="http://hal.freedesktop.org/docs/PolicyKit"
@@ -40,4 +40,11 @@ pkg_setup() {
src_prepare() {
# Fix make check, bug 298345
epatch "${FILESDIR}/${P}-fix-make-check.patch"
+
+ if use doc; then
+ # Fix parallel build failure, bug 293247
+ epatch "${FILESDIR}/${P}-parallel-build-failure.patch"
+
+ eautoreconf
+ fi
}