gentoo resync : 06.08.2019

4 files changed, 64 insertions, 30 deletions

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."
-}