public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-arcade/savagewheels/
Date: Thu, 25 May 2017 11:14:10 +0000 (UTC)	[thread overview]
Message-ID: <1495710841.c9b5099c2fd242fb249d09b717d2d54438bf9803.soap@gentoo> (raw)

commit:     c9b5099c2fd242fb249d09b717d2d54438bf9803
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 11:13:43 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu May 25 11:14:01 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b5099c

games-arcade/savagewheels: Cleanup ebuild

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../savagewheels/savagewheels-1.6.1-r1.ebuild      | 32 ++++++----------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild b/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild
index 7eeb62a0f53..7d06e4db88b 100644
--- a/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild
+++ b/games-arcade/savagewheels/savagewheels-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-IUSE="debug fmod sound"
+IUSE="fmod sound"
 
 RDEPEND="
 	media-libs/libsdl
@@ -35,7 +35,7 @@ REQUIRED_USE="fmod? ( sound )"
 src_unpack() {
 	unpack ${P}.tar.gz
 
-	cp "${FILESDIR}/${PN}.in" "${S}"
+	cp "${FILESDIR}/${PN}.in" "${S}" || die
 	mkdir "${WORKDIR}/${GAMEDATA}" ||
 		die "Failed to make directory: ${WORKDIR}/${GAMEDATA}"
 	cd "${WORKDIR}/${GAMEDATA}" ||
@@ -44,26 +44,10 @@ src_unpack() {
 }
 
 src_configure() {
-	local mycmakeargs=()
-
-	if use debug; then
-		CMAKE_BUILD_TYPE=Debug
-	fi
-
-	if use sound; then
-		if use fmod; then
-			mycmakeargs+=( -DSOUND=FMOD -DFMOD_PATH=/opt/fmodex/api )
-		else
-			mycmakeargs+=( -DSOUND=YES )
-		fi
-	else
-		mycmakeargs+=( -DSOUND=NO )
-	fi
-
-	mycmakeargs+=(
-		-DCMAKE_INSTALL_DATADIR=/usr/share/${PN}
-		-DCMAKE_INSTALL_LIBEXECDIR=/usr/libexec/${PN}
-		-DCMAKE_INSTALL_PREFIX=/usr
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DATADIR=share/${PN}
+		-DCMAKE_INSTALL_LIBEXECDIR=libexec/${PN}
+		$(usex sound $(usex fmod '-DSOUND=FMOD -DFMOD_PATH=/opt/fmodex/api' '-DSOUND=YES') '-DSOUND=NO')
 	)
 	cmake-utils_src_configure
 }
@@ -71,6 +55,6 @@ src_configure() {
 src_install() {
 	cmake-utils_src_install
 
-	insinto "/usr/share/${PN}"
+	insinto /usr/share/${PN}
 	doins -r "${WORKDIR}/${GAMEDATA}/."
 }


             reply	other threads:[~2017-05-25 11:14 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-05-25 11:14 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-09-04 21:24 [gentoo-commits] repo/gentoo:master commit in: games-arcade/savagewheels/ Andreas Sturmlechner
2022-06-24 13:09 Andrew Ammerlaan
2021-02-28 19:54 Andreas Sturmlechner
2017-04-08  8:21 Amy Liffey
2017-03-04 21:17 Matt Thode
2016-07-01 12:55 Michał Górny
2016-05-09  3:02 Ian Delaney

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1495710841.c9b5099c2fd242fb249d09b717d2d54438bf9803.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox