[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2024-03-02 Thread James Le Cuirot 
commit: fea49236e9203868c37473f081c8677c60985b84
Author: William Breathitt Gray  linaro  org>
AuthorDate: Sat Mar  2 13:41:50 2024 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Mar  2 14:14:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fea49236

games-fps/freedoom-data: update maintainers

Signed-off-by: William Breathitt Gray  linaro.org>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/metadata.xml | 8 
 1 file changed, 8 deletions(-)

diff --git a/games-fps/freedoom-data/metadata.xml 
b/games-fps/freedoom-data/metadata.xml
index 561d4d0ad152..aafdae7a61d2 100644
--- a/games-fps/freedoom-data/metadata.xml
+++ b/games-fps/freedoom-data/metadata.xml
@@ -22,14 +22,6 @@
The levels in this game tend to demand more skillful play than 
the
previous chapters. It is compatible with mods for Doom II.

-   
-   vilhelm.g...@gmail.com
-   William Breathitt Gray
-   
-   
-   proxy-ma...@gentoo.org
-   Proxy Maintainers
-   

ga...@gentoo.org
Gentoo Games Project

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/files/

2023-08-03 Thread Sam James 
commit: 44be330fe5657808e4f6ae9d8398ef25398ddbaf
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug  3 22:18:59 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug  3 22:18:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44be330f

games-fps/freedoom-data: add references to patch

Bug: https://bugs.gentoo.org/909548
Signed-off-by: Sam James  gentoo.org>

 .../files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch| 4 
 1 file changed, 4 insertions(+)

diff --git 
a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
 
b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
index 130e1636374d..333bff6d2598 100644
--- 
a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
+++ 
b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
@@ -1,3 +1,7 @@
+https://bugs.gentoo.org/909548
+https://github.com/freedoom/freedoom/issues/1015
+https://github.com/freedoom/freedoom/pull/1027
+
 From d64ddc6ea90406e21b4b93f5a1e7f99abfaac0d9 Mon Sep 17 00:00:00 2001
 From: Steven Elliott 
 Date: Sun, 16 Jul 2023 14:52:04 -0400

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/files/, games-fps/freedoom-data/

2023-08-03 Thread Sam James 
commit: 23a7ff2f75f4083bbe22e8f75ed17ea2e4380cd8
Author: William Breathitt Gray  linaro  org>
AuthorDate: Sun Jul 30 12:46:51 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug  3 22:11:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23a7ff2f

games-fps/freedoom-data: Support Python PIL 10.0.0

Closes: https://bugs.gentoo.org/909548
Signed-off-by: William Breathit Gray  linaro.org>
Signed-off-by: Sam James  gentoo.org>

 ...oom-data-0.12.1-Python-PIL-10.0.0-support.patch | 39 ++
 .../freedoom-data/freedoom-data-0.12.1-r1.ebuild   |  4 +++
 2 files changed, 43 insertions(+)

diff --git 
a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
 
b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
new file mode 100644
index ..130e1636374d
--- /dev/null
+++ 
b/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
@@ -0,0 +1,39 @@
+From d64ddc6ea90406e21b4b93f5a1e7f99abfaac0d9 Mon Sep 17 00:00:00 2001
+From: Steven Elliott 
+Date: Sun, 16 Jul 2023 14:52:04 -0400
+Subject: [PATCH] create_caption: Python PIL 10.0.0 support (#1027)
+
+To support Python PIL 10.0.0 this change uses newer API textbbox() when
+available, and older API textsize() when not.
+---
+ graphics/text/create_caption | 17 +++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/graphics/text/create_caption b/graphics/text/create_caption
+index 7ddbd8d66..22bc0507d 100755
+--- a/graphics/text/create_caption
 b/graphics/text/create_caption
+@@ -18,8 +18,21 @@ background_image.load()
+ background_image = background_image.convert("RGBA")
+ image = Image.new("RGBA", background_image.size, (0, 0, 0, 0))
+ draw = ImageDraw.Draw(image)
+-txt1_size = draw.textsize(txt1, font=font)
+-txt2_size = draw.textsize(txt2, font=font)
++
++# Getting the text size is tricky since for newer PIL, such as 10.0.0, only
++# textbbox() is supported, but for older PIL, such 7.2.0, only textsize()
++# is supported. The solution is to default to the newer API, but fallback to
++# the older one when it is not available.
++try:
++# This newer API returns a four item tuple. The "xy" kwarg is returned in
++# the first two items, and last two items is the size needed, but with 
"xy"
++# added, so passing "(0, 0)" returns the size needed.
++txt1_size = draw.textbbox(xy=(0, 0), text=txt1, font=font)[2:]
++txt2_size = draw.textbbox(xy=(0, 0), text=txt2, font=font)[2:]
++except:
++# This older API simply returns the size needed.
++txt1_size = draw.textsize(txt1, font=font)
++txt2_size = draw.textsize(txt2, font=font)
+ 
+ draw.text(
+ (5, int(image.height - txt1_size[1] - 5)),

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
index 62bcb30b42a9..f50e3558ffb1 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
@@ -20,6 +20,10 @@ BDEPEND="
app-text/asciidoc
games-util/deutex[png]"
 
+PATCHES=(
+   "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch
+)
+
 S="${WORKDIR}/freedoom-${PV}"
 
 DOOMWADPATH=share/doom

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2023-02-19 Thread James Le Cuirot 
commit: b714276eac9895d8e5c172c543d0226b4807e69d
Author: William Breathitt Gray  linaro  org>
AuthorDate: Sun Feb 19 21:29:51 2023 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Feb 19 21:54:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b714276e

games-fps/freedoom-data: enable py3.11

Signed-off-by: William Breathitt Gray  linaro.org>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
index a69869926555..62bcb30b42a9 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit prefix python-any-r1 xdg

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2022-09-19 Thread Michał Górny 
commit: 21d00777fea1e7ef739948284db11190ae491f69
Author: matoro  users  noreply  github  com>
AuthorDate: Mon Sep 19 01:08:58 2022 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Sep 19 06:42:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d00777

games-fps/freedoom-data: Keyword 0.12.1-r1 arm64, #849866

Signed-off-by: matoro  users.noreply.github.com>
Signed-off-by: Michał Górny  gentoo.org>

 games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
index 87611ba48ea7..8300a7ad48e9 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 
 BDEPEND="
$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2021-07-29 Thread Ionen Wolkens 
commit: d897a53fda00bf148edc95a30676b54f6adba636
Author: William Breathitt Gray  gmail  com>
AuthorDate: Thu Jul 29 05:29:28 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Thu Jul 29 10:59:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d897a53f

games-fps/freedoom-data: Add png USE requirement for deutex dependency

Closes: https://bugs.gentoo.org/804882
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: Ionen Wolkens  gentoo.org>

 .../{freedoom-data-0.12.1.ebuild => freedoom-data-0.12.1-r1.ebuild}   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
similarity index 95%
rename from games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
rename to games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
index d0402108c77..87611ba48ea 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
@@ -18,7 +18,7 @@ KEYWORDS="~amd64 ~arm ~x86"
 BDEPEND="
$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
app-text/asciidoc
-   games-util/deutex"
+   games-util/deutex[png]"
 
 S="${WORKDIR}/freedoom-${PV}"
 
@@ -44,7 +44,7 @@ src_install() {
emake install-freedoom \
prefix="${ED}/usr/" \
bindir="bin/" \
-   docdir="share/doc/${P}" \
+   docdir="share/doc/${PF}" \
mandir="share/man/" \
waddir="${DOOMWADPATH}/"
 }

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2021-07-07 Thread Ionen Wolkens 
commit: 26d93e5a01c330ba1652b286cf5b95ff69550ebc
Author: William Breathitt Gray  gmail  com>
AuthorDate: Wed Jul  7 07:48:52 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul  7 12:22:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26d93e5a

games-fps/freedoom-data: Add Python 3.10 to PYTHON_COMPAT

Also removed superfluous eapply_user.

Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/21545
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-fps/freedoom-data/freedoom-data-0.12.1.ebuild | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
index 137df77d239..d0402108c77 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit prefix python-any-r1 xdg
 
@@ -30,7 +30,6 @@ python_check_deps() {
 
 src_prepare() {
xdg_src_prepare
-   eapply_user
 
hprefixify dist/freedoom
 }

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2021-07-07 Thread Ionen Wolkens 
commit: 49692b1d40adcb3eac63c5d8ecb9614a8f7ae878
Author: William Breathitt Gray  gmail  com>
AuthorDate: Wed Jul  7 00:08:01 2021 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Wed Jul  7 12:22:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49692b1d

games-fps/freedoom-data: Add Pillow zlib dependency

Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: Ionen Wolkens  gentoo.org>

 games-fps/freedoom-data/freedoom-data-0.12.1.ebuild | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
index d506e261de8..137df77d239 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 
 BDEPEND="
-   $(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')
+   $(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
app-text/asciidoc
games-util/deutex"
 
@@ -25,7 +25,7 @@ S="${WORKDIR}/freedoom-${PV}"
 DOOMWADPATH=share/doom
 
 python_check_deps() {
-   has_version -b "dev-python/pillow[${PYTHON_USEDEP}]"
+   has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
 }
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2021-03-05 Thread James Le Cuirot 
commit: b1240b97e14e81c021343a54f36adcf11cff3b08
Author: William Breathitt Gray  gmail  com>
AuthorDate: Fri Mar  5 09:18:40 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Fri Mar  5 23:11:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1240b97

games-fps/freedoom-data: Add PYTHON_COMPAT=python3_9

Closes: https://bugs.gentoo.org/774285
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/freedoom-data-0.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
index 5acd29448c9..d506e261de8 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit prefix python-any-r1 xdg

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2020-10-01 Thread James Le Cuirot 
commit: a92a0df30340935af954944454837972f0216523
Author: William Breathitt Gray  gmail  com>
AuthorDate: Thu Oct  1 13:09:18 2020 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Oct  1 15:28:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a92a0df3

games-fps/freedoom-data: Add PYTHON_COMPAT=python3_8

Closes: https://bugs.gentoo.org/745738
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/freedoom-data-0.12.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
index 2fc22d4f026..5acd29448c9 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{7,8} )
 
 inherit prefix python-any-r1 xdg

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2019-11-07 Thread James Le Cuirot 
commit: 79bff252fd4fff131f76752007adea3e1e34c705
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Nov  7 21:25:58 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Nov  7 21:25:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79bff252

games-fps/freedoom-data: Drop old 0.12.0

Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/Manifest   |  1 -
 .../freedoom-data/freedoom-data-0.12.0.ebuild  | 54 --
 2 files changed, 55 deletions(-)

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index 5d68da46525..c976f53feb2 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,2 +1 @@
-DIST freedoom-0.12.0.tar.gz 18409554 BLAKE2B 
01ae58c8edb12a8453f6026f09f45d54b19949d38f0668ddc6d4a6ee5fee4cc62c3926af0fb8e30e5f574b46ad1990fb20b57369821562851ae0cef0a6a5e5f1
 SHA512 
055cae8d16cc7ca2017eeabcaca9436da044def5f630ab46fb0c4cd7d36b9db3b416f9ddeb855e79f21f7c5337d25fb82625ac987712910daec448b49ef9c41e
 DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B 
a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d
 SHA512 
7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.0.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.0.ebuild
deleted file mode 100644
index 078a867ebfa..000
--- a/games-fps/freedoom-data/freedoom-data-0.12.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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 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 ~arm ~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/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."
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2019-11-07 Thread James Le Cuirot 
commit: 649ff60936c15033a90c6ec388163adc45f62553
Author: William Breathitt Gray  gmail  com>
AuthorDate: Mon Nov  4 00:06:51 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Nov  7 21:24:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=649ff609

games-fps/freedoom-data: Version bump to 0.12.1

Closes: https://bugs.gentoo.org/699268
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13540
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/Manifest   |  1 +
 .../freedoom-data/freedoom-data-0.12.1.ebuild  | 57 ++
 2 files changed, 58 insertions(+)

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index e3e6ec23b70..5d68da46525 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1 +1,2 @@
 DIST freedoom-0.12.0.tar.gz 18409554 BLAKE2B 
01ae58c8edb12a8453f6026f09f45d54b19949d38f0668ddc6d4a6ee5fee4cc62c3926af0fb8e30e5f574b46ad1990fb20b57369821562851ae0cef0a6a5e5f1
 SHA512 
055cae8d16cc7ca2017eeabcaca9436da044def5f630ab46fb0c4cd7d36b9db3b416f9ddeb855e79f21f7c5337d25fb82625ac987712910daec448b49ef9c41e
+DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B 
a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d
 SHA512 
7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.1.ebuild
new file mode 100644
index 000..268e336d47e
--- /dev/null
+++ b/games-fps/freedoom-data/freedoom-data-0.12.1.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=( python3_{5,6,7} )
+
+inherit prefix 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 ~arm ~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/freedoom{1,2}.wad \
+   freedoom{1,2}.6 \
+   {NEWS,README}.html
+}
+
+src_install() {
+   emake install-freedoom \
+   prefix="${ED}/usr/" \
+   bindir="bin/" \
+   docdir="share/doc/${P}" \
+   mandir="share/man/" \
+   waddir="${DOOMWADPATH}/"
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+
+   elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} 
directory."
+}

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2019-10-12 Thread James Le Cuirot 
commit: cebf273645ed6b0b7e1bb7d52549e052b7bc0b5a
Author: William Breathitt Gray  gmail  com>
AuthorDate: Thu Oct 10 17:35:50 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 12 14:23:04 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cebf2736

games-fps/freedoom-data: version bump to 0.12.0

Closes: https://bugs.gentoo.org/697430
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/13251
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/Manifest   |  1 +
 .../freedoom-data/freedoom-data-0.12.0.ebuild  | 54 ++
 2 files changed, 55 insertions(+)

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index 234cde6dfeb..faed28aff04 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1 +1,2 @@
 DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B 
a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749
 SHA512 
51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636
+DIST freedoom-0.12.0.tar.gz 18409554 BLAKE2B 
01ae58c8edb12a8453f6026f09f45d54b19949d38f0668ddc6d4a6ee5fee4cc62c3926af0fb8e30e5f574b46ad1990fb20b57369821562851ae0cef0a6a5e5f1
 SHA512 
055cae8d16cc7ca2017eeabcaca9436da044def5f630ab46fb0c4cd7d36b9db3b416f9ddeb855e79f21f7c5337d25fb82625ac987712910daec448b49ef9c41e

diff --git a/games-fps/freedoom-data/freedoom-data-0.12.0.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.12.0.ebuild
new file mode 100644
index 000..078a867ebfa
--- /dev/null
+++ b/games-fps/freedoom-data/freedoom-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 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 ~arm ~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/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."
+}

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/files/ImageMagick/, games-fps/freedoom-data/files/, ...

2019-10-12 Thread James Le Cuirot 
commit: f9a6008926b726a48652c7b117718df18781eeb3
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct 12 14:27:53 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct 12 14:27:53 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9a60089

games-fps/freedoom-data: Drop old 0.11.3-r2

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/Manifest   |  1 -
 .../freedoom-data/files/ImageMagick/policy.xml |  4 --
 .../freedoom-data-0.11.3-Set-DOOMWADPATH.patch | 38 --
 .../freedoom-data/freedoom-data-0.11.3-r2.ebuild   | 61 --
 4 files changed, 104 deletions(-)

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index faed28aff04..e3e6ec23b70 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,2 +1 @@
-DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B 
a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749
 SHA512 
51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636
 DIST freedoom-0.12.0.tar.gz 18409554 BLAKE2B 
01ae58c8edb12a8453f6026f09f45d54b19949d38f0668ddc6d4a6ee5fee4cc62c3926af0fb8e30e5f574b46ad1990fb20b57369821562851ae0cef0a6a5e5f1
 SHA512 
055cae8d16cc7ca2017eeabcaca9436da044def5f630ab46fb0c4cd7d36b9db3b416f9ddeb855e79f21f7c5337d25fb82625ac987712910daec448b49ef9c41e

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 ffacb9209fb..000
--- a/games-fps/freedoom-data/files/ImageMagick/policy.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-  
-

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 0998cc45ebd..000
--- 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 
-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.11.3-r2.ebuild
deleted file mode 100644
index ca3b54b8b10..000
--- a/games-fps/freedoom-data/freedoom-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 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 ~arm ~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

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2019-09-15 Thread Mikle Kolyada 
commit: 58ec7e734272997fcb8e8c8eb069021def9f59de
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Sep 15 09:17:07 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Sep 15 09:17:07 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ec7e73

games-fps/freedoom-data: Add ~arm keyword wrt bug #687800

Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm"
Signed-off-by: Mikle Kolyada  gentoo.org>

 games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild
index 83aced1b3be..ca3b54b8b10 100644
--- a/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/freedoom/freedoom/archive/v${PV}.tar.gz -> freedoom-
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 
 BDEPEND="
$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP}]')

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/files/, games-fps/freedoom-data/

2019-09-07 Thread James Le Cuirot 
commit: 6e1214a616443a221efb504663087ee6976d02c1
Author: William Breathitt Gray  gmail  com>
AuthorDate: Fri Sep  6 07:42:00 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep  7 17:46:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e1214a6

games-fps/freedoom-data: Set DOOMWADPATH in freedoom launch script

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12871
Signed-off-by: James Le Cuirot  gentoo.org>

 .../freedoom-data-0.11.3-Set-DOOMWADPATH.patch | 38 ++
 .../freedoom-data/freedoom-data-0.11.3-r2.ebuild   | 61 ++
 2 files changed, 99 insertions(+)

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 000..0998cc45ebd
--- /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 
+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.11.3-r2.ebuild
new file mode 100644
index 000..83aced1b3be
--- /dev/null
+++ b/games-fps/freedoom-data/freedoom-data-0.11.3-r2.ebuild
@@ -0,0 +1,61 @@
+# 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 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}"
+
+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/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."
+}

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2019-09-07 Thread James Le Cuirot 
commit: 43b6559ae2be85af0299a23270d275752f9bd89c
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Sep  7 17:44:37 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Sep  7 17:46:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43b6559a

games-fps/freedoom-data: Drop old 0.11.3-r1

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: James Le Cuirot  gentoo.org>

 .../freedoom-data/freedoom-data-0.11.3-r1.ebuild   | 57 --
 1 file changed, 57 deletions(-)

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
deleted file mode 100644
index ed2ae707e1a..000
--- a/games-fps/freedoom-data/freedoom-data-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,57 +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 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."
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/, games-fps/freedoom-data/files/ImageMagick/

2019-09-05 Thread James Le Cuirot 
commit: 8912d4ab88d3aa1482bd2c55b765fa8065fa4e7e
Author: William Breathitt Gray  gmail  com>
AuthorDate: Fri Jul  5 14:02:53 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  5 20:08:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8912d4ab

games-fps/freedoom-data: Build from source

Closes: https://bugs.gentoo.org/687676
Package-Manager: Portage-2.3.68, Repoman-2.3.15
Signed-off-by: William Breathitt Gray  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12839
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/Manifest   |  1 +
 .../freedoom-data/files/ImageMagick/policy.xml |  4 ++
 .../freedoom-data/freedoom-data-0.11.3-r1.ebuild   | 57 ++
 3 files changed, 62 insertions(+)

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index d3ca3066e92..e879cf01883 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1 +1,2 @@
 DIST freedoom-0.11.3.zip 18889307 BLAKE2B 
052d7f58d1beb7947f4fff3021ec0229c9746bfb7970a52d23fa44fc881d8cf3c314b8ecf0dc400c2da4e28c623695874ae75dcd1e45933fdb1826ea04f0e24b
 SHA512 
c67fc69bca87cba2ba40b91f578724feaabbd6cd64c6845fa567d6901b7a9e3145185011731c677a71f7b5a6f8707855fb573c0c09b6d47fef83b1577b211816
+DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B 
a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749
 SHA512 
51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636

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 000..ffacb9209fb
--- /dev/null
+++ b/games-fps/freedoom-data/files/ImageMagick/policy.xml
@@ -0,0 +1,4 @@
+
+
+  
+

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 000..ed2ae707e1a
--- /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."
+}

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2019-09-05 Thread James Le Cuirot 
commit: 6ba86c22a70223f3d1a7909b9654e5b1d1de1d2e
Author: William Breathitt Gray  gmail  com>
AuthorDate: Sun Sep  1 03:35:35 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Sep  5 20:08:50 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ba86c22

games-fps/freedoom-data: Drop old

Now that we can build Freedoom from source, we no longer need to provide
the prebuilt WADs.

Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/Manifest   |  1 -
 .../freedoom-data/freedoom-data-0.11.3.ebuild  | 29 --
 2 files changed, 30 deletions(-)

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index e879cf01883..234cde6dfeb 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,2 +1 @@
-DIST freedoom-0.11.3.zip 18889307 BLAKE2B 
052d7f58d1beb7947f4fff3021ec0229c9746bfb7970a52d23fa44fc881d8cf3c314b8ecf0dc400c2da4e28c623695874ae75dcd1e45933fdb1826ea04f0e24b
 SHA512 
c67fc69bca87cba2ba40b91f578724feaabbd6cd64c6845fa567d6901b7a9e3145185011731c677a71f7b5a6f8707855fb573c0c09b6d47fef83b1577b211816
 DIST freedoom-0.11.3.tar.gz 17010131 BLAKE2B 
a0b601575da8516cf9f83466fe2146b708aa3cb21a3df2f7cbcd018a560f65b9b89c85907115050c4985b64eff29a3a9d2cfb7d31e93043e9d3c35fe7749d749
 SHA512 
51e0d5f7ca7c846c556fcba36b0f9c815090bfc76a80200aebd1526291da16b71145fbe254100cc5ad37ffc044d4380ef07b8bd4bdb811f00b9150e7b34dd636

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 5e38d534c7e..000
--- 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."
-}

[gentoo-commits] repo/gentoo:master commit in: games-fps/freedoom-data/

2019-06-18 Thread James Le Cuirot 
commit: 6d3f99b17a5f609a1ebc4330ab9cb7d9aef849b5
Author: William Breathitt Gray  gmail  com>
AuthorDate: Fri Jun 14 09:29:43 2019 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Tue Jun 18 21:20:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d3f99b1

games-fps/freedoom-data: New package

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: William Breathitt Gray  gmail.com>
Signed-off-by: James Le Cuirot  gentoo.org>

 games-fps/freedoom-data/Manifest   |  1 +
 .../freedoom-data/freedoom-data-0.11.3.ebuild  | 29 +++
 games-fps/freedoom-data/metadata.xml   | 42 ++
 3 files changed, 72 insertions(+)

diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
new file mode 100644
index 000..d3ca3066e92
--- /dev/null
+++ b/games-fps/freedoom-data/Manifest
@@ -0,0 +1 @@
+DIST freedoom-0.11.3.zip 18889307 BLAKE2B 
052d7f58d1beb7947f4fff3021ec0229c9746bfb7970a52d23fa44fc881d8cf3c314b8ecf0dc400c2da4e28c623695874ae75dcd1e45933fdb1826ea04f0e24b
 SHA512 
c67fc69bca87cba2ba40b91f578724feaabbd6cd64c6845fa567d6901b7a9e3145185011731c677a71f7b5a6f8707855fb573c0c09b6d47fef83b1577b211816

diff --git a/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild 
b/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild
new file mode 100644
index 000..5e38d534c7e
--- /dev/null
+++ b/games-fps/freedoom-data/freedoom-data-0.11.3.ebuild
@@ -0,0 +1,29 @@
+# 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-data/metadata.xml 
b/games-fps/freedoom-data/metadata.xml
new file mode 100644
index 000..08a722785b1
--- /dev/null
+++ b/games-fps/freedoom-data/metadata.xml
@@ -0,0 +1,42 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   The Freedoom project aims to create a complete free content 
first person
+   shooter game. But Freedoom by itself is just the raw material 
for a
+   game: it must be paired with a compatible game engine to be 
played.
+
+   id Software released the source code to their classic game, 
Doom, under
+   the GNU General Public License. This means that the program 
code that
+   powers Doom is free; Freedoom complements this with free levels,
+   artwork, sound effects and music to make a completely free game.
+
+   Phase 1 is the first part of the single-player game, containing 
four
+   chapters which are nine levels each, smoothly paced for beginner
+   players. It is compatible with mods for the original Doom and 
The
+   Ultimate Doom.
+
+   Phase 2 is the second major part of the single-player game, a 
massive
+   32-level chapter expanding upon the same concepts present in 
Phase 1, as
+   well as containing additional monsters and the double-barreled 
shotgun!
+   The levels in this game tend to demand more skillful play than 
the
+   previous chapters. It is compatible with mods for Doom II.
+   
+   
+   vilhelm.g...@gmail.com
+   William Breathitt Gray
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   ga...@gentoo.org
+   Gentoo Games Project
+   
+   
+   https://github.com/freedoom/freedoom/issues
+   https://freedoom.github.io
+   freedoom/freedoom
+   
+