[gentoo-commits] repo/gentoo:master commit in: games-rpg/xu4/

[Sam James]

commit:     00d2214015bff5efde48539aafe99955c4a0cc2e
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 29 10:28:45 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 29 10:32:12 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d22140

games-rpg/xu4: drop patch for newer zlib

See 491bf8bd3ef621da49b168736a04f23aa4c7719c. Could do ifndef in patch
but I'd like to remove all of these eventually and there's only a handful.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-rpg/xu4/xu4-0.9-r1.ebuild | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/games-rpg/xu4/xu4-0.9-r1.ebuild b/games-rpg/xu4/xu4-0.9-r1.ebuild
index 744dd0e7d8cd..c0e6e3552f38 100644
--- a/games-rpg/xu4/xu4-0.9-r1.ebuild
+++ b/games-rpg/xu4/xu4-0.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -22,6 +22,12 @@ DEPEND="${RDEPEND}
 
 S=${WORKDIR}/u4
 
+PATCHES=(
+       "${FILESDIR}/${P}-ldflags.patch"
+       "${FILESDIR}/${PV}-savegame.patch"
+       "${FILESDIR}/${P}-warnings.patch"
+)
+
 src_unpack() {
        # xu4 will read the data files right out of the zip files
        # but we want the docs from the original.
@@ -34,12 +40,6 @@ src_unpack() {
        unzip -q ../ultima4.zip || die
 }
 
-PATCHES=(
-       "${FILESDIR}/${P}-ldflags.patch"
-       "${FILESDIR}/${PV}-savegame.patch"
-       "${FILESDIR}/${P}-warnings.patch"
-       "${FILESDIR}/${P}-zip.patch"
-)
 src_prepare() {
        default
 
@@ -49,6 +49,8 @@ src_prepare() {
        sed -i \
                -e 's:-Wall:$(E_CFLAGS):' src/Makefile \
                || die
+
+       has_version "<sys-libs/zlib-1.3" && eapply "${FILESDIR}/${P}-zip.patch"
 }
 
 src_compile() {