summaryrefslogtreecommitdiff
path: root/games-fps
diff options
context:
space:
mode:
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/Manifest.gzbin21058 -> 21071 bytes
-rw-r--r--games-fps/freedm-data/Manifest3
-rw-r--r--games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch38
-rw-r--r--games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild (renamed from games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild)6
-rw-r--r--games-fps/freedoom-data/Manifest3
-rw-r--r--games-fps/freedoom-data/files/freedoom-data-0.11.3-Set-DOOMWADPATH.patch38
-rw-r--r--games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild (renamed from games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild)6
-rw-r--r--games-fps/quake1-demodata/Manifest2
-rw-r--r--games-fps/quake1-demodata/quake1-demodata-1.06.ebuild11
9 files changed, 93 insertions, 14 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 9057569a8c16..77f375c96bb4 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
Binary files differ
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index b62a254c9d68..6261a39d776d 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,4 +1,5 @@
AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677
+AUX freedm-data-0.11.3-Set-DOOMWADPATH.patch 1334 BLAKE2B 7dde43eba843ee4acbfc88cafeac2472bf81fa32be18ef935293b15ef1fdbcbb46f306c164acbe0b1cf4f6c8d4ddb6e761fe005a67cace5c65846a5c5106011f SHA512 dfd6cb3e4b200e45c618a2d2b34a1b3bb1212845b8b635dc6fc13040c1b1e40b52155fd974faa7e45483b2b257fe5a91e5849b855ea20936dc03d686c9a64cb0
DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749 SHA512 51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636
-EBUILD freedm-data-0.11.3-r1.ebuild 1220 BLAKE2B fadf4a1f5757a51c41a0691cdb4dba3c11e557c937086310a26c244c3164be1096d60f409147cb12a88cb8b9bc671c4e1a93885c124af4cc6f1487453a8bbef8 SHA512 6be1782d8577cea151040186cf402911cf4bacda8f025aae1297784499b6adf4a14927e87e4a503b2355613388ca55d2b3ff28611bd4c0318c1863869ab146fb
+EBUILD freedm-data-0.11.3-r2.ebuild 1304 BLAKE2B c0e43fb51c4db08be0ca2f38ca43a5282d25af78ff5398f7abd0d98294e111a77aa304062975958f30b85377662a9ddbc291d39983f63384e626ab1ecf3ea7b2 SHA512 ffba609c9e642e28da1feebaf4d1f468c9d73a088169848692ffcfccbb6c8cdc625a0cb5fc24e854d7095c04dca6db7890de234e4455d1868bd9dbf4aa4f0a6b
MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
diff --git a/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch b/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch
new file mode 100644
index 000000000000..0998cc45ebd1
--- /dev/null
+++ b/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch
@@ -0,0 +1,38 @@
+From 19b8fe33843b1e431fb0737a57087f58c168952c Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Fri, 6 Sep 2019 16:20:49 +0900
+Subject: [PATCH] dist/freedoom: Set DOOMWADPATH with sensible default value if
+ unset
+
+Engines such as Odamex may not have a default search path and simply
+search for freedoom1.wad relative to the current directory. This can
+cause an unexpected WAD file not found error when executing the freedoom
+script.
+
+This issue is mitigated by setting a default DOOMWADPATH environment
+variable with sensible search paths, if it is not already set. All
+engines listed in the PORTS variable support the DOOMWADPATH environment
+variable, which makes it a simple and convenient way of helping prevent
+this error.
+---
+ dist/freedoom | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dist/freedoom b/dist/freedoom
+index 62e3c4d5..0c0961a5 100755
+--- a/dist/freedoom
++++ b/dist/freedoom
+@@ -31,6 +31,10 @@ case "$(basename "$0")" in
+ ;;
+ esac
+
++if [ -z "$DOOMWADPATH" ]; then
++ export DOOMWADPATH="/usr/share/doom:/usr/share/games/doom:/usr/local/share/doom:/usr/local/share/games/doom"
++fi
++
+ if [ -z "$PORT" ] && [ -h "$HOME"/.doomport ]; then
+ if [ -f "$(readlink -f "$HOME"/.doomport)" ] \
+ && [ -x "$(readlink -f "$HOME"/.doomport)" ]; then
+--
+2.23.0
+
diff --git a/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild b/games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild
index 99ce657c7869..29e3894685d9 100644
--- a/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild
+++ b/games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit python-any-r1 xdg
+inherit prefix python-any-r1 xdg
DESCRIPTION="Game resources for FreeDM"
HOMEPAGE="https://freedoom.github.io"
@@ -23,6 +23,8 @@ BDEPEND="
S="${WORKDIR}/freedoom-${PV}"
+PATCHES="${FILESDIR}/${P}-Set-DOOMWADPATH.patch"
+
DOOMWADPATH=share/doom
python_check_deps() {
@@ -36,6 +38,8 @@ src_prepare() {
xdg_src_prepare
eapply_user
+
+ hprefixify dist/freedoom
}
src_compile() {
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index 35676af223af..50ca02f0b06e 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,4 +1,5 @@
AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677
+AUX freedoom-data-0.11.3-Set-DOOMWADPATH.patch 1334 BLAKE2B 7dde43eba843ee4acbfc88cafeac2472bf81fa32be18ef935293b15ef1fdbcbb46f306c164acbe0b1cf4f6c8d4ddb6e761fe005a67cace5c65846a5c5106011f SHA512 dfd6cb3e4b200e45c618a2d2b34a1b3bb1212845b8b635dc6fc13040c1b1e40b52155fd974faa7e45483b2b257fe5a91e5849b855ea20936dc03d686c9a64cb0
DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749 SHA512 51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636
-EBUILD freedoom-data-0.11.3-r1.ebuild 1250 BLAKE2B b674b2bd7a51e0d65d562a1e866b1e7ce5d188e754cb6ca67f5e332aeb8b60d2171d240da9a5d7141732a5699b13a2a672417963b02a312b185171288d54d942 SHA512 ced60b234184624e6d0297f6b231a2af37bcdcb65bc89831c71b4430f0ffb41ca4c56164fe3b8602fb0ffcac58a27f313196f52fa64ad845cd34c74b939f5bd3
+EBUILD freedoom-data-0.11.3-r2.ebuild 1334 BLAKE2B ee6d1e6f0fe07183b071720ee842171268a6b0fb041126afac7780adaa9a88ee881722ba9d3369ea9b0f9633ed137513777754aaf77a74680e12aebdf2b84fc9 SHA512 475410b4c5946cd6b70613e78af9fdbe6eb98489e00f62910e4cc0528fd45e875b98212d9779b94f2a048ffa9f6fce58785ba633795559c5dccb353499bf02e5
MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
diff --git a/games-fps/freedoom-data/files/freedoom-data-0.11.3-Set-DOOMWADPATH.patch b/games-fps/freedoom-data/files/freedoom-data-0.11.3-Set-DOOMWADPATH.patch
new file mode 100644
index 000000000000..0998cc45ebd1
--- /dev/null
+++ b/games-fps/freedoom-data/files/freedoom-data-0.11.3-Set-DOOMWADPATH.patch
@@ -0,0 +1,38 @@
+From 19b8fe33843b1e431fb0737a57087f58c168952c Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Fri, 6 Sep 2019 16:20:49 +0900
+Subject: [PATCH] dist/freedoom: Set DOOMWADPATH with sensible default value if
+ unset
+
+Engines such as Odamex may not have a default search path and simply
+search for freedoom1.wad relative to the current directory. This can
+cause an unexpected WAD file not found error when executing the freedoom
+script.
+
+This issue is mitigated by setting a default DOOMWADPATH environment
+variable with sensible search paths, if it is not already set. All
+engines listed in the PORTS variable support the DOOMWADPATH environment
+variable, which makes it a simple and convenient way of helping prevent
+this error.
+---
+ dist/freedoom | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/dist/freedoom b/dist/freedoom
+index 62e3c4d5..0c0961a5 100755
+--- a/dist/freedoom
++++ b/dist/freedoom
+@@ -31,6 +31,10 @@ case "$(basename "$0")" in
+ ;;
+ esac
+
++if [ -z "$DOOMWADPATH" ]; then
++ export DOOMWADPATH="/usr/share/doom:/usr/share/games/doom:/usr/local/share/doom:/usr/local/share/games/doom"
++fi
++
+ if [ -z "$PORT" ] && [ -h "$HOME"/.doomport ]; then
+ if [ -f "$(readlink -f "$HOME"/.doomport)" ] \
+ && [ -x "$(readlink -f "$HOME"/.doomport)" ]; then
+--
+2.23.0
+
diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild b/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild
index ed2ae707e1a1..83aced1b3be6 100644
--- a/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-inherit python-any-r1 xdg
+inherit prefix python-any-r1 xdg
DESCRIPTION="Game resources for Freedoom: Phase 1+2"
HOMEPAGE="https://freedoom.github.io"
@@ -23,6 +23,8 @@ BDEPEND="
S="${WORKDIR}/freedoom-${PV}"
+PATCHES="${FILESDIR}/${P}-Set-DOOMWADPATH.patch"
+
DOOMWADPATH=share/doom
python_check_deps() {
@@ -36,6 +38,8 @@ src_prepare() {
xdg_src_prepare
eapply_user
+
+ hprefixify dist/freedoom
}
src_compile() {
diff --git a/games-fps/quake1-demodata/Manifest b/games-fps/quake1-demodata/Manifest
index 42a818047274..51a46ffe9923 100644
--- a/games-fps/quake1-demodata/Manifest
+++ b/games-fps/quake1-demodata/Manifest
@@ -1,3 +1,3 @@
DIST quake106.zip 9094045 BLAKE2B 39d639a7c4daf48bacfed3d8f7488131cabd61eba3d1969b23958f4f35ac7f693a165500a4a1cf2b917bb8d363d360a402c7100ba8f6b7083c7eaba1fe16756a SHA512 8960c48d9c3c8bb142fd812968d29f05304384bd559b5cdb1d2cb8b6faac84d30ebf9cdf5e5e4eb3739907d9b599ca2ba34035647c58a8ed1874bdc7f0b75e1d
-EBUILD quake1-demodata-1.06.ebuild 1649 BLAKE2B 0cb318c5343cec04bc601b03b08ce00c31f28ea67757e6ea066a1786b30399ebe0e5ad1f4df8ebb0f260b0d9fd63f204f5813676900cb93841022f73b3a787d7 SHA512 5e54e5e87fbe59ba0a08ffdeea300958ec4c7246fc984ef72e565028c328a4420ec4a51f55e181755e28a8f1572182a4a77badd225b04f45ca6b3dcafe88e98b
+EBUILD quake1-demodata-1.06.ebuild 1496 BLAKE2B 7b4c998677e668480227edf95ed1c6779a0cf200159aea09cd1958d3e196076f7222a3dda8160ac730917bb3327e6eacc1cfa3d9029dd613aaf493a42483ef02 SHA512 20ecec2d80baedaf9055ec322a5a60b4d5e85f045b9536e31a06d735211df1f6673eff1a404c805cff2db021dd54161932ba3c574575acde074bf5020df1d1fb
MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
index 7b8a34815e89..102d80da46f6 100644
--- a/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
+++ b/games-fps/quake1-demodata/quake1-demodata-1.06.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -17,7 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="symlink"
-RDEPEND=""
+RDEPEND="symlink? ( !games-fps/quake1-data )"
DEPEND="app-arch/lha
app-arch/unzip"
@@ -30,13 +30,6 @@ pkg_setup() {
if has_version "games-fps/quake1-data" ; then
ewarn "games-fps/quake1-data already includes the demo data,"
ewarn "so this installation is not very useful."
- echo
- if use symlink ; then
- eerror "The symlink for the demo data conflicts with the cdinstall data"
- die "Remove the 'symlink' USE flag for this package"
- fi
- ebeep
- epause
fi
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 06:11:43 +0000