gentoo resync : 27.03.2021

6 files changed, 64 insertions, 6 deletions

diff --git a/games-simulation/Manifest.gz b/games-simulation/Manifest.gz
index b73091232b1e..d9b6238fdfed 100644
--- a/games-simulation/Manifest.gz
+++ b/games-simulation/Manifest.gz
diff --git a/games-simulation/corsix-th/Manifest b/games-simulation/corsix-th/Manifest
index 354fd9d8c98c..0fa1e3c2b8b3 100644
--- a/games-simulation/corsix-th/Manifest
+++ b/games-simulation/corsix-th/Manifest
@@ -1,4 +1,4 @@
 AUX corsix-th-0.64-cmake_lua_detection.patch 288 BLAKE2B 90673498871c16f48c752c5581dfec0a290966ef0ec79c977b69575b26a22843829679a7c0225caabe2b570b9b6a38e025115f3a2cf0597b0dad9dc78f01f36d SHA512 52dc61c7aa8c170da225801f2eb06140e9dc28c4d55853eac99b573475a21fb03b945de676898719927abd517b34ecce2aa5c4998ac6e6fcc673cf2aaf7cdb9e
 DIST corsix-th-0.64.tar.gz 4062048 BLAKE2B 2b807a5c712a19cac80bae613065dd8c9e1219573a3c288c1433b6fa857c3a93632e9c51ba126a70626b4044d469ca1ebc815257f291fa9f86ea94491aae35fe SHA512 c02d07ae4fb9a1ce008f32c4b9ea12a949316feddca4e2a29e860e0d88efdfa0440d372b00b9d3eda5e5c3ca739085510ebe8650790d06a7e91255b7d0990e6c
-EBUILD corsix-th-0.64-r100.ebuild 1954 BLAKE2B 10cc84893f919fab0639b986956fc5ac503b15fb948549a71f581b96ab3c62f0deb163729c729d656aa9c868a6e0c33710836a0f02a98bb137782204347c06f0 SHA512 b46c422d3e28c50d416fefa5b0c9de5865fb2825c27306c9dc09eb570fbc363af8214710dd9a96713d20dfc740a012b1f99aafd8cefc35789ad0b86754a2e2e5
+EBUILD corsix-th-0.64-r100.ebuild 1952 BLAKE2B 02649e3c0f2de55cb02e036e330080f36aa07dd4e170ac18ea391adbaf041e3cac9d02abee22541442ec5c4dc0649f881b558c18f4af4f488b4525a823682486 SHA512 8e0708ae6c2fc61a59c3951a556e9ce38ae24c24903cc282e4712f47f5f44892e34c02ff52134be5136c6e5809cfc0bd9796ae550826bdda69ae683f7480d22f
 MISC metadata.xml 716 BLAKE2B 16fe66f9f3fce58b6b17df3906fdcf4e9b7a9a49be872ba69cd5deeb47bffca495ff3a8b8c89fc71cbe8b3960954a462aff8c10c6afd34c18acef95931c382f8 SHA512 643ef59451c07fd3e61b22fb9891cc2478dff78c1e2a50ed455b15bf1c01e49d384af177c687e48b2bd6590278ac121458a94760a25bdc064ce309ff5ab3b868
diff --git a/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild b/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
index 0b163556250d..3d8959f55a62 100644
--- a/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
+++ b/games-simulation/corsix-th/corsix-th-0.64-r100.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}"
 # of Lua (or to be precise: if in src_configure cmake has been told to use
 # LuaJIT documentation generation looks for LuaJIT, otherwise any
 # dev-lang/lua slot will do; see the first few lines of the bundled file
-# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua:0 conflicts
+# CMake/GenerateDoc.cmake for details) - but since dev-lang/lua conflicts
 # with the other slots of same, try to keep the deptree sane until we get
 # rid of unslotted Lua.
 BDEPEND="
diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index f0b225ac89dc..bec0532bbecb 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,4 +1,6 @@
 DIST endgame-singularity-music-007.zip 51774799 BLAKE2B 78595b16e422d2312be860686aca9401f6f1eed35fe40dbbc3a3999b1feb5e32aa6d51a66d94c9241aca2b6606bb7135491298b94c8033a1437c2cd7b23f9120 SHA512 ab46e77c833085f0c5b1b46fef72ab807e79ca422ad043ef67a4bf4384cb0177319f21b4bd01496e6c3fc6fe9a2f36ec256e19f0e829ad7bf9f0c5bd38bf0fe5
+DIST singularity-1.00.tar.gz 1944972 BLAKE2B 1ca2b120311a19f175014835930610583e8f605dbda3ca3ca96d7e0da86bddeb4b0a264f50a003aa51e05b86ce971255ffda5f498598dde6be370b9a953eb1d0 SHA512 f3581048c5a535fdbd28d2af1ac596f5396fd712b716931f17de75f8b170f0e226deb2c113023357e21e7de1294e4a632515962df9ee43768baf0fb4bbaa08da
 DIST singularity-1.0a1.tar.gz 1927083 BLAKE2B aeed099dd33c135f5b2e21f5e907646f32aaa0879a1b2e1f09c19045499ae52b004a8f52fee72bfe0977805899e4c7cdff6abf36e9fd3604f73cba7e395c265e SHA512 8ce624a50819e0abc04fd81a1d7658eab64ea8325de0a5790ec2a92e5fa6b62cfef8fe705fe8b209194c05927e3cf5adfc6f48934e0a70edf8b251c24084fc25
-EBUILD singularity-1.0_alpha1-r1.ebuild 1292 BLAKE2B c5ea671b32ffd02f8e5b2ef25ff95445c84e0f1bf794de5ad572bdf7a3233ea50ac1cfd520ee765324b998d61a09ca447c88d91c9c864f1f93c470ed0c90a9b3 SHA512 b5a174d35fca6d9fe173f8fb189e355274fe2852e26500b173846038ed2b784291920c6433bdb43bc463dc7fc5730e7f5dde33b3ebefa1f935b3c5c036558f86
+EBUILD singularity-1.00.ebuild 1250 BLAKE2B 8be42e500a5fda8f637e735e05f855810aa01bdfade0dce55c31ce1a58f7b25491b3eb95a1cd62a4ee575bfb0f5a5fcd7bea80726c2b948fefb2b2241bd3e9d1 SHA512 eea697f55a9212793dd044cb73475a9910cc27cf6bdc7eb20359e5212c909994c4d33c8730a14b2b37caab1d8ab36d993e593a640dcdaf6729bf5eb19bc17674
+EBUILD singularity-1.0_alpha1-r2.ebuild 1418 BLAKE2B 6a423edfa115554d268432d43384d6252640a11e233a7eda735e95814224b44ab897e915706dabe092c984ca3a477b6b77e0929dee232a6abc3e4c0bd3d9f2ce SHA512 ecd2e07da45e4372e3a0f5d7ae075eb1ececb93aff5280717978a88b046a64be4f6caafc6d6dd88b9984d58fa1f7809de43f9ce60dd7fdf12cf09cdbdef62d16
 MISC metadata.xml 342 BLAKE2B 599486446074178c42f941d12e8babc285e015798d4c925f93d52040278ebba1d538223639d0d03d387901fbf216d0adb5c514f2a49318da3571509e03b52ec5 SHA512 558b706d3e1ac877859ef93f34cebbca1e477a8dc92ef7448b288c8794fc8ae9e5a62b54e9ec8f553637db7a6b051c3908c036bf704bcbd4d44a030aa7fde983
diff --git a/games-simulation/singularity/singularity-1.00.ebuild b/games-simulation/singularity/singularity-1.00.ebuild
new file mode 100644
index 000000000000..02d8aec65fc7
--- /dev/null
+++ b/games-simulation/singularity/singularity-1.00.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+DISTUTILS_SINGLE_IMPL=1
+
+inherit desktop distutils-r1
+
+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}"
+
+LICENSE="GPL-2 CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="app-arch/unzip"
+DEPEND="
+	$(python_gen_cond_dep '
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pygame[${PYTHON_USEDEP}]
+		dev-python/polib[${PYTHON_USEDEP}]
+	')
+"
+# sdl-mixer is used at runtime (through pygame)
+# bug #731702
+RDEPEND="
+	${DEPEND}
+	media-libs/sdl-mixer[vorbis,wav]
+	!sys-cluster/singularity
+"
+
+src_install() {
+	distutils-r1_src_install
+
+	insinto /usr/share/${PN}/${PN}/music
+	doins "${WORKDIR}"/${MUSIC}/*
+
+	dodoc README.txt TODO
+
+	domenu ${PN}.desktop
+	newicon ${PN}/data/themes/default/images/icon.png ${PN}.png
+}
diff --git a/games-simulation/singularity/singularity-1.0_alpha1-r1.ebuild b/games-simulation/singularity/singularity-1.0_alpha1-r2.ebuild
index eaa127e077a6..15b223751af5 100644
--- a/games-simulation/singularity/singularity-1.0_alpha1-r1.ebuild
+++ b/games-simulation/singularity/singularity-1.0_alpha1-r2.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
@@ -17,14 +17,21 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+DEPEND="
+	${PYTHON_DEPS}
 	$(python_gen_cond_dep '
 		dev-python/numpy[${PYTHON_MULTI_USEDEP}]
 		dev-python/pygame[${PYTHON_MULTI_USEDEP}]
 		dev-python/polib[${PYTHON_MULTI_USEDEP}]
 	')
 "
-DEPEND="${RDEPEND}"
+# sdl-mixer is used at runtime (through pygame)
+# bug #731702
+RDEPEND="
+	${DEPEND}
+	media-libs/sdl-mixer[vorbis,wav]
+	!sys-cluster/singularity
+"
 BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${P/_alpha/a}"