gentoo resync : 28.04.2021

6 files changed, 85 insertions, 72 deletions

diff --git a/games-arcade/tomatoes/Manifest b/games-arcade/tomatoes/Manifest
index d11ce04e52c5..5c7d819331c8 100644
--- a/games-arcade/tomatoes/Manifest
+++ b/games-arcade/tomatoes/Manifest
@@ -1,7 +1,7 @@
-AUX tomatoes-1.55-c_str.patch 573 BLAKE2B eccedf249d78074ce6292d580ad71cf9ff9b55f70d03976f26225f144b06c090714c4815c925cfc425bd8094e28fb1e5d0a5bf3ed6a48b6400c892afc922a812 SHA512 fce01efcdea6f14c497b747158e03e57fc39f532ddad7f8da80d6c94be6e9ec6b46b43e908e96f9b3744029ff285699f72b91a73b21b3e213d7054bf4e14f927
-AUX tomatoes-1.55-gcc43.patch 278 BLAKE2B 6597c2e500add91cf58f3a45e88d26b684f90b6a7a4644063701958cd5ba9b7f2d7c296f4c0adbd7718e72fdfc0198cfb0531d256f4d6c37d2ac54afa8b39ae1 SHA512 b0f6e5c3468902f73b2f88327f510b726082af6ace75d15f1d72c95d7ff19cfefef5558f2cdb2e0cf363a80f3c624c912825a1abb251608577bd617972b88e1c
-AUX tomatoes-1.55-underlink.patch 977 BLAKE2B 15d602a7a1618e331a4fe62ee72c22ff91af47cd1dfbf11f6b7039d7e43599c97d9a79705091f65cf1f2be5adbc8d8ed11f0246a8386134bc5694de901302175 SHA512 c6b1fb64b0196f0eb6a6f0d6a779d437d09901737670f66309598a84706615e1c9e48e60a7f6db15ce10f9237c1bdf8589cec39c46a4659fd4fcb3fe39225aa8
+AUX tomatoes-1.55-c_str.patch 500 BLAKE2B b1ddb221951e1e03c01372440660c0d62e92d1ea08bf5eb5bbbbdc397cb447de1b50b18890679254d7824699faa74f818c5192ac9a35c8ae8a043c4c804c5b83 SHA512 43d34e18fb25ca5b1ba1815b3f801f58763288cb5075f40dac6e32bc69d943d1bf99cb11fb1933a1b4d64b026a72dc5d0eb1eb7563f319e781167c964b3c02f2
+AUX tomatoes-1.55-gcc43.patch 282 BLAKE2B 96ff4d81ca15fe6813dc3df77fdb126b4907d995f8c6179496a1212d5c0f636b23c684ddaafc6c850de78514d66af054e77bec8812567c95bd563a70d22bada6 SHA512 e40f5602f628481de6385a437300c602dc930ced906aca9e632783482052b8d0c7638d323f6f07deafc05c95f706c2901dbb1e27e18a390a03338f2237442673
+AUX tomatoes-1.55-underlink.patch 905 BLAKE2B 2deffc2f21569ed78e032400bac9dc3d77ea6bd2916e986d586eff6796018df632b8d31fc396830db683a7fcf1641b53b1d38c8596683f9dcd283445998d3b66 SHA512 6917df7c096827749e4dbe641822c68a65887215c79a3c7392116d72bd3e76ff60192ce168668ad7b5cb01f0750eeb47ccbe54d58c3a0f560b8340ca265b1595
 DIST tomatoes-linux-1.5.tar.bz2 8807421 BLAKE2B ee2128018d13d274b0ed5b27f9339b4e9d47a15753411c30d4174607c252d10d64a40e40b25454adb6f14ec96845b92cf9b0fe57b3bdcbbb70fe905ec0bf1c0e SHA512 517f592bb3c3fb43cb740c58011f06b7a71c96eaff74ce1088db8dbd4aafa3463bba516547cd010e9ef2ca947fd36962c3d13ece6e979cab8adf01ffa991c308
 DIST tomatoes-linux-src-1.55.tar.bz2 62947 BLAKE2B 22561900842dfe4cb56128ddaf471fac56a2c93b4c24ce3cca7045d10235ab60b81184c9617f9f4d10877df23e6db0d5abc0dc032d38788993daab1a2c49ab1e SHA512 b5a6287659746179f0418630c55d34dc34897b532687007386b0b540ec728cc2492813f0d454314994a26a3629a24c802630085f64b969d1e6ea9ec936f5fe35
-EBUILD tomatoes-1.55-r2.ebuild 1590 BLAKE2B 8fcbf3ecad477c5f4e3d80082be96ee75f951233d7be70f7538692ccc91e737e55cfdb50968bdde922f579009a35e9e6ed6da21928af30e39298e74368b1aa4d SHA512 253966b1037eeb4e4143ed467f93e18df6eda3e0cb89a8a4e462b71925d72aff3faba5b685bb18b4a6be03173e200ca43f2c4fe6c6f48e764dc9bde98e07a068
+EBUILD tomatoes-1.55-r3.ebuild 1627 BLAKE2B 2be42abe1e64c49c0c27415fac17291de29c213328b0a71224c3fbf81a5077729c86e017a249aef16f0651a205d1759f2dbc0f318ef9a49bb386a7283ead31a5 SHA512 d0399e6fd944d6908f8137625c51d8192c66a95900b490368ce491f965c8f0472894a655e20a86a401c65260f7fec430c571bc337fb9bc2a1d6c4b65c34e3671
 MISC metadata.xml 331 BLAKE2B 312d2ef06020a89fa08e79d82b22727eff32e689182f3f142bbc788555d2b05ddf93414a616deff188bc6d2ae35561da8fd832c2541c404d6136da144950c5b9 SHA512 adee588bcc930244c19ea9a3ac34b70c3afbbbed2b68d61289742fd7ca3d97eae5724cef90d350a4e5b8ff8b594f8d25fc1a5fbc672459034d0a492bb155223d
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
index dd6927e54153..f001179a837f 100644
--- a/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-c_str.patch
@@ -1,5 +1,5 @@
---- src/config.cpp.orig	2004-09-27 11:35:48.000000000 +0200
-+++ src/config.cpp	2006-02-13 00:00:01.000000000 +0100
+--- a/src/config.cpp
++++ b/src/config.cpp
 @@ -78,6 +78,7 @@
  // makefile.
  char *get_config_location(bool write) {
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
index cd85e31e5936..95bf7ba6eddb 100644
--- a/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-gcc43.patch
@@ -1,5 +1,5 @@
---- src/config.cpp
-+++ src/config.cpp
+--- a/src/config.cpp
++++ b/src/config.cpp
 @@ -27,8 +27,9 @@
  
  *************************************************************************/
diff --git a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
index c028c79ba4a7..bc7763bf492e 100644
--- a/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
+++ b/games-arcade/tomatoes/files/tomatoes-1.55-underlink.patch
@@ -1,5 +1,5 @@
---- makefile.old	2011-06-18 17:35:38.947020335 +0200
-+++ makefile	2011-06-18 17:37:42.337811088 +0200
+--- a/makefile
++++ b/makefile
 @@ -48,7 +47,7 @@
  LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lGL -lGLU -pg
  else
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
deleted file mode 100644
index dd5658f861bf..000000000000
--- a/games-arcade/tomatoes/tomatoes-1.55-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DATA_PV=1.5
-DESCRIPTION="How many tomatoes can you smash in ten short minutes?"
-HOMEPAGE="http://tomatoes.sourceforge.net/about.html"
-SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
-	mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="virtual/opengl
-	virtual/glu
-	media-libs/libsdl[sound,video]
-	media-libs/sdl-image[jpeg,png]
-	media-libs/sdl-mixer[mod]"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	mv ../tomatoes-1.5/* . || die "mv failed"
-	mv icon.png ${PN}.png
-
-	epatch \
-		"${FILESDIR}"/${P}-c_str.patch \
-		"${FILESDIR}"/${P}-underlink.patch \
-		"${FILESDIR}"/${P}-gcc43.patch
-
-	sed -i \
-		-e "/^MPKDIR = /s:./:${GAMES_DATADIR}/${PN}/:" \
-		-e "/^MUSICDIR = /s:./music/:${GAMES_DATADIR}/${PN}/music/:" \
-		-e "/^HISCOREDIR = /s:./:${GAMES_STATEDIR}/${PN}/:" \
-		-e "/^CONFIGDIR = /s:./:${GAMES_SYSCONFDIR}/${PN}/:" \
-		-e "/^OVERRIDEDIR = /s:./data/:${GAMES_DATADIR}/${PN}/data/:" \
-		makefile \
-		|| die "sed failed"
-}
-
-src_install() {
-	dogamesbin tomatoes
-	dodoc README README-src
-
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r tomatoes.mpk music
-
-	doicon ${PN}.png
-	make_desktop_entry tomatoes "I Have No Tomatoes"
-
-	dodir "${GAMES_STATEDIR}"/${PN}
-	touch "${D}${GAMES_STATEDIR}"/${PN}/hiscore.lst || die "touch failed"
-	fperms 660 "${GAMES_STATEDIR}"/${PN}/hiscore.lst
-
-	insinto "${GAMES_SYSCONFDIR}"/${PN}
-	doins config.cfg
-
-	prepgamesdirs
-}
diff --git a/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild b/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
new file mode 100644
index 000000000000..088f0a4563b1
--- /dev/null
+++ b/games-arcade/tomatoes/tomatoes-1.55-r3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop toolchain-funcs
+
+DATA_PV=1.5
+DESCRIPTION="How many tomatoes can you smash in ten short minutes?"
+HOMEPAGE="http://tomatoes.sourceforge.net/about.html"
+SRC_URI="mirror://sourceforge/tomatoes/tomatoes-linux-src-${PV}.tar.bz2
+	mirror://sourceforge/tomatoes/tomatoes-linux-${DATA_PV}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-image[jpeg,png]
+	media-libs/sdl-mixer[mod]
+	virtual/opengl
+	virtual/glu
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/gamestat
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-c_str.patch
+	"${FILESDIR}"/${P}-underlink.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
+
+src_prepare() {
+	default
+
+	mv ../tomatoes-1.5/* . || die "mv failed"
+	mv icon.png ${PN}.png || die
+
+	sed -i \
+		-e "/^MPKDIR = /s:./:/usr/share/${PN}/:" \
+		-e "/^MUSICDIR = /s:./music/:/usr/share/${PN}/music/:" \
+		-e "/^HISCOREDIR = /s:./:/var/games/${PN}/:" \
+		-e "/^CONFIGDIR = /s:./:/etc/${PN}/:" \
+		-e "/^OVERRIDEDIR = /s:./data/:/usr/share/${PN}/data/:" \
+		makefile \
+		|| die "sed failed"
+}
+
+src_configure() {
+	tc-export CXX
+}
+
+src_install() {
+	dobin tomatoes
+	dodoc README README-src
+
+	insinto /usr/share/${PN}
+	doins -r tomatoes.mpk music
+
+	doicon ${PN}.png
+	make_desktop_entry tomatoes "I Have No Tomatoes"
+
+	dodir /var/games/${PN}
+	touch "${ED}"/var/games/${PN}/hiscore.lst || die "touch failed"
+
+	fperms 660 /var/games/${PN}/hiscore.lst
+	fowners -R root:gamestat /var/games/${PN}
+	fperms g+s /usr/bin/${PN}
+
+	insinto /etc/${PN}
+	doins config.cfg
+}