Version bump. Removed old versions.

(Portage version: 2.1.5)

3 files changed, 20 insertions, 39 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index 5f1fe5634679..844a923de3bf 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,12 @@
 # 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.9 2008/03/10 09:07:47 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.10 2008/05/19 20:17:57 cryos Exp $
+
+*avogadro-0.8.0 (19 May 2008)
+
+  19 May 2008; Marcus D. Hanwell <cryos@gentoo.org> -avogadro-0.2.0.ebuild,
+  -avogadro-0.6.0.ebuild, +avogadro-0.8.0.ebuild:
+  Version bump. Removed old versions.
 
 *avogadro-0.6.1 (09 Mar 2008)
 
@@ -21,7 +27,7 @@
   23 Oct 2007; Marcus D. Hanwell <cryos@gentoo.org> +avogadro-0.2.0.ebuild:
   Version bump.
 
-  01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
+  01 Jul 2007; Piotr Jaroszyński <peper@gentoo.org>
   +files/digest-avogadro-0.1.0, Manifest:
   (QA) Add digests.
 
diff --git a/sci-chemistry/avogadro/avogadro-0.2.0.ebuild b/sci-chemistry/avogadro/avogadro-0.2.0.ebuild
deleted file mode 100644
index 4b9ce8e32fc4..000000000000
--- a/sci-chemistry/avogadro/avogadro-0.2.0.ebuild
+++ /dev/null
@@ -1,34 +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/avogadro/avogadro-0.2.0.ebuild,v 1.2 2007/12/10 01:16:50 cryos Exp $
-
-inherit toolchain-funcs multilib
-
-DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
-HOMEPAGE="http://avogadro.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-util/cmake-2.4.6
-	>=dev-cpp/eigen-1.0.5
-	${RDEPEND}"
-RDEPEND=">=x11-libs/qt-4.3.0
-	>=sci-chemistry/openbabel-2.1.1"
-
-src_compile() {
-	cmake -DCMAKE_INSTALL_PREFIX=/usr \
-		-DLIBRARY_OUTPUT_PATH=PROJECT_BINARY_DIR/$(get_libdir) \
-		-DCMAKE_BUILD_TYPE=release \
-		-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/avogadro-0.6.0.ebuild b/sci-chemistry/avogadro/avogadro-0.8.0.ebuild
index 0e5a9dea4e26..9477dec28a47 100644
--- a/sci-chemistry/avogadro/avogadro-0.6.0.ebuild
+++ b/sci-chemistry/avogadro/avogadro-0.8.0.ebuild
@@ -1,6 +1,8 @@
 # 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.6.0.ebuild,v 1.1 2008/03/01 17:53:17 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.8.0.ebuild,v 1.1 2008/05/19 20:17:57 cryos Exp $
+
+RESTRICT="mirror"
 
 inherit toolchain-funcs multilib
 
@@ -11,18 +13,25 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
+IUSE="python"
 
 DEPEND=">=dev-util/cmake-2.4.6
 	>=dev-cpp/eigen-1.0.5
 	${RDEPEND}"
 RDEPEND=">=x11-libs/qt-4.3.0
-	>=sci-chemistry/openbabel-2.2.0_beta4"
+	>=sci-chemistry/openbabel-2.2.0_beta5
+	python? ( >=dev-lang/python-2.5 >=dev-libs/boost-1.34 )"
 
 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"