[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/, app-doc/gimp-help/files/
commit: aba2b486ec0f3c3c66e6405b1b6bd8a5f6f40f0b Author: Sergey Torokhov yandex ru> AuthorDate: Sun Mar 3 15:09:41 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 21 03:15:22 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aba2b486 app-doc/gimp-help: drop old 2.10.0-r2 Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/Manifest | 1 - .../gimp-help/files/gimp-help-2.10.0-python3.patch | 297 - app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 44 --- 3 files changed, 342 deletions(-) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index b47b3228533e..f364e53f8979 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -1,2 +1 @@ -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 diff --git a/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch b/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch deleted file mode 100644 index e42214a0f82b.. --- a/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch +++ /dev/null @@ -1,297 +0,0 @@ -diff -urNp a/tools/xml2po/__init__.py b/tools/xml2po/__init__.py a/tools/xml2po/__init__.py 2019-11-28 11:45:00.889048989 +0100 -+++ b/tools/xml2po/__init__.py 2020-01-06 13:24:24.715787902 +0100 -@@ -166,7 +166,7 @@ class XMLDocument(object): - elif node.isText(): - if node.isBlankNode(): - if self.app.options.get('expand_entities') or \ -- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ): -+ (not (node.prev and not node.prev.isBlankNode() and node.nextElementSibling() and not node.next.isBlankNode()) ): - #print >>sys.stderr, "BLANK" - node.setContent('') - else: -@@ -200,7 +200,7 @@ class XMLDocument(object): - tree = ctxt.doc() - newnode = tree.getRootElement() - except: --print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text) -+print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr) - return text - - self.normalizeNode(newnode) -@@ -259,7 +259,7 @@ class XMLDocument(object): - if not self.expand_entities: - result += '&' + child.name + ';' - else: --result += child.content.decode('utf-8') -+result += child.content - else: - result += self.myAttributeSerialize(child) - child = child.next -@@ -326,7 +326,7 @@ class XMLDocument(object): - pass - - content = '<%s>%s' % (starttag, text, endtag) --tmp = tmp + content.encode('utf-8') -+tmp = tmp + content - - newnode = None - try: -@@ -338,7 +338,7 @@ class XMLDocument(object): - pass - - if not newnode: --print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')) -+print("""Error while parsing translation as XML:\n"%s"\n""" % (text), file=sys.stderr) - return - - newelem = newnode.getRootElement() -@@ -354,7 +354,7 @@ class XMLDocument(object): - copy = newelem.copyNodeList() - next = node.next - node.replaceNode(newelem.copyNodeList()) --node.next = next -+node.__next__ = next - - else: - # In practice, this happens with tags such as " " (only whitespace in between) -@@ -406,7 +406,7 @@ class XMLDocument(object): - translation = self.app.getTranslation(outtxt) # unicode or None - if translation is not None: - self.replaceAttributeContentsWithText(attr, -- translation.encode('utf-8')) -+ translation) - else: - self.app.msg.outputMessage(outtxt, node.lineNo(), "", spacepreserve=False, - tag = node.name + ":" + attr.name) -@@ -447,14
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: bec3e130178e6d7add09abd405cac995712c016c Author: Sergey Torokhov yandex ru> AuthorDate: Sun Mar 3 15:23:46 2024 + Commit: Sam James gentoo org> CommitDate: Thu Mar 21 03:15:23 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bec3e130 app-doc/gimp-help: add PYTHON_COMPAT 3.12 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/35611 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index a1be0ef7b573..496d138224d0 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..11} ) +PYTHON_COMPAT=( python3_{10..12} ) inherit python-any-r1 DESCRIPTION="GNU Image Manipulation Program help files"
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 8542b9e249e64538cab369709b17251c4d9e8bed Author: Sam James gentoo org> AuthorDate: Sat Dec 23 20:33:59 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 23 20:33:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8542b9e2 app-doc/gimp-help: disable py3.9 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 b8149f1b2960..dfd098a6ac79 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_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit python-any-r1 DESCRIPTION="GNU Image Manipulation Program help files" 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 index 916829e99b9c..a1be0ef7b573 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{9..11} ) +PYTHON_COMPAT=( python3_{10..11} ) inherit python-any-r1 DESCRIPTION="GNU Image Manipulation Program help files"
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: d421ff667732643838e1379c0e29cc7f3bafccd4 Author: Sam James gentoo org> AuthorDate: Sat Dec 23 20:32:36 2023 + Commit: Sam James gentoo org> CommitDate: Sat Dec 23 20:33:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d421ff66 app-doc/gimp-help: fix pkg_setup/python-any-r1 use See https://forums.gentoo.org/viewtopic-p-8810860.html. Bug: https://bugs.gentoo.org/891709 Bug: https://bugs.gentoo.org/905693 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 2 ++ 1 file changed, 2 insertions(+) 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 index 5d3d3d3962ba..916829e99b9c 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild @@ -32,6 +32,8 @@ python_check_deps() { } pkg_setup() { + python-any-r1_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
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: f1f68b229beb4d71f8f662f08daa32446c5f968e Author: Sam James gentoo org> AuthorDate: Fri Aug 18 21:49:51 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 21:49:51 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1f68b22 app-doc/gimp-help: Stabilize 2.10.34-r2 ppc64, #912443 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index b267e3d51c16..7354379ea443 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.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 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" IUSE="nls" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 289e91c6a4d2edf2fb5926b53e646a1c4cc221ae Author: Sam James gentoo org> AuthorDate: Fri Aug 18 08:32:06 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 08:32:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=289e91c6 app-doc/gimp-help: Stabilize 2.10.34-r2 ppc, #912443 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 98450b964890..0e0ac7e9ecf5 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.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 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc ~x86" IUSE="nls" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: b1155396d3723e54bcc43ecd6371c73ae3c14844 Author: Sam James gentoo org> AuthorDate: Fri Aug 18 09:21:04 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 09:21:04 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1155396 app-doc/gimp-help: Stabilize 2.10.34-r2 amd64, #912443 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index d81685a101ee..b267e3d51c16 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.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 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86" IUSE="nls" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 696e80a9fb16256fae473258e8f28e277d038ec6 Author: Sam James gentoo org> AuthorDate: Fri Aug 18 09:21:03 2023 + Commit: Sam James gentoo org> CommitDate: Fri Aug 18 09:21:03 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=696e80a9 app-doc/gimp-help: Stabilize 2.10.34-r2 x86, #912443 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 index 0e0ac7e9ecf5..d81685a101ee 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.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 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86" IUSE="nls" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 9da50e66966c7072c149c1ffa3bc06d32e64cdd9 Author: Sergey Torokhov yandex ru> AuthorDate: Tue May 16 18:43:10 2023 + Commit: Sam James gentoo org> CommitDate: Fri May 19 23:49:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9da50e66 app-doc/gimp-help: fix test race contidion Closes: https://bugs.gentoo.org/905894 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/31067 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 4 1 file changed, 4 insertions(+) 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 index 39eb21262abb..98450b964890 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild @@ -68,6 +68,10 @@ src_compile() { emake -j1 } +src_test() { + emake -j1 check +} + src_install() { # See bug: 905693 emake -j1 DESTDIR="${D}" install
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 3202669c08e80bae75d4caa0f8de05fb99cc9607 Author: Ulrich Müller gentoo org> AuthorDate: Sun May 7 07:05:57 2023 + Commit: Ulrich Müller gentoo org> CommitDate: Sun May 7 13:35:28 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3202669c app-doc/gimp-help: Specify LICENSE more precisely FDL version 1.2 or any later version, according to src/gimp.xml. Signed-off-by: Ulrich Müller gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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-r2.ebuild b/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild index 9bb1d39037c8..39eb21262abb 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-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="nls"
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 243ee473e2e6153ba2d927c9e781150221d72d6e Author: Ulrich Müller gentoo org> AuthorDate: Sun May 7 06:04:00 2023 + Commit: Ulrich Müller gentoo org> CommitDate: Sun May 7 13:35:22 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=243ee473 app-doc/gimp-help: Add IUSE="nls" and fix LINGUAS logic Follow standard gettext behavior: - USE="-nls": build only English documentation (and ignore LINGUAS) - USE="nls" and unset LINGUAS: build all available languages - USE="nls" and empty LINGUAS: build only English - USE="nls" and nonempty LINGUAS: build listed languages if supported See also the following mailing list posting for an explanation: https://archives.gentoo.org/gentoo-dev/message/38914ce4a7a228d2d29fb623346fba10#L29 Bug: https://bugs.gentoo.org/891709 Signed-off-by: Ulrich Müller gentoo.org> app-doc/gimp-help/gimp-help-2.10.34-r1.ebuild | 65 --- app-doc/gimp-help/gimp-help-2.10.34-r2.ebuild | 75 +++ 2 files changed, 75 insertions(+), 65 deletions(-) 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.. --- 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 ..9bb1d39037c8 --- /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 +
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: a9cac53fc6e229f8df98fe0d1b1e198d3730 Author: Sergey Torokhov yandex ru> AuthorDate: Fri May 5 21:33:54 2023 + Commit: Sam James gentoo org> CommitDate: Fri May 5 22:38:14 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9cac53f app-doc/gimp-help: 2.10.34 revision bump 1. Add BDEPEND 'gnome-base/librsvg' to build Quickreference PDF files. 2. Force LINGUAS="en" if isn't specified in /etc/portage/make.conf to avoid of building all languages. 3. Force 'emake -j1' on install phase to prevent race condition when docs for several languages are built. Closes: https://bugs.gentoo.org/891709 Closes: https://bugs.gentoo.org/905693 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/30887 Signed-off-by: Sam James gentoo.org> ...-2.10.34.ebuild => gimp-help-2.10.34-r1.ebuild} | 25 ++ 1 file changed, 25 insertions(+) diff --git a/app-doc/gimp-help/gimp-help-2.10.34.ebuild b/app-doc/gimp-help/gimp-help-2.10.34-r1.ebuild similarity index 50% rename from app-doc/gimp-help/gimp-help-2.10.34.ebuild rename to app-doc/gimp-help/gimp-help-2.10.34-r1.ebuild index 4a9d96672c88..2837213514fe 100644 --- a/app-doc/gimp-help/gimp-help-2.10.34.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.34-r1.ebuild @@ -21,13 +21,32 @@ BDEPEND=" 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 } @@ -38,3 +57,9 @@ src_compile() { # Affected with bugs: 677198, 876205. Set "emake -j1" emake -j1 } + +src_install() { + # See bug: 905693 + emake -j1 DESTDIR="${D}" install + einstalldocs +}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: f12d3d62ffd6a51cf0f5fe9eac95766104d0ecb2 Author: Sergey Torokhov yandex ru> AuthorDate: Sun Apr 23 13:49:21 2023 + Commit: Sam James gentoo org> CommitDate: Thu May 4 06:47:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f12d3d62 app-doc/gimp-help: 2.10.34 version bump Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/30717 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/Manifest | 1 + app-doc/gimp-help/gimp-help-2.10.34.ebuild | 40 ++ 2 files changed, 41 insertions(+) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index 037747728007..b47b3228533e 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -1 +1,2 @@ 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 diff --git a/app-doc/gimp-help/gimp-help-2.10.34.ebuild b/app-doc/gimp-help/gimp-help-2.10.34.ebuild new file mode 100644 index ..4a9d96672c88 --- /dev/null +++ b/app-doc/gimp-help/gimp-help-2.10.34.ebuild @@ -0,0 +1,40 @@ +# 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 + sys-devel/gettext +" + +python_check_deps() { + python_has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]" +} + +src_configure() { + econf --without-gimp +} + +src_compile() { + # See bug: 833566 + python_export_utf8_locale + # Affected with bugs: 677198, 876205. Set "emake -j1" + emake -j1 +}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 25e7f317ab8cf69c08a71e9277fc531420a7cd9f Author: Sergey Torokhov yandex ru> AuthorDate: Sun Oct 9 21:32:03 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Oct 10 07:43:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25e7f317 app-doc/gimp-help: drop old revision 2.10.0-r1 Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Arthur Zamarin gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 36 1 file changed, 36 deletions(-) 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.. --- 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 -}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 000e59f38a21158f8e186dce827b056b5b3f531e Author: Sergey Torokhov yandex ru> AuthorDate: Sun Oct 9 21:49:57 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Oct 10 07:43:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000e59f3 app-doc/gimp-help: add PYTHON_COMPAT python3_11 Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Arthur Zamarin gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..da16e6607be6 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"
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 0e110ee5d4af9de066186317a52d905c79cfae40 Author: Sergey Torokhov yandex ru> AuthorDate: Sun Oct 9 21:51:04 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Mon Oct 10 07:43:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e110ee5 app-doc/gimp-help: revert to use emake -j1 Closes: https://bugs.gentoo.org/876205 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/27713 Signed-off-by: Arthur Zamarin gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 da16e6607be6..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 @@ -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 }
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 727133fa83b6a1dd172106cb584b34d98af325db Author: Arthur Zamarin gentoo org> AuthorDate: Sat Oct 8 16:45:19 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Sat Oct 8 16:45:19 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=727133fa app-doc/gimp-help: use python_has_version inside python_check_deps Signed-off-by: Arthur Zamarin gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 4 ++-- app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 9c4c1db5c92a..98bdcf4baa2b 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -28,7 +28,7 @@ DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') PATCHES=( "${FILESDIR}/${P}-python3.patch" ) python_check_deps() { - has_version "dev-libs/libxml2[${PYTHON_USEDEP}]" + python_has_version -d "dev-libs/libxml2[python,${PYTHON_USEDEP}]" } src_configure() { 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 2d9bc7dd0fa5..e67cf0e86c15 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 @@ -29,7 +29,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-python3.patch" ) python_check_deps() { - has_version -b "dev-libs/libxml2[python,${PYTHON_USEDEP}]" + python_has_version "dev-libs/libxml2[python,${PYTHON_USEDEP}]" } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 9879b966a7d0e55af010f7b00b9d79eb536ab6b3 Author: Joonas Niilola gentoo org> AuthorDate: Tue Jun 7 05:46:33 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Jun 7 06:34:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9879b966 app-doc/gimp-help: Stabilize 2.10.0-r2 amd64, #850163 Signed-off-by: Joonas Niilola gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d45d63c3bfb2..ce6d6f5280ba 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 @@ -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 ~riscv sparc x86" +KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 51eb752b61f5f7ea477fd0f00b7a2d5ec3fb5f0d Author: Joonas Niilola gentoo org> AuthorDate: Tue Jun 7 05:48:18 2022 + Commit: Joonas Niilola gentoo org> CommitDate: Tue Jun 7 06:34:07 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51eb752b app-doc/gimp-help: add missing bdeps to 2.10.0-r2 Signed-off-by: Joonas Niilola gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 ce6d6f5280ba..2d9bc7dd0fa5 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 @@ -17,9 +17,11 @@ IUSE="" BDEPEND=" ${PYTHON_DEPS} - sys-devel/gettext $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') + app-text/docbook-xml-dtd + dev-lang/perl dev-libs/libxslt + sys-devel/gettext " # Adds python3 build support, bug 725940
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 69d0ff7da4d2f6cbe5d3a1fdb633102253a9d12c Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jun 7 06:33:18 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jun 7 06:33:18 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69d0ff7d app-doc/gimp-help: sparc stable wrt bug #850163 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="sparc" Signed-off-by: Agostino Sarubbo gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 7093e7e8ec92..d45d63c3bfb2 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 @@ -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 ~riscv ~sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" IUSE="" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: fe09bbd9eb0149bcf99be018eb12e099e21522f5 Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jun 7 06:32:28 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jun 7 06:32:28 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe09bbd9 app-doc/gimp-help: ppc stable wrt bug #850163 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 accf2ea5fbbc..08db4520e01f 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 @@ -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 ~riscv ~sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ~ppc64 ~riscv ~sparc x86" IUSE="" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 8e4b15413290b3511767ee28c03050953a079b2d Author: Agostino Sarubbo gentoo org> AuthorDate: Tue Jun 7 06:32:53 2022 + Commit: Agostino Sarubbo gentoo org> CommitDate: Tue Jun 7 06:32:53 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e4b1541 app-doc/gimp-help: ppc64 stable wrt bug #850163 Package-Manager: Portage-3.0.30, Repoman-3.0.3 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 08db4520e01f..7093e7e8ec92 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 @@ -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 ~riscv ~sparc x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" IUSE="" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 50de2a6af27a489f753d92018ea29098a8660a93 Author: Sam James gentoo org> AuthorDate: Tue Jun 7 01:14:42 2022 + Commit: Sam James gentoo org> CommitDate: Tue Jun 7 01:14:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50de2a6a app-doc/gimp-help: Stabilize 2.10.0-r2 x86, #850163 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 886b27a60f42..accf2ea5fbbc 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 @@ -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 ~riscv ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="" BDEPEND="
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: e1ef183ac6db5d4316ee720ab4ba397a8d6fa240 Author: Sergey Torokhov yandex ru> AuthorDate: Sun Feb 20 19:03:47 2022 + Commit: Sam James gentoo org> CommitDate: Sun Feb 27 00:52:50 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1ef183a app-doc/gimp-help: add python-3.10 compatibility Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 35 1 file changed, 35 insertions(+) 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 new file mode 100644 index ..719b556896f2 --- /dev/null +++ b/app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) +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 + $(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() { + has_version "dev-libs/libxml2[${PYTHON_USEDEP}]" +} + +src_configure() { + econf --without-gimp +}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: e52e53152c51cb41521c3b4df36d51a12b258496 Author: Sergey Torokhov yandex ru> AuthorDate: Sat Feb 26 23:19:31 2022 + Commit: Sam James gentoo org> CommitDate: Sun Feb 27 00:52:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e52e5315 app-doc/gimp-help: add python_export_utf8_locale Closes: https://bugs.gentoo.org/833566 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/24290 Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 7 +++ 1 file changed, 7 insertions(+) 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 719b556896f2..d04db34df635 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 @@ -33,3 +33,10 @@ python_check_deps() { src_configure() { econf --without-gimp } + +src_compile() { + # See bug: 833566 + python_export_utf8_locale + # If affected with bug: 677198 then set "emake -j1" + emake +}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 7b4236b216b55bab4f490237288fc4d5677b43ff Author: Sam James gentoo org> AuthorDate: Sun Feb 27 00:53:29 2022 + Commit: Sam James gentoo org> CommitDate: Sun Feb 27 00:53:29 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b4236b2 app-doc/gimp-help: update python_check_deps call Signed-off-by: Sam James gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d04db34df635..886b27a60f42 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 @@ -27,7 +27,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-python3.patch" ) python_check_deps() { - has_version "dev-libs/libxml2[${PYTHON_USEDEP}]" + has_version -b "dev-libs/libxml2[python,${PYTHON_USEDEP}]" } src_configure() {
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 01b594551b9ae52cd0041bbcccded8ecbab466e4 Author: Yongxiang Liang gmail com> AuthorDate: Thu Dec 9 16:52:08 2021 + Commit: Yixun Lan gentoo org> CommitDate: Sun Dec 12 14:21:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01b59455 app-doc/gimp-help: keyword ~riscv Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Yongxiang Liang gmail.com> Signed-off-by: Yixun Lan gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 940435472341..9c4c1db5c92a 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 @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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 ~riscv sparc x86" IUSE="" BDEPEND="${PYTHON_DEPS}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 32889d8b3d570129ba27dfc4a27da9ad8a5c1ba2 Author: Michał Górny gentoo org> AuthorDate: Wed Sep 23 11:00:08 2020 + Commit: Michał Górny gentoo org> CommitDate: Wed Sep 23 11:07:49 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32889d8b app-doc/gimp-help: Remove old Signed-off-by: Michał Górny gentoo.org> app-doc/gimp-help/Manifest | 1 - app-doc/gimp-help/gimp-help-2.8.2.ebuild | 35 2 files changed, 36 deletions(-) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index 9024553a992..03774772800 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -1,2 +1 @@ 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 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 a4c03371443..000 --- 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 -}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 5171717646d8e1d807fbe86635e2b3370406da01 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:27:22 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:29:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51717176 app-doc/gimp-help: ppc64 stable wrt bug #743523 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Agostino Sarubbo gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ae75ff0b08d..2aa0ad8601d 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 22fac441e76a9998e66ca158f9bee06f2b285054 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:23:05 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:23:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fac441 app-doc/gimp-help: ppc stable wrt bug #743523 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 68f6b857b69..ae75ff0b08d 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 8dc9825d56856f6227a551b4fd463ccade675044 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Sep 23 10:16:34 2020 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Sep 23 10:16:34 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8dc9825d app-doc/gimp-help: amd64 stable wrt bug #743523 Package-Manager: Portage-2.3.103, Repoman-2.3.23 RepoMan-Options: --include-arches="amd64" Signed-off-by: Agostino Sarubbo gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 76ecfd70d85..68f6b857b69 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 08e441dcea99a99a9431e00062b85d70cbb1bec7 Author: Rolf Eike Beer sf-mail de> AuthorDate: Tue Sep 22 05:17:55 2020 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue Sep 22 06:32:54 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e441dc app-doc/gimp-help: stable 2.10.0-r1 for sparc, bug #743523 Package-Manager: Portage-3.0.4, Repoman-3.0.1 RepoMan-Options: --include-arches="sparc" Signed-off-by: Rolf Eike Beer sf-mail.de> Signed-off-by: Sergei Trofimovich gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e710f44f319..76ecfd70d85 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: abf827e43b948d6b84f38627721ffdf09a163baf Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Sep 20 22:36:05 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Sep 20 22:39:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abf827e4 app-doc/gimp-help: x86 stable (bug #743523) Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 3dab2da02f4..e710f44f319 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: bd80924155e036f368128dfe5aa4d67e977a0195 Author: Sergey Torokhov yandex ru> AuthorDate: Sun Aug 23 08:09:03 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Sep 16 08:04:12 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd809241 app-doc/gimp-help: drop old and depend on python2 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/17197 Signed-off-by: Joonas Niilola gentoo.org> app-doc/gimp-help/Manifest| 1 - app-doc/gimp-help/gimp-help-2.10.0.ebuild | 32 app-doc/gimp-help/gimp-help-2.8.2.ebuild | 35 --- 3 files changed, 68 deletions(-) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index 9024553a992..03774772800 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -1,2 +1 @@ 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 diff --git a/app-doc/gimp-help/gimp-help-2.10.0.ebuild b/app-doc/gimp-help/gimp-help-2.10.0.ebuild deleted file mode 100644 index 5180a87afe2..000 --- a/app-doc/gimp-help/gimp-help-2.10.0.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -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="" - -BDEPEND="${PYTHON_DEPS} - sys-devel/gettext -" - -DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') - dev-libs/libxslt -" - -python_check_deps() { - has_version "dev-libs/libxml2[${PYTHON_USEDEP}]" -} - -src_configure() { - econf --without-gimp -} 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 a4c03371443..000 --- 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 -}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/, app-doc/gimp-help/files/
commit: 95b8c676dfeb51f8f54e008a058436b6e5832ab1 Author: Sergey Torokhov yandex ru> AuthorDate: Thu Aug 20 22:10:27 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Sep 16 08:04:11 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95b8c676 app-doc/gimp-help: 2.10.0, fix build using python3 Closes: https://bugs.gentoo.org/725940 Signed-off-by: Sergey Torokhov yandex.ru> Signed-off-by: Joonas Niilola gentoo.org> .../gimp-help/files/gimp-help-2.10.0-python3.patch | 297 + app-doc/gimp-help/gimp-help-2.10.0-r1.ebuild | 36 +++ 2 files changed, 333 insertions(+) diff --git a/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch b/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch new file mode 100644 index 000..e42214a0f82 --- /dev/null +++ b/app-doc/gimp-help/files/gimp-help-2.10.0-python3.patch @@ -0,0 +1,297 @@ +diff -urNp a/tools/xml2po/__init__.py b/tools/xml2po/__init__.py +--- a/tools/xml2po/__init__.py 2019-11-28 11:45:00.889048989 +0100 b/tools/xml2po/__init__.py 2020-01-06 13:24:24.715787902 +0100 +@@ -166,7 +166,7 @@ class XMLDocument(object): + elif node.isText(): + if node.isBlankNode(): + if self.app.options.get('expand_entities') or \ +- (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ): ++ (not (node.prev and not node.prev.isBlankNode() and node.nextElementSibling() and not node.next.isBlankNode()) ): + #print >>sys.stderr, "BLANK" + node.setContent('') + else: +@@ -200,7 +200,7 @@ class XMLDocument(object): + tree = ctxt.doc() + newnode = tree.getRootElement() + except: +-print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text) ++print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr) + return text + + self.normalizeNode(newnode) +@@ -259,7 +259,7 @@ class XMLDocument(object): + if not self.expand_entities: + result += '&' + child.name + ';' + else: +-result += child.content.decode('utf-8') ++result += child.content + else: + result += self.myAttributeSerialize(child) + child = child.next +@@ -326,7 +326,7 @@ class XMLDocument(object): + pass + + content = '<%s>%s' % (starttag, text, endtag) +-tmp = tmp + content.encode('utf-8') ++tmp = tmp + content + + newnode = None + try: +@@ -338,7 +338,7 @@ class XMLDocument(object): + pass + + if not newnode: +-print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')) ++print("""Error while parsing translation as XML:\n"%s"\n""" % (text), file=sys.stderr) + return + + newelem = newnode.getRootElement() +@@ -354,7 +354,7 @@ class XMLDocument(object): + copy = newelem.copyNodeList() + next = node.next + node.replaceNode(newelem.copyNodeList()) +-node.next = next ++node.__next__ = next + + else: + # In practice, this happens with tags such as " " (only whitespace in between) +@@ -406,7 +406,7 @@ class XMLDocument(object): + translation = self.app.getTranslation(outtxt) # unicode or None + if translation is not None: + self.replaceAttributeContentsWithText(attr, +- translation.encode('utf-8')) ++ translation) + else: + self.app.msg.outputMessage(outtxt, node.lineNo(), "", spacepreserve=False, + tag = node.name + ":" + attr.name) +@@ -447,14 +447,14 @@ class XMLDocument(object): + norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node)) + translation = self.app.getTranslation(norm_outtxt) + else: +-translation = outtxt.decode('utf-8') ++translation = outtxt + + starttag = self.startTagForNode(node) + endtag = self.endTagForNode(node) + + worth = self.worthOutputting(node) + if not translation: +-translation = outtxt.decode('utf-8') ++translation = outtxt + if worth and self.app.options.get('mark_untranslated'): + node.setLang('C') + +@@ -463,7 +463,7 @@ class XMLDocument(object): + # repl[0] may contain translated attributes with + # non-ASCII chars, so implicit
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 6bf0e2eae719f66a579a5fe363b2f504b34fc650 Author: Joonas Niilola gentoo org> AuthorDate: Wed Sep 16 08:03:47 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Wed Sep 16 08:04:13 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6bf0e2ea app-doc/gimp-help: return 2.8.2 ebuild Signed-off-by: Joonas Niilola gentoo.org> app-doc/gimp-help/Manifest | 1 + app-doc/gimp-help/gimp-help-2.8.2.ebuild | 35 2 files changed, 36 insertions(+) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index 03774772800..9024553a992 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -1 +1,2 @@ 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 diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild new file mode 100644 index 000..a4c03371443 --- /dev/null +++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild @@ -0,0 +1,35 @@ +# 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 +}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 0e227570475e0b1becac7f986ac7f2a6b59a36ac Author: Sergey Torokhov yandex ru> AuthorDate: Sun Feb 9 10:30:58 2020 + Commit: Michał Górny gentoo org> CommitDate: Tue Feb 11 10:20:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e227570 app-doc/gimp-help: fix missing python_check_deps() Closes: https://bugs.gentoo.org/708566 Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/14603 Signed-off-by: Michał Górny gentoo.org> app-doc/gimp-help/gimp-help-2.10.0.ebuild | 6 +- app-doc/gimp-help/gimp-help-2.8.2.ebuild | 6 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app-doc/gimp-help/gimp-help-2.10.0.ebuild b/app-doc/gimp-help/gimp-help-2.10.0.ebuild index 7041b5998ba..5180a87afe2 100644 --- a/app-doc/gimp-help/gimp-help-2.10.0.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -23,6 +23,10 @@ DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') dev-libs/libxslt " +python_check_deps() { + has_version "dev-libs/libxml2[${PYTHON_USEDEP}]" +} + src_configure() { econf --without-gimp } 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 eddf386a020..f1f2dea4b62 100644 --- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -21,6 +21,10 @@ DEPEND="${PYTHON_DEPS} sys-devel/gettext " +python_check_deps() { + has_version "dev-libs/libxml2[${PYTHON_USEDEP}]" +} + src_configure() { econf --without-gimp }
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: d70a88692bc17e98e82faf278737f280add30eb6 Author: Joonas Niilola gentoo org> AuthorDate: Sat Dec 7 12:22:25 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 7 12:47:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d70a8869 app-doc/gimp-help: enable parallel building for 2.10.0 Package-Manager: Portage-2.3.81, Repoman-2.3.20 Signed-off-by: Joonas Niilola gentoo.org> app-doc/gimp-help/gimp-help-2.10.0.ebuild | 5 - 1 file changed, 5 deletions(-) diff --git a/app-doc/gimp-help/gimp-help-2.10.0.ebuild b/app-doc/gimp-help/gimp-help-2.10.0.ebuild index 51258072104..7041b5998ba 100644 --- a/app-doc/gimp-help/gimp-help-2.10.0.ebuild +++ b/app-doc/gimp-help/gimp-help-2.10.0.ebuild @@ -26,8 +26,3 @@ DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') src_configure() { econf --without-gimp } - -src_compile() { - # see https://bugs.gentoo.org/677198 - emake -j1 -}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 13bedab8be4f2162092380debc8c4dbe82ce56ca Author: Sergey Torokhov yandex ru> AuthorDate: Mon Dec 2 00:32:47 2019 + Commit: Joonas Niilola gentoo org> CommitDate: Sat Dec 7 12:47:06 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13bedab8 app-doc/gimp-help: 2.10.0 version bump Signed-off-by: Sergey Torokhov yandex.ru> Closes: https://github.com/gentoo/gentoo/pull/13830 Signed-off-by: Joonas Niilola gentoo.org> app-doc/gimp-help/Manifest| 1 + app-doc/gimp-help/gimp-help-2.10.0.ebuild | 33 +++ app-doc/gimp-help/metadata.xml| 9 - 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index e7275cf1c9f..9024553a992 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -1 +1,2 @@ +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 diff --git a/app-doc/gimp-help/gimp-help-2.10.0.ebuild b/app-doc/gimp-help/gimp-help-2.10.0.ebuild new file mode 100644 index 000..51258072104 --- /dev/null +++ b/app-doc/gimp-help/gimp-help-2.10.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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="" + +BDEPEND="${PYTHON_DEPS} + sys-devel/gettext +" + +DEPEND="$(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') + dev-libs/libxslt +" + +src_configure() { + econf --without-gimp +} + +src_compile() { + # see https://bugs.gentoo.org/677198 + emake -j1 +} diff --git a/app-doc/gimp-help/metadata.xml b/app-doc/gimp-help/metadata.xml index 6f49eba8f49..e7e7a5da0ad 100644 --- a/app-doc/gimp-help/metadata.xml +++ b/app-doc/gimp-help/metadata.xml @@ -1,5 +1,12 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + torokhov-...@yandex.ru + Sergey Torokhov + + + proxy-ma...@gentoo.org + Proxy Maintainers +
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 746b656af2ec5c8398f4267819255f2c74ccb166 Author: Pacho Ramos gentoo org> AuthorDate: Mon Feb 18 21:20:44 2019 + Commit: Pacho Ramos gentoo org> CommitDate: Mon Feb 18 21:23:51 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=746b656a app-doc/gimp-help: Drop old Package-Manager: Portage-2.3.61, Repoman-2.3.12 Signed-off-by: Pacho Ramos gentoo.org> app-doc/gimp-help/Manifest | 13 -- app-doc/gimp-help/gimp-help-2.6.1.ebuild | 41 2 files changed, 54 deletions(-) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index 7d7a6db419a..e7275cf1c9f 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -1,14 +1 @@ -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
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 1b659c2fc3a7188a6b18c8b57dbf8ac7ed0eb966 Author: Rolf Eike Beer sf-mail de> AuthorDate: Mon Feb 18 17:48:58 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Mon Feb 18 19:48:29 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b659c2f app-doc/gimp-help: stable 2.8.2 for sparc, bug #676388 Signed-off-by: Rolf Eike Beer sf-mail.de> Package-Manager: Portage-2.3.51, Repoman-2.3.11 RepoMan-Options: --include-arches="sparc" Signed-off-by: Sergei Trofimovich gentoo.org> app-doc/gimp-help/gimp-help-2.8.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ac9a1f084eb..a48b67dbafd 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: ff791dd177b732c91dc93590c083b507a3cd693a Author: Rolf Eike Beer sf-mail de> AuthorDate: Tue Feb 5 19:42:51 2019 + Commit: Patrice Clement gentoo org> CommitDate: Sun Feb 17 22:57:58 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff791dd1 app-doc/gimp-help-2.8.2: disable parallel build. Closes: https://bugs.gentoo.org/677198 Closes: https://github.com/gentoo/gentoo/pull/10990 Signed-off-by: Rolf Eike Beer sf-mail.de> Closes: https://github.com/gentoo/gentoo/pull/10990 Signed-off-by: Patrice Clement gentoo.org> app-doc/gimp-help/gimp-help-2.8.2.ebuild | 5 + 1 file changed, 5 insertions(+) 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 3c7f761243f..ac9a1f084eb 100644 --- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild @@ -24,3 +24,8 @@ DEPEND="${PYTHON_DEPS} src_configure() { econf --without-gimp } + +src_compile() { + # see https://bugs.gentoo.org/677198 + emake -j 1 +}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 4ed7cb03be66e16926b61f628b2eb8425aca0644 Author: Mikle Kolyada gentoo org> AuthorDate: Thu Feb 7 10:35:01 2019 + Commit: Mikle Kolyada gentoo org> CommitDate: Thu Feb 7 10:35:01 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4ed7cb03 app-doc/gimp-help: amd64 stable wrt bug #676388 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 app-doc/gimp-help/gimp-help-2.8.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d62199c0486..3c7f761243f 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: fc381a00aa112e1dd86054cc86ed951145d41622 Author: Tobias Klausmann gentoo org> AuthorDate: Thu Jan 31 21:23:31 2019 + Commit: Tobias Klausmann gentoo org> CommitDate: Thu Jan 31 21:23:31 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc381a00 app-doc/gimp-help-2.8.2-r0: alpha stable Bug: http://bugs.gentoo.org/676388 Signed-off-by: Tobias Klausmann gentoo.org> app-doc/gimp-help/gimp-help-2.8.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 a53fadd8d8a..0a557ab93dd 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 89f518b927f2db844841faa6460874055172edea Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jan 27 14:13:45 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jan 27 14:14:35 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89f518b9 app-doc/gimp-help: stable 2.8.2 for ppc64, bug #676388 Package-Manager: Portage-2.3.58, Repoman-2.3.12 RepoMan-Options: --include-arches="ppc64" Signed-off-by: Sergei Trofimovich gentoo.org> app-doc/gimp-help/gimp-help-2.8.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4e35d5f396f..a53fadd8d8a 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: d5ef727be359742322fb5be5ee81746acaaa41b6 Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jan 27 12:29:48 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jan 27 14:09:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ef727b app-doc/gimp-help: stable 2.8.2 for ppc, bug #676388 Package-Manager: Portage-2.3.58, Repoman-2.3.12 RepoMan-Options: --include-arches="ppc" Signed-off-by: Sergei Trofimovich gentoo.org> app-doc/gimp-help/gimp-help-2.8.2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 723351779af..4e35d5f396f 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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: ce6aad5ec5aad35e969638a59a807adbd13cff7e Author: Sergei Trofimovich gentoo org> AuthorDate: Sun Jan 27 12:13:14 2019 + Commit: Sergei Trofimovich gentoo org> CommitDate: Sun Jan 27 12:13:14 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce6aad5e app-doc/gimp-help: stable 2.8.2 for ia64, bug #676388 Package-Manager: Portage-2.3.58, Repoman-2.3.12 RepoMan-Options: --include-arches="ia64" Signed-off-by: Sergei Trofimovich gentoo.org> app-doc/gimp-help/gimp-help-2.8.2.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 f1d6c10a764..723351779af 100644 --- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -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}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: cbd532ba9e3ccf3ba2103a1b0d0696aa839667ae Author: Matt Turner gentoo org> AuthorDate: Sun Apr 22 20:58:35 2018 + Commit: Matt Turner gentoo org> CommitDate: Sun Apr 22 21:03:37 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbd532ba app-doc/gimp-help: drop to ~hppa, bug 641954 app-doc/gimp-help/gimp-help-2.6.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-doc/gimp-help/gimp-help-2.6.1.ebuild b/app-doc/gimp-help/gimp-help-2.6.1.ebuild index e064bf9d686..e1fef672eaa 100644 --- a/app-doc/gimp-help/gimp-help-2.6.1.ebuild +++ b/app-doc/gimp-help/gimp-help-2.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="4" @@ -9,7 +9,7 @@ HOMEPAGE="https://docs.gimp.org/; 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=""
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 8b2d0562eae946c251c9f4266c398454976d832d Author: Harri Nieminen gmail com> AuthorDate: Fri Mar 30 12:09:20 2018 + Commit: Patrice Clement gentoo org> CommitDate: Sun Apr 8 22:42:06 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b2d0562 app-doc/gimp-help: add missing depend on libxml2. Closes: https://bugs.gentoo.org/638874 Closes: https://github.com/gentoo/gentoo/pull/7708 Package-Manager: Portage-2.3.27, Repoman-2.3.7 app-doc/gimp-help/gimp-help-2.8.2.ebuild | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 1a1cf12f05f..f1d6c10a764 100644 --- a/app-doc/gimp-help/gimp-help-2.8.2.ebuild +++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI=6 PYTHON_COMPAT=( python2_7 ) inherit python-any-r1 @@ -16,6 +16,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" IUSE="" DEPEND="${PYTHON_DEPS} + $(python_gen_any_dep 'dev-libs/libxml2[python,${PYTHON_USEDEP}]') dev-libs/libxslt sys-devel/gettext "
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: eb72d0cbfac2f8c4ea821bc9a270bf4db1c7783e Author: Michael Palimaka gentoo org> AuthorDate: Mon Jun 12 08:58:04 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jun 12 08:58:13 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb72d0cb app-doc/gimp-help: version bump 2.8.2 Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-doc/gimp-help/Manifest | 1 + app-doc/gimp-help/gimp-help-2.8.2.ebuild | 25 + 2 files changed, 26 insertions(+) diff --git a/app-doc/gimp-help/Manifest b/app-doc/gimp-help/Manifest index f7df30c06e6..22daaa02c19 100644 --- a/app-doc/gimp-help/Manifest +++ b/app-doc/gimp-help/Manifest @@ -11,3 +11,4 @@ DIST gimp-help-2.6.1-html-pl.tar.bz2 28753373 SHA256 d60a1b99cfcefa43bf400b0add2 DIST gimp-help-2.6.1-html-ru.tar.bz2 29324878 SHA256 4f788dcf870fce463342437e1099bffc965d3d1e173f61d352fedd87d2d6a7ab SHA512 ac564048f0543aa22481756ecd7f5c6c75f96094bc0b6aee2446f4c3ccedf511e2217034f95e1953f5ad615ff5a246de9326adace4641e568e41b603d83c18c7 WHIRLPOOL 8d950b49234f115f66d7ecc92211f35c2a6abd56fbe25c2b01b5329bbef0e396dca20bc8ffc174bc3ba21b861478e52b42d6b934b732ff96e21d6d5083f29818 DIST gimp-help-2.6.1-html-sv.tar.bz2 29462846 SHA256 fb6bb874b28f7cd225efd614f30edf20c978ea15d31217cf22304a7091fa3fc9 SHA512 c12cda4c29bde87d79ae1ed3e1d6ec85f7ea8e3e8c01bf3b3b95a67478fee1c16f8421c4f869134b584c38aac611f6a69e7c1c4dd4b5906a69ad46f8f7b0c6ad WHIRLPOOL 9ab7eaddc1a6ccdf51ec8b473ff257fef0a4618f5b481f2f37a8009be628e323bb39896c01d4521b97c4e33b18b397b67cf9490e5ab6f0dde48af63d663e7850 DIST gimp-help-2.6.1-html-zh_CN.tar.bz2 28735285 SHA256 d82128dcd669c6247ded3b3cfa33071a44a6e08d8325ceb820089b4722ad5c69 SHA512 daa6fd365c04c3dc78c1955301f0544ec67e17ff156e6e10d6cad959b9a1121a976feff29e30008809bc1beb1b4868474c40e36a76ea45410e3b7f5aed719055 WHIRLPOOL 76a7c49eee569d4eaab93f2ca3d8312e228edbab7f6c14535dd8979e58e546ea91c85269b611be8f3ac37890615947d990f3766c228cd2fd61912cbe0605 +DIST gimp-help-2.8.2.tar.bz2 158504580 SHA256 e5658f1553428898bc23f07eedbb87e259ef9010fcf55b99b364f07d143b6e57 SHA512 3afdaa8b2f005d939d039d2e22c8306145e7b7acaca5ef89279998e87931e99d1fe607f1337f7796d667d5c6be456ba976b3c8a937c9dd6b1888d7158cfbed67 WHIRLPOOL 199a9d682c3f5516e858ace16e5c867cd0c28f9f18e2c9133e38dd49217326b674f0563f0f0727003ce5ebcc4a7a7d30d90eed98a4a85de56da62104e6591a67 diff --git a/app-doc/gimp-help/gimp-help-2.8.2.ebuild b/app-doc/gimp-help/gimp-help-2.8.2.ebuild new file mode 100644 index 000..1a1cf12f05f --- /dev/null +++ b/app-doc/gimp-help/gimp-help-2.8.2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2017 Gentoo Foundation +# 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 ~x86-fbsd" +IUSE="" + +DEPEND="${PYTHON_DEPS} + dev-libs/libxslt + sys-devel/gettext +" + +src_configure() { + econf --without-gimp +}
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 60df459a0f175bfff6a4773032f6865aa3e8ea13 Author: Michael Palimaka gentoo org> AuthorDate: Mon Jun 12 08:31:07 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Jun 12 08:58:12 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60df459a app-doc/gimp-help: use HTTPS Package-Manager: Portage-2.3.5, Repoman-2.3.2 app-doc/gimp-help/gimp-help-2.6.1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app-doc/gimp-help/gimp-help-2.6.1.ebuild b/app-doc/gimp-help/gimp-help-2.6.1.ebuild index 5b05d7e900e..e064bf9d686 100644 --- a/app-doc/gimp-help/gimp-help-2.6.1.ebuild +++ b/app-doc/gimp-help/gimp-help-2.6.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 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="http://docs.gimp.org/; +HOMEPAGE="https://docs.gimp.org/; LICENSE="FDL-1.2" SLOT="2"
[gentoo-commits] repo/gentoo:master commit in: app-doc/gimp-help/
commit: 4fe8c8d5c8390152e12903d95f3a930d90bd27e3 Author: Ulrich Müller gentoo org> AuthorDate: Fri Jun 24 22:02:00 2016 + Commit: Ulrich Müller gentoo org> CommitDate: Fri Jun 24 22:02:29 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4fe8c8d5 app-doc/gimp-help: Migrate from LINGUAS to L10N. Package-Manager: portage-2.3.0 app-doc/gimp-help/gimp-help-2.6.1.ebuild | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app-doc/gimp-help/gimp-help-2.6.1.ebuild b/app-doc/gimp-help/gimp-help-2.6.1.ebuild index cba7234..2287ea8 100644 --- a/app-doc/gimp-help/gimp-help-2.6.1.ebuild +++ b/app-doc/gimp-help/gimp-help-2.6.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -17,16 +17,16 @@ 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" +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="${IUSE} linguas_${X}" - SRC_URI="${SRC_URI} linguas_${X}? ( mirror://gimp/help/${P}-html-${X}.tar.bz2 )" - EMPTY_LINGUAS_SRC_URI="mirror://gimp/help/${P}-html-${X}.tar.bz2 ${EMPTY_LINGUAS_SRC_URI}" - EMPTY_LINGUAS_SET="!linguas_${X}? ( ${EMPTY_LINGUAS_SET} " - EMPTY_LINGUAS_BRAKETS="${EMPTY_LINGUAS_BRAKETS} )" + 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_LINGUAS_SET} ${EMPTY_LINGUAS_SRC_URI} ${EMPTY_LINGUAS_BRAKETS}" +SRC_URI="${SRC_URI} ${EMPTY_L10N_SRC_URI}" DEPEND="" RDEPEND=">=media-gfx/gimp-2.4"