gentoo resync : 25.09.2019

4 files changed, 68 insertions, 17 deletions

diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest
index 03957d6464e9..297b6a61a5b4 100644
--- a/games-strategy/colobot-data/Manifest
+++ b/games-strategy/colobot-data/Manifest
@@ -1,5 +1,8 @@
 DIST colobot-data-0.1.11-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873
 DIST colobot-data-0.1.11-music-ogg.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
-DIST colobot-data-0.1.11.zip 55796087 BLAKE2B 2a1a6fc57bb61423360f89c8bac597754cab872b3154f9b3464bef88555e4dcb9e0296a4b6f85271ef95e71c69d1c31737c8ae3b932a0b64dc8d7cfa8393481b SHA512 2024759af47b4c406325e1d72d119391712ec9d53b4059f3e942e0bd2b3881fdbc9613f79510b9b012cdbc76bebd8a008531da4f94be5d6107887bbcb330417f
-EBUILD colobot-data-0.1.11.ebuild 1417 BLAKE2B e7e337a06bcc0f427ca48686a89b7153b1af7a3a50d20d2dc5c9b7a173d3efd3aa21636af625839673d884431eb8cc46b3425bda2493c2d5b73045f0601c6d52 SHA512 7533d79e52f93510df6c96ff8599d852e8c09b7e6a3f8ecc2d327817d7c3f488314ab797df770a27a558dce480f12c6ef878ade5175d02ce924de25dfbd5763f
-MISC metadata.xml 444 BLAKE2B 82c9945aa54230d7c15dcc90dceb4f7e403e2f6650c12f732271ce8e2a76ee6ed4beb418805628e90a5bd1c13ecd3f591dfe02ff0c3e0e77f1225949cc5bfca6 SHA512 1d0148632fa5d38e3a9d299cff71ea8fffe3624d26001fb7f94e509626738e2d8135af26ce692fee45885d5da44cc64ca5d4655979236f182e213c1bcd43357d
+DIST colobot-data-0.1.11.tar.gz 54014394 BLAKE2B 16464ca663a9e470db4f9af052d313240f38cf651edd738412eb2dd7aed187432de859304a0f2625ed9a4d2c73abe00606670754a59404ac4651fa31ce8e688f SHA512 0f79d403e378b098bbc09fb766c34a09bbe1d4fe17e9070a983808477cb7bf3a101a7c156a0148f7b5b5164de481e45c8f83cf25c829e5e20c2aec3f58d59c9a
+DIST colobot-gold-0.1.12-alpha.data.tar.gz 54732267 BLAKE2B 8cf36911764beb921e2b1009fd8550a1a146f594033cfc4de2d8587866780e22f060949735b03c2e355fab412c70c8557587f859edb86ca815ef249edc348926 SHA512 599cc72e1383826b5c840446f52f53b0f325b1de2ce08826bbd6b04072a51f1c4007b5683f2608dd7be67ab358ef2856e790bbbe5c73d8514141e3284be47508
+DIST colobot-music_ogg_0.1.12-alpha.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
+EBUILD colobot-data-0.1.11.ebuild 1410 BLAKE2B 05f62120e6f26e41748a66236751ed597ad36f0d284c5933e222d72adc6df8a208555c348f84ea56f8b0565604d701241777ff8b68c1bd55bdca14defd550c72 SHA512 fabbb3117169c0ed607a7221572ae30ae7bb70dd6d6c646563062019c2195d58822f1496157d0ceff53cfa0835b09b895d8e036253af028b7e0a470ddc1212f1
+EBUILD colobot-data-0.1.12.ebuild 989 BLAKE2B 5613847baa1e09fae7fe2a2b59bb44bdf3ec1e3a430371b1a6a2bb78d637a44b06f6ef05d94526e5a7f55fd3daf17da81de456a743b0333cba34eca2d9702937 SHA512 1b6607b8e168696fc396ba41ae58fad02de70a6b2d952fe638a2a46bd1bbbc9aa96f5382d473579cac6454236c600c1eb07dbe720dd4ee337a9be22178cb41b3
+MISC metadata.xml 524 BLAKE2B b9c8ac4a161d7966a294c6dc8b7c5799cb6d5b7fce77c44897d0b5ac4a62a77fdd4ac9c5fdcecd4d5ec8e93ec9ef5377b9931674c29a9c89a877ae25862d3cb6 SHA512 72d249ccfa5e7962c95f4d2731e075fe23b00f69bacf6df290a246e0bd5c8e4208b72b9eca12fcb4bcf42782fc2810c50338a3febc0762818003a8858de6fbdf
diff --git a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
index b60210f63c30..552ae2376a42 100644
--- a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
+++ b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
@@ -8,27 +8,26 @@ inherit cmake-utils
 DESCRIPTION="Data package for colobot (Colonize with Bots)"
 HOMEPAGE="https://colobot.info/"
 SRC_URI="
-	https://github.com/colobot/colobot-data/archive/colobot-gold-${PV}-alpha.zip -> ${P}.zip
-	music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz )
-	music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )"
+	https://github.com/colobot/colobot-data/archive/colobot-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz
+	music-ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz )
+	music-flac-convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+music music_flac_convert +music_ogg"
+IUSE="+music music-flac-convert +music-ogg"
 REQUIRED_USE="
-	music? ( ^^ ( music_flac_convert music_ogg ) )
-	music_flac_convert? ( music )
-	music_ogg? ( music )"
+	music? ( ^^ ( music-flac-convert music-ogg ) )
+	music-flac-convert? ( music )
+	music-ogg? ( music )"
 
 DEPEND="
-	app-arch/unzip
-	music_flac_convert? ( media-sound/vorbis-tools )"
+	music-flac-convert? ( media-sound/vorbis-tools )"
 
 S="${WORKDIR}/${PN}-colobot-gold-${PV}-alpha"
 
 src_unpack() {
-	unpack "${P}.zip"
+	unpack "${P}.tar.gz"
 
 	cd "${S}" || die
 	if use music; then
@@ -47,7 +46,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DMUSIC=$(usex music)
-		-DMUSIC_FLAC=$(usex music_flac_convert)
+		-DMUSIC_FLAC=$(usex music-flac-convert)
 		-DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}"
 	)
 	cmake-utils_src_configure
diff --git a/games-strategy/colobot-data/colobot-data-0.1.12.ebuild b/games-strategy/colobot-data/colobot-data-0.1.12.ebuild
new file mode 100644
index 000000000000..1a76b184e5b1
--- /dev/null
+++ b/games-strategy/colobot-data/colobot-data-0.1.12.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+MY_P=colobot-gold-${PV}-alpha
+MUSIC_P=colobot-music_ogg_${PV}-alpha
+
+DESCRIPTION="Data package for colobot (Colonize with Bots)"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="
+	https://github.com/colobot/colobot-data/archive/${MY_P}.tar.gz -> ${MY_P}.data.tar.gz
+	music? (
+		https://colobot.info/files/music/${MUSIC_P}.tar.gz )"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+music"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+src_unpack() {
+	unpack "${MY_P}.data.tar.gz"
+	if use music; then
+		tar -x -f "${DISTDIR}/${MUSIC_P}.tar.gz" -C "${S}/music" || die "Failed to unpack music"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use music; then
+		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMUSIC=$(usex music)
+		-DMUSIC_FLAC=OFF
+	)
+	cmake-utils_src_configure
+}
diff --git a/games-strategy/colobot-data/metadata.xml b/games-strategy/colobot-data/metadata.xml
index 12f259a825d5..666782d07980 100644
--- a/games-strategy/colobot-data/metadata.xml
+++ b/games-strategy/colobot-data/metadata.xml
@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">colobot/colobot-data</remote-id>
 	</upstream>
 	<use>
 		<flag name="music">Enable music support</flag>
-		<flag name="music_flac_convert">Fetch flac music and convert it to ogg</flag>
-		<flag name="music_ogg">Fetch ogg music</flag>
+		<flag name="music-flac-convert">Fetch flac music and convert it to ogg</flag>
+		<flag name="music-ogg">Fetch ogg music</flag>
 	</use>
 </pkgmetadata>