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

5 files changed, 48 insertions, 93 deletions

diff --git a/games-arcade/komi/Manifest b/games-arcade/komi/Manifest
index efd81b5afec7..a332e1e9165e 100644
--- a/games-arcade/komi/Manifest
+++ b/games-arcade/komi/Manifest
@@ -1,5 +1,4 @@
-AUX 1.04-DESTDIR.patch 974 BLAKE2B be10af269f5c812e921cf2d7e355b2d4d9380ac4b70910cb43f488572f753da34b3b162aa7e7aa5138eefc62ba17c3e678a59e9954f50165cc3954d0d33defdc SHA512 225ff9737d8cbb76d20be02fded66a12f70d0e65dddfd979f5b72fe1f1dffb74b47ccb065235b1c2ea7d71a198e10bbad144fb22ce4743e4d9842c138b696598
-AUX komi-1.04-install.patch 384 BLAKE2B fcc975cbbc6fce54edb399b73d0f0672e30ab6cf7db8bb68c80468fb4a17c19331444c4d7c3428e0c812dac9468b1fce9cb87e65adcea49a733aca2e875249e3 SHA512 65174431b1668e842795af8f0e17d8e1ea004af29068cc968494ee81bf5fe3c9308192c772f6f37f97388cd1630b7e67f65a8c0973365e7aa2b260c9104e03e0
 DIST komi-1.04.tar.gz 954526 BLAKE2B b7be781da0143f4cd563e885ff7688c2f50b5c1be6fbd8d383aeda06873b25a2081ae58b750a00a70d140757a57ec49652ff5e8c4ebf6ba0f306539707c06c31 SHA512 60babb3642bea7598089b342ba582b2f63f6aa051352ad9b2fa5bad0222a32306775a207712d2e7a9242be5e3ff5b4734f5b62708e451e7230499c6812d4c8a3
-EBUILD komi-1.04-r1.ebuild 918 BLAKE2B 7361900135a1206de147ecfc4a855441fbf20d64f81ba2d0c0d307f32cf943a11e44d7ea5d1f68081b3c007f0b30f7ef5b9557562aa24b90e8aaf36144181eab SHA512 5b1498f26459c6b83ace2efbfcc27ffddb02f4484e3416512ad5a8056e8b97010a0ccd1dabf285d9c28ae0f76df1c3cab61cfdfeb83b8498a87ca12966da0f52
+DIST komi.png 352 BLAKE2B 676acccaf198680b62143c436b21aae418ffeacefbcdf32b03b6a78d69e529a499dd4c7a4e2cdf7bdf996d330b683d09cd7b485b7a76dc6805e7798c13acf2e2 SHA512 ba899f07a56e38ccd7fe35b2060f651ab8a5a7edb099ec0bcc69bb70c43b94d459910fc4fb5fe931617cd8d17aa945e2847325ce5aba0b2550713a35216cf88f
+EBUILD komi-1.04-r2.ebuild 1029 BLAKE2B dfc16e9071e601d32f72c0c4549959281559c5ef5fbd0fd827fcf0cc3a2cdf7442f9608132d1b4419dddc5d3d8adbeb058934cfc00a07080482e734074a51368 SHA512 cb3961229725101316633e6489c6900367f76290511988c176647453d55dfba6994bf1f09b9aff9988058a7b3997f3596479c6cb364108f957ac71230a4c5de9
 MISC metadata.xml 328 BLAKE2B ee75aeb71624ad6198f6d5a65c49bc79556f0bdd37f571287885937d2c4ccc6dafbc1b48ffb0e8b3b983e7dfa73633cada40dd3eef7c5ca3e80be522372dcdde SHA512 6743d5969966274c3048450c1f89ab9266393f693fe958a59fb11d0987e58d2fa808618a5df66bcd68294c771eb92c8c021d4825f528a0e4f84b65e4fc0d6761
diff --git a/games-arcade/komi/files/1.04-DESTDIR.patch b/games-arcade/komi/files/1.04-DESTDIR.patch
deleted file mode 100644
index 4060d51f3a7d..000000000000
--- a/games-arcade/komi/files/1.04-DESTDIR.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/Makefile.orig	2004-12-11 01:36:11.000000000 -0800
-+++ b/Makefile	2004-12-11 01:36:14.000000000 -0800
-@@ -13,9 +13,7 @@
- MIXER=-lSDL_mixer
- SDL_LIB=$(shell sdl-config --static-libs) $(MIXER)
- 
--CFLAGS=-Wall -pedantic -std=c99 -O2 \
--	$(shell sdl-config --cflags) \
--	-DDATAPATH=\"$(DATAPATH)\"
-+CFLAGS= $(ECFLAGS) $(shell sdl-config --cflags) -DDATAPATH=\"$(DATAPATH)\"
- 
- all:	komi
- 
-@@ -24,15 +22,13 @@
- 	-rm *.o
- 
- install:
--	install -d $(DATAPATH)
--	cp -R komidata/* $(DATAPATH)
--	chmod -R 644 $(DATAPATH)
--	chmod 755 $(DATAPATH)
--	install -d $(BINPATH)
--	cp komi $(BINPATH)
--	chmod 755 $(BINPATH)komi
--	install -d $(MANPATH)
--	cp komi.6 $(MANPATH)komi.6
-+	install -d $(DESTDIR)$(DATAPATH)
-+	cp -R komidata/* $(DESTDIR)$(DATAPATH)
-+	chmod -R 644 $(DESTDIR)$(DATAPATH)
-+	chmod 755 $(DESTDIR)$(DATAPATH)
-+	install -d $(DESTDIR)$(BINPATH)
-+	cp komi $(DESTDIR)$(BINPATH)
-+	chmod 755 $(DESTDIR)$(BINPATH)/komi
- 
- komi:	komi.o
- 	$(CC) $(CFLAGS) komi.o -o komi $(SDL_LIB)
diff --git a/games-arcade/komi/files/komi-1.04-install.patch b/games-arcade/komi/files/komi-1.04-install.patch
deleted file mode 100644
index 30395eaff72b..000000000000
--- a/games-arcade/komi/files/komi-1.04-install.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.old	2015-01-05 11:35:24.794160467 +0100
-+++ b/Makefile	2015-01-05 11:36:23.181058180 +0100
-@@ -24,8 +24,6 @@
- install:
- 	install -d $(DESTDIR)$(DATAPATH)
- 	cp -R komidata/* $(DESTDIR)$(DATAPATH)
--	chmod -R 644 $(DESTDIR)$(DATAPATH)
--	chmod 755 $(DESTDIR)$(DATAPATH)
- 	install -d $(DESTDIR)$(BINPATH)
- 	cp komi $(DESTDIR)$(BINPATH)
- 	chmod 755 $(DESTDIR)$(BINPATH)/komi
diff --git a/games-arcade/komi/komi-1.04-r1.ebuild b/games-arcade/komi/komi-1.04-r1.ebuild
deleted file mode 100644
index 5e0804c4843e..000000000000
--- a/games-arcade/komi/komi-1.04-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop
-
-DESCRIPTION="Komi the Space Frog - simple SDL game of collection"
-HOMEPAGE="http://komi.sourceforge.net"
-SRC_URI="mirror://sourceforge/komi/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="media-libs/libsdl[video]
-	media-libs/sdl-mixer
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	eapply "${FILESDIR}"/${PV}-DESTDIR.patch \
-		"${FILESDIR}"/${P}-install.patch
-	sed -i \
-		-e "/^BINPATH/s:=.*:=/usr/bin/:" \
-		-e "/^DATAPATH/s:=.*:=/usr/share/${PN}/:" \
-		-e '/^SDL_LIB/s:$: $(LDFLAGS):' \
-		-e '/^SDL_LIB/s:--static-:--:' \
-		Makefile \
-		|| die "sed failed"
-}
-
-src_compile() {
-	emake ECFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-	newicon komidata/sprites_komi.bmp ${PN}.bmp
-	make_desktop_entry komi Komi /usr/share/pixmaps/${PN}.bmp
-	doman komi.6
-}
diff --git a/games-arcade/komi/komi-1.04-r2.ebuild b/games-arcade/komi/komi-1.04-r2.ebuild
new file mode 100644
index 000000000000..037419878c52
--- /dev/null
+++ b/games-arcade/komi/komi-1.04-r2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+DESCRIPTION="Komi the Space Frog - a simple SDL game"
+HOMEPAGE="http://komi.sourceforge.net/"
+SRC_URI="
+	mirror://sourceforge/komi/${P}.tar.gz
+	https://dev.gentoo.org/~ionen/distfiles/${PN}.png"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libsdl[sound,video]
+	media-libs/sdl-mixer"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	tc-export CC
+
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags sdl SDL_mixer || die) \
+		-DDATAPATH="'\"${EPREFIX}/usr/share/${PN}/\"'"
+	append-libs $($(tc-getPKG_CONFIG) --libs sdl SDL_mixer || die)
+
+	# simpler to use implicit rules than fix the Makefile
+	emake -f /dev/null LDLIBS="${LIBS}" ${PN}
+}
+
+src_install() {
+	dobin ${PN}
+
+	insinto /usr/share/${PN}
+	doins -r komidata/.
+
+	doman ${PN}.6
+	dodoc CHANGELOG.txt README.txt
+
+	doicon "${DISTDIR}"/${PN}.png
+	make_desktop_entry ${PN} ${PN^}
+}