Cleaned ebuild

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

4 files changed, 39 insertions, 22 deletions

diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog
index 84f52f9ef..603f9c10d 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/Manifest b/sci-chemistry/openbabel/Manifest
index a106b8cf6..ca2d1b1f1 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -3,13 +3,13 @@ Hash: SHA1
 
 AUX openbabel-2.3.0-test_lib_path.patch 637 RMD160 08d27b2de2aa7c323808373d5874dd4fd08528c9 SHA1 f5539ee8e213444f05965b3636f0bf1edd7212a7 SHA256 3f6e2f4ba94a85cb901f37142097fd74a484c948c17123af3bd646ad48ea8517
 DIST openbabel-2.3.0.tar.gz 14321281 RMD160 96dafa3c2aca544f79e08b5617ab0da845c28a16 SHA1 408a4bddb7f052fd89c57ea51b4204b721856b16 SHA256 6dadcb256d83b1f2e616fa1853dd1afadb23550a20d1c118b406231a09f861fb
-EBUILD openbabel-2.3.0.ebuild 1256 RMD160 66b68f19cb4ed45911af6d840db48720e9ca42c9 SHA1 af25be4e3bc992d2cd3d3b8690d9d4c81dd20b5b SHA256 9553ebefc3e5c6b7ca31dd527322ad7344f94d4dbdd32f72c8171f311fdb5756
-MISC ChangeLog 693 RMD160 18da3c53af0fe6a77bb46a17d9f45974fba674ed SHA1 d003e78275728ecd5c431c000fded2e81a6141b1 SHA256 e2a2b0dd025d6ca6d64e5edaf80683875f5c39e7d86a46a8371b2bc1afcd034b
-MISC metadata.xml 556 RMD160 cbdac54d6194392cc84af051fcc383b92efaa442 SHA1 1688c92a6f78653de1e6d20454d8ed86fa66c372 SHA256 2c77ec519a361d0e37fc17413bb67c78fe6890c2f07626c642041c8868678739
+EBUILD openbabel-2.3.0.ebuild 1544 RMD160 fc1497c0e26f39994c1ef9d3621e1b49db27b067 SHA1 3d963bc4525020a35979f3024f663b3a9d489ec5 SHA256 4e7913a95c7da763d59c6e676a39e79fa76507f870ec5cf080d4908312d85cf0
+MISC ChangeLog 798 RMD160 debe12bed29a41adebfac23b0553e87f1a4add43 SHA1 341d4eb266eceed992a1f89c5861f52cce4c6e46 SHA256 5d420816c65ffbb94882c7cd9a819c3004b817018d2a71b88b7151d872f26c22
+MISC metadata.xml 490 RMD160 443b08385246148cc37ad53df59658eabcb07cf3 SHA1 4a031d5b463dbcc4fea187c155f4771ee57683fc SHA256 dba1cb37e8e79e9816a15bcad3ceeffd991572ddad57ad58607ebb110a79b5a5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk10vfUACgkQgAnW8HDreRYbiQCeP4S7OPyEg0CCVDS+AdmboTpo
-eRwAoKSjuxGq/GJ1/3P4g9quCkwO5r5S
-=Fu5l
+iEYEARECAAYFAk2MwkIACgkQgAnW8HDreRauCwCfReOsm4/3DAvMpJ67TI+0LAYp
+5ZsAoMei6e5IUUK3PebQIhp7CIHhM1xv
+=rJ1X
 -----END PGP SIGNATURE-----
diff --git a/sci-chemistry/openbabel/metadata.xml b/sci-chemistry/openbabel/metadata.xml
index 92169906f..d0238ddef 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 50c9afa71..1229d6f31 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
+}