[gentoo-commits] repo/gentoo:master commit in: games-strategy/warmux/files/, games-strategy/warmux/

[Ionen Wolkens]

commit:     748756d8d10e901754d9d33a9a6104284ebd6c76
Author:     Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org>
AuthorDate: Mon Oct  4 20:52:18 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Oct  4 23:56:18 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=748756d8

games-strategy/warmux: fix build, deps, bump eapi

Remove nls USE flag, because it caused build failure when disabled,
because in that case it defines its own ngettext macro, which conflicts
with that function defined in libintl.h which is transitively included
anyway.

Closes: https://bugs.gentoo.org/739400
Closes: https://bugs.gentoo.org/796914
Closes: https://bugs.gentoo.org/631434
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/22489
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 .../warmux/files/warmux-11.04.1-clang.patch        | 13 ++++++++
 ...-11.04.1-r1.ebuild => warmux-11.04.1-r2.ebuild} | 37 +++++++++++++---------
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/games-strategy/warmux/files/warmux-11.04.1-clang.patch b/games-strategy/warmux/files/warmux-11.04.1-clang.patch
new file mode 100644
index 00000000000..eb4097bfe6f
--- /dev/null
+++ b/games-strategy/warmux/files/warmux-11.04.1-clang.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/739400
+
+--- a/src/map/tile.cpp
++++ b/src/map/tile.cpp
+@@ -673,7 +673,7 @@ Tile::SynchTileList Tile::GetTilesToSynch()
+     TileItem_NonEmpty *t = static_cast<TileItem_NonEmpty*>(item[i]);
+ 
+     if (t->NeedSynch()) {
+-      SynchTileInfo info = { i, t->GetSynchsum() };
++      SynchTileInfo info = { (uint16_t)i, t->GetSynchsum() };
+       list.push_back(info);
+     }
+   }

diff --git a/games-strategy/warmux/warmux-11.04.1-r1.ebuild b/games-strategy/warmux/warmux-11.04.1-r2.ebuild
similarity index 64%
rename from games-strategy/warmux/warmux-11.04.1-r1.ebuild
rename to games-strategy/warmux/warmux-11.04.1-r2.ebuild
index fd2b025c8fa..b387e9b15a2 100644
--- a/games-strategy/warmux/warmux-11.04.1-r1.ebuild
+++ b/games-strategy/warmux/warmux-11.04.1-r2.ebuild
@@ -1,36 +1,46 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools desktop
 
 DESCRIPTION="A free Worms clone"
-HOMEPAGE="http://gna.org/projects/warmux/"
-SRC_URI="http://download.gna.org/warmux/${P}.tar.bz2"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 S="${WORKDIR}"/${PN}-11.04
 
-LICENSE="GPL-2"
+LICENSE="
+	GPL-2+
+	|| ( Apache-2.0 GPL-3 )
+	UbuntuFontLicense-1.0
+	vlgothic
+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls unicode"
+IUSE="debug unicode"
 
 RDEPEND="
 	dev-libs/libxml2
+	media-libs/libpng:=
 	media-libs/libsdl[joystick,video,X]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-ttf
 	media-libs/sdl-net
-	media-libs/sdl-gfx
-	media-fonts/dejavu
+	media-libs/sdl-gfx:=
 	net-misc/curl
+	virtual/libintl
 	x11-libs/libX11
-	nls? ( virtual/libintl )
-	unicode? ( dev-libs/fribidi )"
+	unicode? ( dev-libs/fribidi )
+"
 DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+BDEPEND="
+	sys-devel/gettext
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-gentoo.patch
@@ -40,6 +50,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-stat.patch
 	"${FILESDIR}"/${P}-fix-c++14.patch
 	"${FILESDIR}"/${P}-respect-AR.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {
@@ -49,18 +60,14 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		--with-localedir-name="${EPREFIX}"/usr/share/locale \
-		--with-datadir-name="${EPREFIX}"/usr/share/${PN} \
-		--with-font-path="${EPREFIX}"/usr/share/fonts/dejavu/DejaVuSans.ttf \
+		--enable-nls \
 		$(use_enable debug) \
-		$(use_enable nls) \
 		$(use_enable unicode fribidi)
 }
 
 src_install() {
 	default
 
-	rm -f "${ED%/}"/usr/share/${PN}/font/DejaVuSans.ttf || die
 	doicon data/icon/warmux.svg
 	make_desktop_entry warmux Warmux
 }