[gentoo-commits] repo/gentoo:master commit in: games-strategy/widelands/

[David Seifert]

commit:     14ca01dbeba3097beef76581824497c27998d1ab
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 20:21:31 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed May  3 20:24:56 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14ca01db

games-strategy/widelands: [QA] Remove PREFIX setting for CMake

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 games-strategy/widelands/widelands-0.18-r1.ebuild | 42 +++++++++++------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/games-strategy/widelands/widelands-0.18-r1.ebuild b/games-strategy/widelands/widelands-0.18-r1.ebuild
index 8b1942ab2fe..68633a78a37 100644
--- a/games-strategy/widelands/widelands-0.18-r1.ebuild
+++ b/games-strategy/widelands/widelands-0.18-r1.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils versionator cmake-utils
 
 MY_PV=build$(get_version_component_range 2)
 MY_P=${PN}-${MY_PV}-src
+
 DESCRIPTION="A game similar to Settlers 2"
 HOMEPAGE="http://www.widelands.org/"
 SRC_URI="https://launchpad.net/widelands/${MY_PV}/build-$(get_version_component_range 2)/+download/${MY_P}.tar.bz2"
@@ -15,10 +17,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
-DEPEND="dev-lang/lua:0
-	>=dev-libs/boost-1.48
-	media-libs/glew
-	media-libs/libpng:0
+RDEPEND="
+	dev-lang/lua:0
+	>=dev-libs/boost-1.48:=
+	media-libs/glew:0=
+	media-libs/libpng:0=
 	media-libs/libsdl[video]
 	media-libs/sdl-gfx
 	media-libs/sdl-image[jpeg,png]
@@ -26,21 +29,18 @@ DEPEND="dev-lang/lua:0
 	media-libs/sdl-net
 	media-libs/sdl-ttf
 	sys-libs/zlib[minizip]"
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
 CMAKE_BUILD_TYPE=Release
 
-# Game is NOT happy being moved from /usr/share/games
-PREFIX="/usr/share/games/${PN}"
-
 PATCHES=(
 	"${FILESDIR}"/${P}-cxxflags.patch
 )
 
 src_prepare() {
-	default
+	cmake-utils_src_prepare
 
 	sed -i -e 's:__ppc__:__PPC__:' src/s2map.cc || die
 	sed -i -e '/WL_VERSION_MINOR/s/17/18/' CMakeLists.txt || die
@@ -48,22 +48,22 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
-		'-DWL_VERSION_STANDARD=true'
-		"-DWL_INSTALL_PREFIX=/usr/games"
-		"-DWL_INSTALL_DATADIR=/usr/share/games/${PN}"
-		"-DWL_INSTALL_LOCALEDIR=/usr/share/games/${PN}/locale"
-		"-DWL_INSTALL_BINDIR=/usr/bin"
+		-DWL_VERSION_STANDARD=true
+
+		# Game is NOT happy being moved from /usr/share/games
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr/share/games/${PN}
+
+		-DWL_INSTALL_PREFIX="${EPREFIX}"/usr/games
+		-DWL_INSTALL_DATADIR="${EPREFIX}"/usr/share/games/${PN}
+		-DWL_INSTALL_LOCALEDIR="${EPREFIX}"/usr/share/games/${PN}/locale
+		-DWL_INSTALL_BINDIR="${EPREFIX}"/usr/bin
 	)
 	cmake-utils_src_configure
 }
 
-src_compile() {
-	cmake-utils_src_compile
-}
-
 src_install() {
 	cmake-utils_src_install
+
 	newicon pics/wl-ico-128.png ${PN}.png
-	make_desktop_entry ${PN} Widelands
-	dodoc ChangeLog CREDITS
+	make_desktop_entry ${PN} ${PN^}
 }