gentoo resync : 08.10.2021

5 files changed, 40 insertions, 18 deletions

diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index fdbeef12a476..6de99b8fddaf 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/defcon-demo/files/defcon b/games-strategy/defcon-demo/files/defcon
index 6e9dd3b5307c..6e9dd3b5307c 100644..100755
--- a/games-strategy/defcon-demo/files/defcon
+++ b/games-strategy/defcon-demo/files/defcon
diff --git a/games-strategy/warmux/Manifest b/games-strategy/warmux/Manifest
index 578f8d748437..7dfa0efb3c62 100644
--- a/games-strategy/warmux/Manifest
+++ b/games-strategy/warmux/Manifest
@@ -1,4 +1,5 @@
 AUX warmux-11.04.1-action.patch 549 BLAKE2B d22e26bae34efd28729cbdb98e97365fb2e42de0bc8c464d2ccc9f2845a78d92716b8d432ae72deedd824938a5243aa3736baeccf7c12ec3cfba7c10573dd4d7 SHA512 c31ac142b43e593f4c7b9fff36a8dd0bb34b371a63935cf55627660d96eda8fe68af721254bd72a2168045a27b32a407df494eb6b216115a0bb0516478187ec9
+AUX warmux-11.04.1-clang.patch 398 BLAKE2B f5bda7f53c6d46f58049e70d95b107dc6d2c03de936e195c42204f4611088526957fa62e4e8f34270b0e0bf8dace89e137372cd6713e0801f7df9b2525e1efea SHA512 a0d39e7c9913f1532c9962e67a90f4172495f8ef0050aee4037c7e213b204aee77269d0af6faf0310220df3714bdb92cb66241810d5819949734b1e297d29b67
 AUX warmux-11.04.1-fix-c++14.patch 488 BLAKE2B 0f60ce6c6d4238ec9eaa06428b4ff251fca1bfb8e3d05cb5c57a9a5d9e229c0775b76fffe33704aa6d8b636959cffc4f529d19cd09065e5842ccfd89745207cd SHA512 c8c6d5d070e926f7ffd03766c95481c0db8b43a8a0f3fad301e7e7210013098696ad5af0c5ab8c70f0081711b6b50847d8873af0ea79315c4c45c760e915eb88
 AUX warmux-11.04.1-gcc47.patch 335 BLAKE2B cfa1e6b42a00a0683c06257bd9156a8a85eef3181ba385f3eb4a82f944259cd2db1b0b56bccf0f68b6b09505f6825e02394fc07c8cd76bd8772340eefa43bc65 SHA512 33e403ce0dd69ae782ca3696838bfaf8126520b92b3b813ac491559dafd429ae3379131965a49e2c7ca2955a384ce41989f89db611696f999edf41c4abdd1270
 AUX warmux-11.04.1-gentoo.patch 1543 BLAKE2B 23c3cb85c720c0df37ed274dfe824f94ffce3362528bf2967b790bb51d7d8ec5bbd803d019dd0d4a68bc757cbe82bf4ca4f03745ffb6c91cbe76e17c34ce9e8e SHA512 30e565a3b212a3b54c29267b29a43343d21a3fbadf2bc70552fb074b0f174f08cf66a6565f19de4f0187dbfe68e9124fda42a0cd85d592f1d596f217f5c3c4f9
@@ -6,5 +7,5 @@ AUX warmux-11.04.1-respect-AR.patch 261 BLAKE2B c50a7d8e50facda13e0af255ddc6e844
 AUX warmux-11.04.1-stat.patch 1746 BLAKE2B 886a8dc439e1546d823e27bbe2313aeff913d02f754abf4355221b99f504d8408ad1c652a3e61abd4fae10e832284f929c7d31767eca317174619f54eaf5f7db SHA512 f0af67d2109585e6cc02621a9ff249cfe5154783216d46d2c7641ec825a8e30d34767122d12ced8bfd916c3c966cadad49eeb43b44aa1954905950272c0c9902
 AUX warmux-11.04.1-zlib.patch 416 BLAKE2B a41b14d70de3c828368835825a240d8708b7d81cbd64fa0cc06540eee60e4f4bced5d7dd6566d4cec49e9e8ed2f2b03ec9578a334c7223d2b43e8c844f1b950a SHA512 09ccc426514cf96d07fc3b05b7f248b0b77d2e61991afe530cb61b9c5ebf5c9222d2d4716861beed95607653ca4c617c03f244a957c4c6369925bd531ab73d3c
 DIST warmux-11.04.1.tar.bz2 110083622 BLAKE2B 50d575986d780e9e1bde2740297e11d3e720afe8396106ff05cd6051ed57315b8cd94d946b85956981743455c1013c8da91e5db0874db1e226b13bd72b3516eb SHA512 99501ea186e091b55a6e45935de83440be02ae4fc12ee6def5ec24e213c829230b4f6017043be6afbc7188e442b0e1128cfd27c290fbe0e49b6597f927fd1e2d
-EBUILD warmux-11.04.1-r1.ebuild 1488 BLAKE2B f87c2c032e30cef1b8e86994a509f047c5fd571993371a90c7c3336157cba59f17020c0f70461d489a3a8cb1ce5647a88a756487c58e5ec6f0df75aae5ff9daa SHA512 ddd926521d1aaf4f775fa4cd9b0dd7ce921b3c52c2869644f55aac1f617477d9b202ffb16f63f03fa8e69c3383484613e07edff2913be1449da0f6b766aab817
+EBUILD warmux-11.04.1-r2.ebuild 1347 BLAKE2B 17e0f21220babcaf338c5fe9e0765f1845e1f402eefe8b99d0fe8dc88182ab58afb602029e73a72f2daef4035b7c110791c869f11dcf4d5fe462514d86d40c45 SHA512 38ed64b4eecdb5d2363a6a7232802bb2dabfa7ef11ee6504dabc796de2dbced4290783e7dfd3c2ba1ec747e7088d7d17bf7bb02214f8a0bf7e4ae96c286b6767
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
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 000000000000..eb4097bfe6f3
--- /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
index fd2b025c8fa8..b5b230f44614 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"
-S="${WORKDIR}"/${PN}-11.04
+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-gfx:=
 	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-ttf
 	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,27 +50,25 @@ PATCHES=(
 	"${FILESDIR}"/${P}-stat.patch
 	"${FILESDIR}"/${P}-fix-c++14.patch
 	"${FILESDIR}"/${P}-respect-AR.patch
+	"${FILESDIR}"/${P}-clang.patch
 )
 
 src_prepare() {
 	default
+
 	eautoreconf
 }
 
 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
 }