games-puzzle/caph: update package

Migrated from deprecated eclass, fixed compilation.

Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>

5 files changed, 33 insertions, 128 deletions

diff --git a/games-puzzle/caph/Manifest b/games-puzzle/caph/Manifest
index 6e8d7ec..d5463fb 100644
--- a/games-puzzle/caph/Manifest
+++ b/games-puzzle/caph/Manifest
@@ -1,21 +1 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-DIST caph-1.1.tar.bz2 685093 SHA256 6415970e7d32aefc6da2740f931052be8741d3f6663910a36962400b7b9a7ae8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQlghgAAoJECZQPTSbOzNLM34P/jC0WABzUNGV70KpGVynaVMr
-fe8JMdzWmPK4ldnTcRbkJjcqbnnNJMEyp5Hhl1Td2NSm4BobPmAh6V/EYbrOqwkH
-bQofg5FMhl4aAH81VsLi/yFG3823Ee0Rmo6JXuY/Q1v5BF3yMijRgugFO8WevJxf
-Q0l+DSONbMUqtIM5BltKe0z+y6DGDWY4KV33ssRunJyZbvD5LprBxDEM+KO5a9JD
-IBDm/tIT2GsKXB/m1o+ZelkjNRaUomkBEivbvMAld+yWVs6/+OC4Jc316j9mvJRa
-gElNjEdy1TiEJswJl5ECnTKu01mA+IXVI9yC5p+MKijoIwix87SJDBDNNbT52qMR
-xWRKdxGZ01tE3y3+z7bgqtIMr9bfXUxa0Mn8QHKj//wNqC8qPU7Rs62WkFPdGJ8s
-IfhBZeMfPxQe4XxiMsNZ4ifHWk1UC9ZuwnQ2i3e7UW/C/9P5TNLOgpbgNoEVzB8W
-DuMbqGye5kLGYPBzKWeTmz9mIjq5s6cnBTxmagiav+XXIJKSsuiwwi+WmFBuZHvF
-kneD8HBzIoL3SMW+XXGiFQ1AenCpBMU9NLEc2TK70uQ7E2zAowlxiStG0SiV49V6
-WziabQthd8zCVxJ9klQlOTZENjA9hEl/tmFshgd2Xjx8JOV5RiC9TprSxGf0doWK
-wfmvDkFUWt26UOL1Zl8e
-=Fhp1
------END PGP SIGNATURE-----
+DIST caph-1.1.tar.bz2 685093 SHA256 6415970e7d32aefc6da2740f931052be8741d3f6663910a36962400b7b9a7ae8 SHA512 44c325b5684210e091e416f2914531e72ce66bfd81303bfc696e9e35fb0bf0c73042e9cc3141146ffbfa0de81b6347fcda8ca37cab5b97119bf4cdb99b55cea7 WHIRLPOOL c9c8b463a1f454b5f8bf4dbeaac8ac55fe8d2d996ee497fe2832b1053868ff1558e95ff8e9a44db87dcab6a7e330ab59e23a2d70e356f81ea628d3620690c522
diff --git a/games-puzzle/caph/caph-1.1.ebuild b/games-puzzle/caph/caph-1.1.ebuild
index f2278fa..2b1e82b 100644
--- a/games-puzzle/caph/caph-1.1.ebuild
+++ b/games-puzzle/caph/caph-1.1.ebuild
@@ -1,38 +1,28 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI="2"
-
-inherit games
+EAPI=7
 
 DESCRIPTION="sandbox physics game"
-HOMEPAGE="http://sourceforge.net/projects/caphgame"
-SRC_URI="mirror://sourceforge/caphgame/caph/${PN}game-${PV}/${P}.tar.bz2"
+HOMEPAGE="http://caphgame.sourceforge.net/"
+SRC_URI="https://download.sourceforge.net/caphgame/${PN}/caphgame-${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-DEPEND="media-libs/libpng
+DEPEND="media-libs/libpng:=
 	media-libs/libsdl"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-linux.patch"
-}
-
-src_compile() {
-	cd src \
-	&& CFLAGS="$CFLAGS -I../include" LFLAGS="-lpng -lSDL" ./mkgen > caph.mk \
-	&& ./build \
-	|| die "build failed"
+	default
+	cp "${FILESDIR}/Makefile" .
 }
 
 src_install() {
-	dogamesbin "bin/caph" || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}"
+	dobin ${PN} || die "dobin failed"
+	insinto "/usr/share/"
 	doins -r "share/${PN}" || die "doins failed"
 	dodoc "doc/${PN}/README" || die "dodoc failed"
-	prepgamesdirs
 }
diff --git a/games-puzzle/caph/files/Makefile b/games-puzzle/caph/files/Makefile
new file mode 100644
index 0000000..46179c5
--- /dev/null
+++ b/games-puzzle/caph/files/Makefile
@@ -0,0 +1,22 @@
+CC ?= gcc
+RM ?= rm
+
+CFLAGS += -Iinclude
+LIBS += -lpng -lSDL -lm
+
+SRC := $(wildcard src/*.c)
+OBJS := $(SRC:.c=.o)
+
+BIN = caph
+
+.PHONY : all clean
+all: $(BIN)
+
+$(BIN): $(OBJS)
+	$(CC) $(LFLAGS)  $(OBJS) -o $@ $(LFLAGS) $(LIBS)
+
+%.o: %.c
+	$(CC) $(CFLAGS) -c $< -o $@ -I.
+
+clean:
+	$(RM) -f src/*.o $(BIN)
diff --git a/games-puzzle/caph/files/caph-linux.patch b/games-puzzle/caph/files/caph-linux.patch
deleted file mode 100644
index f83ba69..0000000
--- a/games-puzzle/caph/files/caph-linux.patch
+++ /dev/null
@@ -1,87 +0,0 @@
---- caph-1.1/src/caph.c.orig	2010-10-25 17:40:24.000000000 +0200
-+++ caph-1.1/src/caph.c	2011-03-19 00:26:07.127666043 +0100
-@@ -37,7 +37,7 @@
- #endif
- 
- #define SYS_PRINT	1
--#define SYS_DATA_DIR	"../share/caph/"
-+#define SYS_DATA_DIR	"/usr/share/games/caph/"
- 
- #define DATA_CONFIG		"caph.conf"
- #define HOME_CONFIG		".caph.conf"
-@@ -48,29 +48,8 @@
- static const char *
- sys_get_data_dir()
- {
--	static char dir[256];
--
--#if defined(_WIN32)
--	strcpy(dir, SYS_DATA_DIR);
--	return dir;
--#else
--	int ret = readlink("/proc/self/exe", dir, sizeof(dir));
--	if (ret < 0) {
--		fprintf(stderr, "%s:%i [ERROR] readlink failed: %s \n",
--					__FILE__, __LINE__, strerror(ret));
--		strcpy(dir, SYS_DATA_DIR);
--		return dir;
--	}
--
--	char	*p = dir;
--
--	while (*p != '\0') ++p;
--	while (*p != '/') --p;
--	*++p = '\0';
--
--	strcat(dir, SYS_DATA_DIR);
--	return dir;
--#endif
-+	static char dir[FILENAME_MAX];
-+	return strcpy(dir, SYS_DATA_DIR);
- }
- 
- static void
-@@ -79,38 +58,19 @@
- #if defined(_WIN32)
- 	SetCurrentDirectory(name);
- #else
--	int	ret;
--
--	ret = chdir(name);
-+	chdir(name);
- #endif
- }
- 
- static const char *
- sys_get_config()
- {
--	static char dir[256];
--	const char *home;
--
-+	static char dir[FILENAME_MAX];
- #if defined(_WIN32)
--	strcpy(dir, DATA_CONFIG);
--	return dir;
-+	return strcpy(dir, DATA_CONFIG);
- #else
--	home = getenv("HOME");
--
--	if (home)
--		strcpy(dir, home);
--	else
--		return "";
--
--	char	*p = dir;
--
--	while (*p != '\0') ++p;
--
--	if (*(p - 1) != '/') {
--		*p++ = '/';
--		*p++ = '\0';
--	}
--
-+	strcpy(dir, getenv("HOME"));
-+	strcat(dir, "/");
- 	strcat(dir, HOME_CONFIG);
- 	return dir;
- #endif
diff --git a/games-puzzle/caph/metadata.xml b/games-puzzle/caph/metadata.xml
index eb2356d..7c8395b 100644
--- a/games-puzzle/caph/metadata.xml
+++ b/games-puzzle/caph/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
+<maintainer type="person">
 	<email>krytzz@soylent.eu</email>
 	<name>steffen stramm</name>
 </maintainer>