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

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-SENTINEL-4 i686

4 files changed, 73 insertions, 2 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/Manifest b/sci-chemistry/avogadro/Manifest
index 8efe092c9f13..37f6fae834e4 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,6 +1,9 @@
+AUX avogadro-0.8.1-openbabel-2.2.0.patch 712 RMD160 6c45fde8cac07bb6cc2b2b5285207a286b2ae58d SHA1 35a2141440e3ba75e3603c717e77a332c2a2c666 SHA256 4b1cd59fa246677fab399913eb9891e4907c206ba5489153375875c3ab84df1e
 DIST avogadro-0.6.1.tar.bz2 2478425 RMD160 f3a80ed76e9ed8d269c47af6b880047b069682a8 SHA1 5ac211a6a09fe5730b776cd313806c77ef7133e7 SHA256 9aaa7b33f595c713522d32f87b759ac9ee4fd28cc1bb05e73923a05093d22d88
 DIST avogadro-0.8.0.tar.bz2 5866598 RMD160 b3fab05c118fb0e93a49f6888113b16fac13f22c SHA1 10ffbfc8460b95d584a71f23d369c2efaa74e988 SHA256 a505ae6f07d94c553b6fa865b3d1f8f0c41460af794de8f3e79e3bcd1c30e9ef
+DIST avogadro-0.8.1.tar.bz2 5936605 RMD160 7651fe29bfa129a44447b937518af634fbcbad85 SHA1 7c6cc99c16bbb593ba6b1ee3e91fd7efc2b60878 SHA256 065d18ab40c137bf61d9936747ae5af2557c54a0355f054f4b549be1821cc549
 EBUILD avogadro-0.6.1.ebuild 1035 RMD160 fdc249c9a6d28c89842815574389beac0aea6601 SHA1 28aa5d75453494c7b40851a4f07b9341dddf7080 SHA256 87af9ac716ce87a482c9b0f7b4f2e6d941b84d35d99570519a901f06115bcbc0
 EBUILD avogadro-0.8.0.ebuild 1201 RMD160 a3ee1368ec306aadce07f7a6f05931b8bd0c2a78 SHA1 3678bda3c2ce98f7ae87707d02cdcca15e1f3693 SHA256 71f07609ed4537462cf258906500c51cbe03cca342d085d9bedd9c27206600fe
-MISC ChangeLog 1449 RMD160 d1c60e60c86ce0e2552c0fc8da82d4bcf63beb6e SHA1 1337f1f586642e667e6c1df5d137060ef2f30646 SHA256 3ca77e216b5e9af7cc98da6ee03516a5455fd4d3493ebcf09307ecf74cf63757
+EBUILD avogadro-0.8.1.ebuild 1296 RMD160 3a4c55a1483e99098ba6712c5c9dfa1f3502fff7 SHA1 92306d49a5c53f066d9fe52d2deec709a1a14fcf SHA256 5c4350921ad826d6af3788ce52019a78eec3d8ca56aba57f7640ad88aa7f648b
+MISC ChangeLog 1702 RMD160 1c0c5c66d259eacfd64e25dc86fd10907e17e0f9 SHA1 16df49196dbf41f2b0a4663385e10381800db642 SHA256 6439c466f8dc3c6afefdd6d1ea000afaa5466a7a46383bdbe6a9853a8afc20ae
 MISC metadata.xml 523 RMD160 c81fded4717706f4cc84fc945db1a634ed49d1ea SHA1 d9473bb5fcad1ecbec02297d45fcf7eca18ada9d SHA256 ebaf67f0b0830de4b78095f92792c22ff71923d76cafb0cc22d7fd875440f06d
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;
+