gentoo resync : 13.10.2019

4 files changed, 4 insertions, 55 deletions

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index 72d4ae1d864f..64f94fe7cf53 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,5 +1,3 @@
-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-r2.ebuild 1339 BLAKE2B 4ca4b7ffa5bb9e87cc7f8e85d03d7c743a00432b5a1de4bbb901ecc1af763613215af76db77cfa2fd62a6d33e70b035a6df76d7bd1126b0c3fb9c299ab157436 SHA512 6fe037be03b3c9e9d32d9b18f8643ff004fe940a035aa1c264a520c602d119e69f37aca3919c9ba3adc1acd9cb1553e7e43d8417bdecc1fa63757eceb1ab2a9b
+DIST freedoom-0.12.0.tar.gz 18409554 BLAKE2B 01ae58c8edb12a8453f6026f09f45d54b19949d38f0668ddc6d4a6ee5fee4cc62c3926af0fb8e30e5f574b46ad1990fb20b57369821562851ae0cef0a6a5e5f1 SHA512 055cae8d16cc7ca2017eeabcaca9436da044def5f630ab46fb0c4cd7d36b9db3b416f9ddeb855e79f21f7c5337d25fb82625ac987712910daec448b49ef9c41e
+EBUILD freedoom-data-0.12.0.ebuild 1054 BLAKE2B 86c87d6e7ee750f068e45553f3f89a1c665cce41a669dc29b45b921d092638d006a46b11530e8d0bd45cc86db94ac1d3814efa3abf1506e047d00727c97c5f18 SHA512 803847f6ce0aba83986c21025deeabed27883469abddd06d7d68099ad0428c3ac4d93668bee93f9d479e4c185a23c2149eebe891da4d4686f1b0d8271ff8a0e0
 MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
diff --git a/games-fps/freedoom-data/files/ImageMagick/policy.xml b/games-fps/freedoom-data/files/ImageMagick/policy.xml
deleted file mode 100644
index ffacb9209fb3..000000000000
--- a/games-fps/freedoom-data/files/ImageMagick/policy.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<policymap>
-  <policy domain="coder" rights="read | write" pattern="PS" />
-</policymap>
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
deleted file mode 100644
index 0998cc45ebd1..000000000000
--- a/games-fps/freedoom-data/files/freedoom-data-0.11.3-Set-DOOMWADPATH.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-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-r2.ebuild b/games-fps/freedoom-data/freedoom-data-0.12.0.ebuild
index ca3b54b8b109..078a867ebfa9 100644
--- a/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit prefix python-any-r1 xdg
 
@@ -18,13 +18,10 @@ KEYWORDS="~amd64 ~arm ~x86"
 BDEPEND="
 	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
 	app-text/asciidoc
-	games-util/deutex
-	virtual/imagemagick-tools[png]"
+	games-util/deutex"
 
 S="${WORKDIR}/freedoom-${PV}"
 
-PATCHES="${FILESDIR}/${P}-Set-DOOMWADPATH.patch"
-
 DOOMWADPATH=share/doom
 
 python_check_deps() {
@@ -32,10 +29,6 @@ python_check_deps() {
 }
 
 src_prepare() {
-	# This is to enable usage of the 'PS' coder, which is
-	# disabled by default (https://bugs.gentoo.org/664236)
-	install -D -t ~/.config/ImageMagick "${FILESDIR}"/ImageMagick/policy.xml || die
-
 	xdg_src_prepare
 	eapply_user