summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen de Groot <yngwin@gentoo.org>2008-08-11 23:40:23 +0000
committerBen de Groot <yngwin@gentoo.org>2008-08-11 23:40:23 +0000
commit069e6039128a7645e1ad911357de589932ef1bcc (patch)
treec0803c3cd5c335de290e0f8e9d56160d95f51613 /media-gfx
parentDropping ancient vidalia version, adding latest release, bringing ebuild up t... (diff)
downloadgentoo-2-069e6039128a7645e1ad911357de589932ef1bcc.tar.gz
gentoo-2-069e6039128a7645e1ad911357de589932ef1bcc.tar.bz2
gentoo-2-069e6039128a7645e1ad911357de589932ef1bcc.zip
Fix split qt4 deps wrt bug 217161.
(Portage version: 2.2_rc7/cvs/Linux 2.6.26-hh1 i686)
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/openmesh/ChangeLog8
-rw-r--r--media-gfx/openmesh/openmesh-1.0.0.ebuild7
-rw-r--r--media-gfx/openmesh/openmesh-1.9.4-r1.ebuild7
-rw-r--r--media-gfx/openmesh/openmesh-1.9.5.ebuild7
4 files changed, 18 insertions, 11 deletions
diff --git a/media-gfx/openmesh/ChangeLog b/media-gfx/openmesh/ChangeLog
index f9a5c7f5486d..f3ef1afd8638 100644
--- a/media-gfx/openmesh/ChangeLog
+++ b/media-gfx/openmesh/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/openmesh
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.5 2007/05/22 14:08:39 dsd Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/ChangeLog,v 1.6 2008/08/11 23:40:23 yngwin Exp $
+
+ 11 Aug 2008; Ben de Groot <yngwin@gentoo.org> openmesh-1.0.0.ebuild,
+ openmesh-1.9.4-r1.ebuild, openmesh-1.9.5.ebuild:
+ Fix split qt4 deps wrt bug 217161.
*openmesh-1.9.5 (22 May 2007)
diff --git a/media-gfx/openmesh/openmesh-1.0.0.ebuild b/media-gfx/openmesh/openmesh-1.0.0.ebuild
index e7f1a941ea19..48eb32605964 100644
--- a/media-gfx/openmesh/openmesh-1.0.0.ebuild
+++ b/media-gfx/openmesh/openmesh-1.0.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.0.0.ebuild,v 1.3 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.0.0.ebuild,v 1.4 2008/08/11 23:40:23 yngwin Exp $
+EAPI="1"
inherit eutils
MY_PN="OpenMesh"
@@ -16,7 +17,7 @@ SLOT="0"
KEYWORDS="amd64 ~x86"
IUSE="qt4 debug"
-RDEPEND="qt4? ( x11-libs/qt )"
+RDEPEND="qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
DEPEND="dev-util/acgmake
${RDEPEND}"
diff --git a/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild b/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild
index 427af247fc69..07e1f5e328f1 100644
--- a/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild
+++ b/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild,v 1.3 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.4-r1.ebuild,v 1.4 2008/08/11 23:40:23 yngwin Exp $
+EAPI="1"
inherit eutils
MY_PN="OpenMesh"
@@ -16,7 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="qt4 debug"
-RDEPEND="qt4? ( x11-libs/qt )"
+RDEPEND="qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
DEPEND=">=dev-util/acgmake-1.2-r2
>=sys-apps/findutils-4.3.0
${RDEPEND}"
diff --git a/media-gfx/openmesh/openmesh-1.9.5.ebuild b/media-gfx/openmesh/openmesh-1.9.5.ebuild
index 8110de9456d2..ea4552c411ec 100644
--- a/media-gfx/openmesh/openmesh-1.9.5.ebuild
+++ b/media-gfx/openmesh/openmesh-1.9.5.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.5.ebuild,v 1.2 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/openmesh/openmesh-1.9.5.ebuild,v 1.3 2008/08/11 23:40:23 yngwin Exp $
+EAPI="1"
inherit eutils
MY_PN="OpenMesh"
@@ -16,7 +17,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="qt4 debug"
-RDEPEND="qt4? ( x11-libs/qt )"
+RDEPEND="qt4? ( || ( x11-libs/qt-gui:4 =x11-libs/qt-4.3* ) )"
DEPEND=">=dev-util/acgmake-1.2-r2
>=sys-apps/findutils-4.3.0
${RDEPEND}"