Gentoo Archives: gentoo-commits

From: "Vadim A. Misbakh-Soloviov" <mva@×××.name>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gamerlay:master commit in: games-strategy/defcon/
Date: Sun, 11 Feb 2018 18:29:26
Message-Id: 1518371278.2671149b0467cd977600131470988d14098beac8.mva@gentoo
1 commit: 2671149b0467cd977600131470988d14098beac8
2 Author: Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
3 AuthorDate: Sun Feb 11 17:47:58 2018 +0000
4 Commit: Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
5 CommitDate: Sun Feb 11 17:47:58 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=2671149b
7
8 defcon: ebuild fix by email request of "R Moog"
9
10 games-strategy/defcon/defcon-1.6.1.ebuild | 35 ++++++++++++++++++-------------
11 1 file changed, 20 insertions(+), 15 deletions(-)
12
13 diff --git a/games-strategy/defcon/defcon-1.6.1.ebuild b/games-strategy/defcon/defcon-1.6.1.ebuild
14 index a8e409a..5bd959c 100644
15 --- a/games-strategy/defcon/defcon-1.6.1.ebuild
16 +++ b/games-strategy/defcon/defcon-1.6.1.ebuild
17 @@ -1,46 +1,51 @@
18 -# Copyright 1999-2013 Gentoo Foundation
19 +# Copyright 1999-2018 Gentoo Foundation
20 # Distributed under the terms of the GNU General Public License v2
21 -# $Header: $
22
23 -EAPI=4
24 +EAPI=6
25
26 -inherit games
27 -inherit versionator
28 +inherit eutils unpacker versionator
29
30 MY_PV=$(replace_version_separator 2 '-')
31
32 DESCRIPTION="http://www.introversion.co.uk/defcon/"
33 HOMEPAGE="Global thermonuclear war simulation with multiplayer support"
34 -SRC_URI="${PN}_${MY_PV}_amd64.tar.gz"
35 +BASE_URI="https://www.introversion.co.uk/defcon/downloads/${PN}_${MY_PV}___ARCH__.deb"
36 +SRC_URI="
37 + x86? ( ${BASE_URI/__ARCH__/i386} )
38 + amd64? ( ${BASE_URI/__ARCH__/amd64} )
39 +"
40
41 LICENSE="Introversion"
42 SLOT="0"
43 -KEYWORDS="~amd64"
44 -RESTRICT="fetch strip"
45 +KEYWORDS="~x86 ~amd64"
46 +RESTRICT="strip"
47 IUSE=""
48
49 DEPEND=""
50 RDEPEND="
51 + ${DEPEND}
52 virtual/glu
53 media-libs/libogg
54 media-libs/libvorbis
55 media-libs/libsdl:0
56 - "
57 +"
58
59 -S="${WORKDIR}/${PN}"
60 +S="${WORKDIR}"
61
62 src_install() {
63 - local dir="${GAMES_PREFIX_OPT}/${PN}"
64 - local exe="${PN}.bin.x86_64"
65 + local dir="/opt/${PN}"
66 + local exe="${PN}.bin.${ARCH/amd/x86_}"
67 + #use x86 && exe="${PN}.bin.x86"
68 + #use amd64 && exe="${PN}.bin.x86_64"
69
70 insinto "${dir}"
71 exeinto "${dir}"
72 + cd "${S}/usr/local/games/${PN}"
73 doexe "${exe}"
74 doicon "${PN}.png"
75 + dodoc "linux.txt" "license.txt"
76 doins sounds.dat main.dat
77
78 - games_make_wrapper "${PN}" "./${exe}" "${dir}"
79 + make_wrapper "${PN}" "./${exe}" "${dir}"
80 make_desktop_entry "${PN}" "${PN}" "${PN}"
81 -
82 - prepgamesdirs
83 }