gentoo resync : 19.04.2018

4 files changed, 18 insertions, 17 deletions

diff --git a/games-arcade/kajaani-kombat/Manifest b/games-arcade/kajaani-kombat/Manifest
index 544568ca6e1c..e4434e107ad8 100644
--- a/games-arcade/kajaani-kombat/Manifest
+++ b/games-arcade/kajaani-kombat/Manifest
@@ -1,5 +1,5 @@
-AUX 0.7-makefile.patch 547 BLAKE2B df9e317d6d48eb0ab41448143055e2b4245eda957ef4da502f24c1cc239c5eaa2d628c55a09802b8338f2c8af9c095faa931fc83d4bf01ab02341b530ad3d2a4 SHA512 2449ec4d80159f0c0194c36c0a744249813654d6159a775ec337858be377af1c2e9773872c85d0061762055512c4b79972f8727e554de42ecef8029bf1c1f425
-AUX kajaani-kombat-0.7-ldflags.patch 436 BLAKE2B 12cc34934f55ec9329609d7e916feec3486994495e82591244635f22d1ca7a9f64e5d33d5fe629dad1a563b448c08b585e6fa307974bdfd882ece46c9dfc8621 SHA512 56daec457f7d0d535a81cc816ec229d2ba8cb0826af3e3d2e488dedb6b8b2c6b948cf46f96bcec875675f2f3f839ee9a8978441adb595f3af28743242e1343bf
+AUX 0.7-makefile.patch 551 BLAKE2B 4b301ca00a4643f00654e81f3a4396d43106bc2f0f5bbae98d71818a3559472607358a6dd9c2b77a9def3c7772df2ad6ae59e33529de368474b9c4a33a9fee77 SHA512 4d319affec25fe585c0f0af14ed872e71b155be2bab3aabbb72ad01b80395f44b35b13abc765390e19e070305339322598942fa1997463632ee07f4a160ba823
+AUX kajaani-kombat-0.7-ldflags.patch 440 BLAKE2B f63321ed06c0ed26cfe28a1a62650ce9b9b37b29898961fb08b58b5119b023c3335798e36130ad144569c2996e7c4f188caf9cadc3d4a37c01a3bb03bd39d11d SHA512 30a8e6293349a30f6dbcc469fb14377d9461df60227e01d18dfc267f254be62b7cee89bcb6df0b24ec5bcb9cb198701e5b9e0d465f699be4880432a0402b2c71
 DIST kajaani-kombat-0.7.tar.gz 1805504 BLAKE2B 664210a44e5dd5b27ca7b47ca9cb9445373d1243c01fcfb227251c6b48fb8b9e2ebd608eec2244f1b12f47bf5c886482bf70a0700538bbf415d93df41c34fcfe SHA512 84f6923b73c9529fa600c533b5a3de9ea9411f81060c5ad9fb85346fa17c9cb70bf6ba8222319e123372b01286a11b40bb355e8ef8c9bec95cd98f4d0e0460cb
-EBUILD kajaani-kombat-0.7.ebuild 951 BLAKE2B a8c1c7680a5b83aaa90c111f08b7a6d24ee1b0ee40fe960761677e2df0b820bbf2bdced3abca2a6fefc335d34e39e5ba4d55f999772092fd91e4c73d701d4752 SHA512 acc7142628eb021e6acd39cbd4b045c952d1a3df052b06efa6c08ddf8d046449f62fc2eb192049f43c6fdd80ac0b39953ff05aa48502d7040f04953c0e02a6a2
+EBUILD kajaani-kombat-0.7-r1.ebuild 906 BLAKE2B 646f8e6b2fe996bc36c1b8b944646be6a829da8bcd8bfd71b2a774cb137770da35b4359a514f9b209fce4f2dee8c26033667b6813c6956ebaa42511204bdacab SHA512 e22f5d2be756d6a5c26bf6d9555df51b06b316d3fd940594f5233fa8ac8b0c43ebb31ccb5fda01552a6dfa2ba899671b41690cf04b6cf3eb46c1094523d3e234
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kajaani-kombat/files/0.7-makefile.patch b/games-arcade/kajaani-kombat/files/0.7-makefile.patch
index 704bb95c1d13..d67f394fa623 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.000000000 -0500
-+++ Makefile	2005-02-28 22:58:45.000000000 -0500
+--- a/Makefile.orig	2005-02-28 22:55:55.000000000 -0500
++++ b/Makefile	2005-02-28 22:58:45.000000000 -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 c575ff1ef57e..268dcf24ce37 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.000000000 +0200
-+++ Makefile	2010-10-15 15:48:18.000000000 +0200
+--- a/Makefile.old	2010-10-15 15:48:06.000000000 +0200
++++ b/Makefile	2010-10-15 15:48:18.000000000 +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.ebuild b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
index c0d0f15e78c3..1d80c8699c66 100644
--- a/games-arcade/kajaani-kombat/kajaani-kombat-0.7.ebuild
+++ b/games-arcade/kajaani-kombat/kajaani-kombat-0.7-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils games
+EAPI=6
+inherit desktop
 
 DESCRIPTION="A rampart-like game set in space"
 HOMEPAGE="http://kombat.kajaani.net/"
@@ -19,14 +19,16 @@ DEPEND="media-libs/libsdl[sound,video]
 	media-libs/sdl-ttf
 	media-libs/sdl-mixer[vorbis]
 	sys-libs/ncurses:0
-	sys-libs/readline:0"
+	sys-libs/readline:0
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-makefile.patch" \
+	default
+	eapply "${FILESDIR}/${PV}-makefile.patch" \
 		"${FILESDIR}"/${P}-ldflags.patch
 	sed -i \
-		-e "s:GENTOODIR:${GAMES_DATADIR}/${PN}/:" \
+		-e "s:GENTOODIR:/usr/share/${PN}/:" \
 		Makefile || die
 	sed -i \
 		-e 's/IMG_Load/img_load/' \
@@ -34,10 +36,9 @@ src_prepare() {
 }
 
 src_install() {
-	dogamesbin kajaani-kombat
-	insinto "${GAMES_DATADIR}/${PN}"
+	dobin kajaani-kombat
+	insinto "/usr/share/${PN}"
 	doins *.{png,ttf,ogg}
-	dodoc AUTHORS ChangeLog README
+	einstalldocs
 	doman kajaani-kombat.6
-	prepgamesdirs
 }