gentoo auto-resync : 17:11:2022 - 00:55:45

5 files changed, 20 insertions, 84 deletions

diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index d4d3dd5aa3ec..950efe8a5846 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest
index 381f35e48852..619725ece8ca 100644
--- a/games-rpg/freedroidrpg/Manifest
+++ b/games-rpg/freedroidrpg/Manifest
@@ -1,4 +1,3 @@
-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-1.0_rc2-r1.ebuild 1871 BLAKE2B 82d423eb1a6305b97e89f71067219f92ff1678b5972ab8000b98f82ba205646dd45fbf78e28cb2af128fc2cbb057323dee1c9111df25ae2dd47940158e066f33 SHA512 f06770fd94a23f8cacb74e2ff276d2a272633548d382742181cdbe70a5dfd6cff3f8b25893e20e2285e757e0f89ed518f72b67806bed139f01b811a2981db3f1
-MISC metadata.xml 1756 BLAKE2B 1b85e1bf9df9f71b6760b9608f09ade463aad58a2cb8982698df87867b02fcfc37f6f36dadb0c29baec72aaea01ccc7d83123d1d02b6233f74eb1a8e1662feb7 SHA512 be635fa55b1efa000c926d7b5937515a6f8c55c1b51886c9eef67d6848e1494b83767f5ec7649e74be3ce806d96b15765d57af04ad259e9eedb882cd54b4cd93
+DIST freedroidRPG-1.0rc3.tar.gz 237674000 BLAKE2B 44031686ccd9af3bb082ec9cd2bf233792d2b1019a35b0fc2585df39a05b678ef784f9ff5861fbbcfe7ea624a338f6ab28f855158b7c1d18d52fa9e410410d7d SHA512 51125619fb57f8cb16746b3ff100175ab7917c567c8b1efcbc1aebc80a4774501a934b2fd544d65f1420212f9043015c2b88f08d785e765a30ce478157d887fd
+EBUILD freedroidrpg-1.0_rc3.ebuild 1569 BLAKE2B 4a8a468f8d415944a10b1f03519095f795b5a9e20041750b635f84ac7d19a7347f809a627e89e80588b8b1e4cc8caee1927ed598f615d20647c4732a31efaa58 SHA512 83fd558973acb96f480774de27848a753a7970b920b47066fbcd4db0c385291ca2d7362bc60b3032a5df1b16d70ef752e7a1e2430b3a4d1905b24e1f686f9920
+MISC metadata.xml 1841 BLAKE2B 35e1181f9a732aa02c9fd3c354aca984cd0084b373bd62da49f270d03b580d2613775bcd273d0a2cdd9e2cd48c4c0e2fb7f2c81d0e6e6af17a38f29ab251d8d1 SHA512 39c950f196b3cfb24ac213fe919f891f969c35993d1e225961a9f4375dbda2d2bad87c9161b161d0997c1e0102b7a4cef356796b209771ccb062692787d0d43c
diff --git a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch b/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
deleted file mode 100644
index fd8bc4f9293c..000000000000
--- a/games-rpg/freedroidrpg/files/freedroidrpg-1.0_rc2-fnocommon.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-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-1.0_rc2-r1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc3.ebuild
index b89390f2d7d2..680b0d7e6349 100644
--- a/games-rpg/freedroidrpg/freedroidrpg-1.0_rc2-r1.ebuild
+++ b/games-rpg/freedroidrpg/freedroidrpg-1.0_rc3.ebuild
@@ -1,35 +1,35 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 LUA_COMPAT=( lua5-3 )
-PYTHON_COMPAT=( python3_{8..10} )
-
+PYTHON_COMPAT=( python3_{8..11} )
 inherit lua-single python-any-r1 xdg
 
 MY_PV=$(ver_rs 2 '')
 
 DESCRIPTION="Modification of the classical Freedroid engine into an RPG"
-HOMEPAGE="https://www.freedroid.org"
-SRC_URI="ftp://ftp.osuosl.org/pub/freedroid/freedroidRPG-$(ver_cut 1-2)/freedroidRPG-${MY_PV}.tar.gz"
+HOMEPAGE="https://www.freedroid.org/"
+SRC_URI="https://ftp.osuosl.org/pub/freedroid/freedroidRPG-$(ver_cut 1-2)/freedroidRPG-${MY_PV}.tar.gz"
 S="${WORKDIR}/${PN}-${MY_PV^^}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="debug devtools nls opengl profile +sound"
+IUSE="debug devtools opengl profile +sound"
 REQUIRED_USE="${LUA_REQUIRED_USE}"
 
 RDEPEND="
 	${LUA_DEPS}
+	media-libs/libjpeg-turbo
 	media-libs/libpng:=
 	media-libs/libsdl[opengl?,sound?,video]
-	>=media-libs/sdl-gfx-2.0.21:=
+	media-libs/sdl-gfx:=
 	media-libs/sdl-image[jpeg,png]
 	sys-libs/zlib:=
+	virtual/libintl
 	devtools? ( media-libs/sdl-ttf )
-	nls? ( virtual/libintl )
 	opengl? (
 		media-libs/glew:0=
 		virtual/opengl
@@ -42,12 +42,9 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fnocommon.patch"
-)
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig"
 
 pkg_setup() {
 	lua-single_pkg_setup
@@ -57,8 +54,8 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	python_fix_shebang src/gen_savestruct.py
-	rm data/sound/speak.py || die # unused, prevent installing
+	python_fix_shebang src/gen_savestruct.py # build only
+	rm data/sound/speak.py || die # unused, skip install / python rdep
 }
 
 src_configure() {
@@ -66,23 +63,11 @@ src_configure() {
 		$(use_enable debug backtrace)
 		$(use_enable debug)
 		$(use_enable devtools dev-tools)
-		$(use_enable nls)
 		$(use_enable opengl)
 		$(use_enable profile rtprof)
 		$(use_enable sound)
 		$(use_with debug extra-warnings)
 	)
-	econf "${econfargs[@]}"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
 
-	if [[ ${REPLACING_VERSIONS} ]]; then
-		local min="1.0_rc1"
-		if ver_test ${REPLACING_VERSIONS} -lt ${min}; then
-			elog "${P} is not compatible with save games before ${min}."
-			elog "Please start a new character."
-		fi
-	fi
+	econf "${econfargs[@]}"
 }
diff --git a/games-rpg/freedroidrpg/metadata.xml b/games-rpg/freedroidrpg/metadata.xml
index 1eb1d7b22e08..c3291bcde5b4 100644
--- a/games-rpg/freedroidrpg/metadata.xml
+++ b/games-rpg/freedroidrpg/metadata.xml
@@ -31,6 +31,7 @@
     <flag name="profile">Enable the integration of the ingame real-time profiler</flag>
   </use>
   <upstream>
-    <remote-id type="gitlab">freedroid/freedroid-src</remote-id>
+    <bugs-to>http://bugs.freedroid.org/</bugs-to>
+    <changelog>https://codeberg.org/freedroid/freedroid-src/src/branch/master/ChangeLog</changelog>
   </upstream>
 </pkgmetadata>