gentoo resync : 16.09.2020

4 files changed, 58 insertions, 91 deletions

diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 4be260e1046a..97133be8ef70 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,5 +1,4 @@
-DIST freedroidRPG-0.16.tar.gz 225570013 BLAKE2B ad87ad3d368c94eb1f3dae2d4c3df97b9bc88acccbec4cbcd31e42b411bb96506faac23f8de9b0317a1ab926b34bd01196adce617ab7b731354049d3fb010643 SHA512 039ee4bfcd58e29a3cfa26ae7f2bc8aed7c289119476bb8f8486006910cf6a2127ba49f7526fac887392ca9e5320fb1a59ba068834e162348905423908b0755a
+AUX freedroidrpg-1.0_rc2-fnocommon.patch 2064 BLAKE2B a806eb258ef31ddc2381390cb374390a9fcf6eeac7ebb04058253b08cf4b842a7f089ff06c15a8781a0c21a968ad6637007144a5c279e46496851b38ac3396ec SHA512 3263e2d10fa77ad17631ef1ab775deb73d6c545bdcc805797f0fbd6d167ac68115d09fa5fdde7fdb649e1cab80add74b4a970a864975b1453b32ba1620d4d440
 DIST freedroidRPG-1.0rc2.tar.gz 233852127 BLAKE2B c87c2314d17037873acf4fc24ce20790c9ec40c8f7b1ea27e6ab9c543abb671bc50b3ff5b86900f7111d1f1a899213dcb90529d2e39918801c9cc3a42585f02e SHA512 a79afdb089691dd59b0128f34f7068c69fac8c057a0485bca3275f4914b1c9c0f21cbb9102ecdc99911b70456c078dbdeb8981fd7714836cd9535677bcc4d1e7
-EBUILD freedroidrpg-0.16-r1.ebuild 1781 BLAKE2B 4ab53881ba87e23fd60353a9f303eb321ca9cfddec398c5e43dd1c51d4939803c0ce60491389c62304efa7159ce2c7452d25de27241a9131275425741c8a255b SHA512 2f4df51a1208eb76f03d830d671f8433bdb2a0c03ed99c06fb1af4e1be8e6e4c09dd566f7bf6faddf6dbf81c1c6c20e80087fbd7cd2e3fe51fbacb0d02fa90ec
-EBUILD freedroidrpg-1.0_rc2.ebuild 2301 BLAKE2B 1bcd27bf1f811a94ba6bf2eea42b89db5e61e18b01107e10958c96b4376359e544704441cb02bec9f919a268bd32a782cd37a927d2317bd525836e2b31d8a873 SHA512 211883a6e5f0aeae2b2be0bd433e57f96c371440b12d95faa989d8279de3fb9304b5837746fd5e062b85cef96a9d0b2a3942833cecc67ee7b4fe8ab9f1ca32eb
+EBUILD freedroidrpg-1.0_rc2.ebuild 2365 BLAKE2B 6e69fb94902c2f15d79792e8d76632ff2bd68cfacfc3e679a77145407479495d47039b097a201faa7dc1570c1cddb28c310dae6ab4608c431bbf45ac8ec03f7a SHA512 03e741bf2ca11dbcc6da6e1828456a5100a0dda8474cfaa85f917493ac230214e959491532ca8d8beefd2ddc8d3b7e844d7285c650ef4c2eefd5603541e521fc
 MISC metadata.xml 1683 BLAKE2B ec2dd3f95adac5207c2c267c676487a9bce23014ae2fe5aec5c8ac29c06e943d61ebc9889a863e2045bfb9c31c871c77030567ef6759b8280f277718525bee8d SHA512 a65fc6904f206288a06e67956c56c7ff0d80ccd8bd634e6c085bbd8ed88977bec5ae5984b0e02acd1c89b403ab8bc211d697140d6f3d00a9205c1db37c2d5346
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch b/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
new file mode 100644
index 000000000000..fd8bc4f9293c
--- /dev/null
+++ b/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
@@ -0,0 +1,49 @@
+Fixes build. https://bugs.gentoo.org/706930#c8
+
+--- freedroidrpg-1.0RC2/src/global.h	2019-03-30 23:20:31.000000000 +1000
++++ freedroidrpg-1.0RC2/src/global.h	2020-06-21 20:51:01.566218463 +1000
+@@ -36,7 +36,6 @@ 
+ #define INTERN_FOR _main_c
+ #include "extint_macros.h"
+ 
+-EXTERN float FPSover1;
+ EXTERN char *AllSkillTexts[];
+ EXTERN char font_switchto_red[];
+ EXTERN char font_switchto_blue[];
+--- freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h	2019-03-30 23:20:31.000000000 +1000
++++ freedroidrpg-1.0RC2/src/lvledit/lvledit_tools.h	2020-06-21 20:41:58.424710693 +1000
+@@ -36,7 +36,7 @@ 
+ 
+ void leveleditor_init_tools(void);
+ 
+-struct leveleditor_tool tool_place, tool_move, tool_select;
++EXTERN struct leveleditor_tool tool_place, tool_move, tool_select;
+ 
+ #define EVENT_LEFT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 1))
+ #define EVENT_RIGHT_PRESS(e) (((e) && e->type == SDL_MOUSEBUTTONDOWN) && (e->button.button == 3))
+--- freedroidrpg-1.0RC2/src/mapgen/mapgen.h	2019-03-30 23:20:31.000000000 +1000
++++ freedroidrpg-1.0RC2/src/mapgen/mapgen.h	2020-06-21 20:43:53.255723534 +1000
+@@ -64,9 +64,9 @@ 
+ extern int total_rooms;
+ 
+ // Interface to the game
+-void (*dungeonmap_convert) (int, int, unsigned char *);
+-void (*dungeonmap_place_enemies) (struct roominfo *);
+-void (*dungeonmap_gift) (struct roominfo *);
++extern void (*dungeonmap_convert) (int, int, unsigned char *);
++extern void (*dungeonmap_place_enemies) (struct roominfo *);
++extern void (*dungeonmap_gift) (struct roominfo *);
+ 
+ int generate_dungeon_gram(int, int);
+ 
+--- freedroidrpg-1.0RC2/src/struct.h	2019-05-13 01:03:36.000000000 +1000
++++ freedroidrpg-1.0RC2/src/struct.h	2020-06-21 20:38:22.189812908 +1000
+@@ -1063,7 +1063,7 @@ 
+ 	struct tux_part_instances default_instances;    // Default part instances
+ 	tux_part_render_motionclass *render_order;      // The render_sets of each motion class
+ 	int gun_muzzle_height;							// Vertical offset to apply to bullets
+-} tux_rendering;
++};
+ 
+ /**
+  * Contains a set of Tux's parts images for a motion class.
diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild
deleted file mode 100644
index cdde16dcc8f2..000000000000
--- a/games-rpg/freedroidrpg/freedroidrpg-0.16-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils gnome2-utils python-any-r1
-
-DESCRIPTION="A modification of the classical Freedroid engine into an RPG"
-HOMEPAGE="http://freedroid.sourceforge.net/"
-SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-${PV}//freedroidRPG-${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls opengl sound"
-
-RDEPEND="
-	virtual/jpeg:0
-	media-libs/libpng:0
-	media-libs/libsdl[opengl?,sound?,video]
-	>=media-libs/sdl-gfx-2.0.21
-	media-libs/sdl-image[jpeg,png]
-	nls? ( virtual/libintl )
-	opengl? ( virtual/opengl )
-	sound? (
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/sdl-mixer[vorbis] )
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^dist_doc_DATA/d' \
-		-e '/-pipe/d' \
-		-e '/^SUBDIRS/s/pkgs//' \
-		Makefile.am || die
-	python_fix_shebang src sound
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-fastmath \
-		--with-embedded-lua \
-		--localedir=/usr/share/locale \
-		$(use_enable nls) \
-		$(use_enable opengl) \
-		$(use_enable sound)
-}
-
-src_install() {
-	local i
-
-	default
-	for i in 48 64 96 128
-	do
-		doicon -s ${i} pkgs/freedesktop/icons/hicolor/${i}x${i}/apps/freedroidRPG.png
-	done
-	doicon -s scalable pkgs/freedesktop/icons/hicolor/scalable/apps/freedroidRPG.svg
-	make_desktop_entry freedroidRPG "Freedroid RPG" freedroidRPG
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	echo
-	ewarn "${P} is not compatible with old save games."
-	ewarn "Please start a new character."
-	echo
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
index a78a6e421625..e132d4f54ac7 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit autotools flag-o-matic desktop python-any-r1 xdg
 
 MY_PV=$(ver_rs 2 '')
@@ -37,6 +38,10 @@ BDEPEND="
 
 S="${WORKDIR}/${PN}-${MY_PV^^}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-fnocommon.patch"
+)
+
 src_prepare() {
 	default
 
@@ -56,7 +61,7 @@ src_configure() {
 	local myconf=(
 		--disable-fastmath
 		--with-embedded-lua
-		--localedir=/usr/share/locale
+		--localedir="${EPREFIX}/usr/share/locale"
 		$(use_enable nls)
 		$(use_enable opengl)
 		$(use_enable sound)