gentoo resync : 28.04.2021

3 files changed, 47 insertions, 36 deletions

diff --git a/games-fps/ut2003-bonuspack-de/Manifest b/games-fps/ut2003-bonuspack-de/Manifest
index d06afdd836b5..272d5e6c8869 100644
--- a/games-fps/ut2003-bonuspack-de/Manifest
+++ b/games-fps/ut2003-bonuspack-de/Manifest
@@ -1,3 +1,3 @@
 DIST debonus.ut2mod.zip 74977458 BLAKE2B bd9c91524e1d3b3ac24434c7daedd886044884cbb36b919452e408b73de317cf43b1c18e3f843a0c272652dd40ae7ad2da007d87ea370da23e88ea599c1026ab SHA512 2c70d39eea1ea647d2fbee21dda5b00057b7feb1607a89d86982ac43e6063820aa70c633fbc21c768d1491fec909a06634e0e883aa771be2607b51ab193f0935
-EBUILD ut2003-bonuspack-de-1.ebuild 749 BLAKE2B e168c222778a123d6c8611e68f64162fd39139ed53c388c9e275b6e24d20ae21e3b453859bfb4c5f6d2dba1a26fc8530db5562cf7f666dac4351bc16887812a5 SHA512 d9e2d598362efefc91c7cb97721a56e0b3d71fe401dcdbd791d3ad3eb4d6684995188f53aec1c0c86cf02a4c444b3740d5ec6ff8badb9bcf959eb2ba88f27164
+EBUILD ut2003-bonuspack-de-1-r1.ebuild 1456 BLAKE2B d8c7c34e060960d6150ab4ce50a94fc4944ec173d03e940f382b63ae45d5180be96b125a8c163d6e8c10be026d6cbfd6e5b3d1cdef713e6f3b46b6c3da2e492b SHA512 35de00e1cef7fc25afde34b0d75a66e3778e45f7183cec4a2370af1182d0c125d5a71ccacba2140d97e28571c7bf788c5a9bbc934b7b4bb41441da6bd43b6faa
 MISC metadata.xml 771 BLAKE2B 705c6aa979f650220a52db3ef5d8c5b8b468b28eac8692a2fbe583ed4b3f694fdfe088d64cc3f6d8506494522f8ca11b491e21e322e3f50ff4453e93ce0d543f SHA512 d30d55503e3b3897d2a5093c06a39f684bdf0879214931a360a87637cd62ae1ca019577f42275bf2b4ba28649ab2989b0a2e184998497ddc5ffddbb6ba35ef5e
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1-r1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1-r1.ebuild
new file mode 100644
index 000000000000..6e54cd2f15ee
--- /dev/null
+++ b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="debonus.ut2mod.zip"
+DESCRIPTION="Digital Extremes Bonus Pack for UT2003"
+HOMEPAGE="https://www.moddb.com/games/unreal-tournament-2003"
+SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/${MY_P}"
+S="${WORKDIR}"
+
+LICENSE="ut2003"
+SLOT="1"
+KEYWORDS="~x86"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="games-fps/ut2003"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip"
+
+src_unpack() {
+	unzip -qq "${DISTDIR}"/${A} || die
+}
+
+src_install() {
+	local dir="${EPREFIX}"/opt/ut2003
+	local Ddir="${D}${dir}"
+
+	# Inlined from games.eclass
+	_games_umod_unpack() {
+		local umod=${1}
+
+		mkdir -p "${Ddir}"/System || die
+		cp "${dir}"/System/{ucc-bin,Manifest.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int} "${Ddir}"/System || die
+		# Don't die here (for now) in case Default.ini, DefUser.ini are missing
+		cp "${dir}"/System/Def{ault,User}.ini "${Ddir}"/System &> /dev/null
+
+		cd "${Ddir}"/System || die
+		UT_DATA_PATH="${Ddir}"/System ./ucc-bin umodunpack -x "${S}/${umod}" -nohomedir &> /dev/null || die "uncompressing file ${umod}"
+		rm -f "${Ddir}"/System/{ucc-bin,{Manifest,Def{ault,User},User,UT200{3,4}}.ini,{Engine,Core,zlib,ogg,vorbis}.so,{Engine,Core}.int,ucc.log &>/dev/null || die "Removing temporary files"
+	}
+
+	mkdir -p "${Ddir}"/{System,Maps,StaticMeshes,Textures,Music,Help} || die
+
+	_games_umod_unpack DEBonus.ut2mod
+}
diff --git a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild b/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
deleted file mode 100644
index 7fc87147a470..000000000000
--- a/games-fps/ut2003-bonuspack-de/ut2003-bonuspack-de-1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_P="debonus.ut2mod.zip"
-DESCRIPTION="Digital Extremes Bonus Pack for UT2003"
-HOMEPAGE="https://www.moddb.com/games/unreal-tournament-2003"
-SRC_URI="http://ftp.student.utwente.nl/pub/games/UT2003/BonusPack/${MY_P}"
-
-LICENSE="ut2003"
-SLOT="1"
-KEYWORDS="~x86"
-IUSE=""
-RESTRICT="bindist mirror strip"
-
-RDEPEND="games-fps/ut2003"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S=${WORKDIR}
-
-dir=${GAMES_PREFIX_OPT}/ut2003
-Ddir=${D}/${dir}
-
-src_unpack() {
-	unzip -qq "${DISTDIR}"/${A} || die
-}
-
-src_install() {
-	mkdir -p "${Ddir}"/{System,Maps,StaticMeshes,Textures,Music,Help} || die
-	games_umod_unpack DEBonus.ut2mod
-	prepgamesdirs
-}