media-gfx/gimp: Fix test execution (bug #406625)

Package-Manager: portage-2.1.10.51/cvs/Linux x86_64

4 files changed, 33 insertions, 7 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 2aa69a65ba74..9a5f117359cc 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.353 2012/03/14 13:01:42 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.354 2012/04/01 02:25:48 sping Exp $
+
+  01 Apr 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.6.12.ebuild,
+  +files/gimp-2.6.12-potfiles-skip.patch:
+  Fix test execution (bug #406625), patch by Julian Ospald
 
 *gimp-2.7.5 (14 Mar 2012)
 
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 6e4059e7c97c..65dbc698a68e 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX gimp-2.6.11-cve-2011-2896.patch 1818 RMD160 4cc01a8197a31f3793897150e190ea097135efe7 SHA1 fc510e48d6a0e4840b7d98d93d0d4350add167ca SHA256 6613af30b70afb984a89dc8fa75ca6ba3271471d7fd62de23a1a9fda2fd5ec89
 AUX gimp-2.6.11-file-uri.patch 2209 RMD160 17cd5c7b454e7f64f7ed50cec4d9fe160ce7f2fc SHA1 77b3f6f50934a70f2ac938cfa0a1876ee72c2d14 SHA256 cb9da632417fcc866c047104cfbe25b5b9964fa5e65e333c042fdf23c19e692f
 AUX gimp-2.6.11-poppler-0.17.patch 15620 RMD160 5f22b65bcadecbff1b67a42a6dd48fd167272bc9 SHA1 418cbe80cc5cd7f6476ce196c755344954df83e0 SHA256 69b214ff495c7cbc1f52c0c56fa9a09e4dfba47f54da8bb3c8b063b26b8d04bd
+AUX gimp-2.6.12-potfiles-skip.patch 481 RMD160 4ddf02e9f6f1c09daf9d29546bd3f107b555a016 SHA1 1419bac320d9bfec8fb92b5dabdb626013d7542d SHA256 1ed0292cab5bc744b3c4450827accc86f1719eb8e75416c282e84a8f65eb9f2f
 AUX gimp-2.7.3-glib-2.29.patch 478 RMD160 24895c62b2ad03247a8bc47d79cd55059188b283 SHA1 c4b8719c7904f4b1349e40ca1e409367a9f5997a SHA256 76a2bac5fbcaacbef592e6c137e12b72320f38224c3c9a717b82f6c34404bbdc
 AUX gimp-2.7.3-libm.patch 995 RMD160 7db10366261d3b302cac3fda669d805fa3a9d09e SHA1 612e372060d37ea13939a92eff6b5383710f9b51 SHA256 cb49b9611aca4e0082cc2f3e0c334341df3ac41009fda41355bd8af77b8601ca
 AUX gimp-2.7.4-no-deprecation.patch 1061 RMD160 b49a7e6681238be6e21fe2f4d52bdc71d1e50ed9 SHA1 5757e2b04d4b2bc4b7edebfc8bc759104bbcfbf5 SHA256 fb9532406b62a6fa12f8598b142186fad1dc4e937328c8859cb4e8e76d2b19c7
@@ -24,18 +25,18 @@ EBUILD gimp-2.6.11-r3.ebuild 3443 RMD160 602f9483084583edcbe8a43220a14205ee8c33c
 EBUILD gimp-2.6.11-r4.ebuild 3600 RMD160 76cd2144d8b8c13421120f55700560e7a0bd1d8b SHA1 6e94b7147e4d327c3531075324cc0a047d7272dd SHA256 d7b7cfb733e0980a9dd456b86d9c334bba2a5e596f61323d29ed0436015cbaca
 EBUILD gimp-2.6.11-r5.ebuild 3867 RMD160 b0eebc0e7b3cd9b8366ed2343b1e2465cd398f47 SHA1 c668a75835b150b0cf712a8b3ef60888492e10d3 SHA256 d9c1b8f087bf985f8701d95cc5d7e6861028bd27119e8025989902949f8fd8d6
 EBUILD gimp-2.6.11-r6.ebuild 4095 RMD160 bbfbf61addd5cf33fb56e2107b62e0e06f5bb6b6 SHA1 b9a35f81feef39c4ecd8833348695c22d26fe7f8 SHA256 552e6b7d8a21e071a75bdf59e80d9b05270f87f8a3a32a3d08d2292cf3564d36
-EBUILD gimp-2.6.12.ebuild 3400 RMD160 8ccdac57a3cd47185ccae8e681e87347bf2ff36b SHA1 14841bc73be06d92c3c1f830fcc432d03541d6ab SHA256 5d132e8f66b4546df6728bc7ef66696925d94e43b4ce556a85f44469b96de212
+EBUILD gimp-2.6.12.ebuild 3516 RMD160 17ff280c35d18c43c69604dc2748d0d59885eba1 SHA1 ddf4059c038093bd9ef7d718051d301b6a8ed262 SHA256 424f68adb4f0e00fa44d22aacff2776280cb3e39d3262cc5ec33f66c35c2b2a2
 EBUILD gimp-2.7.3-r1.ebuild 3626 RMD160 d074ad38f0044b1d3e405b4609c1df6fa33265f9 SHA1 855b6e26ec07ecbb04b7c2bd9407e8513222d2ba SHA256 aed8112ba79253851498cad67a25a3960fcef97ffafcc56f503a65130704850f
 EBUILD gimp-2.7.3.ebuild 3231 RMD160 23b84300a99be3edc52caf73e0a0704a97a485d3 SHA1 54577dd2fd1cbe58196750fab720bd3f7ab37394 SHA256 5788d4722d6e7f63a55d51a9c3fccc6392c5eaa19054c2121aecd8bcd5d99899
 EBUILD gimp-2.7.4.ebuild 3626 RMD160 31d1d55354410e4a37fe801e8d319d7fedc767ac SHA1 a14d2c6307c3577f8ad233c290d1278f472e340e SHA256 29071e85d79fec518f4567357cdf4fbf02cef697e630d0038a522722f37102b7
 EBUILD gimp-2.7.5.ebuild 3833 RMD160 2b3342d3047bcf5e9705108eab2ba7575aec0319 SHA1 ac9971dacac928c246b347d3e36e945191275250 SHA256 2f06e21c0c07f6fa436b0fa84c47d182f448727e6bc19b94374cd680efd6a3ad
 EBUILD gimp-9999.ebuild 3400 RMD160 daf3c36bea297dcbeb7f50284dd105b7ea7a118b SHA1 0da5a192f04ef994ac3d753e9c78656d3dd89ec6 SHA256 1f4fc471e2157ff7730e5e2ae9ba6f1c6a6f5feb2c751dac24634a538b0b320c
-MISC ChangeLog 49027 RMD160 b10e2bc29a55f6a05ceb5412bc1624670b5713f2 SHA1 30cb6a1d63d0237b9a8db86a405cb6e87be2a8c8 SHA256 76f6ca0af27741dd05838adecbe24cfe8c11cab50257d3fd90d4685cba75a214
+MISC ChangeLog 49201 RMD160 e5010118b4ca1b5558e967c092f4cad3287770c7 SHA1 5da32fd10814e23d5c0804c413215aa02ad7fa5d SHA256 11b000312a4f2308d6b18a936ff26e156c87364c68860b8ffd92a157846f570d
 MISC metadata.xml 563 RMD160 2fc275c6bf65d4b3554c7d792c062ded278e571e SHA1 a29ad2dc2f53b98e128b7d826e1a033af4321126 SHA256 a7a40cad1aedace28e65901d305de88167ca10ec527812f258da5736338af95d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk9glpoACgkQsAvGakAaFgBdqgCfbunkPWFMn5BaD5Iu3HMHpyjr
-lP8An0ogDxSWGLMp8IOKG8VO+ASXQTVl
-=pSRF
+iEYEARECAAYFAk93vJIACgkQsAvGakAaFgBlYwCfZOcE61I/tV4uLFLMAFWW6SoI
+MzkAn1RD/V3xv2kAcUWpeiyYOMnkA0Kd
+=H8J9
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/gimp/files/gimp-2.6.12-potfiles-skip.patch b/media-gfx/gimp/files/gimp-2.6.12-potfiles-skip.patch
new file mode 100644
index 000000000000..ee1b89adc5b6
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-2.6.12-potfiles-skip.patch
@@ -0,0 +1,17 @@
+From: Julian Ospald <julian.ospald@googlemail.com>
+Date: Fri Mar  2 17:29:14 CET 2012
+
+gimp-2.6.11 fails on FEATURES="test"
+correctly add "contactsheet.scm" and "test-sphere.scm" to POTFILES.skip
+
+--- po-script-fu/POTFILES.skip
++++ po-script-fu/POTFILES.skip
+@@ -37,6 +37,8 @@
+ plug-ins/pagecurl
+ plug-ins/print
+ plug-ins/pygimp
++plug-ins/script-fu/scripts/contactsheet.scm
++plug-ins/script-fu/scripts/test-sphere.scm
+ plug-ins/selection-to-path
+ plug-ins/twain
+ plug-ins/win-snap
diff --git a/media-gfx/gimp/gimp-2.6.12.ebuild b/media-gfx/gimp/gimp-2.6.12.ebuild
index 75b212596e53..ad646c3792c8 100644
--- a/media-gfx/gimp/gimp-2.6.12.ebuild
+++ b/media-gfx/gimp/gimp-2.6.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.1 2012/02/02 00:59:17 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.12.ebuild,v 1.2 2012/04/01 02:25:48 sping Exp $
 
 EAPI="3"
 
@@ -99,6 +99,10 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=653980#c6
 	epatch "${FILESDIR}"/${PN}-2.6.11-file-uri.patch
 
+	# fix test suite
+	# https://bugs.gentoo.org/show_bug.cgi?id=406625
+	epatch "${FILESDIR}"/${P}-potfiles-skip.patch
+
 	echo '#!/bin/sh' > py-compile
 	gnome2_src_prepare
 }