Fix split qt4 deps wrt bug 217161.

(Portage version: 2.2_rc7/cvs/Linux 2.6.26-hh1 i686)

4 files changed, 14 insertions, 7 deletions

diff --git a/sci-chemistry/avogadro/ChangeLog b/sci-chemistry/avogadro/ChangeLog
index dec35adda202..92f10eeb6bae 100644
--- a/sci-chemistry/avogadro/ChangeLog
+++ b/sci-chemistry/avogadro/ChangeLog
@@ -1,6 +1,10 @@
 # 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.13 2008/07/10 13:16:35 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/ChangeLog,v 1.14 2008/08/12 00:26:00 yngwin Exp $
+
+  12 Aug 2008; Ben de Groot <yngwin@gentoo.org> avogadro-0.6.1.ebuild,
+  avogadro-0.8.0.ebuild, avogadro-0.8.1.ebuild:
+  Fix split qt4 deps wrt bug 217161.
 
 *avogadro-0.8.1 (10 Jul 2008)
 
diff --git a/sci-chemistry/avogadro/avogadro-0.6.1.ebuild b/sci-chemistry/avogadro/avogadro-0.6.1.ebuild
index 0abe198f849f..05d51a22db6e 100644
--- a/sci-chemistry/avogadro/avogadro-0.6.1.ebuild
+++ b/sci-chemistry/avogadro/avogadro-0.6.1.ebuild
@@ -1,7 +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.1.ebuild,v 1.1 2008/03/09 03:08:17 cryos Exp $
+# $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
@@ -18,7 +19,7 @@ IUSE=""
 DEPEND=">=dev-util/cmake-2.4.6
 	>=dev-cpp/eigen-1.0.5
 	${RDEPEND}"
-RDEPEND=">=x11-libs/qt-4.3.0
+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() {
diff --git a/sci-chemistry/avogadro/avogadro-0.8.0.ebuild b/sci-chemistry/avogadro/avogadro-0.8.0.ebuild
index 375ca6f91d21..d847c17df8d1 100644
--- a/sci-chemistry/avogadro/avogadro-0.8.0.ebuild
+++ b/sci-chemistry/avogadro/avogadro-0.8.0.ebuild
@@ -1,7 +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.8.0.ebuild,v 1.2 2008/05/21 21:20:14 cryos Exp $
+# $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
@@ -18,7 +19,7 @@ IUSE="python"
 DEPEND=">=dev-util/cmake-2.4.8
 	>=dev-cpp/eigen-1.0.5
 	${RDEPEND}"
-RDEPEND=">=x11-libs/qt-4.3.0
+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 )"
 
diff --git a/sci-chemistry/avogadro/avogadro-0.8.1.ebuild b/sci-chemistry/avogadro/avogadro-0.8.1.ebuild
index af467f72da02..a2cfa72a19ff 100644
--- a/sci-chemistry/avogadro/avogadro-0.8.1.ebuild
+++ b/sci-chemistry/avogadro/avogadro-0.8.1.ebuild
@@ -1,7 +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.8.1.ebuild,v 1.1 2008/07/10 13:16:35 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/avogadro/avogadro-0.8.1.ebuild,v 1.2 2008/08/12 00:26:00 yngwin Exp $
 
+EAPI=1
 RESTRICT="mirror"
 
 inherit toolchain-funcs multilib eutils
@@ -18,7 +19,7 @@ IUSE="python"
 DEPEND=">=dev-util/cmake-2.4.8
 	>=dev-cpp/eigen-1.0.5
 	${RDEPEND}"
-RDEPEND=">=x11-libs/qt-4.3.0
+RDEPEND="|| ( ( x11-libs/qt-gui:4 x11-libs/qt-opengl:4 ) =x11-libs/qt-4.3* )
 	>=sci-chemistry/openbabel-2.2.0
 	python? ( >=dev-lang/python-2.5 >=dev-libs/boost-1.34 )"