gentoo resync : 05.12.2021

9 files changed, 34 insertions, 36 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index 68245b97ab13..879d2cc817aa 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/openrct2/Manifest b/games-simulation/openrct2/Manifest
index a8a6b4d56994..6ceac3cbcb65 100644
--- a/games-simulation/openrct2/Manifest
+++ b/games-simulation/openrct2/Manifest
@@ -4,13 +4,14 @@ AUX openrct2-0.2.6-gtest-1.10.patch 740 BLAKE2B b974fbf84765776018e13700f3c9151f
 AUX openrct2.confd 415 BLAKE2B 08c22a6940f07d89b6414917d5438d2926b71397c1aa590db805fea67fe6857ccd7e00117edb0f8135fd055d741ec071e3cd439bd62f516142151ef3af76b2a4 SHA512 d2f6863c507389eab1117497edca2a21121c115b7fd06f59bc358f0a610ebf58b8df3be7683aaf105cc481c27647c4cfa36893c33b3a1da0624325927b5e3d9b
 AUX openrct2.initd 1424 BLAKE2B 0b5940000d0d7ebf0ad14d2326fc6342380fe9fd5266a49610d4c62686062ce2fbaca7c3211f0026d3c8bda6ad8bc7526838734571266da745e2d67ca8be9ec8 SHA512 3c1ebbe9874ecda50b9420d1cb27633a9ddec57f5afab39ceac0845e44c7fdfd0fd0dd9799a14b09f45d3c7e85a93cd994515d495c3b2f1d4e8012e5716f1409
 DIST openrct2-0.3.4.1.tar.gz 14222683 BLAKE2B 170a3beef36f00c1ad7845d8005e0d1e84c9ea4585e650f6bd9bf5ef2cca721b4b274e1a12801d7273a03860eb4c6f564bed9003359f1f4faef7abbf6ab5a028 SHA512 23267ce782d491a042a1733694d4bcdefb9af8a03eb70e0b9f13a464411d238d6c6962dc3cf57275e1641095c4bb859698fd1dae80df5b757a6718d42e5da57f
-DIST openrct2-0.3.5.tar.gz 14179345 BLAKE2B fdba3d18bb6ab051e6612f9c1f1780c8d7c36f3566317cdd1c227617d86f2052b94407d2ae73102c2cab02337ed8c3f6d0456e577841ccee03405a3a67198bcf SHA512 036ad6f88ebe04673a55f679a8ac5e07600ec6e6ab6a2971e1ee9c378e779301084d0c4d134f664921c0cfc3ed222fed9a0e68e3f6ec3b493f6cc5bc745cea05
+DIST openrct2-0.3.5.1.tar.gz 14178153 BLAKE2B a1f15fd427392195502e917f1fd4d8064a2905c1995c9e94157073c6acc026d1f716fb06294768630aa75d104d7c851388c72c38653e4804deeb8237b4a31c00 SHA512 0e36db302631b75aa1411eca945bddd1120997efbc48ba9172887f834670f34e345b8c96f363cdc8791d94bb4df32f6e70e30001989c194a8c525e2614241c84
 DIST openrct2-objects-1.0.21.zip 3159059 BLAKE2B 9a42cddb02a0b5c476d5e84c5943d08190957567ea9cff44b0d4496f6a9ee9a548dd0a359e4a4dac21eacac9a074e25f7fc4ce1c37f4002dd5d35c61660e68c2 SHA512 b267db6542562c0c46c9964c865d33abff57d3d3c9a1f4073366f34cc229af2483a51538e56597d0e17ffdcd5bb1ba52ddc8198f8a0afaf0a30fdc2e00e6b3c0
 DIST openrct2-objects-1.2.2.zip 3383537 BLAKE2B 155f497cab1d72a881b513f19d08853dcf8f811be326e4fb0257c1e3369c02d6259e8e327725c55c22529c148ebbbef722a9005c5a090927f278939348eb77c2 SHA512 3696abf27fe7a7ce57a605aa84805d88966014d6a83eed1f382950a07eacf584de1e2181b77032e29f2525b22e875845de3e49b830ee66ff63ff0b83721c411b
 DIST openrct2-replays-0.0.43.zip 1669525 BLAKE2B 41b9b1accd877b98c7e244abfe799233e0bf75c14fa7e83e8c1fe996406303dec009c396345ec554a5ca1549172b1497e3adb5d038179c42ae1e719c9707567a SHA512 bed91fdfb7c67449f46effc7102ecfb46f3f5b43130cdbfc1343067a95a046714a0d2e9444b8059845c48bec5d0d4d8560ae7e3a3b6ec7182e7eff5bf40a5131
 DIST openrct2-replays-0.0.57.zip 1623894 BLAKE2B 0bc7b6862632140f0ef8122828a022424cb1b78d76d7a28db5fd706afd2d77af4b4feba0e5838c97204a906ac2b38f2330dd04eeef0c5c6c285568d793efebdd SHA512 eae0e60c92c4e21c03444cb0c9b597c575b2b0ad9d744ca3bf98f46e33e241012b18d92167c58e582481b963c6e602eacd0fc40d59730c31d77ade40cc1bba57
+DIST openrct2-replays-0.0.59.zip 3090846 BLAKE2B fbbc808bf3d39a41c3f99d489fb167b7044d0f5c17254599bc4bafd9d43af7bcb76712f643f7d2a6645d30fa98d0ef52bc6fb8ca3c774eba8077e2c62297912f SHA512 6677f2e16380daf925a146925e0f48d41612baf43a0d44f9cff7d1d0786cf3db77afe47cc6237c988c9ffc21fdd9007868a6b92b9cec48d80143a91fccafebb0
 DIST openrct2-title-sequences-0.1.2c.zip 2980030 BLAKE2B f91168bea0a4f88a801c95ea45759e0d1c887a89c18dbbded5887d2914db7119dd65c231aa422e4f8a964a81d832eae05bffaa8b7908fac39a63792d082b53a0 SHA512 0e544d236d5f6ac7f68d75ba1f56f043c76c77676cbb92e6fdbf68a6ae2dc6c41dbdad6083ceec36b2f774bcdd99f64f28de73b208d6a39a8218a9e95502d46e
 EBUILD openrct2-0.3.4.1-r1.ebuild 3909 BLAKE2B e44800b080cb0469490f82a7e79dbf18c02f217fcf6c34588eee95f6e14b30a8725cb3277374c2a0052a9f1cd5bb11d4f37c214c690d5494281a02e166e2b7bd SHA512 5f274a1b7056b850906b9e14f2117ca11263c486ae085ba4d47a8c65fdc5feae492f5b6d5adcd2c8b5453f43547af54308e8c7d98ca79803eda36469c916e33c
-EBUILD openrct2-0.3.5.ebuild 3910 BLAKE2B 416661e06f200b9aed401192af6437037c882890f35ff5402e8d463ef9f70f9b460b8ac21a2f85f8f0480c9a2abc7ff8c239ef6e0f003bdc3c95a5c591fbfe67 SHA512 7579d0dda49573ca8a67a9ee081c5bdd0551b1ed4bc2692701439a9842efbce9135eb029032f97b32413f4cb88021ef388015690c57ae4b628eda711f8d9bb15
-EBUILD openrct2-9999.ebuild 3865 BLAKE2B 965339d33692362952e944e8baae32b58d480f70f31b02678cf6fe86f6a2efa5009c4d03a4a78d6a4d8080d8efe0d9ba06d65447c7ba7b24f8b8aeeb0c7dcc50 SHA512 1e805f8a2562ee238c9f10a89f901614cefd1120fb086fa7224dd3122235d35d24b1f4c38ed11d394093c91a50b6333aba5f3f441a61a25544006eba436e3635
+EBUILD openrct2-0.3.5.1.ebuild 3911 BLAKE2B 2e474cf3dce7eb7bd631e228cd6cf02839daf02baee449f69e1f3686b3982910d4d99c22d546d42b2aca73692b9106643a56871ee6fb258a9af0e6527ed06aad SHA512 bca69421f0d19a8772904b38d807b67e4165b3b540ddc6b5bb7a5c519b803fd8db05bfca7331fe50e8c4c11e9c2b059b0d4bd200e1f8d52bdf4234f554551628
+EBUILD openrct2-9999.ebuild 3865 BLAKE2B 058cdf89f35f5a5447f4b083fa53c7967e6673780ca5de7c630d62f2a12d3eb634e9d1d3cd8561c3479ca0d8e5c26465fcdbfa7ffeae63a387523627081716a6 SHA512 0e7467c7acaf5a4706afe365d56ff9ae1d62293cf6679dd1be20da82dce493bcfdefb135bbb35a8862ff12d9b1a0687c5aad05016cb4bc118c590e603ec198d5
 MISC metadata.xml 1276 BLAKE2B 23704f52521432dde611251039fdefc1d1ed97615fb4dac1e137c309ee6b11d91ea25e4368e6d0d2520a2755b3c15eb2eb129ad4aa1593466ccd2168dbae0ed0 SHA512 c9ed6b7f79f32996d65309a70d850d1e4a8f1a46f805774a5dc7007d34a126f51b543392dc1248ad6d93c82854de942e3e68a1516c5ed84287108a0c337db395
diff --git a/games-simulation/openrct2/openrct2-0.3.5.ebuild b/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
index abeacab690c0..af9c013eb4ff 100644
--- a/games-simulation/openrct2/openrct2-0.3.5.ebuild
+++ b/games-simulation/openrct2/openrct2-0.3.5.1.ebuild
@@ -9,7 +9,7 @@ MY_PN="OpenRCT2"
 MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
-MY_PV_OBJ="1.2.2"
+MY_PV_OBJ="1.0.21"
 MY_PV_RPL="0.0.57"
 MY_PV_TS="0.1.2c"
 
diff --git a/games-simulation/openrct2/openrct2-9999.ebuild b/games-simulation/openrct2/openrct2-9999.ebuild
index ef3f93dd7825..23fa693d06b7 100644
--- a/games-simulation/openrct2/openrct2-9999.ebuild
+++ b/games-simulation/openrct2/openrct2-9999.ebuild
@@ -13,7 +13,7 @@ MY_PN_OBJ="objects"
 MY_PN_RPL="replays"
 MY_PN_TS="title-sequences"
 MY_PV_OBJ="1.2.2"
-MY_PV_RPL="0.0.57"
+MY_PV_RPL="0.0.59"
 MY_PV_TS="0.1.2c"
 
 DESCRIPTION="An open source re-implementation of Chris Sawyer's RollerCoaster Tycoon 2"
diff --git a/games-simulation/simutrans/Manifest b/games-simulation/simutrans/Manifest
index 2a8a6f3ee346..03b9273eed9f 100644
--- a/games-simulation/simutrans/Manifest
+++ b/games-simulation/simutrans/Manifest
@@ -8,5 +8,5 @@ DIST simutrans_pak128-2.8.1.zip 97430218 BLAKE2B 95b6788fd8e4f539b232e9de5632277
 DIST simutrans_pak128.Britain.1.18-120-3.zip 67251660 BLAKE2B 6dbebdf77985e2610f4283b1ae252a19cbfcc37cc1c6974e4132300f87c7d881bd87aba29bb01974d56d261ee6694fd81d0d4b09eb0a2854e38de6f278f91b53 SHA512 234a6c3dffa236ae98ba3372efb2e2b2808c0dcc0933ea5f339aa639e0705674435599e27228f0ee82f24af49ffbd7cb7c6c076ff6569a7ce622c6b8009c8472
 DIST simutrans_pak192.comic.0.5.zip 70896173 BLAKE2B 63557e08387802a788f8e77157674847d757a23f329aa452c9ea6c096f875d665bb2090df34886437a2d35519c83b38f03d06566bf052c1ffe3cad718c7c3dfe SHA512 f61ad804d63027e181bb99a92f48d23cf6a6f47047a1ba9e8f83383cc4e6d603c7fe260d0846613d43765d3fc933bf13ae063d8d8176f8aef41db8d6bf187773
 DIST simutrans_simupak64-122-0.zip 4537410 BLAKE2B 300d0248f4f3781578579f31056810c3f1261660b7d1eaa4ec21e735625c3b499548c560d1b1ee918fd7111ca4f872f77119cffc82014c95753520225226665b SHA512 de099d71392130e26a907f4cd30d5e714cc472cb91c606b3dc5e499653a277750cd971440351fd384c368b453704633ad4eda8ec3e6e16e9ea797080371aaa9d
-EBUILD simutrans-0.122.0-r1.ebuild 3184 BLAKE2B 4d9b66be5565d6abd49332d060a197b606a2756533a18c81e53b646aabc223b8ec139f471746b4e4406cb11da1a8230ba3ffc32d3fb7c136a719d0440159761f SHA512 5b7c1c8656a10c48fa21bd6f7b1c2af7575ae84464ff9de061d10d0929906909f4a626aa98728a4bbf261fca5dade69f01507d8915f5b796d00dcc292f92f8a0
+EBUILD simutrans-0.122.0-r1.ebuild 3181 BLAKE2B ac55c6d47af6ec38a4bad4360085c34932a468583ac5324fb1c7ec1e8debb267ab86e6273820687ad4f997cdfd56ab7b1da18ba65e83429a7fb2e46688538a19 SHA512 2202a7e58712dcdd25954d5b033ddb5f35576d5582b0574972f05c4210571ced4b256943308b5a778ae45d2649054597050da9160f9c8ca6a3f863f83c597bc9
 MISC metadata.xml 765 BLAKE2B 84dd5df7cd0c772c42a52c92aa0dae18c90e544e0b479e577b61fba52921f67d1c638e39576eb13ff8518b52fac53d62b519fee4cd749fdc7655394c1af2ab90 SHA512 e6e3a1434969bdc75217d1de98a11d6261169548d67e4948b01802195c1332f1edb3dbf5e3a0545a1f35190d96e28a8ad8182bb05429ca7747e9dc4b048a8bba
diff --git a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
index 1d54030950e5..5a5fa8c117eb 100644
--- a/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
+++ b/games-simulation/simutrans/simutrans-0.122.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ S=${WORKDIR}
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="+pak128 +pak128-britain +pak128-german +pak192-comic truetype upnp zstd"
 
 RDEPEND="
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
 }