gentoo auto-resync : 13:08:2022 - 14:24:01

4 files changed, 35 insertions, 50 deletions

diff --git a/games-arcade/digger/Manifest b/games-arcade/digger/Manifest
index fbf41f75df3a..0a11d0904bc2 100644
--- a/games-arcade/digger/Manifest
+++ b/games-arcade/digger/Manifest
@@ -1,4 +1,4 @@
-AUX digger-20140423-ldflags.patch 659 BLAKE2B f999cde34935ff2919327b4a6e1fa8ff9a8559507d97e504b0b6ff3f1958307a0aa03b4f0c93415e3056798ed555795079aeb36e830fa02da71962cfa957656e SHA512 69ebbe64576df62927389087f22f4871582bde0507be7cd80f1ea96abb14819c844d7adbbfd13c89e2e6921d1accd289e5cc2246a25a962639dc5bdf40b23fd1
 DIST digger-20140423.tar.gz 117375 BLAKE2B 39ec5a17c2a12c1d23ed8dbcecfcd1f8309d5309540cd6d50d92aeee056e60f31156016f7cbcdf35092690c0e4df9312feee0a686c8fb1afb6068181630aca59 SHA512 9277c6dc4d7f74aeede379b42aeeef881d8fd927ef0e6f6c0e1a5f76be257244c4353758557209647812b942d215dd992939b190ef11f854b41ee2ceaab7eece
-EBUILD digger-20140423-r1.ebuild 525 BLAKE2B e0fb6abcf8bf9fc946d87659f0510b6ffbca397415dddd21ca495228c660ab2b9ddc414e84bb2f6f8127cc28a236a496efdde71e2c1d626f6501cdb33456fed4 SHA512 acbc98c8ddcfa6b75849c8c8b591b53e522218f8b703563d3826b06539b1f922cff0d6cd9b9f284e22eb0247369e1a2ff318f4860b9a5f867ef664a3817120c0
+DIST digger.png 1593 BLAKE2B 64595baa9bc41756cdfaf7bd9a4421e42b0bf82f8114d28227e887e822dcf19e2e6dd40344cdb83875dbcbc6200007ffdd2e0d16bfed8e92ef1b14bdf131fbf7 SHA512 3b191bdb8d823b777bc77495cf8566aa911d46ec45dd1c46f3a0dc100f25ee01b3e145a1512d0122b496ed5eabbdf3a4b3b609a3b2867de49aae22c644a9f510
+EBUILD digger-20140423-r2.ebuild 629 BLAKE2B 3f10b5c04f4f288ac8d1d333b7fd2907675c198ea424fce7ba385f27efcc3e03e8ce77deb7a13a6f9b3d8c12ef97f6055800521cf58ae06e3a4b5e844f2c335d SHA512 f5e81c040045c31420a5e4f307f97dcb0bd577da868cdcbfe48f80e270f414f359149039e3227f8f0cc693e6b81e403af9fe9d874153e45fcaaae4e9fa128db0
 MISC metadata.xml 250 BLAKE2B 8d44bd4c6e7d6491273e2015e36ddac74af7b94a124fd240ff030e16430f5c85e53ab812f0e3e94bb2e6d138f39b512bbe01ff98b0081cacc21a02d648ec7643 SHA512 80ac07a3cac10ad2e72e9989a130b7d2073934fe92914a9db2af4d0e769d4bf537770f8faba0654bbd64a7e85ee38cf1f9d03b4b9cd322864b1b2bb35087d610
diff --git a/games-arcade/digger/digger-20140423-r1.ebuild b/games-arcade/digger/digger-20140423-r1.ebuild
deleted file mode 100644
index 0fd2a02a51dd..000000000000
--- a/games-arcade/digger/digger-20140423-r1.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Digger Remastered"
-HOMEPAGE="http://www.digger.org/"
-SRC_URI="mirror://gentoo/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-
-DEPEND="media-libs/libsdl[X,video]
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${PN}"
-
-PATCHES=( "${FILESDIR}"/${P}-ldflags.patch )
-
-src_install() {
-	dobin digger
-	dodoc digger.txt
-	make_desktop_entry digger Digger
-}
diff --git a/games-arcade/digger/digger-20140423-r2.ebuild b/games-arcade/digger/digger-20140423-r2.ebuild
new file mode 100644
index 000000000000..20b53e40a1c3
--- /dev/null
+++ b/games-arcade/digger/digger-20140423-r2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake desktop
+
+DESCRIPTION="Digger Remastered"
+HOMEPAGE="https://www.digger.org/"
+SRC_URI="
+	mirror://gentoo/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+S="${WORKDIR}/${PN}-${PN}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[X,sound,video]
+	sys-libs/zlib:=
+	x11-libs/libX11"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto"
+
+src_install() {
+	dobin "${BUILD_DIR}"/${PN}
+	dodoc ${PN}.txt
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}
diff --git a/games-arcade/digger/files/digger-20140423-ldflags.patch b/games-arcade/digger/files/digger-20140423-ldflags.patch
deleted file mode 100644
index fd1e9953b634..000000000000
--- a/games-arcade/digger/files/digger-20140423-ldflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru digger-digger.orig/Makefile digger-digger/Makefile
---- digger-digger.orig/Makefile	2013-10-11 04:56:41.000000000 -0400
-+++ digger-digger/Makefile	2014-04-24 13:11:58.749211920 -0400
-@@ -26,7 +26,7 @@
- ifeq ($(ARCH),"LINUX")
- OBJS	+= fbsd_sup.o	# strup()
- RCFLAGS	+= -DLINUX $(shell sdl-config --cflags)
--LIBS	+= $(shell sdl-config --libs) -lz
-+LIBS	+= $(shell sdl-config --libs) -lX11 -lz
- ESUFFIX	=
- endif
- 
-@@ -40,7 +40,7 @@
- all: digger$(ESUFFIX)
- 
- digger$(ESUFFIX): $(OBJS)
--	$(CC) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o digger$(ESUFFIX) $(OBJS) $(LIBS)
- 
- $(OBJS): %.o: %.c
- 	$(CC) -c $(RCFLAGS) $(CFLAGS) $< -o $@