gentoo resync : 20.06.2021

3 files changed, 97 insertions, 13 deletions

diff --git a/games-strategy/uqm/Manifest b/games-strategy/uqm/Manifest
index 06e1494dfd24..bbfd4df18049 100644
--- a/games-strategy/uqm/Manifest
+++ b/games-strategy/uqm/Manifest
@@ -4,9 +4,15 @@ DIST uqm-0.7.0-1-source.tgz 1591613 BLAKE2B 400309aced671a23bf325b95bb471db2e5b9
 DIST uqm-0.7.0-3domusic.uqm 18980671 BLAKE2B e86828b8a4a2ae7aee7469a9792c3ba7f472208fe33de46f2797024331a290c1092fcae4a1d599fa002d9cd9ef0248df6cb6cda673d3c0ef90c55ae4a38afd56 SHA512 e7d723194685388813d72e1add9a710ecd3de9b33381dfe66acee6c31a31634ee9031ecc83c2003a5222b9381efe150a2f2a9289f8505d842182ca03b012183b
 DIST uqm-0.7.0-content.uqm 11538533 BLAKE2B 8b654f47d8d2e66dac197b10b96fdfc62907cafc6b5b9046a84588d539349263012c5cb235a428e2cb9a8840b1ff7565035f810a8445892b3c272bb629769348 SHA512 c80aa9f1158d07534abc1ef625662dfcd5021cb5e8091d46b3e9a2d96a0fffbe7e9e6cc88680b43d810c8e68a580f7a0d4b62c08e9f7b948ae7f017e4ad20dd2
 DIST uqm-0.7.0-voice.uqm 115143439 BLAKE2B 397bf018e128fc3ac95f40e087b809af58d935549489a1f317495d13be166317f2108eee9d1d5dc2283ef486df70d90aeb1808c29fd78d016fae504189a78625 SHA512 693a4869f8567637b112138f8a074b65919776175addbd353e3601085ee4e4bb4758daca64921c902463f5dc38baa6f7fda4ad32f3cf1786646ef48f15cdeb80
+DIST uqm-0.8.0-3domusic.uqm 18980671 BLAKE2B 56e2eb59026fb039e068206d0490e2449e95500c78b7aad6bf2f0e639332bbc207eea6942d89b841f5cd96b506936fbd9070fb52f00bc7034a5eeddac07da235 SHA512 23704a1f2ee5818aed2fa6e7e69252d0f101b2e9ce03ce1f2904d3d3bd28397287e983baebffacec34d149b7e0427294c9e42fc003f3e32d2e760de67b557ab7
+DIST uqm-0.8.0-content.uqm 11547353 BLAKE2B f68f880e194390770dcec230c00053422cd9968486cd8918012c348e49ef925dca1cd4487fb426003d4be8e30966467603e8d57bf7e0c2269e1400e909e7e1c5 SHA512 52219d00cae79f0184119f6c1ec66c1e41539b40540b7e59baf225d42708a8b54b56368497129e5dbf20a77379fd36aa7d4f019cace90b40f3029e98b03eccd3
+DIST uqm-0.8.0-src.tgz 1611401 BLAKE2B aa7363e42c0d4cf0d3ed09e1fdb47b417dc440e22bffbb208d815f096975c95c7284aa222b3f55464b35df90894d59d5c571bbb4d3b9258c68b6043dbac22305 SHA512 7e964aaccd69e2d775f9e5f42a01b40b2b6d9188741330e56ecaf3888a664b33aa4271418081b7a9193a093e9fa466c947e08a6931c6b91797005a0093f19217
+DIST uqm-0.8.0-voice.uqm 115164704 BLAKE2B 957ea3bd0c4ab2b0d59af249faece5641dd763c219c56e73baf825f36cc09a5d72c9da1707ae3b43553577f3051527da013a494a580e73d2f673896e64936467 SHA512 5735087284931d593e76ef7429f0dd1da792f51d0c623574284795199c2a1ff3f2664ad931149a49bfdb756457e704dc6fefa08fcc6b9ffdc63f3916627abd10
 DIST uqm-remix-disc1.uqm 50188876 BLAKE2B 02bf183aa9ef5460831d4bbcfa90ce4745814de017700d7e6dcb1a065dff2a37d47239fdacbb2ba7639a788d795ac45579952aa7f78b760aa9dc8e3aa9d2ccde SHA512 fed2a6e260ee96802898ad9b6c968acaac3613187fe38370fb557d6d220b499b922447ea04edd15763d0161f5c156ce03bc9d55a86ed3b4e2e0140a4fb17e99b
 DIST uqm-remix-disc2.uqm 60282662 BLAKE2B c556a99adfb11c8b90cf1de272ce5d42aaf7ec16d246572286646328ddd24b0928f013c8de7806e6545b436c2fa152e0cfd7f4851769992848d6aecb0379a433 SHA512 3053693417facef6d01cdb366a15c1bd2a6272961df5870c4151a928845dd76e4ac5fc59f232da5034d56fd9476d3074840a2e9f16d63dba341aeffd92827c4e
 DIST uqm-remix-disc3.uqm 39924875 BLAKE2B f5f495f2c3aca9d6a9a95df51379398a823cb795d85d0ccaa719676d54d7b1dbe9d1b41724eb13fabf62359d6aa72d90615de1f437e2ffde7066436fdebeb13b SHA512 2337752e3a2447ab048cc6782153bbb120d2d6b890c5bfae9cbef60a46d12abf716917863286b0196bf6f5e8ef301b5f84338237520880b10cbf75e450076951
+DIST uqm-remix-disc4-1.uqm 87927958 BLAKE2B e1a603b07bb4d0535ff69fd7ef5f85f71cacf4fe4c95d559228ecac0a925ff4fa5f2117955e3477fd14facbfd0881994929a3f3cfdd8f62eb70d9e4314728fa6 SHA512 93030505d7dfc0f9de1f5d8c2a26c07b67540d67202ccfb71f6223730fbe92285011bd76dba8ff751d3e28025489a51d4804947164f9118a8e0bb742fd7803e3
 DIST uqm-remix-disc4.uqm 86545760 BLAKE2B d644e537ccf234ff846525d70ebe9bd910f68db78f9c7e8dc72b768f24acd98e8db587592352d575bb919561ef5c7dcf09a7e414d31d519475915c65cf65f9b7 SHA512 07f0fbe0b9889602eab43f376577c8e0a19c6db50bbb3f01f57836c7caab1eb18813e94d8d9f2d3098a6b6c9dc336290b7f5262c586f2fb41ffab0e2b0ba7f65
 EBUILD uqm-0.7.0.1.ebuild 3025 BLAKE2B 32b12b00bc7b779279d8e776035261ced811dea61e3a6b8494a5034234622060c8c23bd527dba58f9cd5af3fe761986e54716f2879153c12c4dd96125a15eef1 SHA512 269799cf4839bf20eca5ee277f26de944dcf28cd6cd37c5b2c8143db54cb3bf4e53b8e8e2a72e365cc1b2ceb4a047a4822a40c3a398d8121adc918b93af1b443
-MISC metadata.xml 572 BLAKE2B 154cfbc9c11b74fb658a2e8b494e394f1924291e2273e0fef3346471c9059adf42e819dbf795aad3fdf4296a272e149cf46a8502a195b6bb97287c7b0c548409 SHA512 cd21d5260e39857374bcd1795f2cb2c158104ce865cd9c091202bab404f8133b547d0ba8e7a2580a0177ee1b97de31bdf1b0658f0b20860d70585ecb85bd49b1
+EBUILD uqm-0.8.0.ebuild 2147 BLAKE2B 9cf1cc895dd9cf18f889a08578844a3c61af81a929e74fb3a6b3fc892e094cfb90ac8fe6cdeed562e94a0db26d1849a85c3dde05c6cb0f4ece6a6449e28d27f3 SHA512 d3e0df25b779f746384421f4da3e656a9904e9f8d5b0129f143c09e9757e12438d47717a17e93eb38bdc05a0b8d60a6c5335a527e3e14a0144bd1f9d51ec8fa8
+MISC metadata.xml 561 BLAKE2B e68a86e394ef6ff93af35c4742528507522ed95426a86a327a24771ba05e899c4abab41fe0cb7d0461bfeac2212bc402a043d9348b245fc64f092ac8e2fdd8a5 SHA512 430cc397d8246de7a25da2b75953806d24505e8f9abd388491ecedb1d53f6d198b4dcd302de9a2603b9486ec70f85f5a57ac94833ac02dd772fb2cda9287a99e
diff --git a/games-strategy/uqm/metadata.xml b/games-strategy/uqm/metadata.xml
index 0a1a6fc92acb..9695c0c1152f 100644
--- a/games-strategy/uqm/metadata.xml
+++ b/games-strategy/uqm/metadata.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>games@gentoo.org</email>
-    <name>Gentoo Games Project</name>
-  </maintainer>
-  <use>
-    <flag name="music">download and install music files (large)</flag>
-    <flag name="remix">download and install music remix files (large)</flag>
-    <flag name="voice">download and install voice files (large)</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">sc2</remote-id>
-  </upstream>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+	<use>
+		<flag name="music">download and install original 3DO music files</flag>
+		<flag name="remix">download and install remixed music files (large)</flag>
+		<flag name="voice">download and install voice files (large)</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">sc2</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/games-strategy/uqm/uqm-0.8.0.ebuild b/games-strategy/uqm/uqm-0.8.0.ebuild
new file mode 100644
index 000000000000..084f28188da4
--- /dev/null
+++ b/games-strategy/uqm/uqm-0.8.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop multiprocessing toolchain-funcs
+
+DESCRIPTION="The Ur-Quan Masters: Port of Star Control 2"
+HOMEPAGE="http://sc2.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/sc2/${P}-src.tgz
+	mirror://sourceforge/sc2/${P}-content.uqm
+	music? ( mirror://sourceforge/sc2/${P}-3domusic.uqm )
+	voice? ( mirror://sourceforge/sc2/${P}-voice.uqm )
+	remix? (
+		mirror://sourceforge/sc2/${PN}-remix-disc1.uqm
+		mirror://sourceforge/sc2/${PN}-remix-disc2.uqm
+		mirror://sourceforge/sc2/${PN}-remix-disc3.uqm
+		mirror://sourceforge/sc2/${PN}-remix-disc4-1.uqm
+	)"
+
+LICENSE="CC-BY-2.0 CC-BY-NC-SA-2.5 GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="music remix voice"
+
+RDEPEND="
+	media-libs/libmikmod
+	media-libs/libpng:=
+	media-libs/libsdl2[joystick,sound,video]
+	media-libs/libvorbis
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	cat > config.state <<-EOF || die
+		CHOICE_accel_VALUE='plainc'
+		CHOICE_debug_VALUE='nodebug'
+		CHOICE_mikmod_VALUE='external'
+		INPUT_install_prefix_VALUE='${EPREFIX}/usr'
+	EOF
+	#CHOICE_sound_VALUE='$(usex openal{,} mixsdl)' # experimental and segfaults
+
+	sed -i "/^PROG_gcc_FILE/s|=.*|='$(tc-getCC)'|" \
+		build/unix/config_proginfo_build || die
+	sed -i 's/-O3//' build/unix/build.config || die
+
+	# use ${T} not to leave build files behind (bug 576098)
+	sed -i "/^TEMPFILE=/s|=.*|='${T}/uqm'|" build/unix/config_functions || die
+}
+
+src_compile() {
+	echo | MAKE_VERBOSE=1 ./build.sh -j$(makeopts_jobs) uqm || die
+}
+
+src_install() {
+	dobin uqm
+	doman doc/users/uqm.6
+
+	insinto /usr/share/${PN}/content
+	doins content/version
+
+	insinto /usr/share/${PN}/content/packages
+	doins "${DISTDIR}"/${P}-content.uqm
+
+	insinto /usr/share/${PN}/content/addons
+	use music && doins "${DISTDIR}"/${P}-3domusic.uqm
+	use voice && doins "${DISTDIR}"/${P}-voice.uqm
+	use remix && doins "${DISTDIR}"/${PN}-remix-disc{1,2,3,4-1}.uqm
+
+	dodoc AUTHORS BUGS ChangeLog README WhatsNew doc/users/manual.txt
+
+	doicon src/symbian/uqm.svg
+	make_desktop_entry uqm "The Ur-Quan Masters"
+}