* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2017-04-27 21:41 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2017-04-27 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 724f9c5be4812a400d7ed0c8fbe69da1edcfe5e4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 26 22:25:09 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 27 21:41:27 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724f9c5b
games-action/descent2-data: Rewrite with GOG, closes #369397, #612896
Thanks to Jared B for the initial ebuild work and Xdelta patches.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
games-action/descent2-data/Manifest | 2 +
.../descent2-data/descent2-data-1.0.ebuild | 4 +-
.../descent2-data/descent2-data-1.2.ebuild | 121 +++++++++++++++++++++
3 files changed, 125 insertions(+), 2 deletions(-)
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
new file mode 100644
index 00000000000..1c4606943d9
--- /dev/null
+++ b/games-action/descent2-data/Manifest
@@ -0,0 +1,2 @@
+DIST d2xptch12.tgz 158419 SHA256 61743c19baecde602c778e6ea44ef4a28bab9b8aa16a5f2772e3799863487a80 SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b WHIRLPOOL ea2d14205eaa8978f22b9e9c3e20d99cf4c9ea8f43a4c688cb4cd9fc85b41b1dfdfed9fa38161ba776357a16370ede00fcc191a5d01ba1e7c4635720f0d1e77c
+DIST setup_descent2_2.1.0.10.exe 554371624 SHA256 e787d95574f8a4bf3c442ad49e837186319d3bb041a33a00df726be3be7c9750 SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618 WHIRLPOOL 1f13b652c79752772cf2a151ca7663443e8936be352ddb100e140b00bc6f88a13ba5d4dfad17cb07ed78ed5b629fad1aaeeb7424a2216b68761c4065b6f8ac3c
diff --git a/games-action/descent2-data/descent2-data-1.0.ebuild b/games-action/descent2-data/descent2-data-1.0.ebuild
index 8a1ae686d06..cd4b41ef4d8 100644
--- a/games-action/descent2-data/descent2-data-1.0.ebuild
+++ b/games-action/descent2-data/descent2-data-1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -15,7 +15,7 @@ SRC_URI=""
# mirror://3dgamers/descent2/d2ptch${MY_PV}.exe
# See readme.txt
-LICENSE="${PN}"
+LICENSE="descent-data"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE="videos"
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
new file mode 100644
index 00000000000..94768008928
--- /dev/null
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CDROM_OPTIONAL="yes"
+inherit cdrom eutils
+
+# 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="http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz"
+
+# For GOG install
+MY_EXE="setup_descent2_2.1.0.10.exe"
+
+DESCRIPTION="Data files for Descent 2"
+HOMEPAGE="http://www.interplay.com/games/descent.php"
+SRC_URI="cdinstall? ( ${MY_PATCH} )
+ !cdinstall? ( ${MY_EXE} )"
+LICENSE="descent-data"
+SLOT="0"
+KEYWORDS="~amd64 ~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/unarj
+ 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 here:"
+ elog "${DISTDIR}/${MY_EXE}"
+ 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"
+ unarj e "${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
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2017-12-10 21:41 Michał Górny
0 siblings, 0 replies; 11+ messages in thread
From: Michał Górny @ 2017-12-10 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 0580eea0c674271a480a46d0fbb6186b50059cbf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 10 21:39:19 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Dec 10 21:41:23 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0580eea0
games-action/descent2-data: Update Manifest hashes
games-action/descent2-data/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index 1c4606943d9..2680c7103c7 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,2 +1,2 @@
-DIST d2xptch12.tgz 158419 SHA256 61743c19baecde602c778e6ea44ef4a28bab9b8aa16a5f2772e3799863487a80 SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b WHIRLPOOL ea2d14205eaa8978f22b9e9c3e20d99cf4c9ea8f43a4c688cb4cd9fc85b41b1dfdfed9fa38161ba776357a16370ede00fcc191a5d01ba1e7c4635720f0d1e77c
+DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
DIST setup_descent2_2.1.0.10.exe 554371624 SHA256 e787d95574f8a4bf3c442ad49e837186319d3bb041a33a00df726be3be7c9750 SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618 WHIRLPOOL 1f13b652c79752772cf2a151ca7663443e8936be352ddb100e140b00bc6f88a13ba5d4dfad17cb07ed78ed5b629fad1aaeeb7424a2216b68761c4065b6f8ac3c
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2017-12-18 9:33 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2017-12-18 9:33 UTC (permalink / raw
To: gentoo-commits
commit: d1dde84b29794dbc468f903c251477b01fa0e3df
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 18 09:32:54 2017 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Dec 18 09:32:54 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1dde84b
games-action/descent2-data: Update Manifest hashes
Package-Manager: Portage-2.3.19, Repoman-2.3.6
games-action/descent2-data/Manifest | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index 2680c7103c7..d645545ed59 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,2 +1,2 @@
DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
-DIST setup_descent2_2.1.0.10.exe 554371624 SHA256 e787d95574f8a4bf3c442ad49e837186319d3bb041a33a00df726be3be7c9750 SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618 WHIRLPOOL 1f13b652c79752772cf2a151ca7663443e8936be352ddb100e140b00bc6f88a13ba5d4dfad17cb07ed78ed5b629fad1aaeeb7424a2216b68761c4065b6f8ac3c
+DIST setup_descent2_2.1.0.10.exe 554371624 BLAKE2B fb05302652c7ba46c06d314453a03430850404c05fb8d43681b7505bdf1a3901d0875f0a63379b121c7338d9b3092410cfa77c5d98690c98b27b0bffaf00ae3d SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2018-09-16 9:34 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2018-09-16 9:34 UTC (permalink / raw
To: gentoo-commits
commit: 9dd60d7be9f12d51e4974e12a1ff536544cb4b86
Author: Christian Tietz <christian.tietz <AT> mailbox <DOT> org>
AuthorDate: Sun Sep 16 00:23:22 2018 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 09:34:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd60d7b
games-action/descent2-data: Fix GOG download
Also replace broken ${DISTDIR} message.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9883
games-action/descent2-data/Manifest | 2 +-
games-action/descent2-data/descent2-data-1.2.ebuild | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/games-action/descent2-data/Manifest b/games-action/descent2-data/Manifest
index d645545ed59..a2c68556a95 100644
--- a/games-action/descent2-data/Manifest
+++ b/games-action/descent2-data/Manifest
@@ -1,2 +1,2 @@
DIST d2xptch12.tgz 158419 BLAKE2B e4bd0d33fa8912b87f8018673c2f9fa9d965f96787b7af76da5473e0c6b06ca78303977cdb6e1f85affefe187b2f1e947eb477313b379bf2464e2a0ba95b74bf SHA512 14d59280e685a9c3d5e23e1d535f37f89768e022b795067793a994c5150685addfcacbd2dc52231804240d01d17d57b1db04335d41bc5930e3c8a845ebbb396b
-DIST setup_descent2_2.1.0.10.exe 554371624 BLAKE2B fb05302652c7ba46c06d314453a03430850404c05fb8d43681b7505bdf1a3901d0875f0a63379b121c7338d9b3092410cfa77c5d98690c98b27b0bffaf00ae3d SHA512 0db1935864eb59002cc995dfe9c40badd72d0a3dcec61092b0760481cd3d1316db17631c05043b938e4b958d696c508ce379face9baa260dcc598c77b4460618
+DIST setup_descent_2_1.1_(16596).exe 563071744 BLAKE2B f4c81daf5f3fe752687630bf4d9f10076e6f343161ea9675e3ab5698034fd8066727d939263db7a388d1e7e89834b8cea6e58e65433fd83a1d732b5439a693e5 SHA512 baf4577409c011f668d10a1a43385a916b951457b43b90883cef73af6622bed31a717f3d50d5a85698237fc4160281f3e2f4e07c9a261d63f52024ca05839fbd
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index 94768008928..a1312069872 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,7 +11,7 @@ inherit cdrom eutils
MY_PATCH="http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz"
# For GOG install
-MY_EXE="setup_descent2_2.1.0.10.exe"
+MY_EXE="setup_descent_2_1.1_(16596).exe"
DESCRIPTION="Data files for Descent 2"
HOMEPAGE="http://www.interplay.com/games/descent.php"
@@ -38,8 +38,8 @@ DEPEND="cdinstall? (
S="${WORKDIR}"
pkg_nofetch() {
- elog "You must place a copy of, or symlink to, the GOG setup package here:"
- elog "${DISTDIR}/${MY_EXE}"
+ 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."
}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2020-02-12 21:04 David Seifert
0 siblings, 0 replies; 11+ messages in thread
From: David Seifert @ 2020-02-12 21:04 UTC (permalink / raw
To: gentoo-commits
commit: 750d554a7a682c9356eef12c4c2971c4576a5824
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 12 21:03:36 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 12 21:03:36 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=750d554a
games-action/descent2-data: [QA] inherit estack.eclass directly
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
games-action/descent2-data/descent2-data-1.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index a1312069872..4ca0152d5ff 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
CDROM_OPTIONAL="yes"
-inherit cdrom eutils
+inherit cdrom estack eutils
# Not possible to apply official 1.2 patch under Linux. A Gentoo user
# created Xdelta patches and the DXX-Rebirth project kindly hosted them.
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2020-09-05 23:08 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2020-09-05 23:08 UTC (permalink / raw
To: gentoo-commits
commit: 5076a5d39849249f0ddc424bf5e36b69aa167892
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 5 23:05:16 2020 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sat Sep 5 23:07:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5076a5d3
games-action/descent2-data: Use arj instead of unarj
unarj has a problematic license. Unlike descent2-demodata, this is
untested as I don't have the CD but this case is much simpler so it
should work.
Bug: https://bugs.gentoo.org/694746
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/descent2-data/descent2-data-1.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index 4ca0152d5ff..175865f367a 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -28,7 +28,7 @@ RDEPEND="!<games-action/d2x-0.2.5-r3
!games-action/descent2-demodata"
DEPEND="cdinstall? (
- app-arch/unarj
+ app-arch/arj
dev-util/xdelta:3
)
!cdinstall? (
@@ -52,7 +52,7 @@ src_unpack() {
case ${CDROM_SET} in
0)
einfo "Found Descent 2 CD"
- unarj e "${CDROM_ABSMATCH}" || die ;;
+ arj e -y -_ "${CDROM_ABSMATCH}" || die ;;
1)
einfo "Found Descent 2 installation"
cd "${CDROM_ABSMATCH%/*}" || die ;;
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2021-10-19 0:19 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2021-10-19 0:19 UTC (permalink / raw
To: gentoo-commits
commit: 7cc5edd51f71b53294a60a7a5cf2dd0e56d864d7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 19 00:18:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Oct 19 00:18:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cc5edd5
games-action/descent2-data: Keyword 1.2 arm64, #805497
Signed-off-by: Sam James <sam <AT> gentoo.org>
games-action/descent2-data/descent2-data-1.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index aa325c48be2..c1c1430af8f 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -19,7 +19,7 @@ SRC_URI="cdinstall? ( ${MY_PATCH} )
!cdinstall? ( ${MY_EXE} )"
LICENSE="descent-data"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="doc videos"
RESTRICT="bindist !cdinstall? ( fetch )"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2022-11-22 14:00 Arthur Zamarin
0 siblings, 0 replies; 11+ messages in thread
From: Arthur Zamarin @ 2022-11-22 14:00 UTC (permalink / raw
To: gentoo-commits
commit: 9fe21e2766b53cd8177e58d81ee3302ffd8128e0
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 13:59:53 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 13:59:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fe21e27
games-action/descent2-data: Keyword 1.2 ppc64, #850472
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
games-action/descent2-data/descent2-data-1.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index c1c1430af8fe..a867c6a8b84d 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="cdinstall? ( ${MY_PATCH} )
!cdinstall? ( ${MY_EXE} )"
LICENSE="descent-data"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
IUSE="doc videos"
RESTRICT="bindist !cdinstall? ( fetch )"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2023-07-05 20:49 Conrad Kostecki
0 siblings, 0 replies; 11+ messages in thread
From: Conrad Kostecki @ 2023-07-05 20:49 UTC (permalink / raw
To: gentoo-commits
commit: e441f419dd4701924c17f015c089cb2f3e3e879e
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jul 5 07:49:34 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Jul 5 20:49:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e441f419
games-action/descent2-data: use HTTPS, fix HOMEPAGE
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
games-action/descent2-data/descent2-data-1.2.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2.ebuild
index a867c6a8b84d..cde97c1738f4 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -8,13 +8,13 @@ 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="http://www.dxx-rebirth.com/download/dxx/misc/d2xptch12.tgz"
+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="http://www.interplay.com/games/descent.php"
+HOMEPAGE="https://www.interplay.com"
SRC_URI="cdinstall? ( ${MY_PATCH} )
!cdinstall? ( ${MY_EXE} )"
LICENSE="descent-data"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2024-06-09 11:34 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2024-06-09 11:34 UTC (permalink / raw
To: gentoo-commits
commit: b3ddb67da78310a13a1d4bfcf67edcaff1385b0a
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 11:30:08 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 11:34:23 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3ddb67d
games-action/descent2-data: EAPI 8
Tested with USE=cdinstall. GOG install should be fine.
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../{descent2-data-1.2.ebuild => descent2-data-1.2-r1.ebuild} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/games-action/descent2-data/descent2-data-1.2.ebuild b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
similarity index 98%
rename from games-action/descent2-data/descent2-data-1.2.ebuild
rename to games-action/descent2-data/descent2-data-1.2-r1.ebuild
index cde97c1738f4..5b81d07228cc 100644
--- a/games-action/descent2-data/descent2-data-1.2.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=8
CDROM_OPTIONAL="yes"
inherit cdrom estack
@@ -17,6 +17,7 @@ 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"
@@ -35,8 +36,6 @@ DEPEND="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."
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/
@ 2024-06-14 22:26 James Le Cuirot
0 siblings, 0 replies; 11+ messages in thread
From: James Le Cuirot @ 2024-06-14 22:26 UTC (permalink / raw
To: gentoo-commits
commit: dc3715e54ff4f1549576cd25fb6abeaeb7f9ef11
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 14 22:25:24 2024 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Fri Jun 14 22:25:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc3715e5
games-action/descent2-data: Fix patching the CD readme file
Closes: https://bugs.gentoo.org/933992
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
games-action/descent2-data/descent2-data-1.2-r1.ebuild | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/games-action/descent2-data/descent2-data-1.2-r1.ebuild b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
index 5b81d07228cc..8f19d07739b9 100644
--- a/games-action/descent2-data/descent2-data-1.2-r1.ebuild
+++ b/games-action/descent2-data/descent2-data-1.2-r1.ebuild
@@ -97,10 +97,14 @@ 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
+ local x dir
+ for x in *.xdelta; do
+ case "${x}" in
+ *.txt.xdelta) dir=doc ;;
+ *) dir=data ;;
+ esac
+ xdelta3 -d -s "${dir}/${x%.*}" "${x}" "${dir}/${x%.*}.new" || die
+ mv "${dir}/${x%.*}"{.new,} || die
done
fi
fi
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-06-14 22:26 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-10 21:41 [gentoo-commits] repo/gentoo:master commit in: games-action/descent2-data/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-06-14 22:26 James Le Cuirot
2024-06-09 11:34 James Le Cuirot
2023-07-05 20:49 Conrad Kostecki
2022-11-22 14:00 Arthur Zamarin
2021-10-19 0:19 Sam James
2020-09-05 23:08 James Le Cuirot
2020-02-12 21:04 David Seifert
2018-09-16 9:34 James Le Cuirot
2017-12-18 9:33 James Le Cuirot
2017-04-27 21:41 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox