[gentoo-commits] proj/sci:master commit in: sci-chemistry/openbabel/

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

commit:     b42161658cfe02fb43865103a0659b2e350412b9
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 25 16:26:42 2011 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Mar 25 16:26:42 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b4216165

Cleaned ebuild

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

---
 sci-chemistry/openbabel/ChangeLog              |    4 ++
 sci-chemistry/openbabel/metadata.xml           |    3 --
 sci-chemistry/openbabel/openbabel-2.3.0.ebuild |   42 ++++++++++++++++-------
 3 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog
index 84f52f9..603f9c1 100644
--- a/sci-chemistry/openbabel/ChangeLog
+++ b/sci-chemistry/openbabel/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Mar 2011; Justin Lecher <jlec@gentoo.org> openbabel-2.3.0.ebuild,
+  metadata.xml:
+  Cleaned ebuild
+
   07 Mar 2011; Justin Lecher <jlec@gentoo.org> openbabel-2.3.0.ebuild:
   Correct Slots for gtk 3 introduction to tree
 

diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml
index 9216990..d0238dd 100644
--- a/sci-chemistry/openbabel/metadata.xml
+++ b/sci-chemistry/openbabel/metadata.xml
@@ -8,7 +8,4 @@
 	search, convert, analyze, or store data from molecular modeling, chemistry,
 	solid-state materials, biochemistry, or related areas.
   </longdescription>
-  <use>
-    <flag name="gui">Build wxWidgets GUI.</flag>
-  </use>
 </pkgmetadata>

diff --git a/sci-chemistry/openbabel/openbabel-2.3.0.ebuild b/sci-chemistry/openbabel/openbabel-2.3.0.ebuild
index 50c9afa..1229d6f 100644
--- a/sci-chemistry/openbabel/openbabel-2.3.0.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.3.0.ebuild
@@ -4,7 +4,10 @@
 
 EAPI="3"
 
-inherit cmake-utils eutils
+WX_GTK_VER="2.8"
+PYTHON_DEPEND="python? 2"
+
+inherit cmake-utils eutils python wxwidgets
 
 DESCRIPTION="Interconverts file formats used in molecular modeling"
 HOMEPAGE="http://openbabel.sourceforge.net/"
@@ -13,38 +16,51 @@ SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
 KEYWORDS="~amd64"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="doc gui"
+IUSE="doc python wxwidgets"
 
 RDEPEND="
+	dev-cpp/eigen:2
 	dev-libs/libxml2:2
-	>=sci-chemistry/inchi-1.03
 	!sci-chemistry/babel
-	dev-cpp/eigen:2
+	sci-libs/inchi
 	sys-libs/zlib
-	gui? ( x11-libs/wxGTK )"
+	wxwidgets? ( x11-libs/wxGTK:2.8[X] )"
 DEPEND="${RDEPEND}
 	>=dev-util/cmake-2.4.8"
 
+DOCS="AUTHORS ChangeLog NEWS README THANKS doc/*.inc doc/README* doc/*.mol2"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-test_lib_path.patch
+}
+
 src_configure() {
-	epatch "${FILESDIR}/${P}-test_lib_path.patch" \
-		|| die "Failed to apply ${P}-test_lib_path.patch"
 	local mycmakeargs=""
-	mycmakeargs="${mycmakearg}
+	mycmakeargs="${mycmakeargs}
 		-DOPENBABEL_USE_SYSTEM_INCHI=ON
-		$(cmake-utils_use gui BUILD_GUI)
-		$(cmake-utils_use_enable test TESTS)"
+		$(cmake-utils_use python PYTHON_BINDINGS)
+		$(cmake-utils_use wxwidgets BUILD_GUI)"
 
 	cmake-utils_src_configure
 }
 
 src_install() {
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die
-	dodoc doc/{*.inc,README*,*.inc,*.mol2} || die
 	dohtml doc/{*.html,*.png} || die
 	if use doc ; then
 		insinto /usr/share/doc/${PF}/API/html
 		doins doc/API/html/* || die
 	fi
-
 	cmake-utils_src_install
 }
+
+src_test() {
+	local mycmakeargs=""
+	mycmakeargs="${mycmakeargs}
+		-DOPENBABEL_USE_SYSTEM_INCHI=ON
+		$(cmake-utils_use wxwidgets BUILD_GUI)
+		$(cmake-utils_use_enable test TESTS)"
+
+	cmake-utils_src_configure
+	cmake-utils_src_compile
+	cmake-utils_src_test
+}