Integrated some improvements from My Th <rei4dan@gmail.com> in bug 212212.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 79 insertions, 35 deletions

diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog
index 716ff83c7c0b..ec037c29ba04 100644
--- a/sci-chemistry/openbabel/ChangeLog
+++ b/sci-chemistry/openbabel/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-chemistry/openbabel
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.20 2009/02/18 21:44:47 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.21 2009/02/28 20:49:33 cryos Exp $
+
+*openbabel-2.2.1_beta3-r1 (28 Feb 2009)
+
+  28 Feb 2009; Marcus D. Hanwell <cryos@gentoo.org>
+  -openbabel-2.2.1_beta3.ebuild, +openbabel-2.2.1_beta3-r1.ebuild:
+  Integrated some improvements from My Th <rei4dan@gmail.com> in bug 212212.
 
 *openbabel-2.2.1_beta3 (18 Feb 2009)
 
diff --git a/sci-chemistry/openbabel/Manifest b/sci-chemistry/openbabel/Manifest
index 1a8837360f71..0e2459bf241f 100644
--- a/sci-chemistry/openbabel/Manifest
+++ b/sci-chemistry/openbabel/Manifest
@@ -6,6 +6,6 @@ DIST openbabel-2.2.1b3-20090215-r2890.tar.gz 6585623 RMD160 8769dd271fb7607e86e8
 EBUILD openbabel-2.0.2.ebuild 667 RMD160 ee4ee93793126401b8148b2bab91df99ef0d53c5 SHA1 02301355cfc193b2d435e722afd94fcaf7e64c53 SHA256 eda3d983c1605a34a35b1a7fa415dbed3fc5279e33be1c8cbb0f9016c3c11fe5
 EBUILD openbabel-2.1.1.ebuild 693 RMD160 50e56a7c0b2726cf9b38640c0ea4536b8ba3f20a SHA1 bee5cbc6b81225ddda7fb05225ec84fc77c73f33 SHA256 22ad4f03522744f0829b1ba6948096fa7a018599fdf4f75b3e9bd1111d68bd7f
 EBUILD openbabel-2.2.0.ebuild 774 RMD160 fa383243633dcb5cfd92a026ff954a15cb2fc8b8 SHA1 c693823b9734268e0f1983a15b6c99fdcb62b0cb SHA256 d97b420623375cd44d4e183e0ba29ee584b39956c6347eda16ad0a206450c277
-EBUILD openbabel-2.2.1_beta3.ebuild 850 RMD160 4fc0be1a4de44b488208839de4c8b17410a4855b SHA1 6ab91dcb9e46453fd03da41084899eafa81a2d0b SHA256 b47f770e8e12faee1b1dc5fab8a4b14496065d6ed67ee99607eb7b53c7e41c33
-MISC ChangeLog 4099 RMD160 e6b593c66b98dff2c36080333e6bf09c9ed4e94b SHA1 08f18ffb4d0de4fd7238aeb863b3c38946ff0967 SHA256 8c6ead5027da03ffc43c659eb576c257107f12e10da51e9b897d28f0844b2fb5
+EBUILD openbabel-2.2.1_beta3-r1.ebuild 1596 RMD160 7a0a23aaec3d031939ebcdc0669b41104dd6debe SHA1 99d8f358ef907950b3b3d4176df7cafdd786a854 SHA256 461c45fc4ae0aed02e9bd5e340b9337ca15029b086a8e10fb2f899daf05a6930
+MISC ChangeLog 4337 RMD160 62fb64d23130d01676fa229911956fc5715a8985 SHA1 3ff48c830a8ff6359f7edd2cece4d7f6dc919b7b SHA256 8d3a6fc663389707223e76a0dfa02b739a0f0471ccfc29a20237bdd1e963a787
 MISC metadata.xml 490 RMD160 443b08385246148cc37ad53df59658eabcb07cf3 SHA1 4a031d5b463dbcc4fea187c155f4771ee57683fc SHA256 dba1cb37e8e79e9816a15bcad3ceeffd991572ddad57ad58607ebb110a79b5a5
diff --git a/sci-chemistry/openbabel/openbabel-2.2.1_beta3-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.2.1_beta3-r1.ebuild
new file mode 100644
index 000000000000..d2c526d6160c
--- /dev/null
+++ b/sci-chemistry/openbabel/openbabel-2.2.1_beta3-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.1_beta3-r1.ebuild,v 1.1 2009/02/28 20:49:33 cryos Exp $
+
+EAPI=1
+
+inherit eutils
+
+MY_PV="2.2.1b3-20090215-r2890"
+
+DESCRIPTION="interconverts file formats used in molecular modeling"
+HOMEPAGE="http://openbabel.sourceforge.net/"
+SRC_URI="mirror://sourceforge/openbabel/${PN}-${MY_PV}.tar.gz"
+
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="doc"
+
+RDEPEND="!sci-chemistry/babel
+	>=dev-libs/libxml2-2.6.5
+	sys-libs/zlib"
+
+DEPEND="${RDEPEND}
+	>=dev-libs/boost-1.33.1
+	dev-lang/perl
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${PN}-${MY_PV}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${PN}-2.2.0-doxyfile.patch"
+}
+
+src_compile() {
+	econf \
+		--enable-static \
+		|| die "econf failed"
+	emake || die "emake failed"
+	if use doc ; then
+		emake docs || "make docs failed"
+	fi
+}
+
+src_test() {
+	emake check || die "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+	cd doc
+	dohtml *.html *.png
+	dodoc *.inc README* *.inc *.mol2
+	if use doc ; then
+		dodir /usr/share/doc/${PF}/API/html
+		insinto /usr/share/doc/${PF}/API/html
+		cd API/html
+		doins *
+	fi
+}
+
+pkg_postinst() {
+	echo
+	elog "This version of OpenBabel includes InChI version 1 (software version"
+	elog "1.02_beta). It does not produce Standard InChI/InChIKey."
+	elog "To get Standard InChI/InChIKey software version 1.02 must be used."
+}
diff --git a/sci-chemistry/openbabel/openbabel-2.2.1_beta3.ebuild b/sci-chemistry/openbabel/openbabel-2.2.1_beta3.ebuild
deleted file mode 100644
index b70f072b9a31..000000000000
--- a/sci-chemistry/openbabel/openbabel-2.2.1_beta3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.1_beta3.ebuild,v 1.1 2009/02/18 21:44:47 cryos Exp $
-
-inherit eutils
-
-MY_PV="2.2.1b3-20090215-r2890"
-
-DESCRIPTION="interconverts file formats used in molecular modeling"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/openbabel/${PN}-${MY_PV}.tar.gz"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-RDEPEND="!sci-chemistry/babel
-	dev-libs/libxml2"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-	dev-lang/perl"
-
-S=${WORKDIR}/${PN}-${MY_PV}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-	cd doc
-	dohtml *.html *.png
-	dodoc *.inc README* *.inc *.mol2
-}