gentoo resync : 03.07.2021

3 files changed, 28 insertions, 13 deletions

diff --git a/games-board/hexxagon/Manifest b/games-board/hexxagon/Manifest
index 9e8b1c3c4b16..d008f2a1da12 100644
--- a/games-board/hexxagon/Manifest
+++ b/games-board/hexxagon/Manifest
@@ -1,3 +1,4 @@
+AUX hexxagon-1.0.2-glibc-2.31.patch 352 BLAKE2B 0c18ce84d481d0b2662980f9dbf388ec3dfc6ffebff0fab3c43a986dc016d6b44f069ef37856411437db41977247efa6de780a36f55e199e7215b529b1cfc67c SHA512 8d6f690c612c10a07439833583f5fd58051e302c3027c2fb3022e6660358d68fab223b494a5e25a092aa600bfc08421b2e0749bf8e98fb9463ea3761815a7e5e
 DIST hexxagon-1.0.2.tar.bz2 1286713 BLAKE2B f6c3a7d0c0b2cd87ec896ebf6c1783561ae9a94a63c678463d2c5912a3bf380f682f136f258591051d00281fe2a92ba6add6477f50ce310b94529b9e4ca0e3e6 SHA512 8723534c4d260b1bac943609ca91ff224a120ad1f6e6362b1c515766f9ad3b339bbb9b0374cd71a482e127c47f6e1742b5189662f22e8eec07978417f5a6bda2
-EBUILD hexxagon-1.0.2-r1.ebuild 627 BLAKE2B 3aaa789aa413e34ed74b2628c0ae7dda1db75fc568733a764d907a54b13bf8555746c582cd331d7c64e7ea2effb1cf3a4584b441b93bb5a868c1e9f5f39940c7 SHA512 1065bac8ac77086f68edb9d7c5a83717eedc017c4040b1ee847ab067685585c864ab26c139200309d68d35aa5be0847bd29ad97641137ae18dc63fc6be139f76
+EBUILD hexxagon-1.0.2-r1.ebuild 637 BLAKE2B 51536371176de1f1b17f6286f0347a352ba4a9cbd5dcdaeb8d1d2fcf8289f5628d761a4ba07bb22f79be745692c3d377f5b7203e96376ef360aecbfc62b403fd SHA512 8b379a985422b30800c6bf87cef3225ca727a1282b0aa57b0b45ab7b33304d81e41ebcd77b32cf1873b0b5ff3077f9dfedd7a48f5a8d6fc36065772949f2ada5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-board/hexxagon/files/hexxagon-1.0.2-glibc-2.31.patch b/games-board/hexxagon/files/hexxagon-1.0.2-glibc-2.31.patch
new file mode 100644
index 000000000000..037228067c90
--- /dev/null
+++ b/games-board/hexxagon/files/hexxagon-1.0.2-glibc-2.31.patch
@@ -0,0 +1,11 @@
+glibc-2.31 removed timezone support and it conflicts with the re-declaration.
+https://bugs.gentoo.org/710712
+--- a/src/gui/microtime.h
++++ b/src/gui/microtime.h
+@@ -24,6 +24,4 @@
+ #include <time.h>
+ 
+-int gettimeofday(struct timeval *tv, struct timezone *tz);
+-int settimeofday(const struct timeval *tv , const struct timezone *tz);
+ 
+ class MicroTime
diff --git a/games-board/hexxagon/hexxagon-1.0.2-r1.ebuild b/games-board/hexxagon/hexxagon-1.0.2-r1.ebuild
index 467bf1e50f50..6ec2c8059c34 100644
--- a/games-board/hexxagon/hexxagon-1.0.2-r1.ebuild
+++ b/games-board/hexxagon/hexxagon-1.0.2-r1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit eutils flag-o-matic
+EAPI=8
+
+inherit desktop toolchain-funcs
 
 DESCRIPTION="Clone of the original DOS game"
 HOMEPAGE="https://www.nesqi.se/"
@@ -11,23 +12,25 @@ SRC_URI="https://www.nesqi.se/download/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-RDEPEND="dev-cpp/glibmm:2
+RDEPEND="
+	dev-cpp/glibmm:2
 	dev-cpp/gtkmm:2.4
 	x11-libs/gtk+:2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-src_prepare() {
-	default
+PATCHES=(
+	"${FILESDIR}"/${P}-glibc-2.31.patch
+)
 
-	append-cxxflags -std=c++11
+src_compile() {
+	emake AR="$(tc-getAR)"
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
+	default
+
 	newicon images/board_N_2.xpm ${PN}.xpm
 	make_desktop_entry ${PN} Hexxagon
-	dodoc README
 }