gentoo resync : 08.09.2019

3 files changed, 45 insertions, 2 deletions

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() {