gentoo resync : 06.08.2019

23 files changed, 200 insertions, 78 deletions

diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 81883734596a..9057569a8c16 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/eduke32/Manifest b/games-fps/eduke32/Manifest
index 91b1dc86a7aa..67dfb05ab3aa 100644
--- a/games-fps/eduke32/Manifest
+++ b/games-fps/eduke32/Manifest
@@ -1,7 +1,7 @@
 AUX eduke32-20190419.7615-wad2map-buildfix.patch 539 BLAKE2B 92fe0ec1c1d126eee7f48b4c403194e8b375f28dc9581cb20b393ea4e7464938aacea760075e6c845d45edcf98df476bb3254026d3304f3c52a98f32cf7f7b00 SHA512 983f847af630456ae61dfa65a6fcd890a04e2b14722efd11bc25a3f9e3ac33b9bd5559b6a1e3927471a45196c417a1e17c0b2dd7f177c44b7aa81aa7e224fa92
+AUX eduke32-20190820.8043-log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
+AUX eduke32-20190820.8043-search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 AUX eduke32-bin 268 BLAKE2B 20941b736b5062f237a39d769a28bbbe1442116259bfe8ff5de4e4c5d9ea2a6139a10efcfd687ee681f56a99382e817f9ad00c2eb2da9c0f1e817912b783261e SHA512 f7a472eb7225800f09d22b617aa12d75dca50892a462a128f901f8df1efc3684d324948f553e1fb44a1e9b786aa60279311ee52d1a6d695cdac0b457a8eee937
-AUX log-to-tmpdir.patch 356 BLAKE2B 9cdb65c0e15270b4970144d57e126bef5c5b468c8142b797717536852c71f5f8183f63c5a6adffd6d411b2972831320d5a4f214e05d54bca67129ab84c3b0608 SHA512 f1ac030d0d9bed2cc4e67d33563dc7d2f34d2cda75835ec875ce0c3957191c7a61b8d9a16a1d040ee7d5ca8e98e8a2660fe9ff1d8047bbd86953425124140512
-AUX search-duke3d-path.patch 485 BLAKE2B 5a21dec8abc4cc13922a306107d968d1ad6341e5a0c62802d3069a6ad9d2378ae8d19ab6018c86b9e9ec9553a053bbbd45a04d9dd32eb5a31bc1dd1afb4aa757 SHA512 2c3fa40564bfd8c99090f46aaa03f0ff38f965a65e6e03c93f5c469dbcb1feb32c0092ff7aa13b15f5a531731045ab2cbeb6ec746ca56197d28439b36f591a96
 DIST duke3d_hrp-5.4.zip 933440151 BLAKE2B 20749d6e1bdd07d0e5f28ac2f7e3aff60e8638223b934795320046922311533d6ecaefa3923650568aaa4e026927b53087032415d2d343fc4bd179c9e9ddd640 SHA512 fd5aba0a09193ccd49781d3f06a040000a134ad90f099ab7bf10a8abe474c3a742f922f8fa31522b8993828d516bdd0b5ded327e9c4615c2c101fe655d533f4d
 DIST duke3d_music-sc55-4.02.zip 155441427 BLAKE2B 7fa0c98927dd9a18411ad473269a795d1bc809fa8f9479deef06e12cd0dc97953680e7519c9d22e2d32b6ff79726682746820f78429ad11cb5edf1b64d2e4fe7 SHA512 70d3d7b4705e30cdb19ddc95e11a88afff1dc01dfc6495a488ea665f8097c1200695ec67246ac47a2480d0e68cd7d74e1d61c2120485f53bb93d9c0fb16ba9b2
 DIST duke3d_musopl-2.01.zip 266444823 BLAKE2B 5255c671782279c7723fb1f848a331645a89fdc8dd5336250d06e6eed5b63511c37bfbb07d22d7e7ce29707efe2c55406f2ee81522374de3633f2b448c7dbd6b SHA512 08308b672516a6f3a3b9b85fd836f2a29a24c8fa5f353953f5f55a281dea370046817ccfb8467b4ce25385277ced8afd83c00882e8a246b03afa5e0e349efd35
@@ -9,6 +9,6 @@ DIST duke3d_psx-1.11.zip 7636016 BLAKE2B 63094c0eb2343e443f98844675ddc23a138d87c
 DIST duke3d_voxels-1.21.zip 2997999 BLAKE2B dcb3103a82b45cfcf906d00147a57fe47997680ff7550973ed9741e62e78f9a099c1a13f65eaa133076d6551fcdfbf34e28ff59f2ad59f91ece98753e7d39523 SHA512 4b55dcc192cb2aa8830250fd222664272176bea8f6c6e4ac6d488abfecb1332b5793986c164fde78901904e2bde37e6ee4aa020c5eb578002de8f6102f44df15
 DIST duke3d_xxx-1.33.zip 26586453 BLAKE2B 7e3c46172d3db1b2eb49eb07f243a9ead4f260d6b1dcae9f8bd599b8e9ba3a19068032afeb4ec2cf61742b6216e3a06c24f2b7e8903f9636f9d00f4d57ada47f SHA512 4783d159610fc178e748446b7a5f9c13d90e1aca3cef34deb82e99655b7f4a254f1130e16dbcfad9013b95bc07161d5c5dccfcc552fbb7a88404b4b9cedbadbf
 DIST eduke32_classic.png 5129 BLAKE2B 332ad44b7f6b4f51362387aa6870e7db54423ca5a1f0586cb5019322fb72317d8e88e0bbf46ac89b56290db7e2e4a8442179a6eb87a615fd741b5f00ce96a1c8 SHA512 b41dece8f1ddcadde3367a83f6029ffdc5805811b40380e270169684fb3b368258bd8caeb55623dadffb6fb9d72faf9a3d75907722623f4fac94a4347f8ce833
-DIST eduke32_src_20190719-7814.tar.xz 14751836 BLAKE2B 95017d0fbb4a3d4db3bb64657671bad58f368af5f4c1d52cfc805d99bbfc77019dfc372d3aa82e9c216a783a41993d6c8e539b2861b72604c0397cfc52f046c4 SHA512 cf8783e36b73ee76ba7c824d9322a64b87ae48ddb7002e3e4b61120c03c03a03bb0205f790483421c5992e536adee0be1c497cd7aa8357fa0aa518f50a4ba861
-EBUILD eduke32-20190719.7814.ebuild 5972 BLAKE2B a212513a58223dfc35ef3cdb50937a3d6294ed5fafe6fd6ed5804d5c27b479c34b9e4b2a39431b1272848cf547b1275cb5b295b8efe6a2b1c5009d0906573391 SHA512 df0fbf71fe5ee81e75f476f5baa42e6fffccb314928b1ba563683ba431bc040a20866ccafb8edde4ccf1bc7f177b48cfcdf3f235a80687b143836e22b90a629d
+DIST eduke32_src_20190820-8043.tar.xz 15922344 BLAKE2B 5414087f8c88c04438b2db5f5323bf82853353f05e00481be596de0e6c981bd651d53515f674d8c128865aba79d6d62a530e3346d215fc67caa36e8afb10c22e SHA512 5bfb6134acbb33e3c4c702306dfe2b005766910efe78b38e9ab1aa3221ccccf6b1e97ddc193222f25b8cd8b23a0f6fd6e13a4b4ae48589e24d8a0de958b5616a
+EBUILD eduke32-20190820.8043.ebuild 6012 BLAKE2B 118c08659973f2cdbfba5b22cfa3df3771344d4d838b2974a17bdc732af0e58cbce5fb651a3c59a3de11b5c5ba1c3a27aca20f049cc484bf9600c812ca44a8fd SHA512 3311884582e9ededa714dfd8a53cabbffc15b750879a87d06ea05db4804e8e583d843812af30e05ca14ca5d3091597691cb9d9fd448788d7f5e1743151018373
 MISC metadata.xml 1727 BLAKE2B 3448f8633a915311ffb9ccc6d53bf8a94928df2625eaba9e21952dab0c6eb6ec1d5da514c8ad6f810a94005571e69d1d00d1d4ecc2e2afc6ea99ee5aa9de73f5 SHA512 8aeb500968ff3b161f244cc0374f9d6b2261ad11104f92f496ab501675cc50e68981a28f0482b06845a2e058ac63464db92c0250373d2036c249739e2954063a
diff --git a/games-fps/eduke32/eduke32-20190719.7814.ebuild b/games-fps/eduke32/eduke32-20190820.8043.ebuild
index 196f0653f812..9f03ea77a4ef 100644
--- a/games-fps/eduke32/eduke32-20190719.7814.ebuild
+++ b/games-fps/eduke32/eduke32-20190820.8043.ebuild
@@ -79,8 +79,8 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20190419.7615-wad2map-buildfix.patch"
-	"${FILESDIR}/log-to-tmpdir.patch"
-	"${FILESDIR}/search-duke3d-path.patch"
+	"${FILESDIR}/${PN}-20190820.8043-log-to-tmpdir.patch"
+	"${FILESDIR}/${PN}-20190820.8043-search-duke3d-path.patch"
 )
 
 src_unpack() {
diff --git a/games-fps/eduke32/files/log-to-tmpdir.patch b/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
index 24cec1b00af1..24cec1b00af1 100644
--- a/games-fps/eduke32/files/log-to-tmpdir.patch
+++ b/games-fps/eduke32/files/eduke32-20190820.8043-log-to-tmpdir.patch
diff --git a/games-fps/eduke32/files/search-duke3d-path.patch b/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch
index c35af40c749e..c35af40c749e 100644
--- a/games-fps/eduke32/files/search-duke3d-path.patch
+++ b/games-fps/eduke32/files/eduke32-20190820.8043-search-duke3d-path.patch
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index 7975d84ec2f7..b62a254c9d68 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,3 +1,4 @@
-DIST freedm-0.11.3.zip 7853186 BLAKE2B 5f399233e0d1f1c61d8170dc8e13ca0c6efe79255a87511027ad69e9ab7cf21045e9bc7f40fec6fa3604b3c77590cde8e85b2e9a53e1d89c5aeaf67bffa7023e SHA512 263f126e519a883b828b4f321363fe0f8c557ae58b76c6b3e28aa60e86c15fcc78c866bf003fc523276cefbb431023de64f09b026e85b0a0c7c85a88d1f47cd0
-EBUILD freedm-data-0.11.3.ebuild 588 BLAKE2B 58f96cb841b50dc6d8042d3d5f891a689dbefff0ed38ad284ad5278dc70cadc23c2374d6465dbbceba0654c4ab18171b9885eeb65a1e4696b1e09c066dbf9979 SHA512 6ee871e952c8cbcdeba69b807bca9bba5532f077954429db08f82ed05bb65285c1756423f0aaccdd1ba99c5e42a60593a9ea50e0ca0629a015edba0ab831b4b7
+AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677
+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
 MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
diff --git a/games-fps/freedm-data/files/ImageMagick/policy.xml b/games-fps/freedm-data/files/ImageMagick/policy.xml
new file mode 100644
index 000000000000..ffacb9209fb3
--- /dev/null
+++ b/games-fps/freedm-data/files/ImageMagick/policy.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<policymap>
+  <policy domain="coder" rights="read | write" pattern="PS" />
+</policymap>
diff --git a/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild b/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..99ce657c7869
--- /dev/null
+++ b/games-fps/freedm-data/freedm-data-0.11.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Game resources for FreeDM"
+HOMEPAGE="https://freedoom.github.io"
+SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
+	app-text/asciidoc
+	games-util/deutex
+	virtual/imagemagick-tools[png]"
+
+S="${WORKDIR}/freedoom-${PV}"
+
+DOOMWADPATH=share/doom
+
+python_check_deps() {
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+src_compile() {
+	emake wads/freedm.wad
+}
+
+src_install() {
+	emake install-freedm \
+		prefix="${ED}/usr/" \
+		bindir="bin/" \
+		mandir="share/man/" \
+		waddir="${DOOMWADPATH}/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "FreeDM WAD file installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
+}
diff --git a/games-fps/freedm-data/freedm-data-0.11.3.ebuild b/games-fps/freedm-data/freedm-data-0.11.3.ebuild
deleted file mode 100644
index 43ac7804c6a0..000000000000
--- a/games-fps/freedm-data/freedm-data-0.11.3.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Game resources for FreeDM"
-HOMEPAGE="https://freedoom.github.io"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedm-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/freedm-${PV}"
-
-DOOMWADPATH=/usr/share/doom
-
-src_install() {
-	insinto ${DOOMWADPATH}
-	doins freedm.wad
-	dodoc CREDITS.txt README.html
-}
-
-pkg_postinst() {
-	elog "FreeDM WAD file installed into ${DOOMWADPATH} directory."
-}
diff --git a/games-fps/freedm/Manifest b/games-fps/freedm/Manifest
index bc206eae18fe..a9f4fe12674c 100644
--- a/games-fps/freedm/Manifest
+++ b/games-fps/freedm/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedm-0.11.3.ebuild 525 BLAKE2B 25f0efebab82c86cee9ecb2ac7984097d511db2f96efa1316eb44622e503e1b913c6b871b09a29ef05dbb408719e69047dbfa46ca5577bc321f7a711737206f3 SHA512 27432177099fcd42ee3c72d4e2ab5dd8569fe75d23d85174d44629377ed38ed3d5336203b333f39ea5ec181a4d604e9cbb44e12e88e5dcbf3647133f5152b0b3
+EBUILD freedm-0.11.3-r1.ebuild 537 BLAKE2B bbb92634756b06c366a717d0436d77473800b01556bb613d49869567edf36c2025c5577cd65b4c210c6539578459d3fe6babc87b3244d9dd67166c5181bbd314 SHA512 6c6cde2b143e2ce2ec99d05bb1612d2baee4a54e0fcc5a295f986ff527eb6afcd7b875d3167e22e588d92b2cfee60a280fb6aff1f88e4902f38e21382524dcf9
 MISC metadata.xml 1480 BLAKE2B 0755aba8cc597778e420a8142e5febd305e317057870abdaa2f5761e2b45f86c139f63aa096fdb20a5984552d886b47ba7b458ed7f3e971ce4442d03f31e75f9 SHA512 d5847035c6bfa72c3af95a8af203df5909236616726a474dcc33c051de8149f82f4d8c9d1bc8be05b6b05ae1f3a8ec3064f400aa120a6c87d43358ab2e7e20f3
diff --git a/games-fps/freedm/freedm-0.11.3.ebuild b/games-fps/freedm/freedm-0.11.3-r1.ebuild
index 47c3ee76f4c5..fe8bae6ec409 100644
--- a/games-fps/freedm/freedm-0.11.3.ebuild
+++ b/games-fps/freedm/freedm-0.11.3-r1.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	~games-fps/freedm-data-${PV}
 	|| (
-		games-fps/gzdoom
+		games-fps/gzdoom[nonfree(+)]
 		games-engines/odamex
 		games-fps/doomsday
 		games-fps/prboom-plus
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index b667bef450be..35676af223af 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,3 +1,4 @@
-DIST freedoom-0.11.3.zip 18889307 BLAKE2B 052d7f58d1beb7947f4fff3021ec0229c9746bfb7970a52d23fa44fc881d8cf3c314b8ecf0dc400c2da4e28c623695874ae75dcd1e45933fdb1826ea04f0e24b SHA512 c67fc69bca87cba2ba40b91f578724feaabbd6cd64c6845fa567d6901b7a9e3145185011731c677a71f7b5a6f8707855fb573c0c09b6d47fef83b1577b211816
-EBUILD freedoom-data-0.11.3.ebuild 632 BLAKE2B a65af31246cf206f39dfd031caffa57a04b35f3cec7471a2515ed4b35646ea6f13c3ec2ee66dbdadbbe61d15af0f3cf871f69b1ffd28fd8c9defeeaa7b10a81f SHA512 b2c47cfed880ab80ff4c8ceaa0926871ace5fe4cd2d812922273466c91125cf7e1f64e3543c74c77750be9873c0cbe6cd5a144f90bc01ead6e3576e977289425
+AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677
+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
 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
new file mode 100644
index 000000000000..ffacb9209fb3
--- /dev/null
+++ b/games-fps/freedoom-data/files/ImageMagick/policy.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<policymap>
+  <policy domain="coder" rights="read | write" pattern="PS" />
+</policymap>
diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild b/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild
new file mode 100644
index 000000000000..ed2ae707e1a1
--- /dev/null
+++ b/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+
+inherit python-any-r1 xdg
+
+DESCRIPTION="Game resources for Freedoom: Phase 1+2"
+HOMEPAGE="https://freedoom.github.io"
+SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-${PV}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
+	app-text/asciidoc
+	games-util/deutex
+	virtual/imagemagick-tools[png]"
+
+S="${WORKDIR}/freedoom-${PV}"
+
+DOOMWADPATH=share/doom
+
+python_check_deps() {
+	has_version -b "dev-python/pillow[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+src_compile() {
+	emake wads/freedoom{1,2}.wad
+}
+
+src_install() {
+	emake install-freedoom{1,2} \
+		prefix="${ED}/usr/" \
+		bindir="bin/" \
+		mandir="share/man/" \
+		waddir="${DOOMWADPATH}/"
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
+}
diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild b/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild
deleted file mode 100644
index 5e38d534c7e2..000000000000
--- a/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Game resources for Freedoom: Phase 1+2"
-HOMEPAGE="https://freedoom.github.io"
-SRC_URI="https://github.com/freedoom/freedoom/releases/download/v${PV}/freedoom-${PV}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-BDEPEND="app-arch/unzip"
-
-S="${WORKDIR}/freedoom-${PV}"
-
-DOOMWADPATH=/usr/share/doom
-
-src_install() {
-	insinto ${DOOMWADPATH}
-	doins freedoom1.wad
-	doins freedoom2.wad
-	dodoc CREDITS.txt README.html
-}
-
-pkg_postinst() {
-	elog "Freedoom WAD files installed into ${DOOMWADPATH} directory."
-}
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 641f15e1ccc3..01b696c9ad31 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedoom-0.11.3-r1.ebuild 552 BLAKE2B 47c4ad551c551538d5e04564f1f978015a97deb1b4060940d76ae2524ef04654ed38d22537e5281987b0eb881444d7115789c0bc1f8638f027025e51b456a2ae SHA512 689a084fcf603877e13ab96222c9c5f352ec6c767906056ce43098ab32cff23fb8f5509ffd76aa3acf4fd6153fedf1b44e71f6f57c7490cc50587b97f2626bb5
+EBUILD freedoom-0.11.3-r2.ebuild 564 BLAKE2B 5bab0eaf05d093ae852d870826ff936532d62c75e20919cb93fbb3dcf50941f02766bb70b3510e14ae7da5c5d2b54d92f224b9309b8056c6f1f9c680f3ad55fa SHA512 78a42263ead6ee8b3c80e79e97e09ff6752e186db46221f86b0df35cb18c3b0869d7ee2bb16ad27c49922f8860df2bf0736f2625dbc84e21f186f5da07122d41
 MISC metadata.xml 1809 BLAKE2B 84960851e0fcb2354c71c796ebd28f3c1bea2762e1810d851c04d375cbc90bf6a6cddd9629f802829bb495cea44260b352291e2d3adbb17516c8cb97697da450 SHA512 a1e68567ab9be93d88e5debbba73e2704e5ef9f063bc98f30bc480064e9037b3841fdd3cec24a8f61ba0c76a68d20b63a329dd880d8c99a8c11a3ba39c3de89d
diff --git a/games-fps/freedoom/freedoom-0.11.3-r1.ebuild b/games-fps/freedoom/freedoom-0.11.3-r2.ebuild
index b0297a0238e1..0006bb365ced 100644
--- a/games-fps/freedoom/freedoom-0.11.3-r1.ebuild
+++ b/games-fps/freedoom/freedoom-0.11.3-r2.ebuild
@@ -13,7 +13,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	~games-fps/freedoom-data-${PV}
 	|| (
-		games-fps/gzdoom
+		games-fps/gzdoom[nonfree(+)]
 		games-engines/odamex
 		games-fps/doomsday
 		games-fps/prboom-plus
diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index e2476e917539..526e49c179a6 100644
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,6 @@
-AUX gzdoom-4.1.3-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1
-AUX gzdoom-4.1.3-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
-DIST gzdoom-4.1.3.tar.gz 13084313 BLAKE2B d082efacc99264eff92f51dac1a4ff742ee00c65fec769cd143e1ffa7a1527060735efc7325a5fd5d0950bdce52cf28941837c1a32e3e88483ece574de1fba64 SHA512 16d3db1320eaaf39477971e3724228850abe216fa792d79e288f3551ab635344c22699c10ccf9e7da4dc49543e1b5ff8be7f0053b79dc53e274e33cc17a667ac
-EBUILD gzdoom-4.1.3.ebuild 1416 BLAKE2B d60d589c185e3b675a92329231eabe06139b0acc236df0f31a87ef5b49e547e5e7654ffca00ca1e4b7413cdf5bb6ab7cc600fed0f0cc2216e5b99c8b1d8c2505 SHA512 4be692cbc8c360b7c897723f2b7e61fdd14190424bdee602cf195fdf2f8c018159a004a6fb7fdfc8094d0f96752f7e6522559ef99c8c9d1d343b59ee53d7a80c
-MISC metadata.xml 883 BLAKE2B 3d019a0bf36020e6588fea81419fdf87d1e6e9571dcaac4a38fde6a4a0e2dc9b0fe9784fb2539e20c22a93bd689e997f8e195ba8ed1bf42a897397f8fe9b36ca SHA512 61d4477fa1c674118bf347b237cdb31ef00b2410cda123fc1fa5178c47528d14fb22d65f99ec1a2b41c021b676628fe70d74640074f91d4c5d76beee01415ca2
+AUX gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch 1045 BLAKE2B 642f7d083c577f71336865396cba1c07a68bdf0766033825168689069a12ce18ad062fa4e631f9ce545b392cee35d05f348b5ee41f853c6b374f16e114235380 SHA512 5cae0b86d045285a86f79ed63d7dfa047412241de724f948e6a0cc98412ef1f9f5c119971dfa38fcd2009a00a5bae57e72c8d25b2aedbd7e8eac284e73a53129
+AUX gzdoom-4.2.0-fluidsynth2.patch 1047 BLAKE2B c56fbc64aa85fef15415415b87ad2246b831b6c412ddf3a1e5f841530a0dc42a8feb1f16bca4a6c888d97590d7659cd5694029e893cfb4e72b3fc833554028f5 SHA512 6ef599283753d744345ce91c5556edcc6ee369c6cc2dd478b3e8ec95926b06f0875ce009d78afb9c45ba9da3b22755460f5d0c5d7fbf56322b361390c59fcda1
+AUX gzdoom-4.2.0-install_soundfonts.patch 1379 BLAKE2B 5ce4ee6fe06d5185a1b2fae5b70ed195e61d405d5c5b5973a1409244e657a4899017e16c28574add1d9ff37d4ee02444ff3e162197ad222d5c0990e7c40a9f91 SHA512 2ce0032b5246337c8e1ae80b254ec676460a54d19366902ad30042bfd9c2ae2c92354ab13631affa514bb7c47100c38bdec7b9d76695f2fd0281486a7d7d85dd
+DIST gzdoom-4.2.0.tar.gz 13482879 BLAKE2B 5c68718b840ce00a752179b4c735f064ed2ea669eff5e4bd71e3ccea3bb9af238287ddffc297cbfbe6069c658ec1d203b73790c973f836f8aa9ba33ac3ec2803 SHA512 07ad674eb22eb1388a5e3a6bd91d769fef90cb52728034e30d2967c484acaa41cfc7fc9ed486f4dbd0e86ea4d32bbafde402b771fc2fceb0708551328ef08f0d
+EBUILD gzdoom-4.2.0.ebuild 1968 BLAKE2B daf0b5dc863b64406f8ae41911ea0489f3e437ace6e8ee4d8d645ba50f1dd4ec63faf5313c5bf440953303c2db913693f804fcb196f38fc2cac4c6833aaaf97a SHA512 5cdeecb97701af6413bafa2178a24d29548d1cea3c13d88535cac0041373ecde8c68a0b4557ee4672fdacaefeadbbff7f35c22747e53cddea743f5e4bb4e290d
+MISC metadata.xml 940 BLAKE2B 85d6dcb7986f8a27f1ad929abe60899e01709bb8778668a0cda11ac7c3c4f33349bb832dcdc369e7c136ba022d6ac6673565cb674cb9f642157fc89c9b678e72 SHA512 c27939efdfa612bfea201fd4f1e4399c050b5d0244cb7be914dc1b033f4f09c5614b5f226a9ce29c07cfb31247133a8b69bc81274ddf5b38e159287a85a97a30
diff --git a/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
new file mode 100644
index 000000000000..c74d08a24a47
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-4.2.0-Introduce-the-BUILD_NONFREE-option.patch
@@ -0,0 +1,36 @@
+From 1e09b211a000c649aae6eea736647daa650141bc Mon Sep 17 00:00:00 2001
+From: William Breathitt Gray <vilhelm.gray@gmail.com>
+Date: Sat, 31 Aug 2019 21:23:23 +0900
+Subject: [PATCH] Introduce the BUILD_NONFREE option
+
+This allow users to disable building nonfree components (brightmaps.pk3
+and game_support.pk3) if they so desire.
+---
+ CMakeLists.txt | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7860358ef..23d317f42 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -404,10 +404,15 @@ add_subdirectory( libraries/lzma )
+ add_subdirectory( tools )
+ add_subdirectory( libraries/dumb )
+ add_subdirectory( libraries/gdtoa )
++
+ add_subdirectory( wadsrc )
+-add_subdirectory( wadsrc_bm )
+ add_subdirectory( wadsrc_lights )
+-add_subdirectory( wadsrc_extra )
++option (BUILD_NONFREE "Build nonfree components" ON)
++if( BUILD_NONFREE )
++	add_subdirectory( wadsrc_bm )
++	add_subdirectory( wadsrc_extra )
++endif()
++
+ add_subdirectory( src )
+ 
+ if( NOT CMAKE_CROSSCOMPILING )
+-- 
+2.23.0
+
diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
index 1ae12a832b4b..1ae12a832b4b 100644
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-fluidsynth2.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.2.0-fluidsynth2.patch
diff --git a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
index 1fe0b99d9a8e..1fe0b99d9a8e 100644
--- a/games-fps/gzdoom/files/gzdoom-4.1.3-install_soundfonts.patch
+++ b/games-fps/gzdoom/files/gzdoom-4.2.0-install_soundfonts.patch
diff --git a/games-fps/gzdoom/gzdoom-4.1.3.ebuild b/games-fps/gzdoom/gzdoom-4.2.0.ebuild
index 242bd4e92879..4fbfe9b905b2 100644
--- a/games-fps/gzdoom/gzdoom-4.1.3.ebuild
+++ b/games-fps/gzdoom/gzdoom-4.2.0.ebuild
@@ -9,10 +9,11 @@ DESCRIPTION="A modder-friendly OpenGL source port based on the DOOM engine"
 HOMEPAGE="https://zdoom.org"
 SRC_URI="https://github.com/coelckers/${PN}/archive/g${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT"
+LICENSE="BSD BZIP2 DUMB-0.9.3 GPL-3 LGPL-3 MIT
+	nonfree? ( Activision ChexQuest3 DOOM-COLLECTORS-EDITION freedist )"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="gtk gtk2 openmp"
+IUSE="gtk gtk2 +nonfree openmp"
 
 DEPEND="
 	media-libs/libsdl2[opengl]
@@ -32,6 +33,7 @@ S="${WORKDIR}/${PN}-g${PV}"
 PATCHES=(
 	"${FILESDIR}/${P}-fluidsynth2.patch"
 	"${FILESDIR}/${P}-install_soundfonts.patch"
+	"${FILESDIR}/${P}-Introduce-the-BUILD_NONFREE-option.patch"
 )
 
 src_prepare() {
@@ -51,6 +53,7 @@ src_configure() {
 		-DNO_GTK="$(usex !gtk)"
 		-DNO_OPENAL=OFF
 		-DNO_OPENMP="$(usex !openmp)"
+		-DBUILD_NONFREE="$(usex nonfree)"
 	)
 	cmake-utils_src_configure
 }
@@ -60,3 +63,17 @@ src_install() {
 	make_desktop_entry "${PN}" "GZDoom" "${PN}" "Game;ActionGame"
 	cmake-utils_src_install
 }
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use nonfree ; then
+		elog
+		elog "GZDoom installed without nonfree components."
+		elog "Note: The nonfree game_support.pk3 file is needed to play"
+		elog "      games natively supported by GZDoom."
+		elog "A list of games natively supported by GZDoom may be found"
+		elog "on the ZDoom wiki: https://zdoom.org/wiki/IWAD"
+		elog
+	fi
+}
diff --git a/games-fps/gzdoom/metadata.xml b/games-fps/gzdoom/metadata.xml
index cfd1b5ffe560..5b213dc39913 100644
--- a/games-fps/gzdoom/metadata.xml
+++ b/games-fps/gzdoom/metadata.xml
@@ -18,6 +18,7 @@
 	</maintainer>
 	<use>
 		<flag name="gtk2">Enable support for GTK+2 instead of GTK+3</flag>
+		<flag name="nonfree">Enable non-free components</flag>
 	</use>
 	<upstream>
 		<bugs-to>https://forum.zdoom.org/viewforum.php?f=2</bugs-to>