[gentoo-commits] repo/gentoo:master commit in: games-arcade/digger/files/, games-arcade/digger/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/digger/files/, games-arcade/digger/

[Ionen Wolkens]

commit:     b6c0126ed28dcec5e0e3772b41727333156d6454
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 13 02:05:54 2022 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Aug 13 09:00:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6c0126e

games-arcade/digger: EAPI6->8, switch to cmake

cmake is correct as-is without the patch, albeit still needs
manual src_install

Also:
* add missing icon
* use https for homepage
* add some missing deps: libsdl[sound], xorg-proto, zlib
(would need minor changes to work without libX11 and libsdl[X])

With old gitorious being gone can't look for a new snapshot,
there is a sdl2 fork of this (Digger Reloaded) on github which
may be worth trying but it seems(?) dead as well.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-arcade/digger/Manifest                       |  1 +
 games-arcade/digger/digger-20140423-r1.ebuild      | 27 ------------------
 games-arcade/digger/digger-20140423-r2.ebuild      | 33 ++++++++++++++++++++++
 .../digger/files/digger-20140423-ldflags.patch     | 21 --------------
 4 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/games-arcade/digger/Manifest b/games-arcade/digger/Manifest
index 291e615e7047..04734b322fba 100644
--- a/games-arcade/digger/Manifest
+++ b/games-arcade/digger/Manifest
@@ -1 +1,2 @@
 DIST digger-20140423.tar.gz 117375 BLAKE2B 39ec5a17c2a12c1d23ed8dbcecfcd1f8309d5309540cd6d50d92aeee056e60f31156016f7cbcdf35092690c0e4df9312feee0a686c8fb1afb6068181630aca59 SHA512 9277c6dc4d7f74aeede379b42aeeef881d8fd927ef0e6f6c0e1a5f76be257244c4353758557209647812b942d215dd992939b190ef11f854b41ee2ceaab7eece
+DIST digger.png 1593 BLAKE2B 64595baa9bc41756cdfaf7bd9a4421e42b0bf82f8114d28227e887e822dcf19e2e6dd40344cdb83875dbcbc6200007ffdd2e0d16bfed8e92ef1b14bdf131fbf7 SHA512 3b191bdb8d823b777bc77495cf8566aa911d46ec45dd1c46f3a0dc100f25ee01b3e145a1512d0122b496ed5eabbdf3a4b3b609a3b2867de49aae22c644a9f510

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 $@