gentoo resync : 19.04.2018

4 files changed, 20 insertions, 18 deletions

diff --git a/games-arcade/kobodeluxe/Manifest b/games-arcade/kobodeluxe/Manifest
index e3f7751a3089..4cd8de944a2c 100644
--- a/games-arcade/kobodeluxe/Manifest
+++ b/games-arcade/kobodeluxe/Manifest
@@ -1,5 +1,5 @@
-AUX kobodeluxe-0.5.1-glibc2.10.patch 215 BLAKE2B c539d01a3f3dbedaf90503aba74a4a54754fb9d9e82dace7b0b6a5832aed757c260415816cf41ff75a3cfdee3b7616303f031647706f7b514e98c0e85a6beb01 SHA512 207dca0fb0e65ed3391c9bab7d39a1b4d9ee64a9261e4d23ef72a812fd4caa5d2ccc2235c8c97d4febddd84a020a6d4c18cfc383da4bf2fde49598c8d15014a6
-AUX kobodeluxe-0.5.1-glibc29.patch 2400 BLAKE2B 566b474b40eea4bf7abb3d414beb3bac38576a534ac105db8814eb890f5ad2ffd77d245a083395c60b4b73f07e0cadf52e6c40befb0664254da7f4f168f1d559 SHA512 af5e047b6759c1f15de953646ebe6d05ebdb3571864f38d9b00466165e864fffcd7ab83ead9d42518fdc9c3714f579cc92ecefb7f4cab318317475e51cc3f078
+AUX kobodeluxe-0.5.1-glibc2.10.patch 219 BLAKE2B 78c45966711049c7715ae0efd18289be82b4ea3965d85338ab81c79f07785273a6d767cf471deace08722b3ab9b8581a45201e30343b9e6ad784d820256b7dd9 SHA512 77624a0e18958d76c938e9d1becb72803079364612056687fb955cc912bda9b4443c7e6245abb6a32cc3ff96b04c63993e3cd114f73115254efe7b50f749a45c
+AUX kobodeluxe-0.5.1-glibc29.patch 2408 BLAKE2B c3abfe3594b2c43428d4e49a34285680a1ae2ac40106aac255aa2da846a67ecbcfcf8f5d8af48ca0adbf627d188f6a8941d6b4f75df3bdad39fff4d869b324e1 SHA512 de2014b9a0607ddb5853c63eb4c14daf4f14d2158697348d952305db09b4a8f84a3a918cd730085f01120b7cbcfae076afd73c559c1ddd46f5a9777c89e76897
 DIST KoboDeluxe-0.5.1.tar.bz2 1781752 BLAKE2B d7f08ab9603b861f8992629bac9a65051a3c5fee6822f1951d57cbc5c31055a6cefeed098637dda84c0a1538645f47816848d767a4fa7916726b5784dfbc0414 SHA512 fc107e4367fd300574823aa40c68311d95de3a403d7c930963b8754aac14293f0624996fd77c4de0677921d11883047b68dd95df81eeb03078c37426ebd58afd
-EBUILD kobodeluxe-0.5.1.ebuild 1267 BLAKE2B 5d626390318790b496609427fe21c6495b1cb1e6bf23d46a396526509003be32de3ae857587127ad170704f745c8d3873ac9860508fffa498b3e0f1ee8018c2f SHA512 27e508e11ea87d46c7a26ddddafaf6fcf0233b38f974e41fbc980608fb0fe4d98fd51e77a491980b8888544461b5b8ddd2730be3b00596704e9e320f0c53de24
+EBUILD kobodeluxe-0.5.1-r1.ebuild 1240 BLAKE2B bf7875f2773598a895ff9749090ed2f8401ba16003899c72b24df371fe1098b2ad3014eea11b3039cf6bda82d9e4a4567cbeadec9ed1d94ce62f3ee4bc561ff9 SHA512 dbcd2e12238fe34d2dfd9cfdd89a67dbed625eeffba442088c556e66ec996a91f68b51c9e56aabb6e2fcbe5cc4c3481ad02c4b08ee3b95fa63577c1475c0dd98
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
index 1095cc1c7330..c6c06d9ce2a6 100644
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc2.10.patch
@@ -1,5 +1,5 @@
---- graphics/window.cpp
-+++ graphics/window.cpp
+--- a/graphics/window.cpp
++++ b/graphics/window.cpp
 @@ -398,7 +398,7 @@
  		 */
  		if(token)
diff --git a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
index 98451bb29975..7a9ef355a821 100644
--- a/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
+++ b/games-arcade/kobodeluxe/files/kobodeluxe-0.5.1-glibc29.patch
@@ -1,5 +1,5 @@
---- enemies.h
-+++ enemies.h
+--- a/enemies.h
++++ b/enemies.h
 @@ -70,9 +70,9 @@
  extern const enemy_kind bomb2;
  extern const enemy_kind bombdeto;
@@ -21,8 +21,8 @@
  }
  
  
---- enemy.cpp
-+++ enemy.cpp
+--- a/enemy.cpp
++++ b/enemy.cpp
 @@ -713,7 +713,7 @@
  
  void _enemy::kill_cannon()
diff --git a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-r1.ebuild
index 26695f44115f..846176da162e 100644
--- a/games-arcade/kobodeluxe/kobodeluxe-0.5.1.ebuild
+++ b/games-arcade/kobodeluxe/kobodeluxe-0.5.1-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
 
 MY_P="KoboDeluxe-${PV/_/}"
 DESCRIPTION="An SDL port of xkobo, a addictive space shoot-em-up"
@@ -16,9 +16,11 @@ IUSE="opengl"
 
 DEPEND="media-libs/libsdl
 	media-libs/sdl-image[png]
-	opengl? ( virtual/opengl )"
+	opengl? ( virtual/opengl )
+"
 RDEPEND="${DEPEND}"
-S=${WORKDIR}/${MY_P}
+
+S="${WORKDIR}/${MY_P}"
 
 src_unpack() {
 	unpack ${A}
@@ -27,7 +29,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/${P}-glibc29.patch \
 		"${FILESDIR}"/${P}-glibc2.10.patch
 	# Fix paths
@@ -42,13 +45,12 @@ src_prepare() {
 }
 
 src_configure() {
-	egamesconf $(use_enable opengl)
+	econf $(use_enable opengl)
 }
 
 src_install () {
 	default
 	newicon icons/KDE/icons/32x32/kobodl.png ${PN}.png
 	make_desktop_entry kobodl "Kobo Deluxe"
-	prepgamesdirs
-	fperms 2775 "${GAMES_STATEDIR}"/${PN}
+	keepdir /var/lib/${PN}
 }