commit:     2671149b0467cd977600131470988d14098beac8
Author:     Vadim A. Misbakh-Soloviov <git <AT> mva <DOT> name>
AuthorDate: Sun Feb 11 17:47:58 2018 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Sun Feb 11 17:47:58 2018 +0000
URL:        https://gitweb.gentoo.org/proj/gamerlay.git/commit/?id=2671149b

defcon: ebuild fix by email request of "R Moog"

 games-strategy/defcon/defcon-1.6.1.ebuild | 35 ++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/games-strategy/defcon/defcon-1.6.1.ebuild 
b/games-strategy/defcon/defcon-1.6.1.ebuild
index a8e409a..5bd959c 100644
--- a/games-strategy/defcon/defcon-1.6.1.ebuild
+++ b/games-strategy/defcon/defcon-1.6.1.ebuild
@@ -1,46 +1,51 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
 
-EAPI=4
+EAPI=6
 
-inherit games
-inherit versionator
+inherit eutils unpacker versionator
 
 MY_PV=$(replace_version_separator 2 '-')
 
 DESCRIPTION="http://www.introversion.co.uk/defcon/";
 HOMEPAGE="Global thermonuclear war simulation with multiplayer support"
-SRC_URI="${PN}_${MY_PV}_amd64.tar.gz"
+BASE_URI="https://www.introversion.co.uk/defcon/downloads/${PN}_${MY_PV}___ARCH__.deb";
+SRC_URI="
+       x86? ( ${BASE_URI/__ARCH__/i386} )
+       amd64? ( ${BASE_URI/__ARCH__/amd64} )
+"
 
 LICENSE="Introversion"
 SLOT="0"
-KEYWORDS="~amd64"
-RESTRICT="fetch strip"
+KEYWORDS="~x86 ~amd64"
+RESTRICT="strip"
 IUSE=""
 
 DEPEND=""
 RDEPEND="
+               ${DEPEND}
                virtual/glu
                media-libs/libogg
                media-libs/libvorbis
                media-libs/libsdl:0
-               "
+"
 
-S="${WORKDIR}/${PN}"
+S="${WORKDIR}"
 
 src_install() {
-       local dir="${GAMES_PREFIX_OPT}/${PN}"
-       local exe="${PN}.bin.x86_64"
+       local dir="/opt/${PN}"
+       local exe="${PN}.bin.${ARCH/amd/x86_}"
+       #use x86 && exe="${PN}.bin.x86"
+       #use amd64 && exe="${PN}.bin.x86_64"
 
        insinto "${dir}"
        exeinto "${dir}"
+       cd "${S}/usr/local/games/${PN}"
        doexe "${exe}"
        doicon "${PN}.png"
+       dodoc "linux.txt" "license.txt"
        doins sounds.dat main.dat
 
-       games_make_wrapper "${PN}" "./${exe}" "${dir}"
+       make_wrapper "${PN}" "./${exe}" "${dir}"
        make_desktop_entry "${PN}" "${PN}" "${PN}"
-
-       prepgamesdirs
 }

Reply via email to