Bump to 2.24.2. Fix parallel make, bug #252163.

(Portage version: 2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 61 insertions, 10 deletions

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index 5f8256b7ecdb..15948af9207c 100644
--- a/gnome-extra/gnome-user-docs/ChangeLog
+++ b/gnome-extra/gnome-user-docs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gnome-user-docs
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.10 2008/12/21 17:09:46 eva Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.11 2009/01/11 22:27:24 eva Exp $
+
+*gnome-user-docs-2.24.2 (11 Jan 2009)
+
+  11 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-user-docs-2.24.2-parallel-make.patch,
+  -gnome-user-docs-2.24.0.ebuild, +gnome-user-docs-2.24.2.ebuild:
+  Bump to 2.24.2. Fix parallel make, bug #252163.
 
 *gnome-user-docs-2.24.1 (21 Dec 2008)
 
diff --git a/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make.patch b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make.patch
new file mode 100644
index 000000000000..e1051f24c6e2
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make.patch
@@ -0,0 +1,33 @@
+--- a/gnome2-accessibility-guide/Makefile.am	2009-01-11 22:50:31.000000000 +0100
++++ b/gnome2-accessibility-guide/Makefile.am	2009-01-11 22:51:27.000000000 +0100
+@@ -14,7 +14,7 @@
+ 
+ DOC_LINGUAS = de el en_GB es fi fr hu it oc pt sv
+ 
+-install-data-local: install-doc-pdf
++install-data-hook: install-doc-pdf
+ install-doc-pdf:
+ 	for lc in C $(DOC_LINGUAS); do \
+ 	  pdf="$$lc/$(DOC_MODULE).pdf"; \
+--- a/gnome2-user-guide/Makefile.am	2009-01-11 22:50:27.000000000 +0100
++++ b/gnome2-user-guide/Makefile.am	2009-01-11 22:51:49.000000000 +0100
+@@ -17,7 +17,7 @@
+ 
+ DOC_LINGUAS = ar bg de el es fi fr hu it ja ko oc pa pt pt_BR ru sv th zh_CN
+ 
+-install-data-local: install-doc-pdf
++install-data-hook: install-doc-pdf
+ install-doc-pdf:
+ 	for lc in C $(DOC_LINGUAS); do \
+ 	  pdf="$$lc/$(DOC_MODULE).pdf"; \
+--- a/gnome2-system-admin-guide/Makefile.am	2009-01-11 22:45:28.000000000 +0100
++++ b/gnome2-system-admin-guide/Makefile.am	2009-01-11 22:50:16.000000000 +0100
+@@ -20,7 +20,7 @@
+ 
+ DOC_LINGUAS = ca de el es fi fr it ja ko oc pa pt sv zh_CN
+ 
+-install-data-local: install-doc-pdf
++install-data-hook: install-doc-pdf
+ install-doc-pdf:
+ 	for lc in C $(DOC_LINGUAS); do \
+ 	  pdf="$$lc/$(DOC_MODULE).pdf"; \
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2.ebuild
index 89d139e60006..a7e5e6189a74 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.0.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.0.ebuild,v 1.1 2008/10/20 22:05:52 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2.ebuild,v 1.1 2009/01/11 22:27:24 eva Exp $
 
-inherit gnome2
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME end user documentation"
 HOMEPAGE="http://www.gnome.org/"
@@ -16,15 +18,24 @@ RDEPEND=""
 DEPEND="app-text/scrollkeeper
 	>=app-text/gnome-doc-utils-0.5.6
 	>=dev-util/pkgconfig-0.9"
+#	test? (
+#		~app-text/docbook-xml-dtd-4.1.2
+#		~app-text/docbook-xml-dtd-4.3 )"
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-# Parallel make doesn't always work (bug #135955)
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# Frequently fails to download DTDs from sourceforge
+# Fails to validate, upstream bug #535906
 RESTRICT="test"
 
 pkg_setup() {
-	G2CONF="--disable-scrollkeeper"
+	G2CONF="${G2CONF} --disable-scrollkeeper"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix parallel make, bug #252163
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+
+	eautoreconf
 }