Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/diameter/
Date: Fri, 26 May 2017 23:35:13
Message-Id: 1495841699.08852b15962ce54d5ca50991a641582e9bc5636b.soap@gentoo
1 commit: 08852b15962ce54d5ca50991a641582e9bc5636b
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Fri May 26 23:22:03 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Fri May 26 23:34:59 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08852b15
7
8 games-arcade/diameter: Port to EAPI 6
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 ....4.0.3-r1.ebuild => diameter-0.4.0.3-r2.ebuild} | 29 ++++++++++++----------
13 1 file changed, 16 insertions(+), 13 deletions(-)
14
15 diff --git a/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild b/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
16 similarity index 79%
17 rename from games-arcade/diameter/diameter-0.4.0.3-r1.ebuild
18 rename to games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
19 index eac428443df..6421dfd3c48 100644
20 --- a/games-arcade/diameter/diameter-0.4.0.3-r1.ebuild
21 +++ b/games-arcade/diameter/diameter-0.4.0.3-r2.ebuild
22 @@ -1,9 +1,11 @@
23 -# Copyright 1999-2016 Gentoo Foundation
24 +# Copyright 1999-2017 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26
27 -EAPI=5
28 +EAPI=6
29 +
30 PYTHON_COMPAT=( python2_7 )
31 -inherit python-any-r1 eutils autotools games
32 +
33 +inherit autotools eutils python-single-r1
34
35 DESCRIPTION="Arcade game with elements of economy and adventure"
36 HOMEPAGE="http://gamediameter.sourceforge.net/"
37 @@ -13,26 +15,25 @@ LICENSE="GPL-2"
38 SLOT="0"
39 KEYWORDS="amd64 x86"
40 IUSE=""
41 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
42
43 -RDEPEND=">=dev-games/guichan-0.8[opengl,sdl]
44 +RDEPEND="
45 + >=dev-games/guichan-0.8[opengl,sdl]
46 media-libs/libpng:0=
47 - virtual/opengl
48 - virtual/glu
49 media-libs/libsdl[video]
50 media-libs/sdl-image[gif,jpeg,png]
51 media-libs/sdl-mixer[mod]
52 + virtual/opengl
53 + virtual/glu
54 ${PYTHON_DEPS}"
55 DEPEND="${RDEPEND}
56 virtual/pkgconfig"
57
58 S=${WORKDIR}/gamediameter
59
60 -pkg_setup() {
61 - python-any-r1_pkg_setup
62 - games_pkg_setup
63 -}
64 -
65 src_prepare() {
66 + default
67 +
68 sed -i \
69 -e "s:gamediameter:diameter:" \
70 configure.in || die
71 @@ -46,12 +47,14 @@ src_prepare() {
72 -e '/gui nebular3.gif/s/gui//' \
73 data/texture/Makefile.am || die
74 eautoreconf
75 +
76 + # needed, otherwise -lpython2.7 will not be found
77 python_export PYTHON PYTHON_LIBS
78 }
79
80 src_install() {
81 default
82 +
83 newicon data/texture/gui/eng/main/logo.png ${PN}.png
84 - make_desktop_entry ${PN} Diameter
85 - prepgamesdirs
86 + make_desktop_entry ${PN} ${PN^}
87 }