Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/
Date: Tue, 23 Apr 2019 10:05:29
Message-Id: 1556013920.5e99d2ca2d2cf1c7ae9933c00a01158ed548f8f6.polynomial-c@gentoo
1 commit: 5e99d2ca2d2cf1c7ae9933c00a01158ed548f8f6
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 23 09:35:03 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 23 10:05:20 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e99d2ca
7
8 games-strategy/freeorion: Bumped live ebuild to EAPI-7
9
10 Package-Manager: Portage-2.3.64, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 games-strategy/freeorion/freeorion-9999.ebuild | 22 +++++++++++++---------
14 1 file changed, 13 insertions(+), 9 deletions(-)
15
16 diff --git a/games-strategy/freeorion/freeorion-9999.ebuild b/games-strategy/freeorion/freeorion-9999.ebuild
17 index 8d750687b35..578e570e2ff 100644
18 --- a/games-strategy/freeorion/freeorion-9999.ebuild
19 +++ b/games-strategy/freeorion/freeorion-9999.ebuild
20 @@ -1,10 +1,10 @@
21 -# Copyright 1999-2018 Gentoo Foundation
22 +# Copyright 1999-2019 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 -EAPI=6
26 +EAPI=7
27
28 PYTHON_COMPAT=( python2_7 )
29 -inherit cmake-utils python-single-r1 gnome2-utils
30 +inherit cmake-utils python-single-r1 xdg
31
32 DESCRIPTION="A free turn-based space empire and galactic conquest game"
33 HOMEPAGE="http://www.freeorion.org"
34 @@ -40,7 +40,8 @@ RDEPEND="
35 !dev-games/gigi"
36 # Use bundled gigi as of freeorion-0.4.3
37
38 -DEPEND="${RDEPEND}
39 +DEPEND="${RDEPEND}"
40 +BDEPEND="
41 ${PYTHON_DEPS}
42 virtual/pkgconfig"
43
44 @@ -57,12 +58,11 @@ src_prepare() {
45
46 src_configure() {
47 local mycmakeargs=(
48 - -DCMAKE_BUILD_TYPEE=Release
49 - -DRELEASE_COMPILE_FLAGS=""
50 + -DCMAKE_BUILD_TYPE=Release
51 -DCMAKE_SKIP_RPATH=ON
52 )
53
54 - append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
55 + #append-cppflags -DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
56
57 cmake-utils_src_configure
58 }
59 @@ -74,10 +74,14 @@ src_install() {
60 newenvd "${FILESDIR}/${PN}.envd" 99${PN}
61 }
62
63 +pkg_preinst() {
64 + xdg_pkg_preinst
65 +}
66 +
67 pkg_postinst() {
68 - gnome2_icon_cache_update
69 + xdg_pkg_postinst
70 }
71
72 pkg_postrm() {
73 - gnome2_icon_cache_update
74 + xdg_pkg_postrm
75 }