gentoo resync : 25.11.2020

4 files changed, 13 insertions, 62 deletions

diff --git a/dev-python/pygments/Manifest b/dev-python/pygments/Manifest
index d31a1956abef..8e02c67f650e 100644
--- a/dev-python/pygments/Manifest
+++ b/dev-python/pygments/Manifest
@@ -1,7 +1,5 @@
-DIST Pygments-2.6.1.tar.gz 3303050 BLAKE2B 105f43301d2e7348937345519fe04817fa5baa5de4d0b9b0e9096d34612018bb992721df58a24008b009c0690054ac02c18c57b6b1a8a68039f9b4d20b5900a6 SHA512 0d793bb6eabe43645541347e44932ee50ccd4309f40e7a327422bcbe57d40a7cb8bbf2fb0911744ed6f316c6c08f4216462be88d79192a2ea004d6da51329932
-DIST Pygments-2.7.0.tar.gz 2358072 BLAKE2B a9c4753f62589a676300d366804aecc9349de2367b609919518f11be3ea40c3fb264d68c5da515cf80aaa42fb4e4dd9dd362d58945148a21c81a214c7e6c6b58 SHA512 b70714dd33cac725e0b32678971ab5902895c7d2fd8c9548f69110af32c82ba46a2d366dbbc9c4017e91c39120abe3e5d28e69893e8d92058f0bcbf579909db5
 DIST Pygments-2.7.1.tar.gz 2323072 BLAKE2B ee55bb47369caca78d180659c2f62af18c1b1c6bfd803148ed88254f33c7261bf8acd29d193be2ac9c04d022a1c0c14c0fe9ff3cfcf8a5dc1d4dec90d3f1ee43 SHA512 95d1109cd53092fafa2f1d5c21a135c426700fc92e39bb22a27f47e63d10bdcb9e52593cd282339a3b501430ededbccea4f8d5970ba1171204579b964a6771c8
-EBUILD pygments-2.6.1.ebuild 1122 BLAKE2B c2c52252e8e7a6e7971a7afede468a3b2ffdf1706f200bce925498458c7b041e70f3645ac83779234f5d8e14329661cda49de4675f2f9858ca32a2466131e78a SHA512 dbec1e6acb5e559672ee31fca4e2a14c0e21da3c11c9b6c9e22f5abce86a1c8eafaf1814e6d2fb7b6ee4b2f904e20585faebcc1960eaf151938b141c09a04bb5
-EBUILD pygments-2.7.0.ebuild 1131 BLAKE2B cffa90ae8004c74b462c1e6c5f21f4a8f0f80dcd171920d49d04f835fbda83ff3400829bbfd1ed1cd06d76cf101f03887f31803bfb437537883f962a5ce89a16 SHA512 e7754c7cc98b3182980e269066878438b1f499fdcd9d9a856e98e18e003861f0923ce7bd23fb96fb27ce460710c638dcdf2c4884b662f075ab1b3318b9568668
-EBUILD pygments-2.7.1.ebuild 1173 BLAKE2B 32e92c8122c8c7fce456c43ac09ebb9a3cf1519c6c4476128b3f98534307add093f29920010cb1c5f95c44e6a828ef0d6eaf8134deddc4ae2404661804e7ea73 SHA512 14f1be8c2450e166749dde27bcc5da624cc74310867212b72e65d7cd6368656420dced12e6c016a02274e7be8f1f8715e3683008004f36da76ff72220e9f3792
+DIST Pygments-2.7.2.tar.gz 2350457 BLAKE2B 4a67cd34cc41402e485e2bbb827a00f5184c00d26ca6f341c190457134598bd1cccc87a995eee85eb007a98b6d7b9e3e33585d0c1c0bba4289bedb36d22f351d SHA512 cd667e2cb33261060c316e3b92934dae735e2aa6c427b77852d4d18f28941cb369da05adb8540dd9fe3262b3e30e2fd6456e345bccc848be9dbdba20e97ef157
+EBUILD pygments-2.7.1.ebuild 1164 BLAKE2B 7a0b69f294c30d443b3266a3f261692f8f913878b3351d5322c85686d887ab8531c9ae847a113e2443a2725892f604e990df8053ba14b5a3a7ffd5bd4efded1e SHA512 3a2596b6507a81255a6e9cabe06d56849891f219d0e69c84e0bf132814cb0077431d0e259aa789caceddc7a6d141269c07cd63b2766d6055daa7503a296b4df3
+EBUILD pygments-2.7.2.ebuild 966 BLAKE2B fa0cf443f46babef9acbd41c69f9c00729f67096fc7a799d7fd7616503eeb53f08abea6dc1164018ea5725c69278e7166dcb77f2f6d36a780fce4f35b80ee449 SHA512 89e82d92a767a1a67e4ec63696c7a453905db1847d660e816a4b730e9c954ee78b2610be456f5119c1bdc57852befa918f7c3b30c54e370fce23ae73c3af74a5
 MISC metadata.xml 556 BLAKE2B 87120b6aafeefb97b45a6895b23d08c6443cb177d5bc337845bec55ebdb59ee9eb19ef41c10b3ce4d61452c602f925b4120a441959b5b5d5fea26e15de4a1510 SHA512 b5f4491bb714e2abef07da4e960609aae651ceae3153102467e19bc4d06b9006418729f0b915cc026842253287786faa083d608c0ad5bd7f5c423922740580bd
diff --git a/dev-python/pygments/pygments-2.6.1.ebuild b/dev-python/pygments/pygments-2.6.1.ebuild
deleted file mode 100644
index 89bb177bba44..000000000000
--- a/dev-python/pygments/pygments-2.6.1.ebuild
+++ /dev/null
@@ -1,41 +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=( python3_{6,7,8,9} 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/pytest[${PYTHON_USEDEP}]
-		virtual/ttf-fonts
-	)"
-
-distutils_enable_sphinx doc
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	pytest -vv "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp external/pygments.bashcomp pygmentize
-}
diff --git a/dev-python/pygments/pygments-2.7.1.ebuild b/dev-python/pygments/pygments-2.7.1.ebuild
index 490e9a55d2d7..7e1d16a89248 100644
--- a/dev-python/pygments/pygments-2.7.1.ebuild
+++ b/dev-python/pygments/pygments-2.7.1.ebuild
@@ -21,7 +21,7 @@ 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"
+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 )"
 
diff --git a/dev-python/pygments/pygments-2.7.0.ebuild b/dev-python/pygments/pygments-2.7.2.ebuild
index d203e4246cb1..d821d49619e3 100644
--- a/dev-python/pygments/pygments-2.7.0.ebuild
+++ b/dev-python/pygments/pygments-2.7.2.ebuild
@@ -8,32 +8,26 @@ PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 )
 
 inherit distutils-r1 bash-completion-r1
 
-MY_PN="Pygments"
-MY_P="${MY_PN}-${PV}"
-
+MY_P=${P^}
 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}"
+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 ~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="
+BDEPEND="
 	test? (
-		dev-python/pytest[${PYTHON_USEDEP}]
 		virtual/ttf-fonts
 	)"
 
 distutils_enable_sphinx doc
-
-python_test() {
-	cp -r -l tests "${BUILD_DIR}"/ || die
-	pytest -vv "${BUILD_DIR}"/tests || die "Tests fail with ${EPYTHON}"
-}
+distutils_enable_tests pytest
 
 python_install_all() {
 	distutils-r1_python_install_all