gentoo resync : 15.01.2020

4 files changed, 48 insertions, 56 deletions

diff --git a/games-simulation/singularity/Manifest b/games-simulation/singularity/Manifest
index 9109ca2dd85d..c5a28d451211 100644
--- a/games-simulation/singularity/Manifest
+++ b/games-simulation/singularity/Manifest
@@ -1,4 +1,4 @@
-DIST endgame-singularity-music-006.zip 28250705 BLAKE2B 62f39536afe12d0928056cca05cccbc7542d79ce5a2acfb23dc99e66ea291eeadc2ae8e771cfed5a96ff69bdc217b69f44b8c5143a323fa5c06fe2d34ac6d425 SHA512 47e489112309cc742c2dcffec004aff25c54488fdf2a5f2dc67b7dcf67ca55996fe8e8403e4a16712fbc4e22289f12e612ad9d4322cd1d1aaab871f0ffb27e19
-DIST singularity-0.30c-src.tar.gz 2265133 BLAKE2B a3f7612ac173ef34183ea500d8bef8b1c823b54d0b0acb6a40bce058497d424f76df5fd51da8f1acfb636a556759cea2114529e0e60b453652d0b04a139b19a1 SHA512 ffca50c179b745561a25e3fb3525abb862d72f63f533f8a41472067d0ce94c8a236486c9c40a5040335d84e903c498805d591dc546a92d0a7651105103fe114f
-EBUILD singularity-0.30c-r2.ebuild 1207 BLAKE2B 04aedc608c2c7803a3dd1d9263a342566b140fcc01790eca981adb2e8e5f5505cc55a0952856325ce095c30c4f956c6431dc35e5b7cd3641bc123a1a3daac20c SHA512 901ee8f14e7c850f7d333744d91c9710a3fbce07b96657f3b0f561dd30403b61ef1631dac3aacc5a126aa8a1f31591cf3d234ec178b0212ba4da391482eb58b1
-MISC metadata.xml 405 BLAKE2B 5ce059ade56e4080d77172d347c4f22a80c7d0762df1ddb9833fc92455b0bc22aca2263eb217b15ea82f76bfe268d9d1793b169774f2150888652d8aec83a745 SHA512 c32086dbbfce16439635063e3ed94a44a9bff47f5047cc9c078ed59bf4eac0e7e91b86037f4fd19c1e21fdcb4853e794535cc4d1a8ee898f8e292b26bbe7883f
+DIST endgame-singularity-music-007.zip 51774799 BLAKE2B 78595b16e422d2312be860686aca9401f6f1eed35fe40dbbc3a3999b1feb5e32aa6d51a66d94c9241aca2b6606bb7135491298b94c8033a1437c2cd7b23f9120 SHA512 ab46e77c833085f0c5b1b46fef72ab807e79ca422ad043ef67a4bf4384cb0177319f21b4bd01496e6c3fc6fe9a2f36ec256e19f0e829ad7bf9f0c5bd38bf0fe5
+DIST singularity-1.0a1.tar.gz 1927083 BLAKE2B aeed099dd33c135f5b2e21f5e907646f32aaa0879a1b2e1f09c19045499ae52b004a8f52fee72bfe0977805899e4c7cdff6abf36e9fd3604f73cba7e395c265e SHA512 8ce624a50819e0abc04fd81a1d7658eab64ea8325de0a5790ec2a92e5fa6b62cfef8fe705fe8b209194c05927e3cf5adfc6f48934e0a70edf8b251c24084fc25
+EBUILD singularity-1.0_alpha1.ebuild 1244 BLAKE2B a713c6bb60a887afde322b73483c8d387b7ea4d23a5b294cfbaa6c7513c49f1356ec4200057abeebb3c590c5dded3872da0954c36c14b5a72146bb7a1519f9fd SHA512 805522acd2b6812cc98da1ba53b0bd7710906073ff1ef168e7b3a9baca300ce96bb14d696e1b46ee604e641700b377899ec9a287d7bdf0980b30d0afa9cd3092
+MISC metadata.xml 342 BLAKE2B 599486446074178c42f941d12e8babc285e015798d4c925f93d52040278ebba1d538223639d0d03d387901fbf216d0adb5c514f2a49318da3571509e03b52ec5 SHA512 558b706d3e1ac877859ef93f34cebbca1e477a8dc92ef7448b288c8794fc8ae9e5a62b54e9ec8f553637db7a6b051c3908c036bf704bcbd4d44a030aa7fde983
diff --git a/games-simulation/singularity/metadata.xml b/games-simulation/singularity/metadata.xml
index 3bc51b541a4a..7a0effa40f3b 100644
--- a/games-simulation/singularity/metadata.xml
+++ b/games-simulation/singularity/metadata.xml
@@ -5,9 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<use>
-		<flag name="music">Install music files</flag>
-	</use>
 	<upstream>
 		<remote-id type="google-code">endgame-singularity</remote-id>
 	</upstream>
diff --git a/games-simulation/singularity/singularity-0.30c-r2.ebuild b/games-simulation/singularity/singularity-0.30c-r2.ebuild
deleted file mode 100644
index b00c722f9da3..000000000000
--- a/games-simulation/singularity/singularity-0.30c-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit eutils python-single-r1
-
-MUSIC=endgame-${PN}-music-006
-DESCRIPTION="Simulation of a true AI. Go from computer to computer, chased by the whole world"
-HOMEPAGE="http://www.emhsoft.com/singularity/"
-SRC_URI="https://endgame-singularity.googlecode.com/files/${P}-src.tar.gz
-	music? ( https://endgame-singularity.googlecode.com/files/${MUSIC}.zip )"
-
-LICENSE="GPL-2 CC-BY-SA-2.5"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+music"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pygame[${PYTHON_USEDEP}]
-	media-libs/sdl-mixer[vorbis]"
-DEPEND="${DEPEND}
-	app-arch/unzip"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	rm -f code/{,*}/*.pyc data/*.html || die # Remove unecessary files
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r code data ${PN}.py
-	python_optimize ${ED%/}/usr/share/${PN}
-
-	if use music ; then
-		doins -r ../${MUSIC}/music
-	fi
-
-	make_wrapper ${PN} "${EPYTHON} ${PN}.py" /usr/share/${PN}
-	dodoc README.txt TODO Changelog AUTHORS
-}
diff --git a/games-simulation/singularity/singularity-1.0_alpha1.ebuild b/games-simulation/singularity/singularity-1.0_alpha1.ebuild
new file mode 100644
index 000000000000..d54f147ac48d
--- /dev/null
+++ b/games-simulation/singularity/singularity-1.0_alpha1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit desktop eutils python-single-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/${P/_alpha/a}/${P/_alpha/a}.tar.gz
+	http://emhsoft.com/singularity/${MUSIC}.zip"
+
+LICENSE="GPL-2 CC-BY-SA-2.5"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pygame[${PYTHON_USEDEP}]
+	dev-python/polib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}/${P/_alpha/a}"
+
+src_install() {
+	insinto /usr/share/${PN}
+	doins -r "${PN}" "${PN}.py"
+
+	python_optimize "${ED}/usr/share/${PN}"
+
+	insinto /usr/share/${PN}/${PN}/music
+	doins "${WORKDIR}"/${MUSIC}/*
+
+	make_wrapper ${PN} "${EPYTHON} ${PN}.py" /usr/share/${PN}
+	dodoc README.txt TODO Changelog AUTHORS
+
+	domenu "${PN}.desktop"
+	newicon "${PN}"/data/themes/default/images/icon.png "${PN}.png"
+}