[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/

[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/

[Pacho Ramos]

commit:     5ff7fb1904213ca81cc0b9dba096cd86ccde4da8
Author:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 17 20:53:18 2018 +0000
Commit:     Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Tue Apr 17 21:00:53 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ff7fb19

games-arcade/kajaani-kombat: Drop old

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 .../kajaani-kombat/kajaani-kombat-0.7.ebuild       | 43 ----------------------
 1 file changed, 43 deletions(-)

diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
deleted file mode 100644
index c0d0f15e78c..00000000000
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils games
-
-DESCRIPTION="A rampart-like game set in space"
-HOMEPAGE="http://kombat.kajaani.net/"
-SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND="media-libs/libsdl[sound,video]
-	media-libs/sdl-net
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
-	sys-libs/ncurses:0
-	sys-libs/readline:0"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-makefile.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
-	sed -i \
-		-e "s:GENTOODIR:${GAMES_DATADIR}/${PN}/:" \
-		Makefile || die
-	sed -i \
-		-e 's/IMG_Load/img_load/' \
-		gui_screens.cpp || die
-}
-
-src_install() {
-	dogamesbin kajaani-kombat
-	insinto "${GAMES_DATADIR}/${PN}"
-	doins *.{png,ttf,ogg}
-	dodoc AUTHORS ChangeLog README
-	doman kajaani-kombat.6
-	prepgamesdirs
-}

[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/

[Sergei Trofimovich]

commit:     7e781edca0032b004cf61b58e3fa348fbc6ef5f6
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Tue May 18 21:49:28 2021 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Tue May 18 22:00:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e781edc

games-arcade/kajaani-kombat: use tool-refixed $CXX

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>

 games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
index 2aeaac0b139..f61f69728ca 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit desktop
+EAPI=7
+inherit desktop toolchain-funcs
 
 DESCRIPTION="A rampart-like game set in space"
 HOMEPAGE="http://kombat.kajaani.net/"
@@ -23,16 +23,22 @@ DEPEND="media-libs/libsdl[sound,video]
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PV}-makefile.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+)
+
 src_prepare() {
 	default
-	eapply "${FILESDIR}/${PV}-makefile.patch" \
-		"${FILESDIR}"/${P}-ldflags.patch
+
 	sed -i \
 		-e "s:GENTOODIR:/usr/share/${PN}/:" \
 		Makefile || die
 	sed -i \
 		-e 's/IMG_Load/img_load/' \
 		gui_screens.cpp || die
+
+	tc-export CXX
 }
 
 src_install() {

[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/

[Ionen Wolkens]

commit:     58fa461098632691032a74b27ab3a008030e56fd
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Jun  9 17:00:59 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 20:00:17 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58fa4610

games-arcade/kajaani-kombat: remove unused eclass, minor improvements

Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
index f61f69728ca..7e5f1806554 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
@@ -2,16 +2,16 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit desktop toolchain-funcs
 
-DESCRIPTION="A rampart-like game set in space"
-HOMEPAGE="http://kombat.kajaani.net/"
-SRC_URI="http://kombat.kajaani.net/dl/${P}.tar.gz"
+inherit toolchain-funcs
+
+DESCRIPTION="Rampart-like game set in space"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-net
@@ -34,9 +34,6 @@ src_prepare() {
 	sed -i \
 		-e "s:GENTOODIR:/usr/share/${PN}/:" \
 		Makefile || die
-	sed -i \
-		-e 's/IMG_Load/img_load/' \
-		gui_screens.cpp || die
 
 	tc-export CXX
 }

[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/

[Ionen Wolkens]

commit:     9d6822bcb704d1d05ab250d963303a143c7f7cfc
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 18:28:46 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 20:53:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d6822bc

games-arcade/kajaani-kombat: add .desktop icon, EAPI 7->8

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

 games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
index 6c34c9d2c9d..72fc100bce3 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit desktop flag-o-matic toolchain-funcs
 
@@ -45,7 +45,8 @@ src_install() {
 	insinto /usr/share/${PN}
 	doins *.{ogg,png,ttf}
 
-	make_desktop_entry ${PN} "Kajaani Kombat" applications-games
-
 	einstalldocs
+
+	newicon 1face.png ${PN}.png
+	make_desktop_entry ${PN} "Kajaani Kombat"
 }