* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/
@ 2015-10-30 12:04 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-10-30 12:04 UTC (permalink / raw
To: gentoo-commits
commit: 0bd80b2412af7bd1143f9bb9a3426ebdfab5c333
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 11:14:00 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 12:03:49 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0bd80b24
dev-python/pygments: Backport fix for shell injection
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564478
Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
.../files/2.0.2-shell-injection-backport.patch | 29 +++++++++++
.../files/2.0.2-shell-injection-backport2.patch | 56 +++++++++++++++++++++
dev-python/pygments/metadata.xml | 2 +-
dev-python/pygments/pygments-2.0.2-r1.ebuild | 57 ++++++++++++++++++++++
4 files changed, 143 insertions(+), 1 deletion(-)
diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport.patch
new file mode 100644
index 0000000..0a23adc
--- /dev/null
+++ b/dev-python/pygments/files/2.0.2-shell-injection-backport.patch
@@ -0,0 +1,29 @@
+# HG changeset patch
+# User Javantea <jvoss@altsci.com>
+# Date 1443460403 25200
+# Node ID 6b4baae517b6aaff7142e66f1dbadf7b9b871f61
+# Parent 655dbebddc23943b8047b3c139c51c22ef18fd91
+Fix Shell Injection in FontManager._get_nix_font_path
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -10,6 +10,7 @@
+ """
+
+ import sys
++import shlex
+
+ from pygments.formatter import Formatter
+ from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
+@@ -79,8 +80,8 @@
+ from commands import getstatusoutput
+ except ImportError:
+ from subprocess import getstatusoutput
+- exit, out = getstatusoutput('fc-list "%s:style=%s" file' %
+- (name, style))
++ exit, out = getstatusoutput('fc-list %s file' %
++ shlex.quote("%s:style=%s" % (name, style)))
+ if not exit:
+ lines = out.splitlines()
+ if lines:
diff --git a/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch b/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch
new file mode 100644
index 0000000..78bf447
--- /dev/null
+++ b/dev-python/pygments/files/2.0.2-shell-injection-backport2.patch
@@ -0,0 +1,56 @@
+# HG changeset patch
+# User Tim Hatch <tim@timhatch.com>
+# Date 1445007300 25200
+# Node ID 0036ab1c99e256298094505e5e92fdacdfc5b0a8
+# Parent c0c0d4049a7c325cd69b764c6ceb7747d319212d
+Avoid the shell entirely when finding fonts.
+
+Manually tested on OS X.
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -10,12 +10,13 @@
+ """
+
+ import sys
+-import shlex
+
+ from pygments.formatter import Formatter
+ from pygments.util import get_bool_opt, get_int_opt, get_list_opt, \
+ get_choice_opt, xrange
+
++import subprocess
++
+ # Import this carefully
+ try:
+ from PIL import Image, ImageDraw, ImageFont
+@@ -76,14 +77,11 @@
+ self._create_nix()
+
+ def _get_nix_font_path(self, name, style):
+- try:
+- from commands import getstatusoutput
+- except ImportError:
+- from subprocess import getstatusoutput
+- exit, out = getstatusoutput('fc-list %s file' %
+- shlex.quote("%s:style=%s" % (name, style)))
+- if not exit:
+- lines = out.splitlines()
++ proc = subprocess.Popen(['fc-list', "%s:style=%s" % (name, style), 'file'],
++ stdout=subprocess.PIPE, stderr=None)
++ stdout, _ = proc.communicate()
++ if proc.returncode == 0:
++ lines = stdout.splitlines()
+ if lines:
+ path = lines[0].strip().strip(':')
+ return path
+@@ -198,7 +196,7 @@
+ bold and italic fonts will be generated. This really should be a
+ monospace font to look sane.
+
+- Default: "Bitstream Vera Sans Mono"
++ Default: "Bitstream Vera Sans Mono" on Windows, Courier New on *nix
+
+ `font_size`
+ The font size in points to be used.
diff --git a/dev-python/pygments/metadata.xml b/dev-python/pygments/metadata.xml
index 10b24d2..f91efd2 100644
--- a/dev-python/pygments/metadata.xml
+++ b/dev-python/pygments/metadata.xml
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>python</herd>
diff --git a/dev-python/pygments/pygments-2.0.2-r1.ebuild b/dev-python/pygments/pygments-2.0.2-r1.ebuild
new file mode 100644
index 0000000..3ee352b
--- /dev/null
+++ b/dev-python/pygments/pygments-2.0.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
+
+inherit distutils-r1 bash-completion-r1 vcs-snapshot
+
+MY_PN="Pygments"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Pygments is a syntax highlighting package written in Python"
+HOMEPAGE="http://pygments.org/ https://pypi.python.org/pypi/Pygments"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? (
+ dev-python/nose[${PYTHON_USEDEP}]
+ virtual/ttf-fonts )"
+# dev-texlive/texlive-latexrecommended
+# Removing / commenting out this dep. I can find no mention of it in tests other than
+# importing pygment's own tex module. If it's there and I missed it just uncomment and re-add
+# Tests pass without it
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-shell-injection-backport.patch
+ "${FILESDIR}"/${PV}-shell-injection-backport2.patch
+)
+
+python_compile_all() {
+ use doc && emake -C doc html
+}
+
+python_test() {
+ cp -r -l tests "${BUILD_DIR}"/ || die
+ # With pypy3 there is 1 error out of 1556 tests when run as is and
+ # (SKIP=8, errors=1, failures=1) when run with 2to3; meh
+ nosetests -w "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( doc/_build/html/. )
+
+ distutils-r1_python_install_all
+ newbashcomp external/pygments.bashcomp pygmentize
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/
@ 2015-12-04 8:34 Justin Lecher
0 siblings, 0 replies; 5+ messages in thread
From: Justin Lecher @ 2015-12-04 8:34 UTC (permalink / raw
To: gentoo-commits
commit: 1df3cf378b95f59d76c98bfca0f23648cbabce2b
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 08:34:28 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 08:34:28 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1df3cf37
dev-python/pygments: Fix byte decoding in py3
Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=564478
Package-Manager: portage-2.2.25
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
dev-python/pygments/files/2.0.2-bytes-decode.patch | 16 ++++++++++++++++
...pygments-2.0.2-r1.ebuild => pygments-2.0.2-r2.ebuild} | 1 +
2 files changed, 17 insertions(+)
diff --git a/dev-python/pygments/files/2.0.2-bytes-decode.patch b/dev-python/pygments/files/2.0.2-bytes-decode.patch
new file mode 100644
index 0000000..35f2e26
--- /dev/null
+++ b/dev-python/pygments/files/2.0.2-bytes-decode.patch
@@ -0,0 +1,16 @@
+ pygments/formatters/img.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pygments/formatters/img.py b/pygments/formatters/img.py
+index db5bee3..12d53cd 100644
+--- a/pygments/formatters/img.py
++++ b/pygments/formatters/img.py
+@@ -84,7 +84,7 @@ class FontManager(object):
+ if not exit:
+ lines = out.splitlines()
+ if lines:
+- path = lines[0].strip().strip(':')
++ path = lines[0].decode().strip().strip(':')
+ return path
+
+ def _create_nix(self):
diff --git a/dev-python/pygments/pygments-2.0.2-r1.ebuild b/dev-python/pygments/pygments-2.0.2-r2.ebuild
similarity index 97%
rename from dev-python/pygments/pygments-2.0.2-r1.ebuild
rename to dev-python/pygments/pygments-2.0.2-r2.ebuild
index b2de015..adef7af 100644
--- a/dev-python/pygments/pygments-2.0.2-r1.ebuild
+++ b/dev-python/pygments/pygments-2.0.2-r2.ebuild
@@ -36,6 +36,7 @@ S="${WORKDIR}/${MY_P}"
PATCHES=(
"${FILESDIR}"/${PV}-shell-injection-backport.patch
"${FILESDIR}"/${PV}-shell-injection-backport2.patch
+ "${FILESDIR}"/${PV}-bytes-decode.patch
)
python_compile_all() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/
@ 2018-07-12 22:26 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2018-07-12 22:26 UTC (permalink / raw
To: gentoo-commits
commit: 9e75380f3945567172af1e2487ce4d1d1aeae81f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 12 22:06:43 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 22:25:59 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e75380f
dev-python/pygments: Backport python3.7 generator fix
.../pygments/files/pygments-2.2.0-pep479.patch | 46 ++++++++++++++++++++++
dev-python/pygments/pygments-2.2.0.ebuild | 5 +++
2 files changed, 51 insertions(+)
diff --git a/dev-python/pygments/files/pygments-2.2.0-pep479.patch b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
new file mode 100644
index 00000000000..28d40e9566a
--- /dev/null
+++ b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
@@ -0,0 +1,46 @@
+# HG changeset patch
+# User Miro Hrončok <miro@hroncok.cz>
+# Date 1530720528 -7200
+# Branch py37
+# Node ID 933b5f6afe35e6d554f46085a4e62dc5bf413c87
+# Parent 7941677dc77d4f2bf0bbd6140ade85a9454b8b80
+PEP 479: Raising StopIteration from a generator is now an error
+
+So we return instead. Fix needed for Python 3.7.
+
+Fixes https://bitbucket.org/birkenfeld/pygments-main/issues/1457
+
+diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
+--- a/pygments/lexers/lisp.py
++++ b/pygments/lexers/lisp.py
+@@ -2327,13 +2327,13 @@
+ token = Name.Function if token == Literal else token
+ yield index, token, value
+
+- raise StopIteration
++ return
+
+ def _process_signature(self, tokens):
+ for index, token, value in tokens:
+ if token == Literal and value == '}':
+ yield index, Punctuation, value
+- raise StopIteration
++ return
+ elif token in (Literal, Name.Function):
+ token = Name.Variable if value.istitle() else Keyword.Type
+ yield index, token, value
+diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py
+--- a/pygments/lexers/sql.py
++++ b/pygments/lexers/sql.py
+@@ -347,7 +347,10 @@
+ # Emit the output lines
+ out_token = Generic.Output
+ while 1:
+- line = next(lines)
++ try:
++ line = next(lines)
++ except StopIteration:
++ return
+ mprompt = re_prompt.match(line)
+ if mprompt is not None:
+ # push the line back to have it processed by the prompt
diff --git a/dev-python/pygments/pygments-2.2.0.ebuild b/dev-python/pygments/pygments-2.2.0.ebuild
index 07dcfb61841..d9da923f8cd 100644
--- a/dev-python/pygments/pygments-2.2.0.ebuild
+++ b/dev-python/pygments/pygments-2.2.0.ebuild
@@ -32,6 +32,11 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${MY_P}"
+PATCHES=(
+ # fix generators for python3.7+
+ "${FILESDIR}"/pygments-2.2.0-pep479.patch
+)
+
python_compile_all() {
use doc && emake -C doc html
}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/
@ 2020-03-28 17:44 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2020-03-28 17:44 UTC (permalink / raw
To: gentoo-commits
commit: 7a11479f7a96cee817b13aa634bfdfd12ad6f0f5
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 17:34:01 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 17:43:59 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a11479f
dev-python/pygments: Remove redundant versions
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pygments/Manifest | 2 -
.../pygments/files/pygments-2.2.0-pep479.patch | 46 --------------------
.../pygments/files/pygments-2.2.0-sphinx17.patch | 22 ----------
dev-python/pygments/pygments-2.3.1.ebuild | 50 ----------------------
dev-python/pygments/pygments-2.4.2.ebuild | 42 ------------------
5 files changed, 162 deletions(-)
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index 63a00627e86..7a18ca65096 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,4 +1,2 @@
-DIST Pygments-2.3.1.tar.gz 3124216 BLAKE2B 99a5f96a2d2f9deb1a6b6ad94a21ab7f517cde47b1e91b67ce594732004cf99db51b1240e0270473f87f5d8a435172545b9fa3449a2ddc113faf5aaef6c34f73 SHA512 2c36cb42f8dd62e04b7664b5e87f951a8428ccbb6dbe5b5b43d8c7e6923ada0ab55a231bb8e9ed79eb5a85344ed64d3acc8e7bc991ab1f49c58eb612b8002c1e
-DIST Pygments-2.4.2.tar.gz 9405880 BLAKE2B 20a955fce2b06ab12bd4ede4da9308f1cc5f2286391146fd83f3d598cd38ae66e7df3c1d779c8f6f5de67ad92d032ff02fef8f41141edb007e2f24d3586d82e6 SHA512 c8f378700e99d9e5701ac7e27363921dbabab50a910686aafda1e016c813e99915fcfeed8298323b9b681b3d81f4265ab9a5bb75b8cdff0668c9eff745337b66
DIST Pygments-2.5.2.tar.gz 20263984 BLAKE2B fab5d11458bcb3bd9a825026f119c0bde6f672b00704f3d5db24ce050b959f0c1a34544642fc1b5911f6ae12a9b595a2cbedadc791d6a3e8c83da1a1add60471 SHA512 d6715ca26cdb68d4c771bb530b2395805025c14c78d9099b033d3410ea239c41033fb611e43e39cbaa4ac38078a09324d8cfde42269129be0a096dcc13586859
DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932
diff --git a/dev-python/pygments/files/pygments-2.2.0-pep479.patch b/dev-python/pygments/files/pygments-2.2.0-pep479.patch
deleted file mode 100644
index 28d40e9566a..00000000000
--- a/dev-python/pygments/files/pygments-2.2.0-pep479.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-# HG changeset patch
-# User Miro Hrončok <miro@hroncok.cz>
-# Date 1530720528 -7200
-# Branch py37
-# Node ID 933b5f6afe35e6d554f46085a4e62dc5bf413c87
-# Parent 7941677dc77d4f2bf0bbd6140ade85a9454b8b80
-PEP 479: Raising StopIteration from a generator is now an error
-
-So we return instead. Fix needed for Python 3.7.
-
-Fixes https://bitbucket.org/birkenfeld/pygments-main/issues/1457
-
-diff --git a/pygments/lexers/lisp.py b/pygments/lexers/lisp.py
---- a/pygments/lexers/lisp.py
-+++ b/pygments/lexers/lisp.py
-@@ -2327,13 +2327,13 @@
- token = Name.Function if token == Literal else token
- yield index, token, value
-
-- raise StopIteration
-+ return
-
- def _process_signature(self, tokens):
- for index, token, value in tokens:
- if token == Literal and value == '}':
- yield index, Punctuation, value
-- raise StopIteration
-+ return
- elif token in (Literal, Name.Function):
- token = Name.Variable if value.istitle() else Keyword.Type
- yield index, token, value
-diff --git a/pygments/lexers/sql.py b/pygments/lexers/sql.py
---- a/pygments/lexers/sql.py
-+++ b/pygments/lexers/sql.py
-@@ -347,7 +347,10 @@
- # Emit the output lines
- out_token = Generic.Output
- while 1:
-- line = next(lines)
-+ try:
-+ line = next(lines)
-+ except StopIteration:
-+ return
- mprompt = re_prompt.match(line)
- if mprompt is not None:
- # push the line back to have it processed by the prompt
diff --git a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch b/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
deleted file mode 100644
index bb7c6074ff9..00000000000
--- a/dev-python/pygments/files/pygments-2.2.0-sphinx17.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-# HG changeset patch
-# User WAKAYAMA Shirou <shirou.faw@gmail.com>
-# Date 1500298269 -32400
-# Node ID 1a78f58afb5066cf35b04676d0d5ffbb18d5d540
-# Parent 7941677dc77d4f2bf0bbd6140ade85a9454b8b80
-Change to docutils.parsers in sphinxext.
-
-From Sphinx 1.7, sphinx.utils.compat will be removed.
-
-diff --git a/pygments/sphinxext.py b/pygments/sphinxext.py
---- a/pygments/sphinxext.py
-+++ b/pygments/sphinxext.py
-@@ -16,7 +16,7 @@
-
- from docutils import nodes
- from docutils.statemachine import ViewList
--from sphinx.util.compat import Directive
-+from docutils.parsers.rst import Directive
- from sphinx.util.nodes import nested_parse_with_titles
-
-
-
diff --git a/dev-python/pygments/pygments-2.3.1.ebuild b/dev-python/pygments/pygments-2.3.1.ebuild
deleted file mode 100644
index a76b5759872..00000000000
--- a/dev-python/pygments/pygments-2.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="http://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- virtual/ttf-fonts
- )"
-
-S="${WORKDIR}/${MY_P}"
-
-python_compile_all() {
- use doc && emake -C doc html
-}
-
-python_test() {
- cp -r -l tests "${BUILD_DIR}"/ || die
- # With pypy3 there is 1 error out of 1556 tests when run as is and
- # (SKIP=8, errors=1, failures=1) when run with 2to3; meh
- nosetests --verbosity=3 -w "${BUILD_DIR}"/tests \
- || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( doc/_build/html/. )
-
- distutils-r1_python_install_all
- newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.4.2.ebuild b/dev-python/pygments/pygments-2.4.2.ebuild
deleted file mode 100644
index 8f27abd2d8b..00000000000
--- a/dev-python/pygments/pygments-2.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS=rdepend
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
-
-inherit distutils-r1 bash-completion-r1
-
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Pygments is a syntax highlighting package written in Python"
-HOMEPAGE="https://pygments.org/ https://pypi.org/project/Pygments/"
-SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- test? (
- dev-python/nose[${PYTHON_USEDEP}]
- virtual/ttf-fonts
- )"
-
-distutils_enable_sphinx doc
-
-python_test() {
- cp -r -l tests "${BUILD_DIR}"/ || die
- nosetests --verbosity=3 -w "${BUILD_DIR}"/tests ||
- die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- newbashcomp external/pygments.bashcomp pygmentize
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/
@ 2022-05-31 7:28 Michał Górny
0 siblings, 0 replies; 5+ messages in thread
From: Michał Górny @ 2022-05-31 7:28 UTC (permalink / raw
To: gentoo-commits
commit: c8182378f242de09cc0accb87f0ef4e45e187630
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue May 31 07:26:01 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue May 31 07:26:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8182378
dev-python/pygments: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/pygments/Manifest | 1 -
.../files/pygments-2.11.2-fix-docs-relative.patch | 26 --------------
dev-python/pygments/pygments-2.11.2.ebuild | 41 ----------------------
dev-python/pygments/pygments-2.12.0.ebuild | 41 ----------------------
4 files changed, 109 deletions(-)
diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index b096c4cec670..bd98adf953a0 100644
--- a/dev-python/pygments/Manifest
+++ b/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
diff --git a/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch b/dev-python/pygments/files/pygments-2.11.2-fix-docs-relative.patch
deleted file mode 100644
index 199a88d28dbb..000000000000
--- a/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 <arthurzam@gentoo.org>
-
---- 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/dev-python/pygments/pygments-2.11.2.ebuild b/dev-python/pygments/pygments-2.11.2.ebuild
deleted file mode 100644
index 4df58e44053c..000000000000
--- a/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/dev-python/pygments/pygments-2.12.0.ebuild b/dev-python/pygments/pygments-2.12.0.ebuild
deleted file mode 100644
index 0054a81979e4..000000000000
--- a/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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-05-31 7:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-28 17:44 [gentoo-commits] repo/gentoo:master commit in: dev-python/pygments/files/, dev-python/pygments/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2022-05-31 7:28 Michał Górny
2018-07-12 22:26 Michał Górny
2015-12-04 8:34 Justin Lecher
2015-10-30 12:04 Justin Lecher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox