[gentoo-commits] repo/gentoo:master commit in: games-puzzle/meandmyshadow/files/, games-puzzle/meandmyshadow/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     ee0da788f5576e80c5718f1dfc5dc7cc685ca567
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 20:05:06 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jun 28 21:43:17 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0da788

games-puzzle/meandmyshadow: EAPI-6 bump

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../files/meandmyshadow-0.4-cmake.patch            |  6 ++---
 .../meandmyshadow/meandmyshadow-0.4-r1.ebuild      | 29 +++++++++-------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
index 0bd66d5d284..504f6c0987a 100644
--- a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
+++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
@@ -1,6 +1,6 @@
---- meandmyshadow-0.4.orig/CMakeLists.txt
-+++ meandmyshadow-0.4/CMakeLists.txt
-@@ -15,13 +15,12 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,13 +15,12 @@
  Find_Package(CURL REQUIRED)
  Find_Package(LibArchive REQUIRED)
  Find_Package(OpenSSL REQUIRED)

diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
index c7d403f40c4..567f9a34f9b 100644
--- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
+++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
+
 inherit cmake-utils gnome2-utils
 
 DESCRIPTION="A puzzle/platform game with a player and its shadow"
@@ -13,19 +14,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="opengl"
 
-DEPEND="media-libs/libsdl[sound,video,X]
+DEPEND="
+	app-arch/libarchive
+	dev-libs/openssl:0=
+	media-libs/libsdl[sound,video,X]
 	media-libs/sdl-gfx
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-image[png]
-	dev-libs/openssl:0=
+	media-libs/sdl-mixer[vorbis]
+	media-libs/sdl-ttf
 	net-misc/curl
-	app-arch/libarchive
 	x11-libs/libX11
 	opengl? ( virtual/opengl )
 "
 RDEPEND="${DEPEND}"
 
+DOCS=( AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt )
+
 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
 
 src_configure() {
@@ -36,20 +40,11 @@ src_configure() {
 		-DDATAROOTDIR="/usr/share"
 		-DICONDIR=/usr/share/icons
 		-DDESKTOPDIR=/usr/share/applications
-		$(cmake-utils_use opengl HARDWARE_ACCELERATION)
-		)
+		-DHARDWARE_ACCELERATION=$(usex opengl)
+	)
 	cmake-utils_src_configure
 }
 
-src_install() {
-	cmake-utils_src_install
-	dodoc AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postinst() {
 	gnome2_icon_cache_update
 }