gentoo resync : 03.11.2019

3 files changed, 47 insertions, 39 deletions

diff --git a/games-fps/ut2004-bonuspack-mega/Manifest b/games-fps/ut2004-bonuspack-mega/Manifest
index f525e2204f0a..4a9164ef1f24 100644
--- a/games-fps/ut2004-bonuspack-mega/Manifest
+++ b/games-fps/ut2004-bonuspack-mega/Manifest
@@ -1,3 +1,3 @@
 DIST ut2004megapack-linux.tar.bz2 203124107 BLAKE2B 1459e2638181411446ec5679bceb44023382b3533951478ee06c274199688f3bbe341d7f7806299a332373791b6d0a9e1b57efdc6a13a5983220e0adbc413118 SHA512 4ae5eec0622c2bd96dfc162541bc0771399b012fb00f022282bc8c34600cb8e9bb7c18a52dd55fbef6f16fedaf225e301c46077a6accd001f4c77ddad89ed17b
-EBUILD ut2004-bonuspack-mega-1-r2.ebuild 1156 BLAKE2B bac0ef4f8854377b0b6989d1150a814ad7d60a00701c493c502140bd1ed8ebe6156f1ff0878c346016922b6f823abe13ffb0ae760c065c49d4595f7cec8854bf SHA512 6aeb92058fe6a534f1ab5c688f4c8e3c14baa166dad5356944fe4cb39e29e4bedd4792799e040eacad9dffae4d6e7c5919452fbaa0b5c6cbc91a72c6030861d5
+EBUILD ut2004-bonuspack-mega-1-r3.ebuild 1375 BLAKE2B 11b92ca7bc864e6c196387df7c95b9faae0111b10baf68cd82441f7bf8c3273762a3417254db4d1eeff723d9896a89836c7c710674cc0e7c55b0e95f48c841dc SHA512 8cbc790da61fa8ee378922bab6e67774e793735b8bc2accdf28fe7eabb2577b1ace2cc40a52c465929b207b8e997b066debe7ece8625060fdc17320339c46d2f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
deleted file mode 100644
index 807f91c6bf04..000000000000
--- a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Megapack bonus pack"
-MOD_NAME="Megapack"
-
-inherit games games-mods
-
-MY_P="ut2004megapack-linux.tar.bz2"
-HOMEPAGE="http://www.unrealtournament2004.com/"
-SRC_URI="http://ut2004.ut-files.com/BonusPacks/${MY_P}"
-
-LICENSE="ut2003"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-src_prepare() {
-	mv -f UT2004MegaPack/* . || die
-	rmdir UT2004MegaPack
-
-	# Remove files in Megapack which are already installed
-	rm -r Animations Speech Web
-
-	rm Help/{ReadMePatch.int.txt,UT2004Logo.bmp}
-	mv Help/BonusPackReadme.txt Help/MegapackReadme.txt
-
-	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2
-	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax
-	rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx
-
-	# System
-	rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}*
-	rm System/{ucc,ut2004}-bin
-	rm System/{ucc,ut2004}-bin-linux-amd64
-	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx
-}
diff --git a/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild
new file mode 100644
index 000000000000..4beb21b3c8aa
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-mega/ut2004-bonuspack-mega-1-r3.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="UT2004 Megapack - Megapack bonus pack"
+HOMEPAGE="http://www.unrealtournament2004.com/"
+SRC_URI="http://ut2004.ut-files.com/BonusPacks/ut2004megapack-linux.tar.bz2"
+
+LICENSE="ut2003"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	mv -f UT2004MegaPack/* . || die
+	rmdir UT2004MegaPack || die
+
+	# Remove files in Megapack which are already installed
+	rm -r Animations Speech Web || die
+
+	rm Help/{ReadMePatch.int.txt,UT2004Logo.bmp} || die
+	mv Help/BonusPackReadme.txt Help/MegapackReadme.txt || die
+
+	rm Maps/ONS-{Adara,IslandHop,Tricky,Urban}.ut2 || die
+	rm Sounds/{CicadaSnds,DistantBooms,ONSBPSounds}.uax || die
+	rm StaticMeshes/{BenMesh02,BenTropicalSM01,HourAdara,ONS-BPJW1,PC_UrbanStatic}.usx || die
+
+	# System
+	rm System/{AL,AS-,B,b,C,D,E,F,G,I,L,O,o,S,s,U,V,W,X,x}* || die
+	rm System/{ucc,ut2004}-bin || die
+	rm System/{ucc,ut2004}-bin-linux-amd64 || die
+	rm Textures/{AW-2k4XP,BenTex02,BenTropical01,BonusParticles,CicadaTex,Construction_S,HourAdaraTexor,jwfasterfiles,ONSBP_DestroyedVehicles,ONSBPTextures,PC_UrbanTex,UT2004ECEPlayerSkins}.utx || die
+}
+
+src_install() {
+	insinto /opt/ut2004
+	doins -r Help Maps Music Sounds StaticMeshes System Textures
+
+	dosym ut2004 /opt/ut2004-ded
+}