summaryrefslogtreecommitdiff
path: root/games-fps
diff options
context:
space:
mode:
Diffstat (limited to 'games-fps')
-rw-r--r--games-fps/Manifest.gzbin11888 -> 11873 bytes
-rw-r--r--games-fps/freedm-data/Manifest5
-rw-r--r--games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch43
-rw-r--r--games-fps/freedm-data/freedm-data-0.13.0.ebuild (renamed from games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild)28
-rw-r--r--games-fps/freedm/Manifest2
-rw-r--r--games-fps/freedm/freedm-0.13.0.ebuild (renamed from games-fps/freedm/freedm-0.12.1.ebuild)4
-rw-r--r--games-fps/freedoom-data/Manifest5
-rw-r--r--games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch43
-rw-r--r--games-fps/freedoom-data/freedoom-data-0.13.0.ebuild (renamed from games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild)28
-rw-r--r--games-fps/freedoom/Manifest2
-rw-r--r--games-fps/freedoom/freedoom-0.13.0.ebuild (renamed from games-fps/freedoom/freedoom-0.12.1.ebuild)4
11 files changed, 34 insertions, 130 deletions
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index a7b5857c0caa..a7b5c616a922 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
Binary files differ
diff --git a/games-fps/freedm-data/Manifest b/games-fps/freedm-data/Manifest
index 88a6fb39607b..a3f7779092a1 100644
--- a/games-fps/freedm-data/Manifest
+++ b/games-fps/freedm-data/Manifest
@@ -1,4 +1,3 @@
-AUX freedm-data-0.12.1-Python-PIL-10.0.0-support.patch 1888 BLAKE2B 0e1d81c95ebd4e8cdbe2ecc026b74f4367fc2f4c637bfc4927f5730007bbc65c441001bf64cb4161273da18af42587adcef30398c0b6a4981da7e2800505f8ac SHA512 9a01d013003d565300e34b270e630db18433bdd52d7f03bd03d9fc4da13e72fc56824b03db2fdf8e21b544444564d94ffedd3a51ab7419c97c6238ede19e548e
-DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedm-data-0.12.1-r1.ebuild 1172 BLAKE2B ae8bea0cd17d3bc85d25079a499fe05766e0baf5493a99e8642dfb8436254e6d16ad82ecf40954b60216cebeeb0d3f6a8336732282f60d4908510349f43608bf SHA512 efb6260b85ef022a01c168d1bee79de9bb9976cc082004b70e9868b2aca8f43be5db153d7bdc88d43aff761ccbbc24caf7539bbaeaf5da4fd446c3c423721679
+DIST freedoom-0.13.0.tar.gz 18520091 BLAKE2B c3ad97bab73b3275ae604f4fef7459b5688f1c5fc63336475c34b6c22a56118c3558ad9859ac80d7abc97426a48e5f2b92ac9e02def11f9f0f7f1a2ef76629a5 SHA512 70dd124eee028bbf9aad29b17603c2c4c23e5280219d84a9ffa95417b601cfda33ddf44b6aa991e60194120cfd37110c1c888a5f80d4028e9625377c21f8d7a4
+EBUILD freedm-data-0.13.0.ebuild 1147 BLAKE2B 0caa9240360567f2a732306bbd75d1f90586f0a487a5ca0536052bfb4c9a7bc6ea69d2ad8aafe9eac1cd6f45941d0b9f13ae062571633ca4a375f9b78a97785e SHA512 214e82187fd38dc39547ddd3f5b2314514f5a8c4e30f6f516b41c341a1ed953a308b82033172f163d27c948f244e6e3350c73a32a1d2ca056ca229f424fc5233
MISC metadata.xml 1243 BLAKE2B 41085268911792f092e1a7053c972d2bbed7b3566d1c2635489957e127b8a373f4b72c41b9f45a58b9ce5a77ed795df5ac9b867811ca5e1a2ae7e67a994d028e SHA512 96f16c08f7c79bbbfc3db3aba968d04df302b1ead7c0df59b31220996e2897135ccce06129927f1bd0a12f9f3a9800d6f70ee3a1baf87519bc2ebf8d4521804b
diff --git a/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch b/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch
deleted file mode 100644
index 9cc65812de85..000000000000
--- a/games-fps/freedm-data/files/freedm-data-0.12.1-Python-PIL-10.0.0-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-https://bugs.gentoo.org/909540
-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 <selliott512@gmail.com>
-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/freedm-data/freedm-data-0.12.1-r1.ebuild b/games-fps/freedm-data/freedm-data-0.13.0.ebuild
index c0ad383f8105..e661769184c9 100644
--- a/games-fps/freedm-data/freedm-data-0.12.1-r1.ebuild
+++ b/games-fps/freedm-data/freedm-data-0.13.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
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"
+S="${WORKDIR}/freedoom-${PV}"
LICENSE="BSD"
SLOT="0"
@@ -18,23 +19,18 @@ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
BDEPEND="
$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
app-text/asciidoc
- games-util/deutex[png]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch
-)
-
-S="${WORKDIR}/freedoom-${PV}"
+ dev-util/source-highlight
+ games-util/deutex[png]
+"
-DOOMWADPATH=share/doom
+DOOMWADPATH="share/doom"
python_check_deps() {
- has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
+ python_has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
}
src_prepare() {
- xdg_src_prepare
-
+ default
hprefixify dist/freedoom
}
@@ -50,11 +46,11 @@ src_install() {
bindir="bin/" \
docdir="share/doc/${PF}" \
mandir="share/man/" \
- waddir="${DOOMWADPATH}/"
+ waddir="${DOOMWADPATH}/" \
+ MANUAL_PDF_FILES=
}
pkg_postinst() {
xdg_pkg_postinst
-
elog "FreeDM WAD file installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
}
diff --git a/games-fps/freedm/Manifest b/games-fps/freedm/Manifest
index 3bcaadc19f89..bc94c4f96224 100644
--- a/games-fps/freedm/Manifest
+++ b/games-fps/freedm/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedm-0.12.1.ebuild 577 BLAKE2B f45bf4d3f43661fd6815df7375e64550ea4107c1979ac68b411f6ad4e41f3004b0db162c1527915fbc738a6185d89ddab0e8c9b6dba1faab14e129c2e6e03811 SHA512 700a349b962818af2f63e65763c082aff771d89909d2e2709dd1df4f3e64ab483cfd98105e39f0e20e15faef45b270dd22dfb049eca59d4630a2d9162dd18464
+EBUILD freedm-0.13.0.ebuild 577 BLAKE2B 17e90cb3a620f88f6e81b53f4e2f84d819111545136ed3170b0ad41c6a065255092b497848f2ac17dab974252225d2d4dcdb23fad86fa1579293409247e94f1a SHA512 1c7f62bece037a985c5d416a683e4ed52049bc610599d981d1108700717d35d565673f78536e7e21f8a93016d8a859c731735c03c6062e21a9c7b02a3c6d7981
MISC metadata.xml 1243 BLAKE2B 41085268911792f092e1a7053c972d2bbed7b3566d1c2635489957e127b8a373f4b72c41b9f45a58b9ce5a77ed795df5ac9b867811ca5e1a2ae7e67a994d028e SHA512 96f16c08f7c79bbbfc3db3aba968d04df302b1ead7c0df59b31220996e2897135ccce06129927f1bd0a12f9f3a9800d6f70ee3a1baf87519bc2ebf8d4521804b
diff --git a/games-fps/freedm/freedm-0.12.1.ebuild b/games-fps/freedm/freedm-0.13.0.ebuild
index 5736e33f77a3..7563ce92d612 100644
--- a/games-fps/freedm/freedm-0.12.1.ebuild
+++ b/games-fps/freedm/freedm-0.13.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="A 32-level game designed for competitive deathmatch play"
HOMEPAGE="https://freedoom.github.io"
diff --git a/games-fps/freedoom-data/Manifest b/games-fps/freedoom-data/Manifest
index 96abb5521a7a..780fa3c99195 100644
--- a/games-fps/freedoom-data/Manifest
+++ b/games-fps/freedoom-data/Manifest
@@ -1,4 +1,3 @@
-AUX freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch 1888 BLAKE2B f3efc96d1be891441c6c2cfe62d61e479690730b37f6141bf8e93eab3433259850f0d6a9edff3737755a0d4f61a32ff0b09067cb83eee1892367db3212b66c5a SHA512 18dfd974d010e0c773ec999dc10739c0300eb768d3e92cad8a9e601341970163f7316d3c319758b60ae98fc8273879b731635a694f2eb60927fd338e28412c8d
-DIST freedoom-0.12.1.tar.gz 18405081 BLAKE2B a508d9ce924ff10640d6017302864869efff474c89fe20a866082b565a1ce65182483a5a692c9ce3329b81472ae9e4fee4ac2511670ecb5dd06ccf81930ac70d SHA512 7db65b039ce98593a86a19b46efe629b85a339c4c020750c3abb95d226fca484c63686ab8c88ecc1e16e86a6aca3b8c7952d85103e0f3db07cc7204fa528daf2
-EBUILD freedoom-data-0.12.1-r1.ebuild 1211 BLAKE2B 056d0d186d98eebe1f709d34e545f1358aceb260bb287428cc4a9795fcf498c7fa4a748071dcd6930e12062b53bcd266c120cc1501cd19260bd4166134a4eaab SHA512 a8383f2245ef1f61e3380552333f9c6396fe8cfa1848c0de95512666b04379db801477cc558423be4ce6e8ebaa760cdb90c1e9045f8745ec7a28b4adf9bdeaf6
+DIST freedoom-0.13.0.tar.gz 18520091 BLAKE2B c3ad97bab73b3275ae604f4fef7459b5688f1c5fc63336475c34b6c22a56118c3558ad9859ac80d7abc97426a48e5f2b92ac9e02def11f9f0f7f1a2ef76629a5 SHA512 70dd124eee028bbf9aad29b17603c2c4c23e5280219d84a9ffa95417b601cfda33ddf44b6aa991e60194120cfd37110c1c888a5f80d4028e9625377c21f8d7a4
+EBUILD freedoom-data-0.13.0.ebuild 1186 BLAKE2B 3d8030c866e317f677c803ace8aa9e111f4790b830a458d1527b8bdba5c626da2f20e652cb5286799d7591beeb997529fb1afc8cf01bb9271c2231ce15c9a5b0 SHA512 7c4aa55e6b8d9fd5f7abf25482ed88775cf0ac8fa6bf0650adab3d991934fceff1b4ff8173d32cfbe512888dbd0c595b730905f97d33207253a32cf62c023cb0
MISC metadata.xml 1572 BLAKE2B 67207b719514bd8f3cde685241f39dcf7b8886b92e1d35f420a7bbec1a2d91b408d804624962dd5e9ace975048fc6861e9628ab61ea87ed222ae011a1cf39eed SHA512 9d40972f665b474befcedafd1403c59904c9f1f1eb6f9578f6a90171117b37db3ea40811ecab7b77bacdcf07efb5834ad07758a60bf69f3661b90d114c7ac7a2
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
deleted file mode 100644
index 333bff6d2598..000000000000
--- a/games-fps/freedoom-data/files/freedoom-data-0.12.1-Python-PIL-10.0.0-support.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-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 <selliott512@gmail.com>
-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.13.0.ebuild
index 14d73d3f3fd6..4c8ee0d2cecf 100644
--- a/games-fps/freedoom-data/freedoom-data-0.12.1-r1.ebuild
+++ b/games-fps/freedoom-data/freedoom-data-0.13.0.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-PYTHON_COMPAT=( python3_{10..12} )
+PYTHON_COMPAT=( python3_{10..13} )
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"
+S="${WORKDIR}/freedoom-${PV}"
LICENSE="BSD"
SLOT="0"
@@ -18,23 +19,18 @@ KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
BDEPEND="
$(python_gen_any_dep 'dev-python/pillow[${PYTHON_USEDEP},zlib]')
app-text/asciidoc
- games-util/deutex[png]"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.12.1-Python-PIL-10.0.0-support.patch
-)
-
-S="${WORKDIR}/freedoom-${PV}"
+ dev-util/source-highlight
+ games-util/deutex[png]
+"
-DOOMWADPATH=share/doom
+DOOMWADPATH="share/doom"
python_check_deps() {
- has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
+ python_has_version -b "dev-python/pillow[${PYTHON_USEDEP},zlib]"
}
src_prepare() {
- xdg_src_prepare
-
+ default
hprefixify dist/freedoom
}
@@ -50,11 +46,11 @@ src_install() {
bindir="bin/" \
docdir="share/doc/${PF}" \
mandir="share/man/" \
- waddir="${DOOMWADPATH}/"
+ waddir="${DOOMWADPATH}/" \
+ MANUAL_PDF_FILES=
}
pkg_postinst() {
xdg_pkg_postinst
-
elog "Freedoom WAD files installed into ${EPREFIX}/usr/${DOOMWADPATH} directory."
}
diff --git a/games-fps/freedoom/Manifest b/games-fps/freedoom/Manifest
index 6f8c0e355e3d..b1b0a5d82bcc 100644
--- a/games-fps/freedoom/Manifest
+++ b/games-fps/freedoom/Manifest
@@ -1,2 +1,2 @@
-EBUILD freedoom-0.12.1.ebuild 612 BLAKE2B f367b34c2bf620e8ed42cfad2d0b077727928b7727eb31ef1bbf6c9aa3dabf31384a0c283cc9d1201bdde86c3371f68ef1a775c3f8080d12985298fc3b1720a4 SHA512 2ba03818e3c4a484787287bb56eee532a814aac0119f17d07241cac5a42f84479f2c2c6087b52de4f36922060a50c4ec9f81ca9afd7aed0bee046a3855598986
+EBUILD freedoom-0.13.0.ebuild 612 BLAKE2B 6310799143189b1467f4774baff523994d6a68dbd6cb32dcc9b97b36975f3d8f0e7dec574fc99f073fa6d82649a1feb310ecf7b2f7449f4abaafb0193bd6200e SHA512 41537b4d65929195afd699ad435f99986d2aa03b19a80f8070fc54478bfcc995d15aa2f32954f9cdea3680720ef34f723f5282b61e5b9de17cfeff307fb50050
MISC metadata.xml 1572 BLAKE2B 67207b719514bd8f3cde685241f39dcf7b8886b92e1d35f420a7bbec1a2d91b408d804624962dd5e9ace975048fc6861e9628ab61ea87ed222ae011a1cf39eed SHA512 9d40972f665b474befcedafd1403c59904c9f1f1eb6f9578f6a90171117b37db3ea40811ecab7b77bacdcf07efb5834ad07758a60bf69f3661b90d114c7ac7a2
diff --git a/games-fps/freedoom/freedoom-0.12.1.ebuild b/games-fps/freedoom/freedoom-0.13.0.ebuild
index b7bd5cd1f59e..96dfe8ad3945 100644
--- a/games-fps/freedoom/freedoom-0.12.1.ebuild
+++ b/games-fps/freedoom/freedoom-0.13.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
DESCRIPTION="A complete free-content single-player focused game based on the Doom engine"
HOMEPAGE="https://freedoom.github.io"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-07 12:43:57 +0000