gentoo auto-resync : 10:10:2022 - 13:34:00

3 files changed, 4 insertions, 41 deletions

diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest
index 12534d7ec8ab..8adc1cd3f813 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,5 +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
-EBUILD gimp-help-2.10.0-r1.ebuild 834 BLAKE2B 0a2d90d65e8c44f863aa72bfaf35196fefd9e4040c6e92b9b911f606d7fbdcaee5dac071caded8e1711f10427450d5341fa478a5e2625b282e9d550786cb1b40 SHA512 b28bc3741ee49071435df1ed481b74d15c8f0374dc19fcd58afdc5f248e0d9d2d3c50344461b3da8cd0136479e546c0f3910146c9870a575663c635ac520890e
-EBUILD gimp-help-2.10.0-r2.ebuild 989 BLAKE2B e8c9c9805266495502f3ac346f34bc0d7f465412453ef4dea4ca013c3accdfeaf2e1f1b76b3ae1c845efa5ae634ea3eba9c0cfa56e213d245fbdf2a87671b5c5 SHA512 523736616dd9cdb8d30cfbbcb054dee5801e1c961e1b613951210bf5954dfab92ebd15891fa5799ba0e68556d271b4195f92423ca724df1d91f68b059d039986
+EBUILD gimp-help-2.10.0-r2.ebuild 995 BLAKE2B a5c0ae2fca5f18a316679bcd0a62a841ca695dcf5b6916cbe2dcec258424c99ad5c8c6d447c6eb47668f3ddcddd999b5cd393fd60ac7c356ab5a9bc7717b84d3 SHA512 4403c05b88523f7704404a1eeae901f420787169f0969d85b29deae2d857e84d9f2ec119683f35c630bda0e37729b316d9be0afc5e3ea5dc6435744ea6088ebb
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
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
deleted file mode 100644
index 98bdcf4baa2b..000000000000
--- a/app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-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 ~riscv sparc x86"
-IUSE=""
-
-BDEPEND="${PYTHON_DEPS}
-	sys-devel/gettext
-"
-
-DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-	dev-libs/libxslt
-"
-
-# Adds python3 build support, bug 725940
-# patch is from https://gitlab.gnome.org/GNOME/gimp-help/-/issues/201
-PATCHES=( "${FILESDIR}/${P}-python3.patch" )
-
-python_check_deps() {
-	python_has_version -d "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-src_configure() {
-	econf --without-gimp
-}
diff --git a/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild b/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
index e67cf0e86c15..2acfe7888565 100644
--- a/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
+++ b/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit python-any-r1
 
 DESCRIPTION="GNU Image Manipulation Program help files"
@@ -39,6 +39,6 @@ src_configure() {
 src_compile() {
 	# See bug: 833566
 	python_export_utf8_locale
-	# If affected with bug: 677198 then set "emake -j1"
-	emake
+	# Affected with bugs: 677198, 876205. Set "emake -j1"
+	emake -j1
 }