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

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

7 files changed, 20 insertions, 168 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/Manifest b/sci-chemistry/avogadro/Manifest
index ca0dae9c526d..f6060358e1db 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,11 +1,4 @@
-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
-DIST avogadro-0.9.1.tar.bz2 3837378 RMD160 9328cb352e6b2c0133634ec06bc3573b1934cb52 SHA1 bf9926448a9d1d0fb193e240139b920ee8896f8b SHA256 f605eb0fef748e0b8370ab92b9c481f28c63764498237cdc6be7db11f897e2c0
-EBUILD avogadro-0.6.1.ebuild 1091 RMD160 565b3a3daad69ed05bd0407683bb0f358710cac7 SHA1 8b83071a09032ddb7d910d46289b40d8f15dbd04 SHA256 10d9e52d6eaa438930c0deaabcb3e59e64efb3ba2ca6c1f11097c423ff4c2f18
-EBUILD avogadro-0.8.0.ebuild 1257 RMD160 3954de8a619dd3b62eaeda68613bce09b656da5b SHA1 6e1b7c858ab5dbaf11f91e2443038742da570ca0 SHA256 b9de82b1849a651e37b960d2c4076a85214b0f2a8bff75ccc7c03021b85116a2
-EBUILD avogadro-0.8.1.ebuild 1357 RMD160 6e74ee1d304425849506c6f1e1e6db7919617631 SHA1 54eafcbb6ee914c63da09b98fe5bd3a837075a18 SHA256 9fc81ae418ce4b48bdee4b6ff2bf80511559141d4866c40f2f7b58b3c8ecdd7e
-EBUILD avogadro-0.9.1.ebuild 940 RMD160 4755170e2515766297eef7d6eb39170acf77b625 SHA1 f987d4fee4d4e1d7412e860205d3bff5b5ad30be SHA256 8dbcada1b71c4d84b3ea5a0d74220ce67df011ac823c52b5e110e518a35bc795
-MISC ChangeLog 2167 RMD160 5ff3ba851cab897ac9059af40b28a1c97109e301 SHA1 c7eb531551cfaeab8a52f859e20e0b63680f6650 SHA256 aaab2abe99c76c1a581aebd2878c32d392ed7bac6dad2d6978e72288100b66ec
+DIST avogadro-0.9.2.tar.bz2 3891679 RMD160 4b5fa47338f94c31fd6bc7475807a2e03369b6c6 SHA1 3e0435b4f69dd4d5d7a6d489f55c91fd302f8339 SHA256 67f2875d1b873a44b3e5b446a475b67196250bdc600c42ccdc89ca67e90b46ae
+EBUILD avogadro-0.9.2.ebuild 951 RMD160 33f994937e3f9cefc62c0cf7ae92e46cfc1357cc SHA1 b251278b6b4674362312558f6382fc0360ce6328 SHA256 7490734b48d032bb7b41daff68a1ff38bfe87915c39998ebb2fd25fb52cdd000
+MISC ChangeLog 2486 RMD160 68d4fe7fee1f65e30de484bfc299181bed542245 SHA1 548c2aff7b1a982e5aa47adfab6143098d3910c8 SHA256 e6e4e5f774261666ad3a6284f40b668a97719bd26e13cba731c31d56ccb694d2
 MISC metadata.xml 600 RMD160 d3559123f9438a9d0a49783ebb38027f91492e8d SHA1 f0dc9728b4196c6b09e8a0c4fdb02cd9f692cda4 SHA256 298cc4b9c2fc652f167bf9ae6e9faec1cfd1aa41a276295f4d1a6814912b58af
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;
-