gentoo resync : 20.02.2019

4 files changed, 7 insertions, 57 deletions

diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 75f348919dbc..3bd0ab67654a 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index f1550dea3d3a..88a684eca5fe 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,17 +1,3 @@
-DIST gimp-help-2.6.1-html-de.tar.bz2 32847795 BLAKE2B 6938d23a2d03e5447eb55b9d9483d38fa027b29943c2faa3cf06dd7a9af3220cd1d8220d8e43b202fbd5d553db68154702f6718fea5904bbd22f39a05bc1a11f SHA512 31d079341eed56b1ad3b3c8770c5f11ebd97be20d62569b5e3ee21944f54dce6a8cd47861038251cd91c73d3fe4ba17aff4f6d4fd94936e6e134f809bd55d4ba
-DIST gimp-help-2.6.1-html-en.tar.bz2 28726945 BLAKE2B b670a565753bcda4988b2d4753ef89b2696edeafc315f5947a40e0437c5d941318677f2c11d23c8f83d97c89dcd5c1d55971899ce9601361c07668a269e61159 SHA512 4507e43dc00878d6efd8870f1cf8e2279981b50c24a48723f46c9f2ac53787dcd077b35eb8c48eaaf8916b8128790206143f616b11ba07f83f95242b8a33582a
-DIST gimp-help-2.6.1-html-es.tar.bz2 29865240 BLAKE2B 5d454d790dc0b5b8615c94f1bd37e8591653ebfaebc73da88269be2f03fb8c062a04be30466cbc4f6cf45b61768007b51457f83c0aa16e55366111557181802b SHA512 738275027ec489e6ec0fc97ab157fcc60ca1541ace0a641963e6b3ecf94edd3fda1e4555fccd1c6e58ace042b9229e9bed1d744c67085332cdff83ffdfc8b9d6
-DIST gimp-help-2.6.1-html-fr.tar.bz2 28946028 BLAKE2B 77f78f217b6d33fa1252f2e653eef1e2537911b97747e143447efcc5b5c57701c1a101d82474a0a6ce00a3bd3c3f999d6aef92cf9100b4b95004e72f6cc66afd SHA512 59f3b7c2bde02fe91a8ce5acf56c5321ccfeb09e593256f114c0f5c028501850d3678d25097d6469b0b63f971ba9a6dda98985560b228dbacd4697a16f8f193b
-DIST gimp-help-2.6.1-html-it.tar.bz2 33907905 BLAKE2B 5e9a1cef7bb208676084c33efe6065ffcdd60bcd74d9bd6073d7f1f1cf693826a25327900b5ce27061892db353c0a59e241b1f44fa314fb0fbe2621027639cf8 SHA512 582a90011b72cdee54a995df16fa61390678f79ef9623eabc24faa7dc17fa00182efe83122cf52af21533b05972802a025915254f88f1775b86f260992c1b3e0
-DIST gimp-help-2.6.1-html-ja.tar.bz2 23109244 BLAKE2B 09f688c9d948375905347e85d5462dc2826eaedc9e515c539156bfaba44ac5bdba16b79cda27ed5593f53189e169811299cf88f7c4705f827d36cdc1cdf12b0a SHA512 1dd7e5f83dd53cc9cb00cd57bab0ac5a7d1be16c75d9c0649d182e79b810dfd2e6564de6c19f985837dfd3a852e15a1bf832899195a4eb09e02a1c07678c6a5d
-DIST gimp-help-2.6.1-html-ko.tar.bz2 28291254 BLAKE2B 94776d59bc87756f23b01867ae71d019e357db62de8c7f7bbdb184b2bd3e167720754322c78faeee3b8f293964e619521c6f9ec1d8795fe21037eb6097f021c1 SHA512 44471b02102b88981ec898cd92598b785f3459eb32f348cd6f7b32e0ea9cbb616027332c2cb51f570f75065bc7ccbcac2cc761b637976fc6b38473cc464f3269
-DIST gimp-help-2.6.1-html-nl.tar.bz2 28868153 BLAKE2B ac9644e238f1223e670c13fc5e3bc1fa1f82da074a9603e143142e669accd09ac7062703f4e6b6806329cd414fceda6a97fcef08b4bacf5e7bd1bcd173d0cdfb SHA512 6efa6c04cce39f2c38140454e31d62f21138278ee936849a2b2aab605f4b699df9057cbbaa57763e6c28a722b1eea1fbd80ae373ea20d24ab7558a2e5ce972e3
-DIST gimp-help-2.6.1-html-nn.tar.bz2 23321117 BLAKE2B 6f2f0c378b46ecb40e5a385936a152c06d63301dbdfeddb436c689223506dafc9e5c58285d32277941cd50cb4461db64ced2a5559f9da35bbd4b64ca063c4ad2 SHA512 f832800db45bee6d6420dab263ec7ebf093301f877d9a8df51b5c07dd3dbf3d32c4fe28cdbd57e4b702fa06c8d8d8e192dcc5e914258c69165da863b1269a66e
-DIST gimp-help-2.6.1-html-pl.tar.bz2 28753373 BLAKE2B bb444ca6b56bcd343628c8fdab95ae6701ba00d719be48b76b81d1ae3030c6acd430b456476e9fa65263198b1437ebac0686ce89f33f162ef56edd872f330527 SHA512 41a181137549c9015bdc0ee2ab12182ede606c667ba327a5d9375aebd43dcb5abcd029fdfc0db794a6af5910336da767e3252ec914b18ca531a770fc3af8855c
-DIST gimp-help-2.6.1-html-ru.tar.bz2 29324878 BLAKE2B 21d02e2f7140de405f52d54d6c36af8d94dcf26fcf0abd490ae268f2992f4b090de6d7f31f1b8be1ac88185f03a7bb72a0567ed67e32597aa9e3457882ef07e3 SHA512 ac564048f0543aa22481756ecd7f5c6c75f96094bc0b6aee2446f4c3ccedf511e2217034f95e1953f5ad615ff5a246de9326adace4641e568e41b603d83c18c7
-DIST gimp-help-2.6.1-html-sv.tar.bz2 29462846 BLAKE2B d09f9a682dc787dc50300304dd6a2a04e3783025a428d78b30bea6ab3465235cfdafcd31d550cb62a613a018926999691fa196ba51e40ee65780b125900d712d SHA512 c12cda4c29bde87d79ae1ed3e1d6ec85f7ea8e3e8c01bf3b3b95a67478fee1c16f8421c4f869134b584c38aac611f6a69e7c1c4dd4b5906a69ad46f8f7b0c6ad
-DIST gimp-help-2.6.1-html-zh_CN.tar.bz2 28735285 BLAKE2B 7101fd5e627b7a145ec5e798ccda3928e179b8bf9f3c7dcdaa6f6d09a463d98fedf148ad6ef8ee8fcab2622f73977cd0d282b149a7e6f66fb260b1dac898bea2 SHA512 daa6fd365c04c3dc78c1955301f0544ec67e17ff156e6e10d6cad959b9a1121a976feff29e30008809bc1beb1b4868474c40e36a76ea45410e3b7f5aed719055
 DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
-EBUILD gimp-help-2.6.1.ebuild 1125 BLAKE2B 4a79129dcc0b0201e6013ee166b2e3fa6eb6459c81d2adc37f54cc886c6fc8b6f090893383706cb2724e17900e3cf6d197c137ccc308abdb26e67e0301c5f12c SHA512 65ed45dedf891eae72359739cae100b0a9d841a60ea3a60ec5b296ca8f89b8d28358f4c9b0747bebf398d54191f957b3ad0583e546bd4a2157083895bea24aa6
-EBUILD gimp-help-2.8.2.ebuild 570 BLAKE2B aa6153109486e95dea8590991d746379963ffd7e800862874edcf99d646cadd9a89c9e883c9ecf8ed1d814bdc9543b69e36578384b10ea7995524b960aa4b673 SHA512 e70489808156152908e68b448eaae476c816e079fbd320bbfbc97d35a427880e821f5128c9e3477aa9025b24c0ba888b4b72099d9d6218bbe8ac2787b6aa7e48
+EBUILD gimp-help-2.8.2.ebuild 638 BLAKE2B 49c4ad5ee754911325cfe38111db7fbf2430b4f6d9e8af06fc5b7f218d45ee57f61bf2b72622fbedff5a891d2779640f5bea1bb88f72b06453bb67df9da39cce SHA512 7f57afd1b186c9fe25221ba563478ea249cd21aa712e3b2a438e7dbba093235f2714c373db4f03a130f0e640a08217a35909fa78538d70476ddd05d5cb685aba
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-doc/gimp-help/gimp-help-2.6.1.ebuild b/app-doc/gimp-help/gimp-help-2.6.1.ebuild
deleted file mode 100644
index e1fef672eaa2..000000000000
--- a/app-doc/gimp-help/gimp-help-2.6.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="https://docs.gimp.org/"
-
-LICENSE="FDL-1.2"
-SLOT="2"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-
-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 ja ko nl nn pl ru sv zh-CN"
-
-# Download the english translation if no l10n_* flags are enabled.
-EMPTY_L10N_SRC_URI="mirror://gimp/help/${P}-html-en.tar.bz2"
-for X in ${LANGS} ; do
-	IUSE+=" l10n_${X}"
-	SRC_URI+=" l10n_${X}? ( mirror://gimp/help/${P}-html-${X/-/_}.tar.bz2 )"
-	EMPTY_L10N_SRC_URI="!l10n_${X}? ( ${EMPTY_L10N_SRC_URI} )"
-done
-SRC_URI="${SRC_URI} ${EMPTY_L10N_SRC_URI}"
-
-DEPEND=""
-RDEPEND=">=media-gfx/gimp-2.4"
-
-S=${WORKDIR}/gimp-help-2/
-
-src_compile() { :; }
-
-src_install() {
-	insinto /usr/share/gimp/2.0/help
-	doins -r html/*
-	dodoc AUTHORS MAINTAINERS README
-}
diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
index 3c7f761243fe..a48b67dbafd2 100644
--- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gimp/help/${P}.tar.bz2"
 
 LICENSE="FDL-1.2"
 SLOT="2"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}
@@ -24,3 +24,8 @@ DEPEND="${PYTHON_DEPS}
 src_configure() {
 	econf --without-gimp
 }
+
+src_compile() {
+	# see https://bugs.gentoo.org/677198
+	emake -j 1
+}