5 files changed, 78 insertions, 68 deletions
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 9b8bdfe2b8a6..52c4344a237d 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 1873eac51687..3922932097cc 100644
--- a/app-doc/gimp-help/Manifest
+++ b/app-doc/gimp-help/Manifest
@@ -1,6 +1,6 @@
 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.10.34.tar.bz2 165540436 BLAKE2B eff5afe87bbddf9166647424ef63399a4ebc4215980dddf42f949e18245c60d1095269592f5a314683f7e1d7b27e2b9130215bda5987e7c8dfcafb5cebb6abbc SHA512 316d558f66c96a0d2d0f17baf700020b76aa221f9e220ddfc3e85b10c82b20b9c1cf36893776a342e90af5170e0102eb743b79663451581444d4f881256cf377
-EBUILD gimp-help-2.10.0-r2.ebuild 995 BLAKE2B f3c8f1174793f4d8224445d4b79adb8f88653f8f61bf61e967e0723084886adff60eb7797e072c28b4c4c14eaebc7115e2c9bf314aded7b775f29a3e2c8ebb7b SHA512 2eca175734d4ba78a0b7b8ba3f35436e3ea082b4cef7ef22470e1a73061cbc27e623ab3c042c315c3af41a68ef3e5ee6562e6cfada449194036ed9bbe2235b4c
-EBUILD gimp-help-2.10.34-r1.ebuild 1668 BLAKE2B adab54f98046f9d3ee992e23b1dae8f302f3e188e52c14b620504a1942b6787fa8363fe5aff5844cf48f5d150851a2c2165c209f42b27b3a0b1336923449cb38 SHA512 a9d5e62999eb878bd29f434825715f107a6fe3e113331e29ae2c748ca453af6b9936dcc18646d8c5a0d1e32a250b2576c1ed1e215fc87ae0ab0e3cfd3eb76e8c
+EBUILD gimp-help-2.10.0-r2.ebuild 996 BLAKE2B 0ea85043f6a2d1ddd363d977219e584ba63c11f7b0b830ff5d76773880ab95be23a415541108bf0aaf30db2a391668a3bead7471bb5785eea575d14fc6dffedf SHA512 2b4859b70f51568945e8036e1dde228924a66f03b562b76b3c83dfbb64063169da14b0b0ec796adc7832a34fd84796eed797d645c4e766792fc65ae0009b01fa
+EBUILD gimp-help-2.10.34-r2.ebuild 2078 BLAKE2B 621fe5c800cd0081dc5221c4f4cae5043aadc10bbd0c29a5cb18a594ee7d8b259c623bc11423002d4032babf4c525367b550550183a534a763163a443962a938 SHA512 724506a74b817c2fc9d49200b4129aecccea5814c6ac673cf37f7cacf6d8e0f3c418a593d670294672916c784c1eefe694870fc6c67a63f25bc7c25c7515f9ad
 MISC metadata.xml 401 BLAKE2B a80bbfba7d3e6e613ecc32c54ccad9f6b92e945feab3567fb0491b3cf83f5fb51d90372b6954b1127bce5c1d2028bfb2ed6518a9dde72c2adfc8286884f9efc7 SHA512 5f30ae63c4b82933c885a60d010dd1bb7d92355478aae874ec2aaef647ca3ecdb9f85311280a31d31ed4068e028049d3e54aeac84ff6528f3174db14c938b62c
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 c1ee2c8300a4..b8149f1b2960 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
@@ -10,7 +10,7 @@ DESCRIPTION="GNU Image Manipulation Program help files"
 HOMEPAGE="https://docs.gimp.org/"
 SRC_URI="mirror://gimp/help/${P}.tar.bz2"
 
-LICENSE="FDL-1.2"
+LICENSE="FDL-1.2+"
 SLOT="2"
 KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE=""
diff --git a/app-doc/gimp-help/gimp-help-2.10.34-r1.ebuild b/app-doc/gimp-help/gimp-help-2.10.34-r1.ebuild
deleted file mode 100644
index 2837213514fe..000000000000
--- a/app-doc/gimp-help/gimp-help-2.10.34-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-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}
-	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd
-	dev-lang/perl
-	dev-libs/libxslt
-	gnome-base/librsvg
-	sys-devel/gettext
-"
-
-DOCS=( AUTHORS COPYING NEWS README )
-
-python_check_deps() {
-	python_has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# See bug: 891709
-	if [[ -z "${LINGUAS}" ]] ; then
-		export LINGUAS="en"
-
-		ewarn "The 'LINGUAS' environment variable isn't setup in '/etc/portage/make.conf',"
-		ewarn "therefore only the generic ('en') documentation will be built."
-		ewarn "To build ${PN} for other languages please setup 'LINGUAS' variable"
-		ewarn "or assign it to 'L10N' variable if available, i.e. LINGUAS=\"\${L10N}\""
-		ewarn "The following languages are supported for ${PN}:"
-		ewarn "'ca cs da de el en en_GB es fa fi fr hr hu it ja ko lt nl nn pt pt_BR ro ru sl sv uk zh_CN'"
-		ewarn "For more details please read:"
-		ewarn "https://wiki.gentoo.org/wiki/Localization/Guide#LINGUAS"
-	fi
-}
-
-src_configure() {
-	econf --without-gimp
-}
-
-src_compile() {
-	# See bug: 833566
-	python_export_utf8_locale
-	# Affected with bugs: 677198, 876205. Set "emake -j1"
-	emake -j1
-}
-
-src_install() {
-	# See bug: 905693
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-}
diff --git a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild b/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild
new file mode 100644
index 000000000000..39eb21262abb
--- /dev/null
+++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+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="nls"
+
+BDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]')
+	app-text/docbook-xml-dtd
+	dev-lang/perl
+	dev-libs/libxslt
+	gnome-base/librsvg
+	sys-devel/gettext
+"
+
+DOCS=( AUTHORS COPYING NEWS README )
+
+python_check_deps() {
+	python_has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	# The upstream build system isn't pure gettext and doesn't distinguish
+	# between empty and unset LINGUAS. Default to English only if either
+	# nls is unset or if LINGUAS exists but is empty. #891709
+	if ! use nls || [[ -v LINGUAS && -z ${LINGUAS} ]]; then
+		export LINGUAS="en"
+	elif [[ ! -v LINGUAS ]]; then
+		local line
+		while read line; do ewarn "${line}"; done <<-EOF
+			The "LINGUAS" variable is unset in your configuration,
+			but the "nls" USE flag is set. Therefore, documentation for
+			*all* languages will be built, which may take quite some time.
+			If you want to install documentation for a defined list
+			of languages, please assign "LINGUAS" accordingly.
+			The following languages are supported for ${CATEGORY}/${PN}:
+			"ca cs da de el en en_GB es fa fi fr hr hu it ja ko lt nl nn
+			pt pt_BR ro ru sl sv uk zh_CN"
+			If you want to install only the English documentation, it is
+			recommended to unset the "nls" USE flag for ${CATEGORY}/${PN}.
+
+			For more details please read:
+			https://wiki.gentoo.org/wiki/Localization/Guide#LINGUAS
+		EOF
+	fi
+}
+
+src_configure() {
+	econf --without-gimp
+}
+
+src_compile() {
+	# See bug: 833566
+	python_export_utf8_locale
+	# Affected with bugs: 677198, 876205. Set "emake -j1"
+	emake -j1
+}
+
+src_install() {
+	# See bug: 905693
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+}