gentoo resync : 08.10.2021

6 files changed, 62 insertions, 57 deletions

diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 0a8910dbb22d..041c4531d341 100644
--- a/games-puzzle/Manifest.gz
+++ b/games-puzzle/Manifest.gz
diff --git a/games-puzzle/concentration/Manifest b/games-puzzle/concentration/Manifest
index 623f28a24152..f1901f1580cb 100644
--- a/games-puzzle/concentration/Manifest
+++ b/games-puzzle/concentration/Manifest
@@ -1,4 +1,4 @@
 AUX concentration-1.2-gentoo.patch 4615 BLAKE2B 9057a3518a3f93d4db73019e3128d00deb5b578ff6dcda11a5a05d0cae6a48b40832c1e0dd638d32aef75d70f81f9c2d75404300c261f35f3c16e9ed2115b092 SHA512 a513b43e96e6d401ea705fc9ebcfb868c4680af117551b166c20900417e977a588ab12d19ee6d7e4f58cfea1dc3799845581fb122470093b6fdba187d73689c4
 DIST concentration-1.2.tar.gz 1044563 BLAKE2B 2bd6c36be747ab16c77e5a9d01d270d82674957d3e66c07571c5dc5edbcb86aae59213992fe7a2d8ee34bbbbe8ff32157b5f5dd3125acc0ab0726e977c28c119 SHA512 afa9007cfaaa9a1cedcbfc490cb63d93d8ed1e91230ee714cece481ed3a39b73c82ec4cda65b29a27e9e71a7d2215be7f476e3217b487af54716eb4d692ca005
-EBUILD concentration-1.2-r2.ebuild 650 BLAKE2B abc116b14da1f8cb4c34ebf80f927c462336f45176ee2173c351375f25e9b1bed91a28242c138ba3af9ab3e3407fb1fd1d24111e4ac101dbd19a94365de18d8e SHA512 58296e33b985c3f77f148e32c4934c8ea923ea2ba46d65586b05bf01f486c40e76539d66f7a7e16d755af8a77215728b35b8f178ac8a890026af1a98a85b9527
+EBUILD concentration-1.2-r3.ebuild 637 BLAKE2B aaf212d33461fc7603e9d7ec7a389bb8be110b9492bb14500dfb7d9a71e649ccf5889f6214cf63510dbb293cee41b0776152dd0cc6c28eef54832df96abbc316 SHA512 e0e1f6288e1411aaaf0bd5cbd9c238781e8ee1bf63f091c36f2051e10f2868bad2f4ecb2e45dacaa303d1a55e62f5da2f5a62bed24f8cbea3d6ad97319a8ac09
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/concentration/concentration-1.2-r2.ebuild b/games-puzzle/concentration/concentration-1.2-r3.ebuild
index 5233b13dc8d8..eb664032ce85 100644
--- a/games-puzzle/concentration/concentration-1.2-r2.ebuild
+++ b/games-puzzle/concentration/concentration-1.2-r3.ebuild
@@ -1,28 +1,31 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
 inherit desktop
 
 DESCRIPTION="The classic memory game with some new life"
-HOMEPAGE="https://packages.gentoo.org/package/games-puzzle/concentration"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-DEPEND="media-libs/libsdl[sound,video]
+DEPEND="
+	media-libs/libsdl[sound,video]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-ttf"
-RDEPEND="${DEPEND}"
+RDEPEND="${DEPEND}
+	!sci-biology/unafold"
 
 PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
 
 src_install() {
 	default
+
 	newicon pics/set1/19.png ${PN}.png
-	make_desktop_entry ${PN} Concentration
+	make_desktop_entry ${PN} ${PN^}
 }
diff --git a/games-puzzle/gemdropx/Manifest b/games-puzzle/gemdropx/Manifest
index 0fd19a3b9d79..e8c58615f678 100644
--- a/games-puzzle/gemdropx/Manifest
+++ b/games-puzzle/gemdropx/Manifest
@@ -1,3 +1,3 @@
 DIST gemdropx-0.9.tar.gz 903036 BLAKE2B 8ac4a7df1e0983cc48e17db07d3c0e66c76c23f34df5c094ddd690a8f18bc50ee0a4c0c378b23da1f266b61d4da634655d051daa71592f35d5a8645f0db29761 SHA512 f99292f44575cb86c50e29f220d5fd358b3e6dd379148dcd764eac5bca5edcc49f88e119f9bebddb14017403985378f1bc07633c987556a9264f36ce20cc6fb2
-EBUILD gemdropx-0.9-r2.ebuild 1068 BLAKE2B 9f647c38a0730c05d5fb97b6380964dddf8d20f7530f37544f8408a935c32f56b0a39c52d7377ab307c519af104ae46b3d33e1efbfb13068019cfa16e9787f66 SHA512 e1cab173982a30529b7a86bae686988f15ead3e027e8bdefbf2f3cc0103e1142f346d3f09244e75de9d5b5eb985cfac0b266748d6c5242b1bb171aeeae7460a9
+EBUILD gemdropx-0.9-r3.ebuild 1016 BLAKE2B c86c81d8bcddb804464cfd8f0a84eb0a8e26f09e2fe52c89fdf24f74a4a2d8acaf2bdce6b2331183232623420c58b365338681bbb163af99236e29ebc64c68ce SHA512 265d501108af75a853a5a3d993df8e7275543dbeedf1712cc0f2d19a1492acab4da792c82170f463291afecccce468e47f2b340f9ae6ae4d403ec2e82e49f949
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild
deleted file mode 100644
index 307663065741..000000000000
--- a/games-puzzle/gemdropx/gemdropx-0.9-r2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="A puzzle game where it's your job to clear the screen of gems"
-HOMEPAGE="http://www.newbreedsoftware.com/gemdropx/"
-SRC_URI="ftp://ftp.sonic.net/pub/users/nbs/unix/x/gemdropx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	>=media-libs/libsdl-1.2.3-r1[joystick,video]
-	>=media-libs/sdl-mixer-1.2.1[mod]
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	sed -i \
-		-e '/^CC/d' \
-		-e '/^CXX/d' \
-		-e 's/CXX/CC/' \
-		-e 's/-o/$(LDFLAGS) -o/' \
-		Makefile || die
-
-	find data/ -type d -name .xvpics -exec rm -rf \{\} +
-}
-
-src_compile() {
-	emake \
-		DATA_PREFIX="/usr/share/${PN}" \
-		XTRA_FLAGS="${CFLAGS}"
-}
-
-src_install() {
-	dobin gemdropx
-	dodir "/usr/share/${PN}"
-	cp -r data/* "${ED}/usr/share/${PN}/" || die
-	dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
-	newicon data/images/gemdropx-icon.xpm ${PN}.xpm
-	make_desktop_entry ${PN} "Gem Drop X" /usr/share/pixmaps/${PN}.xpm
-}
diff --git a/games-puzzle/gemdropx/gemdropx-0.9-r3.ebuild b/games-puzzle/gemdropx/gemdropx-0.9-r3.ebuild
new file mode 100644
index 000000000000..81cfe01a5604
--- /dev/null
+++ b/games-puzzle/gemdropx/gemdropx-0.9-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop toolchain-funcs
+
+DESCRIPTION="Puzzle game where it's your job to clear the screen of gems"
+HOMEPAGE="http://www.newbreedsoftware.com/gemdropx/"
+SRC_URI="ftp://ftp.tuxpaint.org/unix/x/gemdropx/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[joystick,sound,video]
+	media-libs/sdl-mixer[mod]"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+	sed -i \
+		-e 's/$(CFLAGS) -o/$(LDFLAGS) -o/' \
+		Makefile || die
+	rm -r data/images/.xvpics || die
+}
+
+src_compile() {
+	local myemakeargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCC)"
+		DATA_PREFIX="${EPREFIX}/usr/share/${PN}"
+		XTRA_FLAGS="${CFLAGS}"
+	)
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r data/.
+
+	dodoc AUTHORS.txt CHANGES.txt ICON.txt README.txt TODO.txt
+
+	newicon data/images/${PN}-icon.xpm ${PN}.xpm
+	make_desktop_entry ${PN} "Gem Drop X"
+}