gentoo resync : 25.09.2021

12 files changed, 122 insertions, 78 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 5e1341f8a1a5..128ed484d462 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/amoebax/Manifest b/games-puzzle/amoebax/Manifest
index ff4a08c99127..71c2bd95da65 100644
--- a/games-puzzle/amoebax/Manifest
+++ b/games-puzzle/amoebax/Manifest
@@ -1,5 +1,6 @@
 AUX amoebax-0.2.1-aclocal.patch 1536 BLAKE2B bb83bfc7e254ca1f649a735121ba8f9bc71abe35c7c935083d50682ee7cbd77b6eeb5f87ac35b5235f46d5abf8b0a995796548401ed2b943b3acf374bd6e18d9 SHA512 f5f501b0bbe76902c65d404e7aebf830d84c329cf8d84ee5c769660bb4a30cbfbae9a0e16eb2697bd693de77ef38811ac52e68fe799add00b97292c2e79a2d27
+AUX amoebax-0.2.1-clang.patch 628 BLAKE2B d9f8f0430d1496d171a8f02d6f574633acd76f4dc452305e2ec860268b3228d2231ee057f9de946f94be59b8d58af79fe0c2c43205bc520dddd50f2ef2a5765e SHA512 2b8611f901da7fd23e6f8511883fae6e3c072fe5f68a6bde988185419781e534544e3f0d3b1cc9550e5901155eaad1939af43e31bbab0c9c0a66807d49021699
 AUX amoebax-0.2.1-compile.patch 227 BLAKE2B de56259f5d58fd3509b2fe2b6d51e7ecd3bdebee4196d03ca3529a24e10123f005529b6e0e9fb434a45c7a8caaaf8197ce9e730276bd3631ad5e3c1b47df2ffc SHA512 fe6b2b3b7d61f5548fc9959dce491e25cdf51313bc46141615e3ea5e96edff34084ac8294b0b8ddace6dc6a374a02cd173e3a4308cb9d56018535f62dfa6defe
 DIST amoebax-0.2.1.tar.bz2 10645579 BLAKE2B 0e8f5d5bb92dd20444bfcb735fdc28142bc359676e057471089b94a6df8a8b45cdecdb1462022909f025310fbc9da1946a50a4d716aa75e34ffc71b4fbc8cfbe SHA512 f8cd20cb35e2456487f55ebc89411ebd47b25cf549d35c36041a27e1d96ef30702151f303dbb457afbf8583f67c53143c30becdea00a26fddad20555e0c7d181
-EBUILD amoebax-0.2.1-r2.ebuild 940 BLAKE2B 0f35ed57c3ee00d4332bfb824ed17a2d1e52e5eb353b8e4f88c317ab4f758cf1510e12040f678c4680f63e796d040510cc30db93450091c87a20ddb619db948a SHA512 91fcaabdada0a4157f9732f00fe8c5c60de7c95676825cc2d239c021aff2e1ccdfe2c5b2661ac04a461b8a3c4fe4b22466394e9b29eacc7dedd3995495dcda79
+EBUILD amoebax-0.2.1-r2.ebuild 831 BLAKE2B 78bb10d93160888539154b8a887e5749c0f1946822bc850af7f7cb0553149db19db711289b257f0baf138ec32f075f4e7c22803c152518172a90881c04dd01f4 SHA512 9c1889f054ec6dd8e828823f1099ef81a4798c9089caa3047962a59704b0b1e25d4d575d15e833afb2cfb25a63e970b1168559551649858c6977450955282c21
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild b/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild
index a0b1fdd1e35a..8a53eb31d761 100644
--- a/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild
+++ b/games-puzzle/amoebax/amoebax-0.2.1-r2.ebuild
@@ -1,40 +1,40 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit autotools
 
-DESCRIPTION="A cute and addictive action-puzzle game, similar to tetris"
-HOMEPAGE="http://www.emma-soft.com/games/amoebax/"
-SRC_URI="http://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
+DESCRIPTION="Cute and addictive action-puzzle game, similar to tetris"
+HOMEPAGE="https://www.emma-soft.com/games/amoebax/"
+SRC_URI="https://www.emma-soft.com/games/amoebax/download/${P}.tar.bz2"
 
 LICENSE="Free-Art-1.2 GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,joystick,video]
+DEPEND="
+	media-libs/libsdl[sound,joystick,video]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer[vorbis]"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-aclocal.patch
+	"${FILESDIR}"/${P}-clang.patch
+	"${FILESDIR}"/${P}-compile.patch
+)
 
 src_prepare() {
 	default
 
-	eapply \
-		"${FILESDIR}"/${P}-aclocal.patch \
-		"${FILESDIR}"/${P}-compile.patch
-
 	sed -i \
-		-e "/^SUBDIRS/s:doc ::" \
+		-e "/^SUBDIRS/s|doc ||" \
 		Makefile.am || die
 	sed -i \
-		-e "/^iconsdir/s:=.*:=/usr/share/pixmaps:" \
-		-e "/^desktopdir/s:=.*:=/usr/share/applications:" \
-		data/Makefile.am || die
-	sed -i \
 		-e '/Encoding/d' \
 		-e '/Icon/s/.svg//' \
 		data/amoebax.desktop || die
+
 	AT_M4DIR=m4 eautoreconf
 }
diff --git a/games-puzzle/amoebax/files/amoebax-0.2.1-clang.patch b/games-puzzle/amoebax/files/amoebax-0.2.1-clang.patch
new file mode 100644
index 000000000000..b649640691bf
--- /dev/null
+++ b/games-puzzle/amoebax/files/amoebax-0.2.1-clang.patch
@@ -0,0 +1,14 @@
+Fixes building with clang:
+Gentoo-Bug: https://bugs.gentoo.org/739286
+
+--- a/src/NewHighScoreState.cxx
++++ b/src/NewHighScoreState.cxx
+@@ -396,7 +396,7 @@ NewHighScoreState::unicodeCharacterPress
+     // FIXME: We are only interessted with ASCII values.
+     if ( 0 == (code & 0xff80) )
+     {
+-        char character[2] = {toupper (static_cast<char>(code & 0x7f)), '\0'};
++        char character[2] = {static_cast<char>(toupper (static_cast<char>(code & 0x7f)), '\0')};
+         std::string::size_type characterPos =
+             m_CursorValues.find (std::string (character));
+         if ( std::string::npos != characterPos )
diff --git a/games-puzzle/hitori/Manifest b/games-puzzle/hitori/Manifest
index 244c1df4f586..4142125dd6ef 100644
--- a/games-puzzle/hitori/Manifest
+++ b/games-puzzle/hitori/Manifest
@@ -1,3 +1,5 @@
 DIST hitori-3.38.2.tar.xz 204992 BLAKE2B 271e7c7c09a0a9cf496783bf19cfc9bfb60a7a94b1addce704e0ee57b9a9d730e6fc96750dc2eb0e14cae2b0d5d8abc7474fe28029b94f0c7d195cdcbf7155da SHA512 6a094e7bf9b528b965819a28b64db0f7b6c474dbd1a54c3063ad2f20b726193a46b4b058566baea7dee889c3d692bd36bdf775a177e430b5772b16762bdc2785
+DIST hitori-3.38.3.tar.xz 205100 BLAKE2B 8b3e477f8a62911c8fa0b366f578adb7bc362445cf3982a131677988e6f7471a0f56a06fcd356ff19692debf27126e98d4f8c52524af3e6e7e22c3b43bb3276c SHA512 1ba966c22304a2538026234fbb9e0ae34a433643af02ecc26a6e5cd240efa89524ee0e98334d01728f25ec987865a8ff724036e37859503d2517e7480d2dc744
 EBUILD hitori-3.38.2.ebuild 702 BLAKE2B d364d02c8b4620dca37add6e275b21ba7a034ecc5fcac28708f4fb5b1d84c1c0223610e7dd5d0426b24165af774bae2b3c11d4eb45c4705f8918c45e5b52c4ce SHA512 3bbcb53f1e89a95ba4c7d19c8c3e2f2b5c3cef4dbf914e014c932dd2cc43b1cf4ffcf0ff9d59c68f3e6948b01249f15d108a2cef2e6e778ccfd38f463d57458d
+EBUILD hitori-3.38.3.ebuild 704 BLAKE2B b5fdb69ecc171dc02b99228f8de0675addfe5f272907383359e61214097891c8230b2ce567669423062e97cba42dc6a26be365882d78e555da9db883d2ead78e SHA512 f6dc91b81412d6d46a67591ef40b3f8cd8de44ea2aa9d42aff208753862d723d7763dab27c9589a867e1927ffdc8bcce29d770d08ec8bf5e2242566996f93061
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/games-puzzle/hitori/hitori-3.38.3.ebuild b/games-puzzle/hitori/hitori-3.38.3.ebuild
new file mode 100644
index 000000000000..dac7645c4182
--- /dev/null
+++ b/games-puzzle/hitori/hitori-3.38.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Logic puzzle game for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Hitori"
+
+LICENSE="GPL-3+ CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+# gtk+-3.22 for build-time optional gtk_show_uri_on_window usage
+RDEPEND="
+	>=dev-libs/glib-2.32:2
+	>=x11-libs/gtk+-3.22.0:3
+	>=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+	dev-libs/appstream-glib
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/games-puzzle/quadra/Manifest b/games-puzzle/quadra/Manifest
index 7ec5f369a003..8c0aada38fc9 100644
--- a/games-puzzle/quadra/Manifest
+++ b/games-puzzle/quadra/Manifest
@@ -1,4 +1,4 @@
-AUX quadra-1.2.0-format.patch 491 BLAKE2B 21341a7d0a6fa1556d9d79d3fa55f2cb1fc4cf6244dc8fbdc937acb9250bec258818ffd6644d1f40a5fc0db07e64555121f2d0ce5c9ef9ffeadf2da6ebe78412 SHA512 a0a05c3ced44a88d7766a0ef2053dce378df4e6cec74acc7d074a27bffc48d6c43977289e779bc526d730b9d5c8acc18c1cc46c865f3ea7de0a6226937a08ffe
-DIST quadra-1.2.0.tar.gz 5103875 BLAKE2B 7b0bce4e8be77de2e357cd14f60ebdbf3ef72f2262013954bca9a8d1a9a2833e00a0fe59f818b78603628999e7e1204c6974a5d9f74f4ea9bb288325d518744c SHA512 1c3e1020a584fa83595b7b183d5346f8e357ddef6b29c0b4a3797e2ace50c6e9ff14f132b8299ca582db739f4d699fa8ab94be93ef86e5a01389f958ce91e837
-EBUILD quadra-1.2.0-r1.ebuild 916 BLAKE2B 93ae5d77d1550e6093955fd293ee12ca3b794d8237ffe34d760e99192418a1e1a35c9a6e875be5d0e5810fb2592f5d1fbe04ccb1da4f394f5609bc176c3e1262 SHA512 0291db9fde214222cdea677e5a287c71d2186d7ee84579c7655a8c45acaaf4544f2cfd39d7372e1e9b29e0ff09ad1a2455095ef55ade8ce52d835528aa7e83cd
-MISC metadata.xml 330 BLAKE2B 799dbb0f33e86286293c94fa4869d686437e5de04fe4b3123db1f2a21ce649f2e2d6e869eaa339aed76ac5fe1c535c5673f47f50901da7be22c737b9aedb0d14 SHA512 aea863a0f9ad666c5a1058158e66a5ed2c365104a9afe9665b90550042ea202a3b76226b255aa36e8d9561d10b8dc8422363667437350ea71595fac92959994d
+AUX quadra-1.3.0-clang.patch 339 BLAKE2B 1afe7cbe54ddf043cefbe1ed7755006499dbf47a2e506165474b5a3b93f1a747e6dcf6dedfcc59c4ee81e51a872227754398dcb87bc836facae7eadce2f4a19d SHA512 2f9133f0a9996fd0e5e32fa3b79566f08963875b2d73501389074afe5832673c106244cd76ec4463a260f0fe0cef5daae569812de294f5b51d688de5116b372f
+DIST quadra-1.3.0.tar.gz 3399868 BLAKE2B a4d7cba4a499e86d80efc8df44a0cdc9bd482d88c135768e36ce9399c5bc2d62ae5211a7c60c1638ea8247633d016376bac4768281a8ca0dba698f6e13ed86c3 SHA512 4f1cf2ed56cb0b5bf4fa2f02e19d4cd733589a5abe121d52bb857af3e6360fd0be0799f87a38cc44aa3899e3f491ebd8d4101e99816255f05d98bbb2b7cc9297
+EBUILD quadra-1.3.0.ebuild 725 BLAKE2B 14b08f17376e57d80d2f77d3f8180049ba482c48ed43efa7d2a8e9304a8e17a46f932a53c965d5ab9f965995ed03cda7525a34ac73d8f8f228f5d9e15ba41e69 SHA512 94b9abf1c6991bc14dacc7923ae3cf2bb8d38528514a49b03a81c6bd7dd7508f35d141b9e2d05e7f7d364f68abb159634c04ff531c0d3a891e2eab1e7994ea5b
+MISC metadata.xml 388 BLAKE2B 28653556e2d130a8d2c6edfdb13a3cad65116d084f1d7cab07fea5def3728d789f6c4a042cfd696214272bdd3e3a61279ad982294a47be1f35ab3e13b553706d SHA512 bd8d7ac04aa3a837c6bd0bc2db4f532a7400a3aee6c338af15b40213acb291326a8c56cc5557db9042752d2c53d3cc46c14aa0a1ec6ecae29ab353172f14b8b2
diff --git a/games-puzzle/quadra/files/quadra-1.2.0-format.patch b/games-puzzle/quadra/files/quadra-1.2.0-format.patch
deleted file mode 100644
index ca56f5b4cc00..000000000000
--- a/games-puzzle/quadra/files/quadra-1.2.0-format.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/source/net_list.cpp.old	2015-12-08 21:41:16.782404098 +0100
-+++ b/source/net_list.cpp	2015-12-08 21:41:33.153114600 +0100
-@@ -693,7 +693,7 @@
- 				//Drawn at a total higher or equal to end_value: suspense!
- 				//  or maybe timer just elapsed and the game is drawn
- 				//  (still suspense! :))
--				sprintf(st, ST_GAMETIED);
-+				sprintf(st, "%s", ST_GAMETIED);
- 				message(-1, st);
- 				{ Sfx stmp(sons.levelup, 0, 0, -1, 18050); }
- 				{ Sfx stmp(sons.levelup, 0, 0, -1, 18100); }
diff --git a/games-puzzle/quadra/files/quadra-1.3.0-clang.patch b/games-puzzle/quadra/files/quadra-1.3.0-clang.patch
new file mode 100644
index 000000000000..07fda7ba02dd
--- /dev/null
+++ b/games-puzzle/quadra/files/quadra-1.3.0-clang.patch
@@ -0,0 +1,10 @@
+https://bugs.gentoo.org/730862
+--- a/source/update.cc
++++ b/source/update.cc
+@@ -87,4 +87,4 @@
+   buf.resize(0);
+-  buf.append("GET "UPDATE_PATH" HTTP/1.0\r\n");
+-  buf.append("Host: "UPDATE_HOST"\r\n");
++  buf.append("GET " UPDATE_PATH " HTTP/1.0\r\n");
++  buf.append("Host: " UPDATE_HOST "\r\n");
+   buf.append("Connection: close\r\n");
diff --git a/games-puzzle/quadra/metadata.xml b/games-puzzle/quadra/metadata.xml
index efa3557c2acc..9f1c6d74cd3a 100644
--- a/games-puzzle/quadra/metadata.xml
+++ b/games-puzzle/quadra/metadata.xml
@@ -7,5 +7,6 @@
 	</maintainer>
 	<upstream>
 		<remote-id type="google-code">quadra</remote-id>
+		<remote-id type="github">quadra-game/quadra</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild b/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
deleted file mode 100644
index c811bb17564e..000000000000
--- a/games-puzzle/quadra/quadra-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A tetris clone with multiplayer support"
-HOMEPAGE="https://github.com/quadra-game/quadra"
-SRC_URI="https://github.com/${PN}-game/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	x11-libs/libX11
-	x11-libs/libXpm
-	x11-libs/libXxf86vm
-	x11-libs/libXext
-	media-libs/libpng:0=
-	sys-libs/zlib
-"
-DEPEND="${RDEPEND}
-	sys-devel/bc
-	x11-base/xorg-proto
-"
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^libgamesdir:=/s:/games:/${PN}:" \
-		-e "/^datagamesdir:=/s:/games:/${PN}:" \
-		config/config.mk.in || die
-	eapply "${FILESDIR}"/${P}-format.patch
-}
-
-src_install() {
-	dobin ${PN}
-	insinto /usr/share/${PN}
-	doins ${PN}.res
-	doicon images/${PN}.xpm
-	make_desktop_entry ${PN} Quadra
-
-	HTML_DOCS="help/*" einstalldocs
-}
diff --git a/games-puzzle/quadra/quadra-1.3.0.ebuild b/games-puzzle/quadra/quadra-1.3.0.ebuild
new file mode 100644
index 000000000000..f06e6e9da9b9
--- /dev/null
+++ b/games-puzzle/quadra/quadra-1.3.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop
+
+DESCRIPTION="Tetris clone with multiplayer support"
+HOMEPAGE="https://github.com/quadra-game/quadra"
+SRC_URI="https://github.com/quadra-game/quadra/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-libs/boost:=
+	media-libs/libpng:=
+	media-libs/libsdl2[sound,video]
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e "/^datagamesdir/s|\/games|\/${PN}|" Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc NEWS.md
+	make_desktop_entry ${PN} ${PN^}
+}