gentoo resync : 05.12.2021

3 files changed, 25 insertions, 28 deletions

diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index 5caa018c9779..b162932f6a07 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,4 +1,4 @@
 DIST endgame-singularity-music-007.zip 51774799 BLAKE2B 78595b16e422d2312be860686aca9401f6f1eed35fe40dbbc3a3999b1feb5e32aa6d51a66d94c9241aca2b6606bb7135491298b94c8033a1437c2cd7b23f9120 SHA512 ab46e77c833085f0c5b1b46fef72ab807e79ca422ad043ef67a4bf4384cb0177319f21b4bd01496e6c3fc6fe9a2f36ec256e19f0e829ad7bf9f0c5bd38bf0fe5
 DIST singularity-1.00.tar.gz 1944972 BLAKE2B 1ca2b120311a19f175014835930610583e8f605dbda3ca3ca96d7e0da86bddeb4b0a264f50a003aa51e05b86ce971255ffda5f498598dde6be370b9a953eb1d0 SHA512 f3581048c5a535fdbd28d2af1ac596f5396fd712b716931f17de75f8b170f0e226deb2c113023357e21e7de1294e4a632515962df9ee43768baf0fb4bbaa08da
-EBUILD singularity-1.00.ebuild 1250 BLAKE2B 8be42e500a5fda8f637e735e05f855810aa01bdfade0dce55c31ce1a58f7b25491b3eb95a1cd62a4ee575bfb0f5a5fcd7bea80726c2b948fefb2b2241bd3e9d1 SHA512 eea697f55a9212793dd044cb73475a9910cc27cf6bdc7eb20359e5212c909994c4d33c8730a14b2b37caab1d8ab36d993e593a640dcdaf6729bf5eb19bc17674
-MISC metadata.xml 343 BLAKE2B cff58df15e9959332dcfa10eda8dcba18a86d2eb9aa96d60de94e7ba1db99cbe9e52619ec0c6444d22f5dab24c367b4fdfbb829ba7b0b5af16a7b15a887a6149 SHA512 9ff43e28042f11a4eba8ea0254f5ebc27d28d6285492200c6bd19ef5230e1dd38cd19fda4bac61cad1defc2e13bf9616ed05f887951aa25e92c8768720c7ad35
+EBUILD singularity-1.00-r1.ebuild 1251 BLAKE2B 202a87e0506bb804c3302ac3bd9b15bd935f2386728d7ba42a67677881b4f8adf17245403605f14b929a2fed77fc85c10f5720e1104a98cef95a88d4d36ce6cf SHA512 b97c39c59dc08fc8a6f41f07053abf0d842e7a13e07c12ed0439565dfe817250fbf19179c9f83929c820e0eea778fdbbec421ddc2a54fc982e6b04b6d4a84973
+MISC metadata.xml 342 BLAKE2B d77c98787a52fc093da68df48ae20c3879730d87a7aaf32dd92a0feebbbe8992654c44b9935801fe2febbc9c0513065d2092993da1b7342ff7e1cdd2fb543d27 SHA512 0fc614003a37a2ef3986056f9f3587dc9d97a6d6af9bc4708489d9ec2260cd023d03c1d9e777879d9ff65574aab0d1c6c305a76ab743131d802f99f614b02e77
diff --git a/games-simulation/singularity/metadata.xml b/games-simulation/singularity/metadata.xml
index 690c0e892aa6..b51d69f31439 100644
--- a/games-simulation/singularity/metadata.xml
+++ b/games-simulation/singularity/metadata.xml
@@ -6,6 +6,6 @@
 		<name>Gentoo Games Project</name>
 	</maintainer>
 	<upstream>
-		<remote-id type="google-code">endgame-singularity</remote-id>
+		<remote-id type="github">singularity/singularity</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-simulation/singularity/singularity-1.00.ebuild b/games-simulation/singularity/singularity-1.00-r1.ebuild
index 02d8aec65fc7..6f80755d6835 100644
--- a/games-simulation/singularity/singularity-1.00.ebuild
+++ b/games-simulation/singularity/singularity-1.00-r1.ebuild
@@ -1,49 +1,46 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{7,8,9} )
 DISTUTILS_SINGLE_IMPL=1
-
+PYTHON_COMPAT=( python3_{8..10} )
 inherit desktop distutils-r1
 
-MUSIC="endgame-${PN}-music-007"
+SINGULARITY_MUSIC="endgame-${PN}-music-007"
+
 DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
-HOMEPAGE="http://www.emhsoft.com/singularity/ https://github.com/singularity/singularity"
-SRC_URI="https://github.com/singularity/singularity/releases/download/v${PV}/${P/_alpha/a}.tar.gz"
-SRC_URI+=" https://emhsoft.com/singularity/${MUSIC}.zip"
-S="${WORKDIR}/${P/_alpha/a}"
+HOMEPAGE="http://www.emhsoft.com/singularity/"
+SRC_URI="
+	https://github.com/singularity/singularity/releases/download/v${PV}/${P}.tar.gz
+	https://emhsoft.com/singularity/${SINGULARITY_MUSIC}.zip"
 
-LICENSE="GPL-2 CC-BY-SA-2.5"
+LICENSE="GPL-2+ BitstreamVera CC0-1.0 CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-BDEPEND="app-arch/unzip"
-DEPEND="
+RDEPEND="
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/pygame[${PYTHON_USEDEP}]
 		dev-python/polib[${PYTHON_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP}]
 	')
-"
-# sdl-mixer is used at runtime (through pygame)
-# bug #731702
-RDEPEND="
-	${DEPEND}
-	media-libs/sdl-mixer[vorbis,wav]
-	!sys-cluster/singularity
-"
+	media-libs/sdl2-image[jpeg,png]
+	media-libs/sdl2-mixer[vorbis]
+	!sys-cluster/singularity"
+BDEPEND="app-arch/unzip"
+
+distutils_enable_sphinx docs
+distutils_enable_tests pytest
 
 src_install() {
+	local DOCS=( AUTHORS.txt Changelog.txt README.txt TODO )
 	distutils-r1_src_install
 
-	insinto /usr/share/${PN}/${PN}/music
-	doins "${WORKDIR}"/${MUSIC}/*
+	python_moduleinto ${PN}/music
+	python_domodule ../${SINGULARITY_MUSIC}/.
 
-	dodoc README.txt TODO
-
-	domenu ${PN}.desktop
 	newicon ${PN}/data/themes/default/images/icon.png ${PN}.png
+	domenu ${PN}.desktop
 }