[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/
commit: 9d6822bcb704d1d05ab250d963303a143c7f7cfc Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jun 29 18:28:46 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jun 29 20:53:12 2021 + 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 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" }
[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/files/, games-arcade/kajaani-kombat/
commit: db4d082f8af014d25ef97f6de6d1390d91341933 Author: Ionen Wolkens gentoo org> AuthorDate: Tue Jun 15 00:25:38 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jun 15 20:00:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db4d082f games-arcade/kajaani-kombat: gcc11 and clang fix, tidy Using -std=c++14 to avoid a rather large patch, but still need a patch due to pointer misuse (also fixes build with clang). Revbump due to minor RDEPEND updates and new .desktop entry. Also, added a missing a EPREFIX. Closes: https://bugs.gentoo.org/739086 Closes: https://bugs.gentoo.org/790743 Signed-off-by: Ionen Wolkens gentoo.org> .../files/kajaani-kombat-0.7-gcc11.patch | 31 +++ ...-0.7-r1.ebuild => kajaani-kombat-0.7-r2.ebuild} | 36 -- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch new file mode 100644 index 000..9a3968fcf83 --- /dev/null +++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-gcc11.patch @@ -0,0 +1,31 @@ +These SDL_* return NULL on error, and gcc11/clang won't allow this. +https://bugs.gentoo.org/739086 +--- a/client_net.cpp b/client_net.cpp +@@ -33,3 +33,3 @@ + cond = SDL_CreateCond(); +- if (cond <0) ++ if (!cond) + { +@@ -39,3 +39,3 @@ + mutex = SDL_CreateMutex(); +- if (mutex < 0) ++ if (!mutex) + { +@@ -47,3 +47,3 @@ + trans_th = SDL_CreateThread (&client_tcpnet::transf_func, (void *) this); +- if (trans_th < 0) ++ if (!trans_th) + { +@@ -53,3 +53,3 @@ + input_th = SDL_CreateThread (&client_tcpnet::input_func, (void *) this); +- if (input_th < 0) ++ if (!input_th) + { +--- a/game_server.cpp b/game_server.cpp +@@ -66,3 +66,3 @@ + con_th = SDL_CreateThread (&game_server::connection_accepter, (void *) this); +- if (con_th < 0) ++ if (!con_th) + { diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild similarity index 54% rename from games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild rename to games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild index 7e5f1806554..6c34c9d2c9d 100644 --- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild +++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r2.ebuild @@ -3,45 +3,49 @@ EAPI=7 -inherit toolchain-funcs +inherit desktop flag-o-matic 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" +LICENSE="BitstreamVera GPL-2+" SLOT="0" KEYWORDS="~amd64 ~x86" -DEPEND="media-libs/libsdl[sound,video] - media-libs/sdl-net +RDEPEND=" + media-libs/libsdl[sound,video] media-libs/sdl-image[png] - media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] - sys-libs/ncurses:0 - sys-libs/readline:0 -" -RDEPEND="${DEPEND}" + media-libs/sdl-net + media-libs/sdl-ttf + sys-libs/ncurses:= + sys-libs/readline:=" +DEPEND="${RDEPEND}" PATCHES=( "${FILESDIR}"/${PV}-makefile.patch "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-gcc11.patch ) src_prepare() { default - sed -i \ - -e "s:GENTOODIR:/usr/share/${PN}/:" \ - Makefile || die + sed -i "s|GENTOODIR|${EPREFIX}/usr/share/${PN}/|" Makefile || die tc-export CXX + append-cxxflags -std=c++14 #790743 } src_install() { - dobin kajaani-kombat - insinto "/usr/share/${PN}" - doins *.{png,ttf,ogg} + dobin ${PN} + doman ${PN}.6 + + insinto /usr/share/${PN} + doins *.{ogg,png,ttf} + + make_desktop_entry ${PN} "Kajaani Kombat" applications-games + einstalldocs - doman kajaani-kombat.6 }
[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/
commit: 58fa461098632691032a74b27ab3a008030e56fd Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Jun 9 17:00:59 2021 + Commit: Ionen Wolkens gentoo org> CommitDate: Tue Jun 15 20:00:17 2021 + 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 levelnine.at> Signed-off-by: Ionen Wolkens 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/
commit: 7e781edca0032b004cf61b58e3fa348fbc6ef5f6 Author: Sergei Trofimovich gentoo org> AuthorDate: Tue May 18 21:49:28 2021 + Commit: Sergei Trofimovich gentoo org> CommitDate: Tue May 18 22:00:58 2021 + 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 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/, games-arcade/burgerspace/, games-arcade/alienwave/, ...
commit: bf2f65d34bb6ced159cb36969380b8988bd5613f Author: Michał Górny gentoo org> AuthorDate: Fri Oct 11 15:35:17 2019 + Commit: Michał Górny gentoo org> CommitDate: Fri Oct 11 15:35:17 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf2f65d3 games-arcade: Remove *-fbsd KEYWORDS Signed-off-by: Michał Górny gentoo.org> games-arcade/abe/abe-1.1-r1.ebuild | 2 +- games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild | 2 +- games-arcade/alienwave/alienwave-0.4.0-r1.ebuild | 2 +- games-arcade/amphetamine/amphetamine-0.8.10-r1.ebuild | 2 +- games-arcade/aop/aop-0.6-r1.ebuild | 2 +- games-arcade/apricots/apricots-0.2.6-r2.ebuild | 2 +- games-arcade/ascii-invaders/ascii-invaders-0.1b-r1.ebuild | 2 +- games-arcade/asteroid/asteroid-1.2.1.ebuild| 2 +- games-arcade/betna/betna-0.9.7.ebuild | 2 +- games-arcade/bomns/bomns-0.99.2.ebuild | 2 +- games-arcade/bub-n-bros/bub-n-bros-1.6.2.ebuild| 2 +- games-arcade/burgerspace/burgerspace-1.9.2.ebuild | 2 +- games-arcade/cavezofphear/cavezofphear-0.5.1.ebuild| 2 +- games-arcade/cob/cob-0.9-r1.ebuild | 2 +- games-arcade/conveysdl/conveysdl-1.3-r1.ebuild | 2 +- games-arcade/defendguin/defendguin-0.0.12-r1.ebuild| 2 +- games-arcade/digger/digger-20140423-r1.ebuild | 2 +- games-arcade/epiar/epiar-0.5-r1.ebuild | 2 +- games-arcade/funnyboat/funnyboat-1.5-r2.ebuild | 2 +- games-arcade/gav/gav-0.9.0-r1.ebuild | 2 +- games-arcade/gnake/gnake-0.94b-r1.ebuild | 2 +- games-arcade/gunocide2ex/gunocide2ex-1.0.ebuild| 2 +- games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild | 2 +- games-arcade/lbreakout2/lbreakout2-2.6.5-r1.ebuild | 2 +- games-arcade/netris/netris-0.52-r3.ebuild | 2 +- games-arcade/nibbles/nibbles-0.0.4-r1.ebuild | 2 +- games-arcade/ninvaders/ninvaders-0.1.1-r1.ebuild | 2 +- games-arcade/openbubbles/openbubbles-1.2-r1.ebuild | 2 +- games-arcade/primateplunge/primateplunge-1.1-r2.ebuild | 2 +- games-arcade/pycadia/pycadia-0.5.1-r1.ebuild | 2 +- games-arcade/rockdodger/rockdodger-0.6.0a-r1.ebuild| 2 +- games-arcade/sdl-sopwith/sdl-sopwith-1.7.5-r2.ebuild | 2 +- games-arcade/sdlroids/sdlroids-1.3.4-r4.ebuild | 2 +- games-arcade/spout/spout-1.3-r1.ebuild | 2 +- games-arcade/supertransball2/supertransball2-1.5-r1.ebuild | 2 +- games-arcade/trailblazer/trailblazer-0.9.ebuild| 2 +- games-arcade/tuxdash/tuxdash-0.8-r1.ebuild | 2 +- games-arcade/tuxpuck/tuxpuck-0.8.2-r2.ebuild | 2 +- games-arcade/watermelons/watermelons-1.1.1-r1.ebuild | 2 +- games-arcade/wop/wop-0.4.3-r2.ebuild | 2 +- games-arcade/xjump/xjump-2.7.5.ebuild | 2 +- games-arcade/xrick/xrick-021212-r2.ebuild | 2 +- games-arcade/xsfcave/xsfcave-0.5-r1.ebuild | 2 +- games-arcade/yarsrevenge/yarsrevenge-0.99-r1.ebuild| 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/games-arcade/abe/abe-1.1-r1.ebuild b/games-arcade/abe/abe-1.1-r1.ebuild index e98e3af41b0..9e2dbd75173 100644 --- a/games-arcade/abe/abe-1.1-r1.ebuild +++ b/games-arcade/abe/abe-1.1-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/abe/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="media-libs/libsdl[sound,video] diff --git a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild b/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild index 58cc73f1c8a..acc061abc50 100644 --- a/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild +++ b/games-arcade/afternoonstalker/afternoonstalker-1.1.5-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="" RDEPEND=">=dev-games/flatzebra-0.1.6" diff --git a/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild b/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild index 7667f63fda5..ae153679760 100644 --- a/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild +++ b/games-arcade/alienwave/alienwave-0.4.0-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.alessandropira.org/${PN}/${P}.tar.gz"; LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86 ~x86-fbsd" +KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="sys-libs/ncurses:0" diff --git a/games-arcade/amphetamine/
[gentoo-commits] repo/gentoo:master commit in: games-arcade/kajaani-kombat/
commit: 5ff7fb1904213ca81cc0b9dba096cd86ccde4da8 Author: Pacho Ramos gentoo org> AuthorDate: Tue Apr 17 20:53:18 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Apr 17 21:00:53 2018 + 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..000 --- 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/files/, games-arcade/kajaani-kombat/
commit: 1d4e8a633367b073a55f8497217eb82a64c668d2 Author: Pacho Ramos gentoo org> AuthorDate: Tue Apr 17 20:53:09 2018 + Commit: Pacho Ramos gentoo org> CommitDate: Tue Apr 17 21:00:51 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d4e8a63 games-arcade/kajaani-kombat: Stop using games.eclass Package-Manager: Portage-2.3.28, Repoman-2.3.9 .../kajaani-kombat/files/0.7-makefile.patch| 4 +- .../files/kajaani-kombat-0.7-ldflags.patch | 4 +- .../kajaani-kombat/kajaani-kombat-0.7-r1.ebuild| 44 ++ 3 files changed, 48 insertions(+), 4 deletions(-) diff --git a/games-arcade/kajaani-kombat/files/0.7-makefile.patch b/games-arcade/kajaani-kombat/files/0.7-makefile.patch index 704bb95c1d1..d67f394fa62 100644 --- a/games-arcade/kajaani-kombat/files/0.7-makefile.patch +++ b/games-arcade/kajaani-kombat/files/0.7-makefile.patch @@ -1,5 +1,5 @@ Makefile.orig 2005-02-28 22:55:55.0 -0500 -+++ Makefile 2005-02-28 22:58:45.0 -0500 +--- a/Makefile.orig2005-02-28 22:55:55.0 -0500 b/Makefile 2005-02-28 22:58:45.0 -0500 @@ -39,8 +39,8 @@ endif ## UNIX RELEASE (default option) diff --git a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch index c575ff1ef57..268dcf24ce3 100644 --- a/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch +++ b/games-arcade/kajaani-kombat/files/kajaani-kombat-0.7-ldflags.patch @@ -1,5 +1,5 @@ Makefile.old 2010-10-15 15:48:06.0 +0200 -+++ Makefile 2010-10-15 15:48:18.0 +0200 +--- a/Makefile.old 2010-10-15 15:48:06.0 +0200 b/Makefile 2010-10-15 15:48:18.0 +0200 @@ -85,7 +85,7 @@ client_net.o: client_net.h client_net.cpp globals.h monitor_queue.h msg.h diff --git a/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild new file mode 100644 index 000..1d80c8699c6 --- /dev/null +++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit desktop + +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() { + 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 +} + +src_install() { + dobin kajaani-kombat + insinto "/usr/share/${PN}" + doins *.{png,ttf,ogg} + einstalldocs + doman kajaani-kombat.6 +}