Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-puzzle/meandmyshadow/files/, games-puzzle/meandmyshadow/
Date: Thu, 28 Jun 2018 21:43:32
Message-Id: 1530222197.ee0da788f5576e80c5718f1dfc5dc7cc685ca567.asturm@gentoo
1 commit: ee0da788f5576e80c5718f1dfc5dc7cc685ca567
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 28 20:05:06 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 28 21:43:17 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee0da788
7
8 games-puzzle/meandmyshadow: EAPI-6 bump
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 .../files/meandmyshadow-0.4-cmake.patch | 6 ++---
13 .../meandmyshadow/meandmyshadow-0.4-r1.ebuild | 29 +++++++++-------------
14 2 files changed, 15 insertions(+), 20 deletions(-)
15
16 diff --git a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
17 index 0bd66d5d284..504f6c0987a 100644
18 --- a/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
19 +++ b/games-puzzle/meandmyshadow/files/meandmyshadow-0.4-cmake.patch
20 @@ -1,6 +1,6 @@
21 ---- meandmyshadow-0.4.orig/CMakeLists.txt
22 -+++ meandmyshadow-0.4/CMakeLists.txt
23 -@@ -15,13 +15,12 @@
24 +--- a/CMakeLists.txt
25 ++++ b/CMakeLists.txt
26 +@@ -15,13 +15,12 @@
27 Find_Package(CURL REQUIRED)
28 Find_Package(LibArchive REQUIRED)
29 Find_Package(OpenSSL REQUIRED)
30
31 diff --git a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
32 index c7d403f40c4..567f9a34f9b 100644
33 --- a/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
34 +++ b/games-puzzle/meandmyshadow/meandmyshadow-0.4-r1.ebuild
35 @@ -1,7 +1,8 @@
36 # Copyright 1999-2018 Gentoo Foundation
37 # Distributed under the terms of the GNU General Public License v2
38
39 -EAPI=5
40 +EAPI=6
41 +
42 inherit cmake-utils gnome2-utils
43
44 DESCRIPTION="A puzzle/platform game with a player and its shadow"
45 @@ -13,19 +14,22 @@ SLOT="0"
46 KEYWORDS="~amd64 ~x86"
47 IUSE="opengl"
48
49 -DEPEND="media-libs/libsdl[sound,video,X]
50 +DEPEND="
51 + app-arch/libarchive
52 + dev-libs/openssl:0=
53 + media-libs/libsdl[sound,video,X]
54 media-libs/sdl-gfx
55 - media-libs/sdl-ttf
56 - media-libs/sdl-mixer[vorbis]
57 media-libs/sdl-image[png]
58 - dev-libs/openssl:0=
59 + media-libs/sdl-mixer[vorbis]
60 + media-libs/sdl-ttf
61 net-misc/curl
62 - app-arch/libarchive
63 x11-libs/libX11
64 opengl? ( virtual/opengl )
65 "
66 RDEPEND="${DEPEND}"
67
68 +DOCS=( AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt )
69 +
70 PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
71
72 src_configure() {
73 @@ -36,20 +40,11 @@ src_configure() {
74 -DDATAROOTDIR="/usr/share"
75 -DICONDIR=/usr/share/icons
76 -DDESKTOPDIR=/usr/share/applications
77 - $(cmake-utils_use opengl HARDWARE_ACCELERATION)
78 - )
79 + -DHARDWARE_ACCELERATION=$(usex opengl)
80 + )
81 cmake-utils_src_configure
82 }
83
84 -src_install() {
85 - cmake-utils_src_install
86 - dodoc AUTHORS ChangeLog README docs/{Controls,ThemeDescription}.txt
87 -}
88 -
89 -pkg_preinst() {
90 - gnome2_icon_savelist
91 -}
92 -
93 pkg_postinst() {
94 gnome2_icon_cache_update
95 }