Version bump, new version fixes bug 259643. Pruned old versions.

(Portage version: 2.2_rc23/cvs/Linux x86_64)

6 files changed, 17 insertions, 158 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index cb5c7507808c..83f803702d5a 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sci-chemistry/avogadro
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.16 2009/02/17 17:46:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.17 2009/03/01 18:22:09 cryos Exp $
+
+*avogadro-0.9.2 (01 Mar 2009)
+
+  01 Mar 2009; Marcus D. Hanwell <cryos@gentoo.org>
+  -files/avogadro-0.8.1-openbabel-2.2.0.patch, -avogadro-0.6.1.ebuild,
+  -avogadro-0.8.0.ebuild, -avogadro-0.8.1.ebuild, -avogadro-0.9.1.ebuild,
+  +avogadro-0.9.2.ebuild:
+  Version bump, new version fixes bug 259643. Removed old versions.
 
 *avogadro-0.9.1 (17 Feb 2009)
 
diff --git a/sci-chemistry/avogadro/avogadro-0.6.1.ebuild b/sci-chemistry/avogadro/avogadro-0.6.1.ebuild
deleted file mode 100644
index 05d51a22db6e..000000000000
--- a/sci-chemistry/avogadro/avogadro-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.1.ebuild,v 1.2 2008/08/12 00:26:00 yngwin Exp $
-
-EAPI=1
-RESTRICT="mirror"
-
-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.bz2"
-
-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-gui:4 x11-libs/qt-opengl:4 ) =x11-libs/qt-4.3* )
-	>=sci-chemistry/openbabel-2.2.0_beta4"
-
-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.8.0.ebuild b/sci-chemistry/avogadro/avogadro-0.8.0.ebuild
deleted file mode 100644
index d847c17df8d1..000000000000
--- a/sci-chemistry/avogadro/avogadro-0.8.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.0.ebuild,v 1.3 2008/08/12 00:26:00 yngwin Exp $
-
-EAPI=1
-RESTRICT="mirror"
-
-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.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-gui:4 x11-libs/qt-opengl:4 ) =x11-libs/qt-4.3* )
-	>=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"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-}
diff --git a/sci-chemistry/avogadro/avogadro-0.8.1.ebuild b/sci-chemistry/avogadro/avogadro-0.8.1.ebuild
deleted file mode 100644
index 6812e084bcf6..000000000000
--- a/sci-chemistry/avogadro/avogadro-0.8.1.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# 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.3 2008/09/22 13:28:43 markusle Exp $
-
-EAPI=1
-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-gui:4 x11-libs/qt-opengl:4 )
-				>=x11-libs/qt-4.3.4 )
-	>=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/avogadro-0.9.1.ebuild b/sci-chemistry/avogadro/avogadro-0.9.2.ebuild
index d1abf40dbc5a..7267f7f733fd 100644
--- a/sci-chemistry/avogadro/avogadro-0.9.1.ebuild
+++ b/sci-chemistry/avogadro/avogadro-0.9.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.1.ebuild,v 1.1 2009/02/17 17:46:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.9.2.ebuild,v 1.1 2009/03/01 18:22:09 cryos Exp $
 
 EAPI=2
 
@@ -15,22 +15,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+glsl python"
 
-RDEPEND="
-	>=sci-chemistry/openbabel-2.2.0
-	x11-libs/qt-gui:4
-	x11-libs/qt-opengl:4
-	glsl? (
-		>=media-libs/glew-1.5.0
-	)
+RDEPEND=">=sci-chemistry/openbabel-2.2.1_beta3
+	>=x11-libs/qt-gui-4.4.0:4
+	>=x11-libs/qt-opengl-4.4.0:4
+	glsl? ( >=media-libs/glew-1.5.0	)
 	python? (
 		>=dev-lang/python-2.5
-		>=dev-libs/boost-1.34
-	)
-"
+		>=dev-libs/boost-1.35
+	)"
 DEPEND="${RDEPEND}
 	dev-cpp/eigen:2
-	>=dev-util/cmake-2.6.2
-"
+	>=dev-util/cmake-2.6.2"
 
 src_configure() {
 	local mycmakeargs
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
deleted file mode 100644
index c8371ccf0081..000000000000
--- a/sci-chemistry/avogadro/files/avogadro-0.8.1-openbabel-2.2.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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;
-