From 4b19be30aa626b327c885dae62c559ec0e9fb935 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Oct 2019 22:19:36 +0100 Subject: gentoo resync : 13.10.2019 --- games-fps/freedm-data/Manifest | 6 +-- games-fps/freedm-data/files/ImageMagick/policy.xml | 4 -- .../files/freedm-data-0.11.3-Set-DOOMWADPATH.patch | 38 -------------- games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild | 61 ---------------------- games-fps/freedm-data/freedm-data-0.12.0.ebuild | 54 +++++++++++++++++++ 5 files changed, 56 insertions(+), 107 deletions(-) delete mode 100644 games-fps/freedm-data/files/ImageMagick/policy.xml delete mode 100644 games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch delete mode 100644 games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild create mode 100644 games-fps/freedm-data/freedm-data-0.12.0.ebuild (limited to 'games-fps/freedm-data') diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest index 6261a39d776d..b998141a5a52 100644 --- a/games-fps/freedm-data/Manifest +++ b/games-fps/freedm-data/Manifest @@ -1,5 +1,3 @@ -AUX ImageMagick/policy.xml 127 BLAKE2B fc13d41dc99e848f79af5e42c9e0ccd28bd07a69c97174e1c70bc6d58eae44b56495bd2c8698e0651ddeba63bcad7bf698c51aca7d7e932013a80a221b8696c2 SHA512 057f150e101344e3f29c654250353304b668bcb225b563f6b6e252e598123e1a634812d9cbbe7a28c2e271f9ee93d0303e66c23231f51f74fbaaaf6ef8fd1677 -AUX freedm-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 freedm-data-0.11.3-r2.ebuild 1304 BLAKE2B c0e43fb51c4db08be0ca2f38ca43a5282d25af78ff5398f7abd0d98294e111a77aa304062975958f30b85377662a9ddbc291d39983f63384e626ab1ecf3ea7b2 SHA512 ffba609c9e642e28da1feebaf4d1f468c9d73a088169848692ffcfccbb6c8cdc625a0cb5fc24e854d7095c04dca6db7890de234e4455d1868bd9dbf4aa4f0a6b +DIST freedoom-0.12.0.tar.gz 18409554 BLAKE2B 01ae58c8edb12a8453f6026f09f45d54b19949d38f0668ddc6d4a6ee5fee4cc62c3926af0fb8e30e5f574b46ad1990fb20b57369821562851ae0cef0a6a5e5f1 SHA512 055cae8d16cc7ca2017eeabcaca9436da044def5f630ab46fb0c4cd7d36b9db3b416f9ddeb855e79f21f7c5337d25fb82625ac987712910daec448b49ef9c41e +EBUILD freedm-data-0.12.0.ebuild 1019 BLAKE2B c5c19b3ffbd917bfa363fd76a3493a78c57b7674590addae4a7a1be15374611283df545c10cd1aa40b64a43031bdc658116cf7a4d49516b1b6e937076f6f1857 SHA512 aa53dedfea432f49624cf1345ca90a1252065af89b4235a95dcabd072e707df84e4c1dd80b3dafcc7fec2239b0e6dcc0f2d2f9ad23f2724a8a46a7c17abb7e51 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 deleted file mode 100644 index ffacb9209fb3..000000000000 --- a/games-fps/freedm-data/files/ImageMagick/policy.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch b/games-fps/freedm-data/files/freedm-data-0.11.3-Set-DOOMWADPATH.patch deleted file mode 100644 index 0998cc45ebd1..000000000000 --- a/games-fps/freedm-data/files/freedm-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 -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/freedm-data/freedm-data-0.11.3-r2.ebuild b/games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild deleted file mode 100644 index 29e3894685d9..000000000000 --- a/games-fps/freedm-data/freedm-data-0.11.3-r2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# 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 prefix 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}" - -PATCHES="${FILESDIR}/${P}-Set-DOOMWADPATH.patch" - -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 - - hprefixify dist/freedoom -} - -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.12.0.ebuild b/games-fps/freedm-data/freedm-data-0.12.0.ebuild new file mode 100644 index 000000000000..62b8cf23423c --- /dev/null +++ b/games-fps/freedm-data/freedm-data-0.12.0.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{5,6,7} ) + +inherit prefix 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" + +S="${WORKDIR}/freedoom-${PV}" + +DOOMWADPATH=share/doom + +python_check_deps() { + has_version -b "dev-python/pillow[${PYTHON_USEDEP}]" +} + +src_prepare() { + xdg_src_prepare + eapply_user + + hprefixify dist/freedoom +} + +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." +} -- cgit v1.2.3