From 8d40af3639353f196d752b26391ae67b5f5a748c Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Tue, 24 Jan 2023 11:00:22 +0100 Subject: [PATCH] dev-python/pygments: Sync with Gentoo It's from Gentoo commit 8239cbe100fadf423adb28f20a79dd31b65724e4. --- .../dev-python/pygments/Manifest | 3 +- .../pygments-2.11.2-fix-docs-relative.patch | 26 ------------ .../dev-python/pygments/metadata.xml | 1 + .../pygments/pygments-2.11.2.ebuild | 41 ------------------- .../pygments/pygments-2.12.0.ebuild | 41 ------------------- ....12.0-r1.ebuild => pygments-2.14.0.ebuild} | 18 +++----- 6 files changed, 8 insertions(+), 122 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.11.2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.12.0.ebuild rename sdk_container/src/third_party/portage-stable/dev-python/pygments/{pygments-2.12.0-r1.ebuild => pygments-2.14.0.ebuild} (64%) diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest b/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest index b096c4cec6..1234781609 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest +++ b/sdk_container/src/third_party/portage-stable/dev-python/pygments/Manifest @@ -1,2 +1 @@ -DIST Pygments-2.11.2.tar.gz 4206258 BLAKE2B d9b7ac03ab564051df8eebf390586387d824584f5485eb6af2048cec181412fe2812409251c9c042421125a2579d9ac6de4006c1c0de025ed7b010482482b9f9 SHA512 606ff0c35fa47882f4c5c3794827132e1ee6ccbb4895ae858f9c93ea0c92b73163c9f4d630b51a8bb782ba0b4944a66d1059ad5d017d3191a0a5b30c1e5b8f9f -DIST Pygments-2.12.0.tar.gz 4282017 BLAKE2B 9ad241d5bcafe59057e9495edb75468e6fa74d150f2d3266590a5a567a7df8ce2ef4ea18f90a8ab83e2fb84993fcf00dec12b04dd968f4c516b8339c49aecc08 SHA512 70bbfaefeb34f9afb5d74aa924ac3da4a913d1c7f607c0b3f80b6cd25c88a8996e516a689062bf2009c472b29999e309eb044f0f427fa1ea8479bf921b51c524 +DIST Pygments-2.14.0.tar.gz 4434562 BLAKE2B a3050bae96a8ae044f803e7964b5dede7a73b04f04f6af9d4b9e4d24e3ae0185138d0d68801ee5ac81cdaf74e50c7fea303913470c23182adb30ff2c08c332a8 SHA512 51416a8e2a8d0288cbbf6fd81e6870ffe9d999da255c43d0f870eb5cb4d01660416d136d39fad38b76c4bace3c3aa648fb306519e85e340545a87fc657aaeb15 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch b/sdk_container/src/third_party/portage-stable/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch deleted file mode 100644 index 199a88d28d..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch +++ /dev/null @@ -1,26 +0,0 @@ -Subject: Fix relative path for doc generation - -Signed-off-by: Arthur Zamarin - ---- a/doc/conf.py -+++ b/doc/conf.py -@@ -244,7 +244,7 @@ def pg_context(app, pagename, templatename, ctx, event_arg): - ctx['languages'] = lexer_name_url - - if pagename in ('styles', 'demo'): -- with open('examples/example.py') as f: -+ with open('doc/examples/example.py') as f: - html = f.read() - lexer = pygments.lexers.get_lexer_for_filename('example.py') - min_contrasts = test_contrasts.min_contrasts() -@@ -280,7 +280,7 @@ def pg_context(app, pagename, templatename, ctx, event_arg): - def source_read(app, docname, source): - # linkify issue / PR numbers in changelog - if docname == 'docs/changelog': -- with open('../CHANGES') as f: -+ with open('CHANGES') as f: - changelog = f.read() - - idx = changelog.find('\nVersion 2.4.2\n') --- -2.35.1 diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml b/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml index a8185a9df5..9f522cdfbe 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml +++ b/sdk_container/src/third_party/portage-stable/dev-python/pygments/metadata.xml @@ -8,6 +8,7 @@ Pygments is a syntax highlighting package written in Python. Pygments can output to html, bbcode, latex, rtf and other formats. + cpe:/a:pygments:pygments Pygments pygments/pygments diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.11.2.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.11.2.ebuild deleted file mode 100644 index 4df58e4405..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.11.2.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 bash-completion-r1 - -MY_P=${P^} -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE=" - https://pygments.org/ - https://github.com/pygments/pygments/ - https://pypi.org/project/Pygments/" -SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" - -BDEPEND=" - test? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}] - virtual/ttf-fonts - )" - -PATCHES=( - "${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch" -) - -distutils_enable_sphinx doc \ - dev-python/wcag-contrast-ratio -distutils_enable_tests pytest - -python_install_all() { - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.12.0.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.12.0.ebuild deleted file mode 100644 index 0054a81979..0000000000 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.12.0.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} pypy3 ) -inherit distutils-r1 bash-completion-r1 - -MY_P=${P^} -DESCRIPTION="Pygments is a syntax highlighting package written in Python" -HOMEPAGE=" - https://pygments.org/ - https://github.com/pygments/pygments/ - https://pypi.org/project/Pygments/" -SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz" -S=${WORKDIR}/${MY_P} - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" - -BDEPEND=" - test? ( - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/pillow[${PYTHON_USEDEP}] - dev-python/wcag-contrast-ratio[${PYTHON_USEDEP}] - virtual/ttf-fonts - )" - -PATCHES=( - "${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch" -) - -distutils_enable_sphinx doc \ - dev-python/wcag-contrast-ratio -distutils_enable_tests pytest - -python_install_all() { - distutils-r1_python_install_all - newbashcomp external/pygments.bashcomp pygmentize -} diff --git a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.12.0-r1.ebuild b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.14.0.ebuild similarity index 64% rename from sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.12.0-r1.ebuild rename to sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.14.0.ebuild index 7d9033ed45..8cb3ab44f8 100644 --- a/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.12.0-r1.ebuild +++ b/sdk_container/src/third_party/portage-stable/dev-python/pygments/pygments-2.14.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} pypy3 ) +PYTHON_COMPAT=( python3_{9..11} pypy3 ) inherit distutils-r1 bash-completion-r1 @@ -18,9 +18,9 @@ HOMEPAGE=" SRC_URI="mirror://pypi/${MY_P:0:1}/${PN^}/${MY_P}.tar.gz" S=${WORKDIR}/${MY_P} -LICENSE="BSD" +LICENSE="BSD-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86" BDEPEND=" test? ( @@ -31,15 +31,9 @@ BDEPEND=" ) " -PATCHES=( - "${FILESDIR}/${PN}-2.11.2-fix-docs-relative.patch" -) - -distutils_enable_sphinx doc \ - dev-python/wcag-contrast-ratio distutils_enable_tests pytest -python_install_all() { - distutils-r1_python_install_all +src_install() { + distutils-r1_src_install newbashcomp external/pygments.bashcomp pygmentize }