From 0aad4cd3e3fe3db90904ffc51b35e4ff160b53c5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Mon, 10 Jun 2024 00:08:04 +0100
Subject: gentoo auto-resync : 10:06:2024 - 00:08:04

---
 games-action/descent2-data/Manifest                |   2 +-
 .../descent2-data/descent2-data-1.2-r1.ebuild      | 120 ++++++++++++++++++++
 .../descent2-data/descent2-data-1.2.ebuild         | 121 ---------------------
 3 files changed, 121 insertions(+), 122 deletions(-)
 create mode 100644 games-action/descent2-data/descent2-data-1.2-r1.ebuild
 delete mode 100644 games-action/descent2-data/descent2-data-1.2.ebuild

(limited to 'games-action/descent2-data')

diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index b2518860fc02..73d2478a9ba1 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,4 +1,4 @@
 DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
 DIST setup_descent_2_1.1_(16596).exe 563071744 BLAKE2B f4c81daf5f3fe752687630bf4d9f10076e6f343161ea9675e3ab5698034fd8066727d939263db7a388d1e7e89834b8cea6e58e65433fd83a1d732b5439a693e5 SHA512 baf4577409c011f668d10a1a43385a916b951457b43b90883cef73af6622bed31a717f3d50d5a85698237fc4160281f3e2f4e07c9a261d63f52024ca05839fbd
-EBUILD descent2-data-1.2.ebuild 2895 BLAKE2B 975300b0cfda424eee0f98de16e7051e2dff77610cce911ba93c25ffeedad84476d8791c06898ec6469288ec6c3314717c80c6b5181098f871fe6d6271d6baac SHA512 84021c9ae3ba5961ddecc7eae6b3349eedc51fb2481fee79fd752fde557dfc0acce10ebb2737d362f4a07bef925c9007a7107cea7b3129bbb771ce4a71673598
+EBUILD descent2-data-1.2-r1.ebuild 2894 BLAKE2B b170d60f9859ec21979b54de68c6e297e452bed1af58b731c5cf506d50d2f09ff50f5645805322f6a5a9e41c2f135fadf1fab110558d942eaffc93abf67aa4a8 SHA512 5f90f10159dba20bd7e6ddbefa4589078a27fa8fc1c2bb7fd17cb1e5fd5be3089ac30ae824e00506ee2ff0a5b0e2dbf243d4f2a6bb6a0539655cfc9823bde4cb
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-action/descent2-data/descent2-data-1.2-r1.ebuild b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
new file mode 100644
index 000000000000..5b81d07228cc
--- /dev/null
+++ b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CDROM_OPTIONAL="yes"
+inherit cdrom estack
+
+# Not possible to apply official 1.2 patch under Linux. A Gentoo user
+# created Xdelta patches and the DXX-Rebirth project kindly hosted them.
+MY_PATCH="https://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz"
+
+# For GOG install
+MY_EXE="setup_descent_2_1.1_(16596).exe"
+
+DESCRIPTION="Data files for Descent 2"
+HOMEPAGE="https://www.interplay.com"
+SRC_URI="cdinstall? ( ${MY_PATCH} )
+	!cdinstall? ( ${MY_EXE} )"
+S="${WORKDIR}"
+LICENSE="descent-data"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="doc videos"
+RESTRICT="bindist !cdinstall? ( fetch )"
+
+# <d2x-0.2.5-r3 may include the data.
+RDEPEND="!<games-action/d2x-0.2.5-r3
+	!games-action/descent2-demodata"
+
+DEPEND="cdinstall? (
+		app-arch/arj
+		dev-util/xdelta:3
+	)
+	!cdinstall? (
+		app-arch/innoextract
+	)"
+
+pkg_nofetch() {
+	elog "You must place a copy of, or symlink to, the GOG setup package in your"
+	elog "distfiles directory."
+	echo
+	elog "If you wish to install from CD-ROM instead, please enable the cdinstall flag."
+}
+
+src_unpack() {
+	if use cdinstall; then
+		default
+		cdrom_get_cds d2data/descent2.sow:descent2.hog
+
+		case ${CDROM_SET} in
+			0)
+				einfo "Found Descent 2 CD"
+				arj e -y -_ "${CDROM_ABSMATCH}" || die ;;
+			1)
+				einfo "Found Descent 2 installation"
+				cd "${CDROM_ABSMATCH%/*}" || die ;;
+		esac
+	else
+		einfo "Unpacking ${MY_EXE}. This will take a while..."
+		innoextract -e -s -p1 -L -I app -d gog "${DISTDIR}/${MY_EXE}" || die
+		cd "${WORKDIR}/gog/app" || die
+	fi
+
+	eshopts_push -s globstar nocaseglob nullglob
+
+	# Strip directories
+	# Lowercase
+	# d2{-2plyr,chaos}.* into data/missions
+	# *.dem into data/demos
+	# Documentation into doc
+	# Remainder into data
+	# Exclude Vertigo files
+
+	tar c \
+		--mode=u+w \
+		--ignore-case \
+		--xform='s:.*/::xg' \
+		--xform='s:.*:\L\0:x' \
+		--xform='s:^d2(-2plyr|chaos)\.:data/missions/\0:x' \
+		--xform='s:.*\.dem$:data/demos/\0:x' \
+		--xform='s:.*\.(pdf|txt)$:doc/\0:x' \
+		--xform='s:^[^/]+$:data/\0:x' \
+		--exclude='d2x*' \
+		--exclude='hoard.ham' \
+		--exclude='panic.*' \
+		--exclude="$(use doc || echo '*.pdf')" \
+		--exclude="$(use videos || echo '*.mvl')" \
+		*.{txt,pdf} *-h.mvl **/*.{ham,hog,mn2,pig,s11,s22} \
+		| tar x -C "${WORKDIR}"
+
+	assert "tar failed"
+	eshopts_pop
+}
+
+src_prepare() {
+	# Patch to 1.2 if necessary
+	if use cdinstall; then
+		if [[ $(md5sum data/descent2.ham) != 7f30c3d7d4087b8584b49012a53ce022* ]]; then
+			local i
+			for i in *.xdelta; do
+				xdelta3 -d -s data/"${i%.*}" "${i}" data/"${i%.*}".new || die
+				mv data/"${i%.*}"{.new,} || die
+			done
+		fi
+	fi
+
+	default
+}
+
+src_install() {
+	insinto /usr/share/games/d2x
+	doins -r data/*
+	[[ -d doc ]] && dodoc doc/*
+}
+
+pkg_postinst() {
+	elog "A client is needed to run the game, e.g. games-action/dxx-rebirth."
+	echo
+}
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
deleted file mode 100644
index cde97c1738f4..000000000000
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CDROM_OPTIONAL="yes"
-inherit cdrom estack
-
-# Not possible to apply official 1.2 patch under Linux. A Gentoo user
-# created Xdelta patches and the DXX-Rebirth project kindly hosted them.
-MY_PATCH="https://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz"
-
-# For GOG install
-MY_EXE="setup_descent_2_1.1_(16596).exe"
-
-DESCRIPTION="Data files for Descent 2"
-HOMEPAGE="https://www.interplay.com"
-SRC_URI="cdinstall? ( ${MY_PATCH} )
-	!cdinstall? ( ${MY_EXE} )"
-LICENSE="descent-data"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-IUSE="doc videos"
-RESTRICT="bindist !cdinstall? ( fetch )"
-
-# <d2x-0.2.5-r3 may include the data.
-RDEPEND="!<games-action/d2x-0.2.5-r3
-	!games-action/descent2-demodata"
-
-DEPEND="cdinstall? (
-		app-arch/arj
-		dev-util/xdelta:3
-	)
-	!cdinstall? (
-		app-arch/innoextract
-	)"
-
-S="${WORKDIR}"
-
-pkg_nofetch() {
-	elog "You must place a copy of, or symlink to, the GOG setup package in your"
-	elog "distfiles directory."
-	echo
-	elog "If you wish to install from CD-ROM instead, please enable the cdinstall flag."
-}
-
-src_unpack() {
-	if use cdinstall; then
-		default
-		cdrom_get_cds d2data/descent2.sow:descent2.hog
-
-		case ${CDROM_SET} in
-			0)
-				einfo "Found Descent 2 CD"
-				arj e -y -_ "${CDROM_ABSMATCH}" || die ;;
-			1)
-				einfo "Found Descent 2 installation"
-				cd "${CDROM_ABSMATCH%/*}" || die ;;
-		esac
-	else
-		einfo "Unpacking ${MY_EXE}. This will take a while..."
-		innoextract -e -s -p1 -L -I app -d gog "${DISTDIR}/${MY_EXE}" || die
-		cd "${WORKDIR}/gog/app" || die
-	fi
-
-	eshopts_push -s globstar nocaseglob nullglob
-
-	# Strip directories
-	# Lowercase
-	# d2{-2plyr,chaos}.* into data/missions
-	# *.dem into data/demos
-	# Documentation into doc
-	# Remainder into data
-	# Exclude Vertigo files
-
-	tar c \
-		--mode=u+w \
-		--ignore-case \
-		--xform='s:.*/::xg' \
-		--xform='s:.*:\L\0:x' \
-		--xform='s:^d2(-2plyr|chaos)\.:data/missions/\0:x' \
-		--xform='s:.*\.dem$:data/demos/\0:x' \
-		--xform='s:.*\.(pdf|txt)$:doc/\0:x' \
-		--xform='s:^[^/]+$:data/\0:x' \
-		--exclude='d2x*' \
-		--exclude='hoard.ham' \
-		--exclude='panic.*' \
-		--exclude="$(use doc || echo '*.pdf')" \
-		--exclude="$(use videos || echo '*.mvl')" \
-		*.{txt,pdf} *-h.mvl **/*.{ham,hog,mn2,pig,s11,s22} \
-		| tar x -C "${WORKDIR}"
-
-	assert "tar failed"
-	eshopts_pop
-}
-
-src_prepare() {
-	# Patch to 1.2 if necessary
-	if use cdinstall; then
-		if [[ $(md5sum data/descent2.ham) != 7f30c3d7d4087b8584b49012a53ce022* ]]; then
-			local i
-			for i in *.xdelta; do
-				xdelta3 -d -s data/"${i%.*}" "${i}" data/"${i%.*}".new || die
-				mv data/"${i%.*}"{.new,} || die
-			done
-		fi
-	fi
-
-	default
-}
-
-src_install() {
-	insinto /usr/share/games/d2x
-	doins -r data/*
-	[[ -d doc ]] && dodoc doc/*
-}
-
-pkg_postinst() {
-	elog "A client is needed to run the game, e.g. games-action/dxx-rebirth."
-	echo
-}
-- 
cgit v1.2.3