gentoo resync : 03.11.2019

3 files changed, 44 insertions, 34 deletions

diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
index 6b55c624b5b1..6bb521f4f68f 100644
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp2/Manifest
@@ -1,4 +1,4 @@
 DIST cbp2-volume1_zip.zip 203766207 BLAKE2B 7f7d19f4a1a1caaf388eccecadb8123a103d4aafbb95f2b344e106b881507f9bac0ffdda48435be7c2303b8bd70545d3d74ca7971f97a989bfa955d3155d956c SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213
 DIST cbp2-volume2_zip.zip 200444127 BLAKE2B 21d61d09af54e86047d46cc8d136cd6ba746098c4d0a53ade1e8e5c4143b543f0a90eb0dbca2cb00e29754f916dc84e7040a5d64f582bedd2a0107bb4c182291 SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4
-EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 857 BLAKE2B c6fda00042d988e77915e9afd736f03f7072296bb0bfe5cf4c0c9cd49d81b7fbaa84f0ea39270012e709ae9985c335b93cf772a9994bb4fb1762a5d6e8df5633 SHA512 b5fa77133c8420a01782124d22570585251c6cee7877648c4e209c1f0c2b432dd09052c5f15956524080ac6f520590a8aa0a67b02b9797d6fbb8e3ec0db08d13
+EBUILD ut2004-bonuspack-cbp2-1-r3.ebuild 1013 BLAKE2B 65affde00f8af3ee2185ad7e422d01d30ea6a469f22983535fcb70d0ef7665f49695876d7f0851adf02c45148b61ff3748cc21f98a68bd8e8210c241ee05c215 SHA512 1263bed67a955c265fada3a1499d3144d4f1a1a15aa0ba6d9f61fe585c877e14cab6be245719695dd3f97c03cea968590e63b1dc34be26f65f6f6259919d7cd5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
deleted file mode 100644
index d1d4cee91dde..000000000000
--- a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r2.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MOD_DESC="Community Bonus Pack 2 Vol 1 and 2"
-MOD_NAME="Community Bonus Pack 2 Vol 1 and 2"
-
-inherit games games-mods
-
-HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
-SRC_URI="https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume1_zip.zip
-	https://ut.rushbase.net/beyondunreal/official/ut2004/cbp2-volume2_zip.zip"
-
-LICENSE="freedist"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="games-fps/ut2004-bonuspack-cbp1
-	games-fps/ut2004-bonuspack-mega"
-
-src_prepare() {
-	# Provided by ut2004-bonuspack-cbp1
-	rm Music/Soeren.ogg
-	# Provided by ut2004-bonuspack-mega
-	rm Textures/Ty_RocketTextures.utx
-
-	cd Help
-	# Useless orphan file
-	rm Note.txt
-	mv GERROIDREADME.txt DOM-CBP2-Gerroid.txt
-	mv Readme.txt CBP2-Readme.txt
-}
diff --git a/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
new file mode 100644
index 000000000000..c14a79c5917f
--- /dev/null
+++ b/games-fps/ut2004-bonuspack-cbp2/ut2004-bonuspack-cbp2-1-r3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="UT2004 Community Bonus Pack 2 Volume 1 and 2"
+HOMEPAGE="https://liandri.beyondunreal.com/Unreal_Tournament_2004"
+SRC_URI="https://ut2004.ut-files.com/BonusPacks/cbp2-volume1_zip.zip
+	https://ut2004.ut-files.com/BonusPacks/cbp2-volume2_zip.zip"
+LICENSE="freedist"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="strip"
+
+BDEPEND="app-arch/unzip"
+RDEPEND="|| ( games-fps/ut2004 >=games-server/ut2004-ded-3369.3-r2 )
+	games-fps/ut2004-bonuspack-cbp1
+	games-fps/ut2004-bonuspack-mega"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	default
+
+	# In ut2004-bonuspack-cbp1.
+	rm Music/Soeren.ogg || die
+
+	# In ut2004-bonuspack-mega.
+	rm Textures/Ty_RocketTextures.utx || die
+
+	# Useless file.
+	rm Help/Note.txt || die
+
+	cd Help || die
+	mv Readme.txt CBP2-Readme.txt || die
+	mv GERROIDREADME.txt DOM-CBP2-Gerroid.txt || die
+	mv Tydal.txt DM-CBP2-Tydal.txt || die
+}
+
+src_install() {
+	insinto /opt/ut2004
+	doins -r *
+}