gentoo resync : 16.09.2020

10 files changed, 116 insertions, 95 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 426c18621343..e23d0200ed71 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/broken-age/Manifest b/games-rpg/broken-age/Manifest
new file mode 100644
index 000000000000..a2712efb897e
--- /dev/null
+++ b/games-rpg/broken-age/Manifest
@@ -0,0 +1,3 @@
+DIST BrokenAge_linux.tar.gz 2159926882 BLAKE2B 351fd74310ce2a03682151b8112d5831d3d495a6fc9cba68a366205033ce0f35f3446f30ccf98024462f144db3782faf68f73944c814a537cdde8c09f6afbadc SHA512 6642fdae52dc5a22dcbaa1c9db865bfe8dee2365014c1854c53436a1cc4fc842134ad96d9576de221cb494d6e04ea6d30f213c5a62a19f29aaf466740e670284
+EBUILD broken-age-2.4.800398.ebuild 994 BLAKE2B 2035faa230b409f9cced72c574d89d4a980703536864bc4d5c8f95ba6f96c0fccb28876f577d3b2e1e954e32f3b6696085ea2b45b61af4e015c999dfd5cd0d57 SHA512 7c55c806436e5546ef7633d133f81298cfc310cedae359e78fb94bd73a3989eaa081d18a45fee82c5e87aadb6843dce55db4d0e5e11177107c424321722e3a75
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/broken-age/broken-age-2.4.800398.ebuild b/games-rpg/broken-age/broken-age-2.4.800398.ebuild
new file mode 100644
index 000000000000..fed3b2fba16a
--- /dev/null
+++ b/games-rpg/broken-age/broken-age-2.4.800398.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils desktop xdg
+
+MY_PN="BrokenAge"
+DESCRIPTION="A point-and-click adventure from Tim Schafer's Double Fine Productions"
+HOMEPAGE="http://www.brokenagegame.com"
+SRC_URI="${MY_PN}_linux.tar.gz"
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch splitdebug"
+
+RDEPEND="
+	media-libs/libsdl2[abi_x86_32,joystick,opengl,sound,video]
+	virtual/opengl[abi_x86_32]
+"
+
+S="${WORKDIR}"
+
+DIR="/opt/${PN}"
+QA_PREBUILT="${DIR}/*"
+
+pkg_nofetch() {
+	einfo "Please buy and download ${SRC_URI} from:"
+	einfo "  https://www.humblebundle.com/store/${PN}"
+	einfo "and move it to your distfiles directory."
+}
+
+src_install() {
+	exeinto "${DIR}"
+	doexe ${MY_PN}
+	make_wrapper ${PN} ./${MY_PN} "${DIR}"
+
+	insinto "${DIR}"
+	doins *.pck
+
+	exeinto "${DIR}"/lib
+	doexe lib/libfmod*.so
+
+	make_desktop_entry ${PN} "Broken Age" applications-games
+	dodoc ReadMe.txt
+}
diff --git a/games-rpg/broken-age/metadata.xml b/games-rpg/broken-age/metadata.xml
new file mode 100644
index 000000000000..26079e608bed
--- /dev/null
+++ b/games-rpg/broken-age/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>games@gentoo.org</email>
+		<name>Gentoo Games Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/games-rpg/eternal-lands/Manifest b/games-rpg/eternal-lands/Manifest
index 69ae0e5bffc5..d8806e066232 100644
--- a/games-rpg/eternal-lands/Manifest
+++ b/games-rpg/eternal-lands/Manifest
@@ -3,4 +3,4 @@ AUX eternal-lands-1.9.5.3-minizip.patch 2944 BLAKE2B be3ff1adb91681bbe826a409f2e
 AUX eternal-lands-1.9.5.8-build.patch 2632 BLAKE2B c31b8b0ec050fb9fb9843f5cfc5db21d6a2c843724a4e6e4c683a011a11dc1b8bac4e73125d72f5d012062bbede3377eed7fd81032a8469bbd55b52d84b8d725 SHA512 1c2ee7c49bc703c5cb7a8078930ca1587606d06b7b7147e038e0598ce4c2cd205fc6aa07306544f622ed0c6ff3d4576c316780d1c2db799fd598b060335c346c
 DIST eternal-lands-1.9.5.8.tar.gz 2863932 BLAKE2B f8c4e88b96b4ee73773a2675e7cf2746e5efe6bf029f046a2ce63496b22c217a93eeea9464977710b95c4fe2d928edefd6aa11a712a8fb82d911ee7d1fd993d3 SHA512 e5e89ec6e7df2b1ac80722b6daf5bbb350d2f1bc4c70c819992b528f25c2ac11434d053ff844ff5873deea16c5bbe305834ffeae7b5ecb6daea5638625851ce0
 EBUILD eternal-lands-1.9.5.8.ebuild 1596 BLAKE2B 51bc31d2824cd5c3b4699777ce4b5652d1ba7c82737270a6d2967b8f9b3382c7cc3c61d238bb876fea097f68dc67ad839f1528e6e0e5e122b26ba5df93f2423c SHA512 1003f55fa02512e108c1a6a336d1e3fead3ba95475ac63f371821fc26773639f808f0f9c848ec6a626ee7713d707dce511c5a866545134d9d77b858705e78d2e
-MISC metadata.xml 385 BLAKE2B 5f7b3fd58c620d6dda10b183473856241e1ade18bdd190865a4c0a8432d1bbead7da0801acc99dd9b42c77757625a4cd145f615435317d0329e0028af8ece506 SHA512 a3b44275d69059374a2dbf2761b2ff68afdb3fb195f714f1d797c7551bae5c488249dd5dba9bd370e982e69d7ba347306c64a82d1894bf66fbf55a5db985df9c
+MISC metadata.xml 253 BLAKE2B 443ca9c8d4f6801169382e87a0ecd1385c56e65229209e7200f9d313ef380e92ae8d7dc3c38e5989a4166289f22607a20b1e13bb960fff6b3d9f78629d8ab020 SHA512 61c4689cbc649d84a00be211b7b5b98dd03e1d3f813eff370df549f2998cd4343f391c18b57cf20e4a8f4dd2311e3bfa04eb60f356f2bbac78f0b68f5091f254
diff --git a/games-rpg/eternal-lands/metadata.xml b/games-rpg/eternal-lands/metadata.xml
index 3b426abd6bc5..26079e608bed 100644
--- a/games-rpg/eternal-lands/metadata.xml
+++ b/games-rpg/eternal-lands/metadata.xml
@@ -5,7 +5,4 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
-	<longdescription>
-		Eternal Lands is a free 3D fantasy MMORPG (massively multiplayer online role playing game)
-	</longdescription>
 </pkgmetadata>
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)