Bump to 2.24.1-r1. More parallel make fixes, bug #255479 and bug #252163.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

4 files changed, 70 insertions, 10 deletions

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index 15948af9207c..af591347aaf5 100644
--- a/gnome-extra/gnome-user-docs/ChangeLog
+++ b/gnome-extra/gnome-user-docs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for gnome-extra/gnome-user-docs
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.12 2009/02/28 12:54:12 eva Exp $
+
+*gnome-user-docs-2.24.2-r1 (28 Feb 2009)
+
+  28 Feb 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-user-docs-2.24.2-parallel-make-gdu.patch,
+  gnome-user-docs-2.20.1.ebuild, -gnome-user-docs-2.24.1.ebuild,
+  +gnome-user-docs-2.24.2-r1.ebuild:
+  Bump to 2.24.1-r1. More parallel make fixes, bug #255479 and bug #252163.
 
 *gnome-user-docs-2.24.2 (11 Jan 2009)
 
diff --git a/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make-gdu.patch b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make-gdu.patch
new file mode 100644
index 000000000000..1e5835dfa48d
--- /dev/null
+++ b/gnome-extra/gnome-user-docs/files/gnome-user-docs-2.24.2-parallel-make-gdu.patch
@@ -0,0 +1,40 @@
+# Fix parallel build issue in gnome-doc-utils makefile
+# https://bugs.gentoo.org/show_bug.cgi?id=255479
+--- a/gnome-doc-utils.make
++++ b/gnome-doc-utils.make
+@@ -251,6 +251,13 @@ _DOC_POFILES = $(if $(DOC_MODULE),						
+ .PHONY: po
+ po: $(_DOC_POFILES)
+ 
++## @ _DOC_MOFILES
++## The .mo files used for translating the document
++_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES))
++
++.PHONY: mo
++mo: $(_DOC_MOFILES)
++
+ ## @ _DOC_LC_MODULES
+ ## The top-level documentation files in all other locales
+ _DOC_LC_MODULES = $(if $(DOC_MODULE),						\
+@@ -311,15 +318,18 @@ $(_DOC_POFILES):
+ 	    $(_xml2po) -e -u $(notdir $@) $$docs); \
+ 	fi
+ 
++$(_DOC_MOFILES): %.mo: %.po
++	msgfmt -o $@ $<
++
+ # FIXME: fix the dependancy
+ # FIXME: hook xml2po up
+-$(_DOC_LC_DOCS) : $(_DOC_POFILES)
++$(_DOC_LC_DOCS) : $(_DOC_MOFILES)
+ $(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
+ 	if ! test -d $(dir $@); then mkdir $(dir $@); fi
+ 	if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
+ 	(cd $(dir $@) && \
+-	  $(_xml2po) -e -p \
+-	    "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
++	  $(_xml2po) -e -t \
++	    "$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo" \
+ 	    "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \
+ 	    cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)
+ 
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.20.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.20.1.ebuild
index bf06f7aec7b2..5902d4c526a3 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.20.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-2.20.1.ebuild
@@ -1,6 +1,6 @@
-# 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.20.1.ebuild,v 1.1 2008/06/01 20:45:26 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.20.1.ebuild,v 1.2 2009/02/28 12:54:12 eva Exp $
 
 inherit gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="FDL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="arm"
 IUSE=""
 
 RDEPEND=""
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2-r1.ebuild
index b83518572345..b0af5b73f94b 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.1.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2-r1.ebuild
@@ -1,10 +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.1.ebuild,v 1.1 2008/12/21 17:09:46 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2-r1.ebuild,v 1.1 2009/02/28 12:54:12 eva Exp $
 
 GCONF_DEBUG="no"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="GNOME end user documentation"
 HOMEPAGE="http://www.gnome.org/"
@@ -24,12 +24,24 @@ DEPEND="app-text/scrollkeeper
 
 DOCS="AUTHORS ChangeLog NEWS README"
 
-# Parallel make doesn't always work (bug #135955)
-#MAKEOPTS="${MAKEOPTS} -j1"
-
 # Fails to validate, upstream bug #535906
 RESTRICT="test"
 
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper"
 }
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Fix parallel make, bug #252163
+	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${P}-parallel-make-gdu.patch"
+
+	# Ugly ugly hack but gnome-doc-utils isn't actually
+	# parallel make safe.
+	sed "s/install-data-local/install-data-hook/" \
+		-i gnome-doc-utils.make || die "sed failed"
+
+	eautoreconf
+}