gentoo resync : 14.07.2018

4 files changed, 27 insertions, 41 deletions

diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 8f6617493637..3d47ddb98923 100644
--- a/games-misc/Manifest.gz
+++ b/games-misc/Manifest.gz
diff --git a/games-misc/exult-sound/Manifest b/games-misc/exult-sound/Manifest
index 425896f4fe58..0aee99e43ffd 100644
--- a/games-misc/exult-sound/Manifest
+++ b/games-misc/exult-sound/Manifest
@@ -1,6 +1,3 @@
-DIST U7MusicOGG_1of2.zip 12614413 BLAKE2B 46b4e36638510d9a13b52aad6c1423b43becd2bcb8afc28bd0d19baaf7ee7af3dd0cc16e64a6685701c3db4b418fb088ede3922041ce91fb74fdceec223d5069 SHA512 aadcb085cc97b5330622c4acbd9d00912af7a87371b38e5d984882686ac1624dba1a70a21e66943d8e4de1c5583ab58a32ed851e50d7ecc861d7051383fb21c0
-DIST U7MusicOGG_2of2.zip 11382878 BLAKE2B c65f7e12b6a2a6d94cf1025c7eeb50a8ec9d81b321a66e602900f61b614899b8db654a1a59203cf4026517eaade6aeb5bd53a27085fc26ca545ae9edf01a354b SHA512 c3157faad5e02531732cd8e7ceb2a81cdb3a5b3eeaf48c73c0e753fc99c0ad438bc49f290d202f59851072aca50d22594f5c4782606d0f70d91d747cea9de924
-DIST jmsfx.zip 4778572 BLAKE2B 26ee8f735b1cb75977493a22c660bb8a9e586ca2f68918db32142d9e654c1a80aaa304756bdc72dc6ec741e699ea9f14139a267f85752cfd1017c6c6c91635bf SHA512 0822a8008ad3b9e2e6824dc6666968b8aa5f475b35dae31cf3d35d36422d68570cef440572bde07d4b4b580520b34581ab0700f7bded0bc66ae5d6020feb1662
-DIST jmsfxsi.zip 6194646 BLAKE2B 5b791132907e6579110d4e450a5c4d1362fa5a4e9021ed758be200ba11a370d44710bdd14a2b9bee0c55fcd1972e3fb732b4926d68b75404b1d5cd9fa90a2408 SHA512 1712d7d264f06d84ba38e864174d2e40a77a4270c94b2a5bccbf31dc41e187d6eeb013ebbfbc171bb6314df103a3ad5dd06daeb8ede0b5aead6cd1443680abdf
-EBUILD exult-sound-0-r1.ebuild 850 BLAKE2B 4d025ade2314dbc62fc62e976f1380ee86cde4471171e4509f6f7eafbd6351dba744ae080dad25c9d5bc309f203ebaa3384d1136d46b06e55b1e6de7f08e6f9a SHA512 130b022140ac82ecfee387390b92b836e2a782585e31a4cc8ad4910001ce1f8bd0c3dee8f1e37fbd222aaa5722709dedabee966c6c9334d1a64c2d2dd2a2c143
+DIST exult_audio.zip 48439905 BLAKE2B ad8a230d9ba92cef94b22b669644a10ae6fcfe92c4dbfc5c3f89535534b4bddfe7d9b69dbf05220033df92b6d172e83340e6571920f42b5e63e66a5417ffa8f4 SHA512 70374a079935b063f41a37aeb90315d55abb584e5542f7fa12c707318db6365e989a5848bba9045a2c2cca1ccd902cc1d31fec8c95511a986de7a75d322d0919
+EBUILD exult-sound-0-r2.ebuild 584 BLAKE2B d33043a392754ce5ed10b7279d06f674da8c1b93492dc96b22dbbc5012f9e154920f6b58bdba23a6157f09dc8633412d4d1a9bebed6ad1427456dd2b358a21d6 SHA512 af667060e9ae88c76d2381555562e7bbe0035683fb4c2a33bbf705f3731838336446c6ab3463f7ac8a9f71c6dbfd9ee7b0fe58f24cc8487897f0ec2cc5e53b1f
 MISC metadata.xml 328 BLAKE2B b895ccfad252cbbeb8fe092b4416086fd43420976392111a9ee7b0f714ee22e32d64b651f7e2370466b32c840b1eb0de8702a6714b9718e6bc90fa4524b84ed0 SHA512 bf9ebdd6a99230e6cb155d0dc42b0d94aa1d15b64afc93420210b6763a46a4c8ab3f18cbc83e54068dc7c62df73baf28ee3cbc13a34c7824a724041ac13be16e
diff --git a/games-misc/exult-sound/exult-sound-0-r1.ebuild b/games-misc/exult-sound/exult-sound-0-r1.ebuild
deleted file mode 100644
index d83c7ae5d659..000000000000
--- a/games-misc/exult-sound/exult-sound-0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Sound data for games-engines/exult"
-HOMEPAGE="http://exult.sourceforge.net/"
-SRC_URI="mirror://sourceforge/exult/U7MusicOGG_1of2.zip
-	mirror://sourceforge/exult/U7MusicOGG_2of2.zip
-	mirror://sourceforge/exult/jmsfx.zip
-	mirror://sourceforge/exult/jmsfxsi.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="!<games-engines/exult-9999"
-
-S="${WORKDIR}"
-
-src_unpack() {
-	mkdir music && cd music || die
-	unpack U7MusicOGG_{1,2}of2.zip
-	cd "${WORKDIR}" || die
-	mkdir flx && cd flx || die
-	unpack jmsfx{,si}.zip
-}
-
-src_install() {
-	insinto /usr/share/exult/music
-	doins "${WORKDIR}/music/"*ogg
-	insinto /usr/share/exult/
-	doins "${WORKDIR}/flx/"*.flx
-	newdoc "${WORKDIR}/music/readme.txt" music-readme.txt
-}
diff --git a/games-misc/exult-sound/exult-sound-0-r2.ebuild b/games-misc/exult-sound/exult-sound-0-r2.ebuild
new file mode 100644
index 000000000000..a1cb960fdc53
--- /dev/null
+++ b/games-misc/exult-sound/exult-sound-0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Sound data for games-engines/exult"
+HOMEPAGE="http://exult.sourceforge.net/"
+SRC_URI="mirror://sourceforge/exult/exult_audio.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="!<games-engines/exult-9999"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/exult/music
+	doins music/*.ogg
+	insinto /usr/share/exult/
+	doins *.flx
+	newdoc music/readme.txt music-readme.txt
+	dodoc README_audiopack.txt readme_{jmsfx,jmsisfx,sqsfxbg,sqsfxsi}.txt
+}