summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Alexander <wired@gentoo.org>2010-11-13 20:53:07 +0000
committerAlex Alexander <wired@gentoo.org>2010-11-13 20:53:07 +0000
commit7a681db598a1fd08e3c412e28db48ffd9e753243 (patch)
tree6ea7d770755d5afd57183368a7c0ce3dff88b4e6 /x11-themes
parentre-enable some of the USE flags for qgtkstyle (diff)
downloadgentoo-2-7a681db598a1fd08e3c412e28db48ffd9e753243.tar.gz
gentoo-2-7a681db598a1fd08e3c412e28db48ffd9e753243.tar.bz2
gentoo-2-7a681db598a1fd08e3c412e28db48ffd9e753243.zip
fixed cairo dep
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Diffstat (limited to 'x11-themes')
-rw-r--r--x11-themes/qgtkstyle/ChangeLog6
-rw-r--r--x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild4
-rw-r--r--x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild4
3 files changed, 9 insertions, 5 deletions
diff --git a/x11-themes/qgtkstyle/ChangeLog b/x11-themes/qgtkstyle/ChangeLog
index 8b95ad673a1d..6f5321832b7f 100644
--- a/x11-themes/qgtkstyle/ChangeLog
+++ b/x11-themes/qgtkstyle/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-themes/qgtkstyle
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/ChangeLog,v 1.4 2010/11/13 20:36:00 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/ChangeLog,v 1.5 2010/11/13 20:53:07 wired Exp $
+
+ 13 Nov 2010; Alex Alexander <wired@gentoo.org> qgtkstyle-4.6.3-r1.ebuild,
+ qgtkstyle-4.7.1-r1.ebuild:
+ fix cairo dep
*qgtkstyle-4.7.1-r1 (13 Nov 2010)
*qgtkstyle-4.6.3-r1 (13 Nov 2010)
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild
index 039ea2cf565e..65d8d3aeb232 100644
--- a/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild
+++ b/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild,v 1.1 2010/11/13 20:36:00 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.6.3-r1.ebuild,v 1.2 2010/11/13 20:53:07 wired Exp $
EAPI="3"
inherit confutils qt4-build
@@ -15,7 +15,7 @@ COMMON_DEPEND="
>=x11-libs/qt-gui-${PV}-r1
"
DEPEND="${COMMON_DEPEND}
- x11-libs/cairo
+ || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 )
"
RDEPEND="${COMMON_DEPEND}
!>x11-libs/qt-gui-${PV}-r9999
diff --git a/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild b/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild
index 311b8d669d3e..812dab03394f 100644
--- a/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild
+++ b/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild,v 1.1 2010/11/13 20:36:00 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/qgtkstyle/qgtkstyle-4.7.1-r1.ebuild,v 1.2 2010/11/13 20:53:07 wired Exp $
EAPI="3"
inherit confutils qt4-build
@@ -15,7 +15,7 @@ COMMON_DEPEND="
>=x11-libs/qt-gui-${PV}-r1
"
DEPEND="${COMMON_DEPEND}
- x11-libs/cairo
+ || ( >=x11-libs/cairo-1.10.0[-qt4] <x11-libs/cairo-1.10.0 )
"
RDEPEND="${COMMON_DEPEND}
!>x11-libs/qt-gui-${PV}-r9999