Fixed issues on Mac OS. Always install en (fallback) images.

(Portage version: 2.1.1-r2)
 (Unsigned Manifest commit)

3 files changed, 15 insertions, 82 deletions

diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 2019a257fede..4300431ca9c1 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,25 +1,25 @@
-AUX gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2114 RMD160 350e5b2a34ead5c99c6dbc402be5e544c9b8fd20 SHA1 dbd0841877a1a5ec3eb4296fb85b5c6553afe027 SHA256 292ada30c79f914a423a453b00af5c777c1cebea399343d35fe9c02e282c4cf2
-MD5 e5299db1f78d512bbd9de8e0cdaaae9a files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2114
-RMD160 350e5b2a34ead5c99c6dbc402be5e544c9b8fd20 files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2114
-SHA256 292ada30c79f914a423a453b00af5c777c1cebea399343d35fe9c02e282c4cf2 files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2114
+AUX gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2096 RMD160 260e9531a40630048708f8f8c2d1d4d9c024979d SHA1 403dae4280597ab70f034af563d677e0cc9489e7 SHA256 1e5ea9fecc99b34625619e3244200582317550c99d80dc618072e356fdf92abe
+MD5 5276babff4db32133cdf20b94f2d461c files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2096
+RMD160 260e9531a40630048708f8f8c2d1d4d9c024979d files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2096
+SHA256 1e5ea9fecc99b34625619e3244200582317550c99d80dc618072e356fdf92abe files/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch 2096
 DIST gimp-help-2-0.10.tar.gz 41802089 RMD160 8bf675b1973077f810382d90f36e8c4057e22aea SHA1 82cfde38b53f4b497d89dd7551c707980f7ad2a6 SHA256 cd1cd381435823809264e10ede6d597ec46d443c5bcd7b803da4190ba505454f
 DIST gimp-help-2-0.11.tar.gz 52058316 RMD160 edfa32797ed6c93048e510b2c4f39f4738468b49 SHA1 b78e8e24b03bd923da7f5f21f99566d789aad963 SHA256 ad1238962ac3eea36b2d07f210e7716f4892b46b49efb313de03c3b71499f9e6
 EBUILD gimp-help-0.10.ebuild 1612 RMD160 dfbb11a3ac1f0d61b677fe1469c06e9e7f0770c1 SHA1 c27f7da3ab4eea7e1fd90e4f5b4d3dfa83e35039 SHA256 03fe6b95dbe6e20b364a191af09d8bb15b79547af46fb4bc1114bc70f64d8eb8
 MD5 812c562338de18f6decdf81e0441abd8 gimp-help-0.10.ebuild 1612
 RMD160 dfbb11a3ac1f0d61b677fe1469c06e9e7f0770c1 gimp-help-0.10.ebuild 1612
 SHA256 03fe6b95dbe6e20b364a191af09d8bb15b79547af46fb4bc1114bc70f64d8eb8 gimp-help-0.10.ebuild 1612
-EBUILD gimp-help-0.11-r1.ebuild 2006 RMD160 77a1b2952c21d5b9dc9e83b319cce3db32ef2a48 SHA1 a3689e3dc21ef13f156ebad842e5579bf5d5c653 SHA256 20ed14ea79f2907f67dec998073395f84b07e71f56d5851953defa580a4efb57
-MD5 2e7e18e45f32691759b5274cd36a8720 gimp-help-0.11-r1.ebuild 2006
-RMD160 77a1b2952c21d5b9dc9e83b319cce3db32ef2a48 gimp-help-0.11-r1.ebuild 2006
-SHA256 20ed14ea79f2907f67dec998073395f84b07e71f56d5851953defa580a4efb57 gimp-help-0.11-r1.ebuild 2006
+EBUILD gimp-help-0.11-r2.ebuild 2006 RMD160 e6a67ffc2c4f89bacd42b7d99bd82b0dfccc2fbb SHA1 34de9f7006806a74322f2972def6d3c51e663e9c SHA256 9c6a0663aa967df99efc3f646d457aad83d597ba78a0ff24b6d34f5b69558f6b
+MD5 0832683e85323a968e543b59caf0d42f gimp-help-0.11-r2.ebuild 2006
+RMD160 e6a67ffc2c4f89bacd42b7d99bd82b0dfccc2fbb gimp-help-0.11-r2.ebuild 2006
+SHA256 9c6a0663aa967df99efc3f646d457aad83d597ba78a0ff24b6d34f5b69558f6b gimp-help-0.11-r2.ebuild 2006
 EBUILD gimp-help-0.11.ebuild 1612 RMD160 ce1891d982a37b7063f38ef442227a7161cbc89d SHA1 26557e9a24e879617d249e13093fb793ef8f4bfa SHA256 4a775f07ddc196ee357adbc2e2472db05f49e1df34e4046fa27452c87d109c9f
 MD5 f26fe80caab463597e7d92d195e06172 gimp-help-0.11.ebuild 1612
 RMD160 ce1891d982a37b7063f38ef442227a7161cbc89d gimp-help-0.11.ebuild 1612
 SHA256 4a775f07ddc196ee357adbc2e2472db05f49e1df34e4046fa27452c87d109c9f gimp-help-0.11.ebuild 1612
-MISC ChangeLog 3568 RMD160 047cd69724cdae85003e47cf4cdd785d16340739 SHA1 6efcf8f6d280a7f1a9aad57b191b3873a552298e SHA256 0887c850a9b17767121f354c7f915de13ebdb80400bf45d0b516246951714433
-MD5 55dec4fc8894713d7820287a9fd37969 ChangeLog 3568
-RMD160 047cd69724cdae85003e47cf4cdd785d16340739 ChangeLog 3568
-SHA256 0887c850a9b17767121f354c7f915de13ebdb80400bf45d0b516246951714433 ChangeLog 3568
+MISC ChangeLog 3811 RMD160 95e2a77e9512fb2473a2530a60d5da251ee109d4 SHA1 91140304ac4ecaeef5554d0db37d83b3a9c66f99 SHA256 06904542467b6525258641308fab46b42266d748a4385b48a6bb5d69942ec32a
+MD5 e174851b0d24418e1c0ce3cbbf4bd9f7 ChangeLog 3811
+RMD160 95e2a77e9512fb2473a2530a60d5da251ee109d4 ChangeLog 3811
+SHA256 06904542467b6525258641308fab46b42266d748a4385b48a6bb5d69942ec32a ChangeLog 3811
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 MD5 dffd46174e78b327c834fc3e4b1cf848 metadata.xml 160
 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 metadata.xml 160
@@ -30,6 +30,6 @@ SHA256 d510a63bfd6b6f729e7349b748903ed234143dac055bc8c7f8fca232561c81d8 files/di
 MD5 e80926bff9d59db57bfdd060890b1817 files/digest-gimp-help-0.11 256
 RMD160 20b7c04d863520e996f2cba2790117e7237453dd files/digest-gimp-help-0.11 256
 SHA256 aab48f03a2f34e4e7f2a06645de7e99fafb8da22bdbf1a0783cad7c97929802d files/digest-gimp-help-0.11 256
-MD5 e80926bff9d59db57bfdd060890b1817 files/digest-gimp-help-0.11-r1 256
-RMD160 20b7c04d863520e996f2cba2790117e7237453dd files/digest-gimp-help-0.11-r1 256
-SHA256 aab48f03a2f34e4e7f2a06645de7e99fafb8da22bdbf1a0783cad7c97929802d files/digest-gimp-help-0.11-r1 256
+MD5 e80926bff9d59db57bfdd060890b1817 files/digest-gimp-help-0.11-r2 256
+RMD160 20b7c04d863520e996f2cba2790117e7237453dd files/digest-gimp-help-0.11-r2 256
+SHA256 aab48f03a2f34e4e7f2a06645de7e99fafb8da22bdbf1a0783cad7c97929802d files/digest-gimp-help-0.11-r2 256
diff --git a/app-doc/gimp-help/files/digest-gimp-help-0.11-r1 b/app-doc/gimp-help/files/digest-gimp-help-0.11-r1
deleted file mode 100644
index a742112cb5fc..000000000000
--- a/app-doc/gimp-help/files/digest-gimp-help-0.11-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 1becf4914fe51d8f0ce4142202c8cb92 gimp-help-2-0.11.tar.gz 52058316
-RMD160 edfa32797ed6c93048e510b2c4f39f4738468b49 gimp-help-2-0.11.tar.gz 52058316
-SHA256 ad1238962ac3eea36b2d07f210e7716f4892b46b49efb313de03c3b71499f9e6 gimp-help-2-0.11.tar.gz 52058316
diff --git a/app-doc/gimp-help/gimp-help-0.11-r1.ebuild b/app-doc/gimp-help/gimp-help-0.11-r1.ebuild
deleted file mode 100644
index f45a3f177404..000000000000
--- a/app-doc/gimp-help/gimp-help-0.11-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-doc/gimp-help/gimp-help-0.11-r1.ebuild,v 1.1 2007/01/21 15:52:55 pva Exp $
-
-inherit autotools
-
-MY_P=${P/gimp-help/gimp-help-2}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="http://docs.gimp.org/"
-SRC_URI="mirror://gimp/help/${MY_P}.tar.gz"
-
-LICENSE="FDL-1.2"
-SLOT="2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="webinstall linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_hr linguas_it linguas_ko linguas_nl linguas_no linguas_ru linguas_sv linguas_zh_CN"
-DEPEND="=app-text/docbook-xml-dtd-4.3*
-		dev-libs/libxml2
-		dev-libs/libxslt
-		webinstall? ( media-gfx/imagemagick )"
-RDEPEND="!<media-gfx/gimp-2.2.12"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/gimp-help-2.0.11-image-honour-ALL_LINGUAS.patch
-	eautomake
-}
-
-src_compile() {
-	local ALL_LINGUAS=""
-
-	use linguas_cs && ALL_LINGUAS="${ALL_LINGUAS} cs"
-	use linguas_de && ALL_LINGUAS="${ALL_LINGUAS} de"
-	use linguas_en && ALL_LINGUAS="${ALL_LINGUAS} en"
-	use linguas_es && ALL_LINGUAS="${ALL_LINGUAS} es"
-	use linguas_fr && ALL_LINGUAS="${ALL_LINGUAS} fr"
-	use linguas_hr && ALL_LINGUAS="${ALL_LINGUAS} hr"
-	use linguas_it && ALL_LINGUAS="${ALL_LINGUAS} it"
-	use linguas_ko && ALL_LINGUAS="${ALL_LINGUAS} ko"
-	use linguas_nl && ALL_LINGUAS="${ALL_LINGUAS} nl"
-	use linguas_no && ALL_LINGUAS="${ALL_LINGUAS} no"
-	use linguas_ru && ALL_LINGUAS="${ALL_LINGUAS} ru"
-	use linguas_sv && ALL_LINGUAS="${ALL_LINGUAS} sv"
-	use linguas_zh_CN && ALL_LINGUAS="${ALL_LINGUAS} zh_CN"
-
-	ALL_LINGUAS=${ALL_LINGUAS} \
-		econf \
-		--without-gimp \
-		$(use_enable webinstall convert) \
-		|| die "econf failed"
-
-	# not parallel make safe (#137192)
-	emake -j1 || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README TERMINOLOGY TODO
-}