gentoo resync : 25.11.2020

3 files changed, 39 insertions, 19 deletions

diff --git a/games-board/biloba/Manifest b/games-board/biloba/Manifest
index 1a5c751bd25e..71d996f1a69b 100644
--- a/games-board/biloba/Manifest
+++ b/games-board/biloba/Manifest
@@ -1,5 +1,6 @@
+AUX biloba-0.9.3-gcc-10.patch 656 BLAKE2B 04bc76ecbd5002c7d7848e303ea932fe254689afd7034457d98ab00606c4ba372720eec45ce60b9978887cc7b57b4d5c37e060f1da85db61944d4b383b2100a9 SHA512 5d47ff448cb56e02ed73500ce25dc03d904cf1855cceab924c4e02e2c92189a64063d1ae82eb275b8a94cf43af068649ae8412ca11050609503d1b6825267df1
 AUX biloba-0.9.3-no-X11-dep.patch 427 BLAKE2B 1aef6c3df05c53c01e4a4ec1f4064e2be21dabe847106da9c8f5d11483d14e5cdb904c8bc20a32b8b359d21ab0e2580dbb4713294576546a01cb996e9c1d4753 SHA512 21d4af601433eecca31f82926fb94791b4ef2193c3c16fadd210c9fdf0acdfdad562ac93b27811186d1736242e88638a2110e9264d0e2c54facd938bcece9a67
 AUX biloba-0.9.3-not-windows.patch 615 BLAKE2B d706e4624334e4e9137ddfb1a2f30bf878a4b7251ad7d3f1093725c1cb6ed24be06b3dd76d7b7191f6c35c5d463fc94725523f6512ba1d948d0ffa1f81d78a8a SHA512 21d6be2dcba0c12e11bf8e3d086c6e8c90e30eaebcd8a7d758eb64c343f60e90e8a332ae2b988950086d044554cdd2bfd5ea8fefade3494e529875199899a832
 DIST biloba-0.9.3.tar.gz 3162976 BLAKE2B 878e63d188066dbd07499bbfe9c3aaf5f5eb562729844ed648ff73e8eb5b2632faf3533b7a1133b1959cbe2b7d37a38995d453055d91597916d6d19169c7383a SHA512 8729299bb37e05b7c27e0d77d022228c385d3d3c475c77b9b8eb81a6df2c2513ea0055b52b65715922fd964e4bab875e3ab5bec58746095346bf0c96d0cf6bc5
-EBUILD biloba-0.9.3-r1.ebuild 999 BLAKE2B 4480e03225eac1910b5ec6ff58b7cd56d0dc07be9eff8539fc45777c4546eba9399f300ce02dea879c8639801050a5ff8513bd130e12aa7b93af52787a81740b SHA512 ae0e2abd3d3db7e4ff4b0414ca23e1abe9e78be7112015a11517b7a666ba6fd95d129b3b6b328b28149178004d02892b07791c859f26d93bb2326be5d9b71d22
+EBUILD biloba-0.9.3-r2.ebuild 889 BLAKE2B 812ca108f3b02a7af05510f69d970e5c99bc643e86977ccc6efb337839bf3570f2d490b68a0358540344c27272da844d5da19f7bbbe88cd47fbef3f3d5bd4de3 SHA512 ea4c65308b40024b5c5d6adc017189d239d1fff0483195882cf831f5208517ecb73cf909088873f19af6c63f8d44784f7122f1235b3d935597b8e10fa50e9b98
 MISC metadata.xml 329 BLAKE2B af2f4cc4fc9c266f2e2250e7068a1f86ba353f647058bc0e74339d24198ae5e302873d36cec6f2b05b13be04439c51eb4174c0a92e0fe6af66d5e81643a264ad SHA512 f182ec126a8585569dc2b3c285edc90a9d2b0656391c490f8f1d86b49b70a67e8b06e3f49e623961c3a350f380672664d93d2cab7bdd9d7f26184e3b7a7d555c
diff --git a/games-board/biloba/biloba-0.9.3-r1.ebuild b/games-board/biloba/biloba-0.9.3-r2.ebuild
index d002df044589..cadf7ee1e240 100644
--- a/games-board/biloba/biloba-0.9.3-r1.ebuild
+++ b/games-board/biloba/biloba-0.9.3-r2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils gnome2-utils
+EAPI=7
+
+inherit autotools desktop xdg
 
 DESCRIPTION="a board game, up to 4 players, with AI and network"
 HOMEPAGE="http://biloba.sourceforge.net/"
@@ -11,24 +12,24 @@ SRC_URI="mirror://sourceforge/biloba/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl:0[X,video,sound]
 	media-libs/sdl-image[png]
 	media-libs/sdl-mixer"
-RDEPEND=${DEPEND}
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	# X11 headers are checked but not used, everything is done through SDL
 	"${FILESDIR}"/${P}-not-windows.patch
 	"${FILESDIR}"/${P}-no-X11-dep.patch
+	"${FILESDIR}/${P}-gcc-10.patch"
 )
 
 src_prepare() {
 	default
 
 	# "missing" file is old, and warns about --run not being supported
-	rm -f missing
+	rm missing || die
 	eautoreconf
 }
 
@@ -37,15 +38,3 @@ src_install() {
 	newicon -s 64 biloba_icon.png ${PN}.png
 	make_desktop_entry biloba Biloba
 }
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-board/biloba/files/biloba-0.9.3-gcc-10.patch b/games-board/biloba/files/biloba-0.9.3-gcc-10.patch
new file mode 100644
index 000000000000..69d27f9aa7b6
--- /dev/null
+++ b/games-board/biloba/files/biloba-0.9.3-gcc-10.patch
@@ -0,0 +1,30 @@
+Description: Fix FTBFS with gcc 10
+Author: Ricardo Mones <mones@debian.org>
+Bug-Debian: https://bugs.debian.org/957039
+Last-Update: 2020-08-29
+
+diff --git a/src/utils.c b/src/utils.c
+index 73bbd05..c51365d 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -53,6 +53,7 @@
+ 
+ char *progpath = NULL;
+ char *langpath = NULL;
++SDL_Surface * screen;
+ 
+ /**
+  * Get an object's X coordinate as pixels
+diff --git a/src/utils.h b/src/utils.h
+index 9b0b155..2018969 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -87,7 +87,7 @@
+ extern char *progpath;
+ extern char *langpath;
+ 
+-SDL_Surface * screen;
++extern SDL_Surface * screen;
+ 
+ int get_x(int x);
+ int get_y(int y);