gentoo resync : 28.04.2021

5 files changed, 86 insertions, 62 deletions

diff --git a/games-roguelike/tome/Manifest b/games-roguelike/tome/Manifest
index 64535c326611..7bcb8e5615a6 100644
--- a/games-roguelike/tome/Manifest
+++ b/games-roguelike/tome/Manifest
@@ -1,6 +1,6 @@
-AUX 2.3.5-gentoo-paths.patch 1172 BLAKE2B d51e277eac8d270815a8b48a18bd943489036643d53b80d4adab147a7510e4b41f1f9ff1062327f7b441c2aea9e3d6509a1dffa69b60dca32fe36f73a639f8c9 SHA512 1d3f053abcbfee4f2fb1acc2911927b4a51881b0ce50da72d4d617207411b9cdba42cf70324c47535e9e560ee8878f3d0f51d4471dcc2bcfaffb136700c6fd0f
-AUX tome-2.3.5-format.patch 2925 BLAKE2B f9d186937649bfc3d409a73cf6a8f067784628374de2c5da656e2f871ba71c3f6edd1837bec79972ecea985f3002374f9edd8184aff3d1c101de25e20cd901a9 SHA512 e8e245e6374ac63effc8f3e1341357f137cd8b4fb378a464e2bd3692d50e5cbd54b7b42b8605346c2d617e1dbb95e42bc9f79a36cc378d07881c73136d603ddb
-AUX tome-2.3.5-noX.patch 453 BLAKE2B 4ec72b20f50593b871990d7b65aec1cd51fe5c25c5de29350b7cf1a77063e13d393962efbadc1380aec97ec1889c645faff54470def7c5200be5050c5c7a87c0 SHA512 9c3fe5a8a9fa0e1e1b0e1ffb4ca8a089eda401a04bc6fe14aba8866090cd96ad13f5fac501ae18ce937f13a94439c8c1ebaa80c7fc07d1c4da9c3c8fa80f67c2
+AUX tome-2.3.5-format.patch 2925 BLAKE2B 8490e618151a05976cd93592a5218c234c93e2e38e8cf62af0c8ad4efe8170c7c6d0d475397df52a28f04c9498991d19c80d8c049704570bbeab6c6269ba48ac SHA512 e9a5763ddf3b3b2a0848031c1cfed30e83649df95902db6bb4278e85bd64d9c3c66b1c8680137eda351a7ba9e966da00947f65937416eb5c637dfccaed1c5cde
+AUX tome-2.3.5-gentoo-paths.patch 1032 BLAKE2B 35f96b35c05a12e355040c12307ce83c4e1e6e6bf2beb55c69ac28b17841735d89f8d27210ced170d6fcbb88409de80a9c05ae93e27c342e80b0c4fbea33cee3 SHA512 f1eb53c8afdd62dbfde78576d4307ecd2dbbd3b19023bbba2dbcc7a81a3aec60e11194ad961bc75107ca9999578afb5626fc5e100149525b1517ee72e3b12728
+AUX tome-2.3.5-noX.patch 453 BLAKE2B c16d66c9e3796421f045eebe9b184a3ade5556b0dc5061a71f449320b48e14530e294421c259a2f1ab7a1b7e1c1985af718d6b4ec341bbe4f8a7f41cfd257d23 SHA512 8e887690673021ca0daace4f2e43dcd8ce2d905cf3db5e97c35e90c227037b4e453e11bac6da97808320e6b6b101fc04ff7d5f65ae55e9d3d2c2318645506a58
 DIST tome-235-src.tar.bz2 2951227 BLAKE2B 7a9a6c608873062f9d6deae38c7e39244ca25d2bbb553d338014078c86b9decc36869c2f39f875425f9c3bb26784d3e460a225c5dabd197437781488f3e15d74 SHA512 f456aa91d18397297c213fa67dd14a4d29e024525be99f83b22cbe42f4d426b57fe6115a7124e3ec34de8f351117de525eab996ba7a2a230119e43639c4c9205
-EBUILD tome-2.3.5.ebuild 3632 BLAKE2B 934ccc63c844f796f064bdf7bed82514c5e849dc0d858ab4d39fd22a11a1ab942a0acfe2f4cc9ae77249bf2a0b86c92591fbf0e09f0aa0c9184f93d91eca5a7a SHA512 bd0335cf3229759ff8e8570e6e3ca84414956d3057aa2c4c134d665d6a5cc9b7945ec6eba588e16075a50428d03833be5489edb5758483e1c6343ba2da0ca100
+EBUILD tome-2.3.5.ebuild 3750 BLAKE2B 53b046c729bc8b3fbc2b3935a6712647e21e7c37a41345560d2ad316adc0089f0310fb4ed94676224fde689b2541159059d3e6a2fc0c119df311caf6d7f38f87 SHA512 4cc75d61b1cf921ed6c09ed0e4f7c37549f5f96c0341e6196e94a840e9cf00bce949fe39f36deb8a201dd40886a39a98d585ad19fc7971a149a7c32d94eb432a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/tome/files/tome-2.3.5-format.patch b/games-roguelike/tome/files/tome-2.3.5-format.patch
index f3ce1cc96faf..90057b44d19e 100644
--- a/games-roguelike/tome/files/tome-2.3.5-format.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-format.patch
@@ -1,5 +1,5 @@
---- dungeon.c.old	2016-02-07 20:12:39.258150130 +0100
-+++ dungeon.c	2016-02-07 20:12:58.239805610 +0100
+--- a/dungeon.c	2016-02-07 20:12:39.258150130 +0100
++++ b/dungeon.c	2016-02-07 20:12:58.239805610 +0100
 @@ -1489,7 +1489,7 @@
  	{
  		char buf[20];
@@ -9,8 +9,8 @@
  		cmsg_format(TERM_L_GREEN,
  		            "Today it is %s of the %s year of the third age.",
  		            get_month_name(bst(DAY, turn), wizard, FALSE), buf);
---- files.c.old	2016-02-07 20:15:07.736451417 +0100
-+++ files.c	2016-02-07 20:15:27.595089867 +0100
+--- a/files.c	2016-02-07 20:15:07.736451417 +0100
++++ b/files.c	2016-02-07 20:15:27.595089867 +0100
 @@ -4856,7 +4856,7 @@
  
  	/* Terminate */
@@ -20,8 +20,8 @@
  
  	/* Require a "base" name */
  	if (!player_base[0]) strcpy(player_base, "PLAYER");
---- lua_bind.c.old	2016-02-07 20:09:29.071592178 +0100
-+++ lua_bind.c	2016-02-07 20:10:48.094164373 +0100
+--- a/lua_bind.c	2016-02-07 20:09:29.071592178 +0100
++++ b/lua_bind.c	2016-02-07 20:10:48.094164373 +0100
 @@ -490,7 +490,7 @@
  /* Files */
  void lua_print_hook(cptr str)
@@ -31,8 +31,8 @@
  }
  
  
---- plots.c.old	2016-02-07 20:11:35.389308152 +0100
-+++ plots.c	2016-02-07 20:12:19.247513152 +0100
+--- a/plots.c	2016-02-07 20:11:35.389308152 +0100
++++ b/plots.c	2016-02-07 20:12:19.247513152 +0100
 @@ -93,7 +93,7 @@
  	{
  		MAKE(new, hooks_chain);
@@ -42,8 +42,8 @@
  #ifdef DEBUG_HOOK
  		if (wizard) cmsg_format(TERM_VIOLET, "HOOK ADD: %s", name);
  		if (take_notes) add_note(format("HOOK ADD: %s", name), 'D');
---- spells1.c.old	2016-02-07 20:15:47.277731397 +0100
-+++ spells1.c	2016-02-07 20:16:03.373438169 +0100
+--- a/spells1.c	2016-02-07 20:15:47.277731397 +0100
++++ b/spells1.c	2016-02-07 20:16:03.373438169 +0100
 @@ -7312,7 +7312,7 @@
  
  	if (who == -2)
@@ -53,8 +53,8 @@
  	}
  
  	/* Analyze the damage */
---- squeltch.c.old	2016-02-07 20:13:11.872558078 +0100
-+++ squeltch.c	2016-02-07 20:13:42.707997918 +0100
+--- a/squeltch.c	2016-02-07 20:13:11.872558078 +0100
++++ b/squeltch.c	2016-02-07 20:13:42.707997918 +0100
 @@ -399,7 +399,7 @@
  
  				if (!max) continue;
@@ -64,8 +64,8 @@
  				if (input_box("New name?", hgt / 2, wid / 2, name, 15))
  				{
  					exec_lua(format("auto_aux:rename_rule(%d, '%s')", sel, name));
---- util.c.old	2016-02-07 20:14:22.786269296 +0100
-+++ util.c	2016-02-07 20:16:44.227693551 +0100
+--- a/util.c	2016-02-07 20:14:22.786269296 +0100
++++ b/util.c	2016-02-07 20:16:44.227693551 +0100
 @@ -4468,7 +4468,7 @@
  		{
  			char buf2[20];
diff --git a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch b/games-roguelike/tome/files/tome-2.3.5-gentoo-paths.patch
index d171a1cf540f..b3ef7fd98e67 100644
--- a/games-roguelike/tome/files/2.3.5-gentoo-paths.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-gentoo-paths.patch
@@ -1,6 +1,6 @@
-diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
---- tome-225-src.orig/src/files.c	2004-01-14 11:17:02.423263360 -0500
-+++ tome-225-src/src/files.c	2004-01-14 11:17:50.074019344 -0500
+diff -rU 1 a/files.c b/files.c
+--- a/files.c	2004-01-14 11:17:02.423263360 -0500
++++ b/files.c	2004-01-14 11:17:50.074019344 -0500
 @@ -5670,3 +5670,3 @@
  	/* Build the filename */
 -	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
@@ -21,9 +21,9 @@ diff -rU 1 tome-225-src.orig/src/files.c tome-225-src/src/files.c
 -	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
 +	sprintf(buf, "GENTOO_DIR/tome-scores.raw");
  
-diff -rU 1 tome-225-src.orig/src/init2.c tome-225-src/src/init2.c
---- tome-225-src.orig/src/init2.c	2004-01-14 11:17:02.473255760 -0500
-+++ tome-225-src/src/init2.c	2004-01-14 11:17:58.286770816 -0500
+diff -rU 1 a/init2.c b/init2.c
+--- a/init2.c	2004-01-14 11:17:02.473255760 -0500
++++ b/init2.c	2004-01-14 11:17:58.286770816 -0500
 @@ -6686,3 +6686,3 @@
  	/* Build the filename */
 -	path_build(buf, 1024, ANGBAND_DIR_APEX, "scores.raw");
diff --git a/games-roguelike/tome/files/tome-2.3.5-noX.patch b/games-roguelike/tome/files/tome-2.3.5-noX.patch
index 5c5982fe730d..b3830af50be1 100644
--- a/games-roguelike/tome/files/tome-2.3.5-noX.patch
+++ b/games-roguelike/tome/files/tome-2.3.5-noX.patch
@@ -1,5 +1,5 @@
---- makefile.old	2012-05-28 14:02:44.787705444 +0200
-+++ makefile	2012-05-28 14:03:44.520524011 +0200
+--- a/makefile	2012-05-28 14:02:44.787705444 +0200
++++ b/makefile	2012-05-28 14:03:44.520524011 +0200
 @@ -458,7 +458,7 @@
  	$(CC) $(PROFILELDFLAGS) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
  
diff --git a/games-roguelike/tome/tome-2.3.5.ebuild b/games-roguelike/tome/tome-2.3.5.ebuild
index cdb3c58fefd5..3e3884187946 100644
--- a/games-roguelike/tome/tome-2.3.5.ebuild
+++ b/games-roguelike/tome/tome-2.3.5.ebuild
@@ -1,97 +1,122 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=7
+
+inherit toolchain-funcs
 
 MY_PV=${PV//./}
 DESCRIPTION="save the world from Morgoth and battle evil (or become evil ;])"
 HOMEPAGE="http://t-o-m-e.net/"
 SRC_URI="http://t-o-m-e.net/dl/src/tome-${MY_PV}-src.tar.bz2"
+S="${WORKDIR}"/tome-${MY_PV}-src/src
 
 LICENSE="Moria"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X Xaw3d gtk sdl"
+IUSE="gtk sdl X Xaw3d"
 
-RDEPEND=">=sys-libs/ncurses-5:0
-	X? ( x11-libs/libX11 )
-	Xaw3d? ( x11-libs/libXaw )
+RDEPEND="
+	>=sys-libs/ncurses-5:0=
 	sdl? (
 		media-libs/sdl-ttf
 		media-libs/sdl-image
 		media-libs/libsdl )
-	gtk? ( >=x11-libs/gtk+-2.12.8:2 ) "
-DEPEND="${RDEPEND}
+	gtk? ( >=x11-libs/gtk+-2.12.8:2 )
+	X? ( x11-libs/libX11 )
+	Xaw3d? ( x11-libs/libXaw )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
-	x11-misc/makedepend"
+	x11-misc/makedepend
+"
+
+RDEPEND+=" acct-group/gamestat"
 
-S=${WORKDIR}/tome-${MY_PV}-src/src
+PATCHES=(
+	"${FILESDIR}/"${PN}-2.3.5-gentoo-paths.patch
+	"${FILESDIR}"/${PN}-2.3.5-format.patch
+	"${FILESDIR}"/${PN}-2.3.5-noX.patch
+)
 
 src_prepare() {
-	mv makefile.std makefile
-	epatch "${FILESDIR}/${PV}-gentoo-paths.patch" \
-		"${FILESDIR}"/${P}-format.patch \
-		"${FILESDIR}"/${P}-noX.patch
+	mv makefile.std makefile || die
+
+	default
+
 	sed -i -e '/^CC =/d' makefile || die
 	sed -i -e "s:xx:x:" ../lib/edit/p_info.txt || die
-	sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die
+	# sed -i -e "s:GENTOO_DIR:${GAMES_STATEDIR}:" files.c init2.c || die
 
-	find .. -name .cvsignore -exec rm -f \{\} +
-	find ../lib/edit -type f -exec chmod a-x \{\} +
+	find .. -name .cvsignore -exec rm -f \{\} + || die
+	find ../lib/edit -type f -exec chmod a-x \{\} + || die
 }
 
 src_compile() {
-	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$(pkg-config ncurses --libs)"
+	tc-export CC
+
+	local GENTOO_INCLUDES="" GENTOO_DEFINES="-DUSE_GCU " GENTOO_LIBS="$($(tc-getPKG_CONFIG) ncurses --libs)"
+
 	if use sdl || use X || use gtk || use Xaw3d; then
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_EGO_GRAPHICS -DUSE_TRANSPARENCY \
 			-DSUPPORT_GAMMA"
 	fi
+
 	if use sdl || use X || use Xaw3d; then
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_PRECISE_CMOVIE -DUSE_UNIXSOCK "
 	fi
+
 	if use sdl; then
 		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(sdl-config --cflags)"
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_SDL "
 		GENTOO_LIBS="${GENTOO_LIBS} $(sdl-config --libs) -lSDL_image -lSDL_ttf"
 	fi
+
 	if use X; then
 		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_X11 "
 		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lX11 "
 	fi
+
 	if use Xaw3d; then
 		GENTOO_INCLUDES="${GENTOO_INCLUDES} -I/usr/X11R6/include "
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_XAW "
 		GENTOO_LIBS="${GENTOO_LIBS} -L/usr/X11R6/lib -lXaw -lXmu -lXt -lX11 "
 	fi
+
 	if use gtk; then
-		GENTOO_INCLUDES="${GENTOO_INCLUDES} $(pkg-config gtk+-2.0 --cflags)"
+		GENTOO_INCLUDES="${GENTOO_INCLUDES} $($(tc-getPKG_CONFIG) gtk+-2.0 --cflags)"
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_GTK2 "
-		GENTOO_LIBS="${GENTOO_LIBS} $(pkg-config gtk+-2.0 --libs) "
+		GENTOO_LIBS="${GENTOO_LIBS} $($(tc-getPKG_CONFIG) gtk+-2.0 --libs) "
 		GTK_SRC_FILE="main-gtk2.c"
 		GTK_OBJ_FILE="main-gtk2.o"
 	else
 		GTK_SRC_FILE=""
 		GTK_OBJ_FILE=""
 	fi
+
 	if use amd64; then
 		GENTOO_DEFINES="${GENTOO_DEFINES} -DLUA_NUM_TYPE=int "
 	fi
+
 	GENTOO_INCLUDES="${GENTOO_INCLUDES} -Ilua -I."
 	GENTOO_DEFINES="${GENTOO_DEFINES} -DUSE_LUA"
+
 	emake -j1 \
 		INCLUDES="${GENTOO_INCLUDES}" \
 		DEFINES="${GENTOO_DEFINES}" \
 		depend
-	emake ./tolua
+
+	emake tolua
+
 	emake \
 		COPTS="${CFLAGS}" \
 		INCLUDES="${GENTOO_INCLUDES}" \
 		DEFINES="${GENTOO_DEFINES}" \
 		LIBS="${GENTOO_LIBS} -lm" \
-		BINDIR="${GAMES_BINDIR}" \
-		LIBDIR="${GAMES_DATADIR}/${PN}" \
+		BINDIR="${EPREFIX}/usr/bin" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" \
 		GTK_SRC_FILE="${GTK_SRC_FILE}" \
 		GTK_OBJ_FILE="${GTK_OBJ_FILE}"
 }
@@ -99,23 +124,22 @@ src_compile() {
 src_install() {
 	emake -j1 \
 		DESTDIR="${D}" \
-		OWNER="${GAMES_USER}" \
-		BINDIR="${GAMES_BINDIR}" \
-		LIBDIR="${GAMES_DATADIR}/${PN}" install
-	cd ..
+		OWNER="nobody" \
+		BINDIR="${EPREFIX}/usr/bin" \
+		LIBDIR="${EPREFIX}/usr/$(get_libdir)/${PN}" install
+
+	cd .. || die
 	dodoc *.txt
 
-	dodir "${GAMES_STATEDIR}"
-	touch "${D}/${GAMES_STATEDIR}/${PN}-scores.raw"
-	prepgamesdirs
-	fperms g+w "${GAMES_STATEDIR}/${PN}-scores.raw"
-	#FIXME: something has to be done about this.
-	fperms g+w "${GAMES_DATADIR}/${PN}/data"
+	dodir /var/games
+	touch "${ED}/var/games/${PN}-scores.raw" || die
+
+	fperms 660 /var/games/${PN}-scores.raw
+	fowners root:gamestat /var/games/${PN}-scores.raw
+	fperms g+s /usr/bin/${PN}
 }
 
 pkg_postinst() {
-	games_pkg_postinst
-	echo
 	ewarn "ToME ${PV} is not save-game compatible with 2.3.0 and previous versions."
 	echo
 	ewarn "If you have older save files and you wish to continue those games,"