New version for GNOME 2.26. Tests are finally working. Clean up old revisions.

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

4 files changed, 23 insertions, 69 deletions

diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog
index d557e0fb81e8..f51b159f3388 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.20 2009/04/28 11:00:13 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.21 2009/05/11 23:21:05 eva Exp $
+
+*gnome-user-docs-2.26.1 (11 May 2009)
+
+  11 May 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gnome-user-docs-2.20.1.ebuild, -gnome-user-docs-2.22.1.ebuild,
+  -gnome-user-docs-2.24.2.ebuild, +gnome-user-docs-2.26.1.ebuild:
+  New version for GNOME 2.26. Tests are finally working. Clean up old
+  revisions.
 
   28 Apr 2009; Raúl Porcel <armin76@gentoo.org>
   gnome-user-docs-2.24.2-r1.ebuild:
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
deleted file mode 100644
index 5902d4c526a3..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.20.1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# 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.2 2009/02/28 12:54:12 eva Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="FDL-1.1"
-SLOT="0"
-KEYWORDS="arm"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.5.6
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# Parallel make doesn't always work (bug #135955)
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper"
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.22.1.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.22.1.ebuild
deleted file mode 100644
index c32cc1ef77f4..000000000000
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.22.1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2008 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.22.1.ebuild,v 1.7 2008/11/13 19:19:50 ranger Exp $
-
-inherit gnome2
-
-DESCRIPTION="GNOME end user documentation"
-HOMEPAGE="http://www.gnome.org/"
-
-LICENSE="FDL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=""
-DEPEND="app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.5.6
-	>=dev-util/pkgconfig-0.9"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-
-# Parallel make doesn't always work (bug #135955)
-MAKEOPTS="${MAKEOPTS} -j1"
-
-# Frequently fails to download DTDs from sourceforge
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="--disable-scrollkeeper"
-}
diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.26.1.ebuild
index a7e5e6189a74..72f7bb4b3b53 100644
--- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.24.2.ebuild
+++ b/gnome-extra/gnome-user-docs/gnome-user-docs-2.26.1.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.1 2009/01/11 22:27:24 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.26.1.ebuild,v 1.1 2009/05/11 23:21:05 eva Exp $
 
 GCONF_DEBUG="no"
 
@@ -12,21 +12,18 @@ HOMEPAGE="http://www.gnome.org/"
 LICENSE="FDL-1.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
+IUSE="test"
 
 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 )"
+	>=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"
 
-# Fails to validate, upstream bug #535906
-RESTRICT="test"
-
 pkg_setup() {
 	G2CONF="${G2CONF} --disable-scrollkeeper"
 }
@@ -35,7 +32,13 @@ src_unpack() {
 	gnome2_src_unpack
 
 	# Fix parallel make, bug #252163
-	epatch "${FILESDIR}/${P}-parallel-make.patch"
+	epatch "${FILESDIR}/${PN}-2.24.2-parallel-make.patch"
+	epatch "${FILESDIR}/${PN}-2.24.2-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
 }