Fixed installation with empty linguas, bug #297109 thank Diego E. 'Flameeyes' Pettenò for report.

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

3 files changed, 15 insertions, 4 deletions

diff --git a/app-doc/gimp-help/ChangeLog b/app-doc/gimp-help/ChangeLog
index 4214dc6b3afc..042a3bf099cf 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.59 2009/10/20 13:29:23 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/ChangeLog,v 1.60 2009/12/16 06:51:01 pva Exp $
+
+*gimp-help-2.6.0-r1 (16 Dec 2009)
+
+  16 Dec 2009; Peter Volkov <pva@gentoo.org> -gimp-help-2.6.0.ebuild,
+  +gimp-help-2.6.0-r1.ebuild:
+  Fixed installation with empty linguas, bug #297109 thank Diego E.
+  'Flameeyes' Pettenò for report.
 
 *gimp-help-2.6.0 (20 Oct 2009)
 
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 33e9123f580f..9083bf472f05 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -16,6 +16,6 @@ DIST gimp-help-2.6.0-html-ru.tar.bz2 28960430 RMD160 c76300d56e770cfdcb998b3bda5
 DIST gimp-help-2.6.0-html-sv.tar.bz2 29049203 RMD160 47c80a6151ae55e626f93342583ea4d2787e27c6 SHA1 077c8240b331ed9fca5f357bfe6313abd2b9ebaf SHA256 afc9ee5bb119544ac329ba272ffef19b2146b086de8aae1bcd13c0e19d43fe7d
 DIST gimp-help-2.6.0-html-zh_CN.tar.bz2 28337962 RMD160 1d606eb0af1aaee220977c8aedc5504decca609f SHA1 e802ec97463c4c8aecc3c6b21647a39fad70e5bc SHA256 69b17056576ea5ddd44caf4a7949569c94947c2140199328ff8214cf2ba2be8e
 EBUILD gimp-help-2.4.2.ebuild 1286 RMD160 839fc6e395556a7862c7af39dcf7dcfa2128f710 SHA1 73f73f5c0523850a62040f14a1893860f5e31268 SHA256 eb005739792985f858b8e634a3986a20b84f92080aff5f5fb4bfb0425ddaf75a
-EBUILD gimp-help-2.6.0.ebuild 1028 RMD160 74256e6dc14edc29c3e1dabc766c862ba3c6ea32 SHA1 d90b2741399c478f46a72afcdbc622dd8f68ee0c SHA256 30c49e439e6412dd4ba3791a3d699ff957eabf52a67dc5fb3eb5823632af0468
-MISC ChangeLog 8485 RMD160 16e475f2c75e9f8d4fcfff9660ea93fe1af6acb3 SHA1 b29f480010c3268b9c8cbff2453684e03c7c2816 SHA256 cba020ccc4a049550f740e8e560894327810c0af492a68992bdf1d3f33dde426
+EBUILD gimp-help-2.6.0-r1.ebuild 1327 RMD160 be1e9d47555f3690f99cd8f565bc16d0e0de9932 SHA1 41d62304ad37db1276ae4989b32b1b72bc672634 SHA256 b77679e12fbb2bf4a016d1cfa38d1603fe8f3f2c3a9c47a3466b98908d6592b0
+MISC ChangeLog 8724 RMD160 006430155982c40658def9e68074c48a3dfcc253 SHA1 3042c7d8e18b563c183a8eaf59a02b3c285f8543 SHA256 d2ce8e05976bfe9721d292e510d9672962b999cdf7a25135e6c68f46f7977bac
 MISC metadata.xml 247 RMD160 9ab021632d7f758e344b1c87e6dabf8c0d3f5038 SHA1 f88765d28a9aaddcaa11b545a66ca1e640efa454 SHA256 280a49393f87cc525776499e43a13b6cfcce14aa6af9b9958bf983435f9b05d5
diff --git a/app-doc/gimp-help/gimp-help-2.6.0.ebuild b/app-doc/gimp-help/gimp-help-2.6.0-r1.ebuild
index 9a7d791d9bbb..e6ef9008d7c3 100644
--- a/app-doc/gimp-help/gimp-help-2.6.0.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.6.0-r1.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/app-doc/gimp-help/gimp-help-2.6.0.ebuild,v 1.1 2009/10/20 13:29:23 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/gimp-help-2.6.0-r1.ebuild,v 1.1 2009/12/16 06:51:01 pva Exp $
 
 inherit eutils
 
@@ -21,7 +21,11 @@ LANGS="de en es fr it ja ko nl nn pl ru sv zh_CN"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} linguas_${X}"
 	SRC_URI="${SRC_URI} linguas_${X}? ( mirror://gimp/help/${P}-html-${X}.tar.bz2 )"
+	EMPTY_LINGUAS_SRC_URI="mirror://gimp/help/${P}-html-${X}.tar.bz2 ${EMPTY_LINGUAS_SRC_URI}"
+	EMPTY_LINGUAS_SET="!linguas_${X}? ( ${EMPTY_LINGUAS_SET} "
+	EMPTY_LINGUAS_BRAKETS="${EMPTY_LINGUAS_BRAKETS} )"
 done
+SRC_URI="${SRC_URI} ${EMPTY_LINGUAS_SET} ${EMPTY_LINGUAS_SRC_URI} ${EMPTY_LINGUAS_BRAKETS}"
 
 DEPEND=""
 RDEPEND=">=media-gfx/gimp-2.4"