From 9097a9c06c0b1e11c7f6579f03e3f32948be3f24 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 20 Dec 2024 06:30:59 +0000
Subject: gentoo auto-resync : 20:12:2024 - 06:30:59

---
 games-arcade/jazz2-data/Manifest                   |  5 +-
 .../jazz2-data/jazz2-data-0-r20200327.ebuild       | 81 ----------------------
 .../jazz2-data/jazz2-data-0-r20241219.ebuild       | 64 +++++++++++++++++
 games-arcade/jazz2-data/metadata.xml               |  3 -
 4 files changed, 66 insertions(+), 87 deletions(-)
 delete mode 100644 games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
 create mode 100644 games-arcade/jazz2-data/jazz2-data-0-r20241219.ebuild

(limited to 'games-arcade/jazz2-data')

diff --git a/games-arcade/jazz2-data/Manifest b/games-arcade/jazz2-data/Manifest
index 959e471bfae5..a76f23770c07 100644
--- a/games-arcade/jazz2-data/Manifest
+++ b/games-arcade/jazz2-data/Manifest
@@ -1,6 +1,5 @@
 DIST jazz2-shareware-demo.zip 7658261 BLAKE2B b2b4412cd62feba07878a091a2a47d432a10d09f5f552eeb49095938d9ca6f97e94ab31e9cc8545019d9bdd8e5f97270dd9c1b25ba2099b260ff731dee5847c6 SHA512 208aedbb581f001c8215932166c71e5a160c70af6343d06aa35211558f898f18c47f066c896f016372aaefc8dbc495bc28ace18ce5fcbb729a9d2444a445d9ce
-DIST jj2plus-v1.zip 153487 BLAKE2B 49867cd3d30ee26e8795a7983657f7092710d43b0b8f083853bd0284fc5e1917954951a796747f4700ab43f82633886eb7fa229950fcc003c798f24fd9c33209 SHA512 139b8f98a6c4b8bb7067893e4387af540e7c15d1e633c5f964d7a6ae64320ad1a432434403a74aa4b4af36e3d4eb5245e74ade395ea473c8fd2e3fc37cef06a5
 DIST setup_jazz_jackrabbit_2_1.24hf_(16886).exe 58050816 BLAKE2B 6a6492aedc3d7387e5ef5bfc641d54c46dbe850f65f9269268c962cf963164dcd98c2f2651e9dc3b7c2d0ea9ea00836e9cc1332a158b08c34f8fa9fbfb44859e SHA512 df6fc47abf24aaa1895df5f897f698b53865fdc499e2454e07b273eddc8fcdeeebe8fc2992292fb27e077da252d3d5728823ce6a2e83412c150fb8742a52116f
 DIST setup_jazz_jackrabbit_2_cc_1.2x_(16742).exe 57273872 BLAKE2B 85cd51fbe706bd6a040931d084102cf46c13d3508653ac429f721b93b8bcef131bea688a1d49cc6e789fa108fed5611e2bd476a2f50ceee4ac0c16531d49795a SHA512 fafce9bb318903970b8ba8e3c08cd261c748180158c162db4f67408d12b436a1a091b2423e2df0859e6c65df5ffe1e7e07d370089b6ebf70f8fc32ff5c260a86
-EBUILD jazz2-data-0-r20200327.ebuild 1833 BLAKE2B 3c9ddcb372f67f6219dbcfc196eb37fd8e7a9c319a2056331b6b1d1eaf92f250b525b62d0ee97cffb2053ffc863f667b3f5a9c6c8f1a2db68bc527938c4ff363 SHA512 e9bc4994484521dc737e1bff89321b227bd4f8267d6a88409867bc887b3a3dea4dc0a3d7b44800bcbc75209f292f255ac63274974a789bc4b50f986b0c76488c
-MISC metadata.xml 512 BLAKE2B d56ac98f2d1c8bfc9b0d34083033d8bf273b320102b9e3d38771894bfd799476e26bf75e19c223eea5b99d66b9d353d955007d44f9a3a6315ae2c363576a6e53 SHA512 87ddcda53963aa6d37fb9d407488f9e93ac713d635420bf14248d7a390e646b5d417ce6a9b71eec2336c780f9c750ba572faf0b8b8b9778c3b02d8e80ae84f23
+EBUILD jazz2-data-0-r20241219.ebuild 1256 BLAKE2B e9383c3e626108dab33ca51bb94adf204cb17b3c1d57a3f03246e6e2dd7d227e2f635182937c7e4348172c4e6914a39e68284c9aec351b2e3e6c372ad4956d4a SHA512 59dcd4d202b578e249e1b5e0eb48e103a7ac274afac2015bb0adaf88ee54915b5a5d6b014dcc0c932c193f6c3537963e79f0c06039b14e3b084958c99c1aedc6
+MISC metadata.xml 430 BLAKE2B 976efec639b4a3100ddc48c941e5a94974b9383002f39db906e45fb352583653a0085416fd6b784c5683b06689fa3c026778d0ea55940b4e16bb833527548e49 SHA512 08e3c6cc2f1dcd2d0becedec881c974e1bdcb3111e1c4f8aa5cd7679355178ca022084a69391bf2da3b6cccc9e714b00404d316ac01d8d1b1bdca806c594563f
diff --git a/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild b/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
deleted file mode 100644
index ecb870298485..000000000000
--- a/games-arcade/jazz2-data/jazz2-data-0-r20200327.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DEATTK="http://deat.tk/jazz2/misc"
-JJ2PLUS="${DEATTK}/jj2plus-v1.zip"
-
-DESCRIPTION="Jazz Jackrabbit 2 data files imported for games-arcade/jazz2"
-HOMEPAGE="https://www.gog.com/game/jazz_jackrabbit_2_collection"
-
-# Order is significant!
-SRC_URI="
-	${JJ2PLUS}
-	demo? (
-		${DEATTK}/shareware-demo.zip -> jazz2-shareware-demo.zip
-	)
-	!demo? (
-		cc? ( setup_jazz_jackrabbit_2_cc_1.2x_(16742).exe )
-		setup_jazz_jackrabbit_2_1.24hf_(16886).exe
-	)
-"
-
-LICENSE="free-noncomm GOG-EULA"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+cc demo gles2-only"
-RESTRICT="!demo? ( bindist fetch )"
-
-# jazz2-import is available only before version 1.0.0
-RDEPEND="<games-arcade/jazz2-1:=[gles2-only=]"
-
-BDEPEND="
-	${RDEPEND}
-	app-arch/unzip
-	!demo? ( app-arch/innoextract )
-"
-
-DIR="/usr/share/jazz2"
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	local a
-	einfo "Please place the following files in your distfiles directory."
-	einfo
-	einfo "  Go to https://www.gog.com/game/jazz_jackrabbit_2_collection,"
-	einfo "  purchase the game, and download:"
-	for a in ${A}; do
-		[[ ${SRC_URI} == */${a}* ]] && continue
-		einfo "    - ${a}"
-	done
-	einfo
-	einfo "  You must also download:"
-	einfo "    - ${JJ2PLUS}"
-}
-
-src_unpack() {
-	ln -snf "${DISTDIR}/${JJ2PLUS##*/}" || die
-
-	if use demo; then
-		ln -snf "${DISTDIR}"/jazz2-shareware-demo.zip shareware-demo.zip || die
-	else
-		local EXE
-		for EXE in ${A}; do
-			[[ ${EXE} == *.exe ]] || continue
-			innoextract -e -s -p0 -I app -d "${EXE}" "${DISTDIR}/${EXE}" || die
-		done
-	fi
-}
-
-src_install() {
-	if use demo; then
-		jazz2-import /no-wait /output "${ED}${DIR}" || die
-	else
-		local EXE
-		for EXE in ${A}; do
-			[[ ${EXE} == *.exe ]] || continue
-			jazz2-import /no-wait /output "${ED}${DIR}" "${EXE}"/app || die
-		done
-	fi
-}
diff --git a/games-arcade/jazz2-data/jazz2-data-0-r20241219.ebuild b/games-arcade/jazz2-data/jazz2-data-0-r20241219.ebuild
new file mode 100644
index 000000000000..50ae121bfcfd
--- /dev/null
+++ b/games-arcade/jazz2-data/jazz2-data-0-r20241219.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit estack
+
+DESCRIPTION="Jazz Jackrabbit 2 data files for games-arcade/jazz2"
+HOMEPAGE="https://www.gog.com/game/jazz_jackrabbit_2_collection"
+
+# Order is significant!
+SRC_URI="
+	demo? (
+		https://deat.tk/jazz2/misc/shareware-demo.zip -> jazz2-shareware-demo.zip
+	)
+	!demo? (
+		setup_jazz_jackrabbit_2_1.24hf_(16886).exe
+		cc? ( setup_jazz_jackrabbit_2_cc_1.2x_(16742).exe )
+	)
+"
+
+S="${WORKDIR}/app"
+LICENSE="free-noncomm GOG-EULA"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+cc demo"
+RESTRICT="!demo? ( bindist fetch )"
+
+RDEPEND=">=games-arcade/jazz2-3.0.0-r1"
+
+BDEPEND="
+	demo? ( app-arch/unzip )
+	!demo? ( app-arch/innoextract )
+"
+
+DIR="/usr/share/jazz2"
+
+pkg_nofetch() {
+	einfo "Please buy and download the following files from"
+	einfo "${HOMEPAGE}."
+	einfo
+	local EXE
+	for EXE in ${A}; do
+		einfo " - ${EXE}"
+	done
+}
+
+src_unpack() {
+	if use demo; then
+		unzip -qoL -d app "${DISTDIR}/${A}" || die
+	else
+		local EXE
+		for EXE in ${A}; do
+			innoextract -e -s -p0 -L -I app "${DISTDIR}/${EXE}" || die
+		done
+	fi
+}
+
+src_install() {
+	eshopts_push -s nullglob
+	insinto /usr/share/jazz2/Source
+	doins -r *.j?? *.it *.mod *.s3m tiles*/
+	eshopts_pop
+}
diff --git a/games-arcade/jazz2-data/metadata.xml b/games-arcade/jazz2-data/metadata.xml
index aa4c2459df1a..fcd190be0a62 100644
--- a/games-arcade/jazz2-data/metadata.xml
+++ b/games-arcade/jazz2-data/metadata.xml
@@ -5,9 +5,6 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="github">deathkiller/jazz2</remote-id>
-	</upstream>
 	<use>
 		<flag name="cc">Install The Christmas Chronicles additional data</flag>
 		<flag name="demo">Use the free demo data instead of the full retail game data</flag>
-- 
cgit v1.2.3