Version bump (fixes bug #230803). Removed old ebuilds.

(Portage version: 2.2_rc1/cvs/Linux 2.6.25-SENTINEL-4 i686)

5 files changed, 21 insertions, 38 deletions

diff --git a/sci-chemistry/openbabel/ChangeLog b/sci-chemistry/openbabel/ChangeLog
index 8384957c7715..e1e989b296b4 100644
--- a/sci-chemistry/openbabel/ChangeLog
+++ b/sci-chemistry/openbabel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/openbabel
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.17 2008/05/19 17:19:29 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/ChangeLog,v 1.18 2008/07/06 21:00:29 markusle Exp $
+
+*openbabel-2.2.0 (06 Jul 2008)
+
+  06 Jul 2008; Markus Dittrich <markusle@gentoo.org> openbabel-2.0.2.ebuild,
+  -openbabel-2.1.0.ebuild, openbabel-2.1.1.ebuild,
+  -openbabel-2.2.0_beta4-r1.ebuild, +openbabel-2.2.0.ebuild:
+  Version bump (fixes bug #230803). Removed old ebuilds.
 
 *openbabel-2.2.0_beta5 (19 May 2008)
 
diff --git a/sci-chemistry/openbabel/openbabel-2.0.2.ebuild b/sci-chemistry/openbabel/openbabel-2.0.2.ebuild
index accc07b12bcd..8a74c68c89c6 100644
--- a/sci-chemistry/openbabel/openbabel-2.0.2.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.0.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.0.2.ebuild,v 1.4 2006/08/28 13:42:35 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.0.2.ebuild,v 1.5 2008/07/06 21:00:29 markusle Exp $
 
 DESCRIPTION="Open Babel interconverts file formats used in molecular modeling."
 SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
@@ -12,7 +12,7 @@ IUSE=""
 RDEPEND="!sci-chemistry/babel"
 
 src_install () {
-	make DESTDIR=${D} install || die
+	make DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	cd doc
 	dohtml *.html *.png
diff --git a/sci-chemistry/openbabel/openbabel-2.1.0.ebuild b/sci-chemistry/openbabel/openbabel-2.1.0.ebuild
deleted file mode 100644
index df55e30ea942..000000000000
--- a/sci-chemistry/openbabel/openbabel-2.1.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.1.0.ebuild,v 1.1 2007/04/08 14:55:03 cryos Exp $
-
-DESCRIPTION="Open Babel interconverts file formats used in molecular modeling"
-SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
-HOMEPAGE="http://openbabel.sourceforge.net/"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-RDEPEND="!sci-chemistry/babel"
-
-src_install () {
-	make DESTDIR=${D} install || die "make install failed."
-	dodoc AUTHORS ChangeLog NEWS README THANKS
-	cd doc
-	dohtml *.html *.png
-	dodoc *.inc README* *.inc *.mol2
-}
diff --git a/sci-chemistry/openbabel/openbabel-2.1.1.ebuild b/sci-chemistry/openbabel/openbabel-2.1.1.ebuild
index 57ce932ba08b..31c08d70b38c 100644
--- a/sci-chemistry/openbabel/openbabel-2.1.1.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.1.1.ebuild,v 1.1 2007/07/11 09:40:23 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.1.1.ebuild,v 1.2 2008/07/06 21:00:29 markusle Exp $
 
 DESCRIPTION="Open Babel interconverts file formats used in molecular modeling"
 SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
@@ -12,7 +12,7 @@ IUSE=""
 RDEPEND="!sci-chemistry/babel"
 
 src_install () {
-	make DESTDIR=${D} install || die "make install failed."
+	make DESTDIR="${D}" install || die "make install failed."
 	dodoc AUTHORS ChangeLog NEWS README THANKS
 	cd doc
 	dohtml *.html *.png
diff --git a/sci-chemistry/openbabel/openbabel-2.2.0_beta4-r1.ebuild b/sci-chemistry/openbabel/openbabel-2.2.0.ebuild
index 49a06562c914..321eee097a0f 100644
--- a/sci-chemistry/openbabel/openbabel-2.2.0_beta4-r1.ebuild
+++ b/sci-chemistry/openbabel/openbabel-2.2.0.ebuild
@@ -1,25 +1,21 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.0_beta4-r1.ebuild,v 1.1 2008/04/21 05:52:31 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/openbabel/openbabel-2.2.0.ebuild,v 1.1 2008/07/06 21:00:29 markusle Exp $
 
 inherit eutils
 
 DESCRIPTION="Open Babel interconverts file formats used in molecular modeling"
-SRC_URI="mirror://sourceforge/openbabel/${PN}-2.2.0b4-20080301-r2299.tar.gz"
+SRC_URI="mirror://sourceforge/openbabel/${P}.tar.gz"
 HOMEPAGE="http://openbabel.sourceforge.net/"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE=""
-RDEPEND="!sci-chemistry/babel"
-
-S=${WORKDIR}/${PN}-2.2.0b4
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}/${P}-obconversion_api_fix.diff"
-}
+RDEPEND="!sci-chemistry/babel
+		 dev-libs/libxml2"
+DEPEND="${RDEPEND}
+		dev-libs/boost
+		dev-lang/perl"
 
 src_install () {
 	make DESTDIR="${D}" install || die "make install failed."