gentoo resync : 08.10.2021

3 files changed, 50 insertions, 48 deletions

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"
+}