gentoo resync : 25.11.2020

4 files changed, 87 insertions, 24 deletions

diff --git a/dev-python/pyglet/Manifest b/dev-python/pyglet/Manifest
index 89e7c62c6787..48451cf14b14 100644
--- a/dev-python/pyglet/Manifest
+++ b/dev-python/pyglet/Manifest
@@ -1,5 +1,7 @@
-DIST pyglet-1.5.3.tar.gz 6356079 BLAKE2B 517b196eff334d572d4db181ce0480c3af8e2bc4a92e23e1fd7c335aedebe3afa493eb3f4745d8daffc3c7d930b9e333075014d2ba5d4303f4691c490a09f252 SHA512 12e7189272b9ab3b4bd3d713d0e979cfc1d76200fc8454b31573fca29b179f99242c34a1adb7a1c2fabb7b950cc3006cfcd8b188eb2c50ae95cca95b0e15582c
+DIST pyglet-1.5.10.tar.gz 6417209 BLAKE2B 2c413c111ce3d016ca23186e92b17cb6f67bb904d90ca241eb0f95372a0a9ff8915014f31294a6609e2f35072cb963b6998d791157ede2e2bf01175edeb91582 SHA512 02b3859f2805f703997d7799e324e7debe9375f6c0df211ceff2f750aa7dbbad61b6ece55fbfec111e4f47f0ee6a71881fd73a47bef794a437615ecb42d0f411
+DIST pyglet-1.5.11.tar.gz 6414606 BLAKE2B bc39a611b10a6397f31ce402d0f4be17093e5c37fdbd6bb419156cc00929fd951cfc8e309a0c2a557afba9c567f203956c6ac7fdd1c677d4a5c199c1633e86e4 SHA512 4121fcd45c8d7f500e2bcbaf85e30e39d44b9de165a818455c006964787ad9dcdbb1a670ca72e149a3574ec7c18f113166190acca9a2dec4bef4b5fde856e129
 DIST pyglet-1.5.7.tar.gz 6367378 BLAKE2B 68d4aa673a7463f7da0f4ccb7f413b602f32ecc423438326fc4262a4449fe22dff25a513074611ce2c77c130dfe9cc29e44e54a95169875208731f70803f1a45 SHA512 2c2a06636b1db788241028d1ef2290a774b98721ccc92ceed2b2895bcee81d4aa72b2111896091b54531936513772505b0d43003e412735d606130ed4b08f8c9
-EBUILD pyglet-1.5.3.ebuild 1246 BLAKE2B 350edfa28f84c2710faa23d3c220c2b34881359ee70b599fa6d407d3ae2f982704c286bc34ae967313a870ed3c5033dbf5e6262606cd4436fb917df9f705569c SHA512 7caa07d04e801c2f9eb70c99d3bc89798d9d0703267577c54c02774193ea9423b828a3ebf22e29d88121eb95f7c75317b1402eb4761822479d618e99f91123be
-EBUILD pyglet-1.5.7-r1.ebuild 1287 BLAKE2B 8d24aa272e05d0fc81fd888d8a1efad348a6aaaebea48eea099474dba17c601e2790a5ffd3b611e4bc152bf38aaae45ff1ca2a5eb5d4b8bcf4482287c1a3af87 SHA512 6caa1f0b6f1c21ef1eaae01213b9c6ad7aa559f3f155ca5f4ac0eb3c8ddf39af33f514280770f777611f5696d3fc9d3515dfd73745936d384b33d86359cf2293
+EBUILD pyglet-1.5.10.ebuild 1299 BLAKE2B 52d481d9b418e26b01b26c864014691245b8c09aff2cd859b5b0f7082c7c4982fc9b0ff783e4952d2a49cdf17af4c8ed9feecafa1f89ab78f3b049a1127bc6fe SHA512 17a9d5de3761944b0c311450832175b29427394b84d3e6a71f8e738140c4ca1d98f53b27ca245a37027e21a5456fbf2febad8170a2ddad16c48bc6bf9f7236ab
+EBUILD pyglet-1.5.11.ebuild 1299 BLAKE2B 52d481d9b418e26b01b26c864014691245b8c09aff2cd859b5b0f7082c7c4982fc9b0ff783e4952d2a49cdf17af4c8ed9feecafa1f89ab78f3b049a1127bc6fe SHA512 17a9d5de3761944b0c311450832175b29427394b84d3e6a71f8e738140c4ca1d98f53b27ca245a37027e21a5456fbf2febad8170a2ddad16c48bc6bf9f7236ab
+EBUILD pyglet-1.5.7-r1.ebuild 1285 BLAKE2B 58ca933e3d968262b39cc844c25738c71a82405fb966cb98b94f2a0ec6728a023f4c941d79b23a45de7200331237ad1fb0016de6f515a5ca0eb353ad6ac44faf SHA512 7e5aefbd904b868b6ee2238eb281d19e3ad3f2a84ff44a431b9d3f99956fa192a5c26b9c7c6cabcf3d9b73326502ec5d7f343fe6e37a3310e302465d54f9f39a
 MISC metadata.xml 996 BLAKE2B 74fda944aaa3954eafb31e21741f8cb599c9f8bff46c662a598cb384da9770d3160302b37ce8cbe9ddbc7dfe63c594614783afa568ab4be5e73db502fdc3a095 SHA512 a13a1aa2134de7bc7e007f81540631623c5a3fc1f5bfd4b6f7bc744eff8cc037da321292aa968184d324099dbfd87f608d7c0a2aeea90707c27aee5532a1fe15
diff --git a/dev-python/pyglet/pyglet-1.5.3.ebuild b/dev-python/pyglet/pyglet-1.5.10.ebuild
index 3c019ee11f70..225581d36f34 100644
--- a/dev-python/pyglet/pyglet-1.5.3.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.10.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit distutils-r1 virtualx xdg-utils
 
@@ -13,11 +13,17 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples image +sound test"
-RESTRICT="!test? ( test )"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
 
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
 RDEPEND="
+	virtual/glu
 	virtual/opengl
 	image? ( || (
 		dev-python/pillow[${PYTHON_USEDEP}]
@@ -30,27 +36,20 @@ RDEPEND="
 "
 #	ffmpeg? ( media-libs/avbin-bin )
 
-BDEPEND="
-	test? (
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-"
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
 
-# pyglet.gl.glx_info.GLXInfoException: pyglet requires an X server with GLX
-# Other tests fail or stall for unknown reasons.
-RESTRICT=test
+distutils_enable_tests pytest
 
-DOCS=(
-	DESIGN
-	NOTICE
-	README.md
-	RELEASE_NOTES
-)
+src_test() {
+	virtx distutils-r1_src_test
+}
 
 python_test() {
 	xdg_environment_reset
-	run_in_build_dir virtx pytest -v "${S}"/tests
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
 }
 
 python_install_all() {
diff --git a/dev-python/pyglet/pyglet-1.5.11.ebuild b/dev-python/pyglet/pyglet-1.5.11.ebuild
new file mode 100644
index 000000000000..225581d36f34
--- /dev/null
+++ b/dev-python/pyglet/pyglet-1.5.11.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1 virtualx xdg-utils
+
+DESCRIPTION="Cross-platform windowing and multimedia library for Python"
+HOMEPAGE="http://www.pyglet.org/"
+SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples image +sound"
+
+BDEPEND="
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/gst-python[${PYTHON_USEDEP}]
+	)
+"
+RDEPEND="
+	virtual/glu
+	virtual/opengl
+	image? ( || (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		x11-libs/gtk+:2
+	) )
+	sound? ( || (
+		media-libs/openal
+		media-sound/pulseaudio
+	) )
+"
+#	ffmpeg? ( media-libs/avbin-bin )
+
+DOCS=( DESIGN NOTICE README.md RELEASE_NOTES )
+
+distutils_enable_tests pytest
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	xdg_environment_reset
+
+	# Specify path to avoid running interactive tests
+	# We could add in integration tests, but they're slow
+	pytest -vv tests/unit || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyglet/pyglet-1.5.7-r1.ebuild b/dev-python/pyglet/pyglet-1.5.7-r1.ebuild
index 13aa03ae4b4a..2e306bc3c3be 100644
--- a/dev-python/pyglet/pyglet-1.5.7-r1.ebuild
+++ b/dev-python/pyglet/pyglet-1.5.7-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/pyglet/pyglet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples image +sound"
 
 BDEPEND="