gentoo resync : 24.09.2020

3 files changed, 2 insertions, 39 deletions

diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index da4140d90a7e..a4d87746f89f 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,6 +1,4 @@
 AUX gimp-help-2.10.0-python3.patch 13294 BLAKE2B 86ed2514e95210986e9d108e908abbf89354e3ff2ef314ad4409e42804b59728cac8f4b8eab3d1d431aaf3fc4745774fbf405ebad80c235b69e3583e47132b38 SHA512 b1932670247c793c8bd9c70045fb3f568ff99c964f2bc8ca1e7971f510512b7e476ced5c79b0bbd4e6966c9caf5c75f436926772b36996f5cf3d9e80bcc7ad76
 DIST gimp-help-2.10.0.tar.bz2 187092180 BLAKE2B 29a7fbe3fcb6f3210aeda4bc514d7e0eeca05f9fabd3b9022c7ed1e5a9432876cc3bf530632648e2eb50509add4e387106d9705a1c17469e33496daec737d21b SHA512 2f6d5e7cf0c3b4960c92074ef02d51a1d089c148f6453a66e453a3084cdede280f72c6b77d35f66777adbda8aa273ec2a472fb538142e51bb263c3077eec473a
-DIST gimp-help-2.8.2.tar.bz2 158504580 BLAKE2B d0023a4290879f97e3365f1208427997d1facc09a7ed4ac0a274615e9eff378c9a4da0d7c5190bc24ad27c2b03d6c513003297d835562b0fa3e02685443d15e9 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67
-EBUILD gimp-help-2.10.0-r1.ebuild 815 BLAKE2B be668d378c70c7e7886f303489079443d64fc98d0d12741fe587c83408c532a0c916f5fe6e02ab2488074078c9a9f03f3c3e38547187d0e8d391c64caf3ff283 SHA512 2947622745a5d351f5edcf4a790c46433dad8417292555cd7b1fd76c0447bd359faeee13d891e3f2c3cee8115038d6e919aeb8414ce3fbf6c8615848e6d453ca
-EBUILD gimp-help-2.8.2.ebuild 705 BLAKE2B 4215bc3e5412c04561fe446f6af0e15f5db175f9344404980df1fc7949a921d479a2821551739d9c6cfaeed7f90eb258e40d0a80c74fc8635a7a79d7a54463b4 SHA512 d401d0ed37534661e4704f17afca367e972118895a5e46d7a020ee8b778648ee6311209dff153143be47afa89d473694a7faf82359cca369aeab980e88126c04
+EBUILD gimp-help-2.10.0-r1.ebuild 812 BLAKE2B eef293fc6b84407508cb1cf92d2beef57b7a27a29495a8a347ce373062fb3960540ad67e159ea4237c752e7e8990c7c6cfea2e7bae08033c9b44aed343b8d98e SHA512 99a08f462c3413763f82ed655a15cbbccfaab48b57818845ddd84bc52e32d932b7fb9030a59ead418e2eafe336f32ada39311d88ef6aa74c651c0d24c158e576
 MISC metadata.xml 370 BLAKE2B 18f0dfd3b6fb8f284f888dbcd30d3d4ddce8753e58ef3e92ba0803bd6dadd36962f2f6e57dcd6ccebc547bf43b8972bdaf27e5817c77307172fdb835fe2d9c9e SHA512 9ad9dbdfc25d5a59c0129f1f83615d73bcb9026cc0411a71e9987bca46389fa5f3905a72d22ddac319b1838b770cc5755a2ec312a05db1752e10be5cca08ea38
diff --git a/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild b/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild
index 76ecfd70d852..2aa0ad8601dd 100644
--- a/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.10.0-r1.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"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 BDEPEND="${PYTHON_DEPS}
diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild
deleted file mode 100644
index a4c033714438..000000000000
--- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-inherit python-any-r1
-
-DESCRIPTION="GNU Image Manipulation Program help files"
-HOMEPAGE="https://docs.gimp.org/"
-SRC_URI="mirror://gimp/help/${P}.tar.bz2"
-
-LICENSE="FDL-1.2"
-SLOT="2"
-KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND="${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-	dev-libs/libxslt
-	sys-devel/gettext
-"
-
-python_check_deps() {
-	has_version "dev-libs/libxml2[${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	econf --without-gimp
-}
-
-src_compile() {
-	# see https://bugs.gentoo.org/677198
-	emake -j 1
-}