Version bump, removed -j1 as it was fixed upstream. Made installable with gimp-2.6, bug #240433, thank Jeroen Roovers and Night Nord for report.

Package-Manager: portage-2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686

3 files changed, 16 insertions, 29 deletions

diff --git a/app-doc/gimp-help/ChangeLog b/app-doc/gimp-help/ChangeLog
index e697e561e010..5ccbf39fb1b0 100644
--- a/app-doc/gimp-help/ChangeLog
+++ b/app-doc/gimp-help/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-doc/gimp-help
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.52 2008/07/24 21:39:41 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.53 2008/10/11 19:28:21 pva Exp $
+
+*gimp-help-2.4.2 (11 Oct 2008)
+
+  11 Oct 2008; Peter Volkov <pva@gentoo.org> -gimp-help-2.4.0.ebuild,
+  +gimp-help-2.4.2.ebuild:
+  Version bump, removed -j1 as it was fixed upstream. Made installable with
+  gimp-2.6, bug #240433, thank Jeroen Roovers and Night Nord for report.
 
   24 Jul 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 2a044db94664..5ca3c716ee15 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,23 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gimp-help-0.13-image-files.patch 458 RMD160 4f9373f15b66ddeb9cc941176ad3b9c320e0ed66 SHA1 f03455d8362ed11c338ab41cfb0fee3c581c40cc SHA256 08a6b583de5c32d11ddc001e702904c42f8b1d9313d9bc398fdbae5cd73c7e53
 AUX gimp-help-2.4.0-quickreference-linguas.patch 1359 RMD160 215d7fe20c55f85cddc9f0342ac672c3b46d2d57 SHA1 2c473b52c517d68e5edd46fd7b51016a7d4e42cf SHA256 900787059de08dafa98c194ca518239123cafa81d09605be4cfb65015aca609f
 AUX gimp-help-2.4.0-skip-linguas-images.patch 1507 RMD160 4fedd8a403ddd7f2a81449131758b6b92df464b7 SHA1 6740716b797693f4852dd94a34c8d7edf3043dbb SHA256 07a008f46574f6ce3b8ac4ebb5d1098b85320fddb6e2ce83f8ca3fdda2ec173f
 DIST gimp-help-2-0.12.tar.gz 59806667 RMD160 739a2d032ee8d8f852888bc41ec8ce10b3acea03 SHA1 f54a574fe50fa6bac121348bd2aaf7e6492f617a SHA256 605617b0ce9142f6762eefeabd427ba33dfe846bd7d8c543f1cdd26baa4a41b4
 DIST gimp-help-2-0.13.tar.gz 74245267 RMD160 311ea605d1b768a7b8d8013e15e58763ea6d0b72 SHA1 a288838d329521503de83f3d71ed418f3298721e SHA256 26608aaea237494c8554d2b77044e3e98a939505e6e218ca8b2dd7b186c8eece
-DIST gimp-help-2.4.0.tar.bz2 81555148 RMD160 a84d87aa77207b9b1cc6653fd8b6fe5b8eeeead5 SHA1 a9d65ca8b4e54245d35db9f290f469a44710390d SHA256 5cdf56bf048665a84b2379c25971d9b23d2e150f469e2e457947774cb3ab1c02
 DIST gimp-help-2.4.1.tar.bz2 44892363 RMD160 c061c94bd48b5a6b2d2c4247c764147410f59fc5 SHA1 d875a73de4afd0fc134cb73b428b90868ddeb32c SHA256 b5cc43de5b92c10dcd53209af1cc10114072be46a884ef4538f7fdc7ae2fc673
+DIST gimp-help-2.4.2.tar.bz2 49365211 RMD160 368c9c75b1a28637091de57edcd26722cf6e199a SHA1 461ac31e8299185d3f16c658c5008090691e45ef SHA256 e66c577aba33b02123f08decac6191f4a2fdbb1a12744fbb6d1275fa8c4c9745
 EBUILD gimp-help-0.12.ebuild 1863 RMD160 9a01f8216dcb77ba02960f819a3b15d5cdb7f639 SHA1 9b35f2f6e7116902b4b482ea9f6f89ef0567b915 SHA256 62dcb816fcd6d1bb2c9b7756ca5f8f4465b36561888072fb38a65e5b7272980d
 EBUILD gimp-help-0.13.ebuild 1959 RMD160 4be91c28d81cd46b09ccce18b827412ba6a90877 SHA1 2a5f07a1df59b276bf8ff23e1c56e0149f88f30e SHA256 89d176fa76c3cb0b159f30dd32152d723f05fbaad654d8d706e8aeaed825a832
-EBUILD gimp-help-2.4.0.ebuild 1470 RMD160 2cd106e83ee58c4262d7640e6bef095f7548f2d2 SHA1 b9cc89923a0fcd1d160ef39312138ac5bae9451f SHA256 d6f4636c4793172c5bea86ef432b2410a6fb404fdeafe078721016db878a8eb7
 EBUILD gimp-help-2.4.1.ebuild 1294 RMD160 e822a2268f73eb3098684a99fc4d3f7503a87c7e SHA1 5f5b9b815f9af01761e319a5842f9c92e537a2bf SHA256 2cc4aa4a716698d0d08985404a7955d8582a4c9a9b4eb703a6eaa4461c72b367
-MISC ChangeLog 7418 RMD160 490fde3e9fe751de4959db90dcdae84703844b4b SHA1 25818092a60aef5482bc52c33b06584d2ab06262 SHA256 2dab0d685dae2c144249899d5f40c7e15445e47ff5c5388558660e40dbc89820
+EBUILD gimp-help-2.4.2.ebuild 1291 RMD160 d7258e9410f6d95f3e64f44df1533d24709b0902 SHA1 5029a766c82235d57eab647fff93cf4d789c83bf SHA256 0abf3c71adb32dc400f14ca9da7f5beced3ab8a5bf0eea4fd621aebe4a09e831
+MISC ChangeLog 7694 RMD160 22dd9cd8b3c758202b234b2b900cd1da379c8d5f SHA1 c1a93245ebdde10240f15f6a5085a543d4e54cce SHA256 c4d6c0a6374ddc000648b10202b58e54d351358c9dec541b2d320832e68d8bc1
 MISC metadata.xml 391 RMD160 b35843b074c41ec3eb286a74261d97603886a8d8 SHA1 5aa3b018fc81f8ea1873bc40592ad550e4fe9b8c SHA256 c7c816712c3a248fe45b67d6b92048c5f30ec7d7492eebd75890031d6819b960
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkiI9qIACgkQoeSe8B0zEfxi1ACeOoDbQIIfuCId35BkquE0XIi6
-30gAnA9DusTRU8wdI6N70ncJcpLSNzWI
-=k9Ud
------END PGP SIGNATURE-----
diff --git a/app-doc/gimp-help/gimp-help-2.4.0.ebuild b/app-doc/gimp-help/gimp-help-2.4.2.ebuild
index 4c11905cb67e..369933539d67 100644
--- a/app-doc/gimp-help/gimp-help-2.4.0.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.4.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/gimp-help-2.4.0.ebuild,v 1.4 2008/03/09 00:25:11 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/gimp-help-2.4.2.ebuild,v 1.1 2008/10/11 19:28:21 pva Exp $
 
-inherit eutils autotools
+inherit eutils
 
 DESCRIPTION="GNU Image Manipulation Program help files"
 HOMEPAGE="http://docs.gimp.org/"
@@ -17,7 +17,7 @@ IUSE=""
 # Only *not* outdated translations (see, configure.ac) are listed.
 # On update do not forgive to check quickreference/Makefile.am for
 # QUICKREFERENCE_ALL_LINGUAS. LANGS should include that langs too.
-LANGS="de en es fr it ko nl no ru sv"
+LANGS="de en es fr it ko nl no pl ru sv"
 
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
@@ -26,16 +26,7 @@ done
 DEPEND="=app-text/docbook-xml-dtd-4.3*
 		dev-libs/libxml2
 		dev-libs/libxslt"
-RDEPEND="=media-gfx/gimp-2.4*"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-skip-linguas-images.patch
-	epatch "${FILESDIR}"/${P}-quickreference-linguas.patch
-	eautoreconf
-}
+RDEPEND=">=media-gfx/gimp-2.4"
 
 src_compile() {
 	local ALL_LINGUAS=""
@@ -50,11 +41,10 @@ src_compile() {
 		--disable-network \
 		|| die "econf failed"
 
-	emake -j1 || die "emake failed"
+	emake || die "emake failed"
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "make install failed"
-
 	dodoc AUTHORS ChangeLog HACKING NEWS README TERMINOLOGY
 }