[gentoo-commits] proj/sci:master commit in: sci-mathematics/gambit/

["Justin Lecher" <jlec@gentoo.org>]

commit:     8f2846c5830cee4c2a28a7e7e6eccafe13311a00
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 25 13:13:58 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 25 13:13:58 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8f2846c5

Cleaned ebuild

(Portage version: 2.2.0_alpha41/git/Linux x86_64, signed Manifest commit with key 70EB7916)

---
 sci-mathematics/gambit/ChangeLog                  |    6 ++-
 sci-mathematics/gambit/gambit-0.2010.09.01.ebuild |   44 ++++++++-------------
 sci-mathematics/gambit/metadata.xml               |   16 ++++----
 3 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/sci-mathematics/gambit/ChangeLog b/sci-mathematics/gambit/ChangeLog
index 6953686..c3d9a0e 100644
--- a/sci-mathematics/gambit/ChangeLog
+++ b/sci-mathematics/gambit/ChangeLog
@@ -1,7 +1,11 @@
-# ChangeLog for sci-misc/gambit
+# ChangeLog for sci-mathematics/gambit
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Jun 2011; Justin Lecher <jlec@gentoo.org> gambit-0.2010.09.01.ebuild,
+  metadata.xml:
+  Cleaned ebuild
+
   16 Apr 2011; Dongxu Li <dongxuli2011@gmail.com> ChangeLog:
   Moved the the sci-mathematics category.
 

diff --git a/sci-mathematics/gambit/gambit-0.2010.09.01.ebuild b/sci-mathematics/gambit/gambit-0.2010.09.01.ebuild
index 132a798..9eea1b2 100644
--- a/sci-mathematics/gambit/gambit-0.2010.09.01.ebuild
+++ b/sci-mathematics/gambit/gambit-0.2010.09.01.ebuild
@@ -2,44 +2,34 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-DESCRIPTION="Gambit: Software Tools for Game Theory"
+EAPI=4
 
-HOMEPAGE="http://www.gambit-project.org/doc/index.html"
+WX_GTK_VER="2.8"
+
+inherit wxwidgets
 
-SRC_URI="mirror://sourceforge/gambit/${P}.tar.gz
-	"
+DESCRIPTION="Gambit: Software Tools for Game Theory"
+HOMEPAGE="http://www.gambit-project.org/doc/index.html"
+SRC_URI="mirror://sourceforge/gambit/${P}.tar.gz"
 	#http://econweb.tamu.edu/gambit/doc/${PN}-manual-${PV}.pdf
 	#http://econweb.tamu.edu/gambit/doc/${PN}-manual-${PV}.tar.gz
 
 LICENSE="GPL-2"
-
 SLOT="0"
-
 KEYWORDS="~amd64 ~x86"
+IUSE="X"
 
-#IUSE="wxwindows" 
-IUSE="X" 
-
-DEPEND="X? ( >=x11-libs/wxGTK-2.6 
-		=x11-libs/gtk+-1.2* )
-		"
-
-RDEPEND=""
+DEPEND="
+	X? (
+		x11-libs/wxGTK:2.8[X]
+		x11-libs/gtk+:2 )"
+RDEPEND="${DEPEND}"
 
-src_compile() {
-	# disable 
+src_configure() {
 	local myconf
-	if use amd64
-		then
+	if use amd64; then
 		myconf='--disable-enumpoly'
-		fi
+	fi
 	econf "${myconf}" \
-		"$(use_enable X gui)" ||die
-	emake ||die
+		$(use_enable X gui)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install ||die
-	dodoc NEWS README* AUTHORS ChangeLog
-}
-

diff --git a/sci-mathematics/gambit/metadata.xml b/sci-mathematics/gambit/metadata.xml
index f29201e..48126bd 100644
--- a/sci-mathematics/gambit/metadata.xml
+++ b/sci-mathematics/gambit/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<maintainer>
-  <email>dongxuli2011@gmail.com</email>
-  <name>Dongxu Li</name>
-</maintainer>
-<use>
-  <flag name="X">
+	<herd>sci</herd>
+	<maintainer>
+		<email>dongxuli2011@gmail.com</email>
+		<name>Dongxu Li</name>
+	</maintainer>
+	<use>
+		<flag name="X">
   Enable gui support using wxWidgets. 
   </flag>
-</use>
+	</use>
 </pkgmetadata>