gentoo resync : 17.06.2021

4 files changed, 84 insertions, 51 deletions

diff --git a/games-arcade/kajaani-kombat/Manifest b/games-arcade/kajaani-kombat/Manifest
index e4caaeab3c04..de047f54ec2b 100644
--- a/games-arcade/kajaani-kombat/Manifest
+++ b/games-arcade/kajaani-kombat/Manifest
@@ -1,5 +1,6 @@
 AUX 0.7-makefile.patch 551 BLAKE2B 4b301ca00a4643f00654e81f3a4396d43106bc2f0f5bbae98d71818a3559472607358a6dd9c2b77a9def3c7772df2ad6ae59e33529de368474b9c4a33a9fee77 SHA512 4d319affec25fe585c0f0af14ed872e71b155be2bab3aabbb72ad01b80395f44b35b13abc765390e19e070305339322598942fa1997463632ee07f4a160ba823
+AUX kajaani-kombat-0.7-gcc11.patch 778 BLAKE2B 95e3b7482729aa7cae0c58e795ebf72b6eb08970eea3151c8480eefbd6dcf7e2c13acccc83cf7737aa66b8652d801038a1f32d721a71cdfc80e4539fbbb4e162 SHA512 d55d1e88165ef35b97a29645e4cdf393c76bf93cebf12446e01578934cfbb7dc79672610469240d0e62562ce7ac8aa7646c0d47baccaa95de8870bfd9765c371
 AUX kajaani-kombat-0.7-ldflags.patch 440 BLAKE2B f63321ed06c0ed26cfe28a1a62650ce9b9b37b29898961fb08b58b5119b023c3335798e36130ad144569c2996e7c4f188caf9cadc3d4a37c01a3bb03bd39d11d SHA512 30a8e6293349a30f6dbcc469fb14377d9461df60227e01d18dfc267f254be62b7cee89bcb6df0b24ec5bcb9cb198701e5b9e0d465f699be4880432a0402b2c71
 DIST kajaani-kombat-0.7.tar.gz 1805504 BLAKE2B 664210a44e5dd5b27ca7b47ca9cb9445373d1243c01fcfb227251c6b48fb8b9e2ebd608eec2244f1b12f47bf5c886482bf70a0700538bbf415d93df41c34fcfe SHA512 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb
-EBUILD kajaani-kombat-0.7-r1.ebuild 929 BLAKE2B 932dbd1284f76c603448d7f8c29caad55684046d8b87f11f8b3c96600ad726d5a2ed1b86c15e53ff88f81b6f84745b7d36185dc7e48330a96abc36dc43a76514 SHA512 450fe189118c1181ec5ee9f3fca370bc7cebdcf026059ab60613c792e00924b8c74b6c84d22495e4500a411daf16d8a0a7025644aae0710e2a35216bd7131881
+EBUILD kajaani-kombat-0.7-r2.ebuild 998 BLAKE2B 98ab5fe720ddb1cc29ea11a53f673e8ebc4844a7f77236331ad891e184c2e9ceb37551f95e6b5feabe072e4787af260dbd920f86e209bbaecbdf8f4f1ae6172b SHA512 9e8c82324ba87c79a6a7cfe78a6d187214a5333451236e5b850830988efcbedf651f4d754531e8276738831920ea4b8000a29489d609c8a6efc9bb22f9c6e556
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch
new file mode 100644
index 000000000000..9a3968fcf83f
--- /dev/null
+++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch
@@ -0,0 +1,31 @@
+These SDL_* return NULL on error, and gcc11/clang won't allow this.
+https://bugs.gentoo.org/739086
+--- a/client_net.cpp
++++ b/client_net.cpp
+@@ -33,3 +33,3 @@
+   cond = SDL_CreateCond();
+-  if (cond <0)
++  if (!cond)
+     {
+@@ -39,3 +39,3 @@
+   mutex = SDL_CreateMutex();
+-  if (mutex < 0)
++  if (!mutex)
+     {
+@@ -47,3 +47,3 @@
+   trans_th = SDL_CreateThread (&client_tcpnet::transf_func, (void *) this);
+-  if (trans_th < 0)
++  if (!trans_th)
+     {
+@@ -53,3 +53,3 @@
+   input_th = SDL_CreateThread (&client_tcpnet::input_func, (void *) this);
+-  if (input_th < 0)
++  if (!input_th)
+     {
+--- a/game_server.cpp
++++ b/game_server.cpp
+@@ -66,3 +66,3 @@
+   con_th = SDL_CreateThread (&game_server::connection_accepter, (void *) this);
+-  if (con_th < 0)
++  if (!con_th)
+     {
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
deleted file mode 100644
index f61f69728cac..000000000000
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop toolchain-funcs
-
-DESCRIPTION="A rampart-like game set in space"
-HOMEPAGE="http://kombat.kajaani.net/"
-SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-net
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/ncurses:0
-	sys-libs/readline:0
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PV}-makefile.patch
-	"${FILESDIR}"/${P}-ldflags.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "s:GENTOODIR:/usr/share/${PN}/:" \
-		Makefile || die
-	sed -i \
-		-e 's/IMG_Load/img_load/' \
-		gui_screens.cpp || die
-
-	tc-export CXX
-}
-
-src_install() {
-	dobin kajaani-kombat
-	insinto "/usr/share/${PN}"
-	doins *.{png,ttf,ogg}
-	einstalldocs
-	doman kajaani-kombat.6
-}
diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
new file mode 100644
index 000000000000..6c34c9d2c9d8
--- /dev/null
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Rampart-like game set in space"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="BitstreamVera GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-net
+	media-libs/sdl-ttf
+	sys-libs/ncurses:=
+	sys-libs/readline:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-makefile.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-gcc11.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}/|" Makefile || die
+
+	tc-export CXX
+	append-cxxflags -std=c++14 #790743
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.6
+
+	insinto /usr/share/${PN}
+	doins *.{ogg,png,ttf}
+
+	make_desktop_entry ${PN} "Kajaani Kombat" applications-games
+
+	einstalldocs
+}