[gentoo-commits] proj/gamerlay:master commit in: games-util/terragear-cs/

[Christian Schmitt]

commit:     e81be31aa37d2b45176ff26d2b4fe9aa8d0ef2c8
Author:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
AuthorDate: Mon Apr  2 07:30:42 2012 +0000
Commit:     Christian Schmitt <chris <AT> ilovelinux <DOT> de>
CommitDate: Mon Apr  2 07:31:45 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=e81be31a

[games-util/terragear-cs] always require gdal

---
 games-util/terragear-cs/metadata.xml             |    3 ---
 games-util/terragear-cs/terragear-cs-9999.ebuild |   14 +++-----------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/games-util/terragear-cs/metadata.xml b/games-util/terragear-cs/metadata.xml
index c526329..a5f4ada 100644
--- a/games-util/terragear-cs/metadata.xml
+++ b/games-util/terragear-cs/metadata.xml
@@ -2,9 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>games</herd>
-<use>
- <flag name="gdal">Compile ogr-decode</flag>
-</use>
 <maintainer>
 <email>chris@××××××××××.de</email>
 <name>Christian Schmitt</name>

diff --git a/games-util/terragear-cs/terragear-cs-9999.ebuild b/games-util/terragear-cs/terragear-cs-9999.ebuild
index 695eda3..ffdd080 100644
--- a/games-util/terragear-cs/terragear-cs-9999.ebuild
+++ b/games-util/terragear-cs/terragear-cs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -13,13 +13,13 @@ EGIT_REPO_URI="git://gitorious.org/fg/${PN}.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="gdal"
+IUSE=""
 
 DEPEND=">=dev-games/simgear-9999
 	dev-libs/boost
 	dev-libs/newmat
+	sci-libs/gdal
 	|| ( =x11-libs/agg-2.5 >x11-libs/agg-2.5[gpc] )
-	gdal? ( sci-libs/gdal )
 "
 
 RDEPEND="${DEPEND}"
@@ -27,11 +27,3 @@ RDEPEND="${DEPEND}"
 src_prepare() {
 	sed -e "s|genpolyclip|agggpc|g" -i CMakeModules/FindGPC.cmake
 }
-
-src_configure() {
-	mycmakeargs=(
-	$(cmake-utils_use_enable gdal)
-	)
-
-	cmake-utils_src_configure
-}