Version bump and fixed compile issue due to openbabel-2.2.0 API change (see bug #231173).

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

3 files changed, 69 insertions, 1 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index 36cefcbcf56f..dec35adda202 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sci-chemistry/avogadro
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.12 2008/05/21 21:20:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.13 2008/07/10 13:16:35 markusle Exp $
+
+*avogadro-0.8.1 (10 Jul 2008)
+
+  10 Jul 2008; Markus Dittrich <markusle@gentoo.org>
+  +files/avogadro-0.8.1-openbabel-2.2.0.patch, +avogadro-0.8.1.ebuild:
+  Version bump and fixed compile issue due to openbabel-2.2.0 API change
+  (see bug #231173).
 
   21 May 2008; Marcus D. Hanwell <cryos@gentoo.org> avogadro-0.8.0.ebuild:
   Bumped dependency to cmake-2.4.8. Should fix bug 222947.
diff --git a/sci-chemistry/avogadro/avogadro-0.8.1.ebuild b/sci-chemistry/avogadro/avogadro-0.8.1.ebuild
new file mode 100644
index 000000000000..af467f72da02
--- /dev/null
+++ b/sci-chemistry/avogadro/avogadro-0.8.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.8.1.ebuild,v 1.1 2008/07/10 13:16:35 markusle Exp $
+
+RESTRICT="mirror"
+
+inherit toolchain-funcs multilib eutils
+
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
+HOMEPAGE="http://avogadro.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="python"
+
+DEPEND=">=dev-util/cmake-2.4.8
+	>=dev-cpp/eigen-1.0.5
+	${RDEPEND}"
+RDEPEND=">=x11-libs/qt-4.3.0
+	>=sci-chemistry/openbabel-2.2.0
+	python? ( >=dev-lang/python-2.5 >=dev-libs/boost-1.34 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-openbabel-2.2.0.patch
+}
+
+src_compile() {
+	if use python; then
+		USEPYTHON="TRUE"
+	else
+		USEPYTHON="FALSE"
+	fi
+	cmake -DCMAKE_INSTALL_PREFIX=/usr \
+		-DLIBRARY_OUTPUT_PATH=PROJECT_BINARY_DIR/$(get_libdir) \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DENABLE_PYTHON=${USEPYTHON} \
+		-DLIB_INSTALL_DIR=$(get_libdir) \
+		-DCMAKE_C_COMPILER=$(type -p $(tc-getCC)) \
+		-DCMAKE_CXX_COMPILER=$(type -p $(tc-getCXX)) || die "cmake failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/sci-chemistry/avogadro/files/avogadro-0.8.1-openbabel-2.2.0.patch b/sci-chemistry/avogadro/files/avogadro-0.8.1-openbabel-2.2.0.patch
new file mode 100644
index 000000000000..c8371ccf0081
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-0.8.1-openbabel-2.2.0.patch
@@ -0,0 +1,12 @@
+diff -Naur avogadro-0.8.1/libavogadro/src/boost.h avogadro-0.8.1.new/libavogadro/src/boost.h
+--- avogadro-0.8.1/libavogadro/src/boost.h	2008-05-14 21:10:06.000000000 -0400
++++ avogadro-0.8.1.new/libavogadro/src/boost.h	2008-07-10 09:02:00.000000000 -0400
+@@ -46,7 +46,7 @@
+ 	void (OBMol::*ToInertialFrame)() = &OBMol::ToInertialFrame;
+ 	void (OBMol::*Center)() = &OBMol::Center;
+ 	bool (OBMol::*DeleteHydrogens)() = &OBMol::DeleteHydrogens;
+-	bool (OBMol::*AddHydrogens)(bool, bool) = &OBMol::AddHydrogens;
++	bool (OBMol::*AddHydrogens)(bool, bool, double) = &OBMol::AddHydrogens;
+ 	OBBond * (OBMol::*GetBondIDX)(int)const = &OBMol::GetBond;
+ 	OBBond * (OBMol::*GetBondAtoms)(int, int)const = &OBMol::GetBond;
+