1 |
commit: f9a6008926b726a48652c7b117718df18781eeb3 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 12 14:27:53 2019 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 12 14:27:53 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a60089 |
7 |
|
8 |
games-fps/freedoom-data: Drop old 0.11.3-r2 |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> |
12 |
|
13 |
games-fps/freedoom-data/Manifest | 1 - |
14 |
.../freedoom-data/files/ImageMagick/policy.xml | 4 -- |
15 |
.../freedoom-data-0.11.3-Set-DOOMWADPATH.patch | 38 -------------- |
16 |
.../freedoom-data/freedoom-data-0.11.3-r2.ebuild | 61 ---------------------- |
17 |
4 files changed, 104 deletions(-) |
18 |
|
19 |
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest |
20 |
index faed28aff04..e3e6ec23b70 100644 |
21 |
--- a/games-fps/freedoom-data/Manifest |
22 |
+++ b/games-fps/freedoom-data/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
-DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749 SHA512 51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636 |
25 |
DIST freedoom-0.12.0.tar.gz 18409554 BLAKE2B 01ae58c8edb12a8453f6026f09f45d54b19949d38f0668ddc6d4a6ee5fee4cc62c3926af0fb8e30e5f574b46ad1990fb20b57369821562851ae0cef0a6a5e5f1 SHA512 055cae8d16cc7ca2017eeabcaca9436da044def5f630ab46fb0c4cd7d36b9db3b416f9ddeb855e79f21f7c5337d25fb82625ac987712910daec448b49ef9c41e |
26 |
|
27 |
diff --git a/games-fps/freedoom-data/files/ImageMagick/policy.xml b/games-fps/freedoom-data/files/ImageMagick/policy.xml |
28 |
deleted file mode 100644 |
29 |
index ffacb9209fb..00000000000 |
30 |
--- a/games-fps/freedoom-data/files/ImageMagick/policy.xml |
31 |
+++ /dev/null |
32 |
@@ -1,4 +0,0 @@ |
33 |
-<?xml version="1.0" encoding="UTF-8"?> |
34 |
-<policymap> |
35 |
- <policy domain="coder" rights="read | write" pattern="PS" /> |
36 |
-</policymap> |
37 |
|
38 |
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 |
39 |
deleted file mode 100644 |
40 |
index 0998cc45ebd..00000000000 |
41 |
--- a/games-fps/freedoom-data/files/freedoom-data-0.11.3-Set-DOOMWADPATH.patch |
42 |
+++ /dev/null |
43 |
@@ -1,38 +0,0 @@ |
44 |
-From 19b8fe33843b1e431fb0737a57087f58c168952c Mon Sep 17 00:00:00 2001 |
45 |
-From: William Breathitt Gray <vilhelm.gray@×××××.com> |
46 |
-Date: Fri, 6 Sep 2019 16:20:49 +0900 |
47 |
-Subject: [PATCH] dist/freedoom: Set DOOMWADPATH with sensible default value if |
48 |
- unset |
49 |
- |
50 |
-Engines such as Odamex may not have a default search path and simply |
51 |
-search for freedoom1.wad relative to the current directory. This can |
52 |
-cause an unexpected WAD file not found error when executing the freedoom |
53 |
-script. |
54 |
- |
55 |
-This issue is mitigated by setting a default DOOMWADPATH environment |
56 |
-variable with sensible search paths, if it is not already set. All |
57 |
-engines listed in the PORTS variable support the DOOMWADPATH environment |
58 |
-variable, which makes it a simple and convenient way of helping prevent |
59 |
-this error. |
60 |
---- |
61 |
- dist/freedoom | 4 ++++ |
62 |
- 1 file changed, 4 insertions(+) |
63 |
- |
64 |
-diff --git a/dist/freedoom b/dist/freedoom |
65 |
-index 62e3c4d5..0c0961a5 100755 |
66 |
---- a/dist/freedoom |
67 |
-+++ b/dist/freedoom |
68 |
-@@ -31,6 +31,10 @@ case "$(basename "$0")" in |
69 |
- ;; |
70 |
- esac |
71 |
- |
72 |
-+if [ -z "$DOOMWADPATH" ]; then |
73 |
-+ export DOOMWADPATH="/usr/share/doom:/usr/share/games/doom:/usr/local/share/doom:/usr/local/share/games/doom" |
74 |
-+fi |
75 |
-+ |
76 |
- if [ -z "$PORT" ] && [ -h "$HOME"/.doomport ]; then |
77 |
- if [ -f "$(readlink -f "$HOME"/.doomport)" ] \ |
78 |
- && [ -x "$(readlink -f "$HOME"/.doomport)" ]; then |
79 |
--- |
80 |
-2.23.0 |
81 |
- |
82 |
|
83 |
diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild b/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild |
84 |
deleted file mode 100644 |
85 |
index ca3b54b8b10..00000000000 |
86 |
--- a/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild |
87 |
+++ /dev/null |
88 |
@@ -1,61 +0,0 @@ |
89 |
-# Copyright 1999-2019 Gentoo Authors |
90 |
-# Distributed under the terms of the GNU General Public License v2 |
91 |
- |
92 |
-EAPI=7 |
93 |
- |
94 |
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) |
95 |
- |
96 |
-inherit prefix python-any-r1 xdg |
97 |
- |
98 |
-DESCRIPTION="Game resources for Freedoom: Phase 1+2" |
99 |
-HOMEPAGE="https://freedoom.github.io" |
100 |
-SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz" |
101 |
- |
102 |
-LICENSE="BSD" |
103 |
-SLOT="0" |
104 |
-KEYWORDS="~amd64 ~arm ~x86" |
105 |
- |
106 |
-BDEPEND=" |
107 |
- $(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]') |
108 |
- app-text/asciidoc |
109 |
- games-util/deutex |
110 |
- virtual/imagemagick-tools[png]" |
111 |
- |
112 |
-S="${WORKDIR}/freedoom-${PV}" |
113 |
- |
114 |
-PATCHES="${FILESDIR}/${P}-Set-DOOMWADPATH.patch" |
115 |
- |
116 |
-DOOMWADPATH=share/doom |
117 |
- |
118 |
-python_check_deps() { |
119 |
- has_version -b "dev-python/pillow[${PYTHON_USEDEP}]" |
120 |
-} |
121 |
- |
122 |
-src_prepare() { |
123 |
- # This is to enable usage of the 'PS' coder, which is |
124 |
- # disabled by default (https://bugs.gentoo.org/664236) |
125 |
- install -D -t ~/.config/ImageMagick "${FILESDIR}"/ImageMagick/policy.xml || die |
126 |
- |
127 |
- xdg_src_prepare |
128 |
- eapply_user |
129 |
- |
130 |
- hprefixify dist/freedoom |
131 |
-} |
132 |
- |
133 |
-src_compile() { |
134 |
- emake wads/freedoom{1,2}.wad |
135 |
-} |
136 |
- |
137 |
-src_install() { |
138 |
- emake install-freedoom{1,2} \ |
139 |
- prefix="${ED}/usr/" \ |
140 |
- bindir="bin/" \ |
141 |
- mandir="share/man/" \ |
142 |
- waddir="${DOOMWADPATH}/" |
143 |
-} |
144 |
- |
145 |
-pkg_postinst() { |
146 |
- xdg_pkg_postinst |
147 |
- |
148 |
- elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} directory." |
149 |
-} |