summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Lauer <patrick@gentoo.org>2013-07-12 08:09:56 +0000
committerPatrick Lauer <patrick@gentoo.org>2013-07-12 08:09:56 +0000
commitb50ee385ca196f0f1d1cd82c3de91a0624cafb53 (patch)
tree37f1676920bf1991c56dc62e76f7dc2481e0ea7b /kde-base
parentAdjusting qtgui/designer deps for qt-4.8.5 (diff)
downloadgentoo-2-b50ee385ca196f0f1d1cd82c3de91a0624cafb53.tar.gz
gentoo-2-b50ee385ca196f0f1d1cd82c3de91a0624cafb53.tar.bz2
gentoo-2-b50ee385ca196f0f1d1cd82c3de91a0624cafb53.zip
Adapting deps for upcoming qt-4.8.5
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'kde-base')
-rw-r--r--kde-base/kwin/ChangeLog6
-rw-r--r--kde-base/kwin/kwin-4.10.4.ebuild3
-rw-r--r--kde-base/kwin/kwin-4.10.5.ebuild3
3 files changed, 9 insertions, 3 deletions
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 0d83271686a1..06a75d1eb42e 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for kde-base/kwin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.340 2013/07/02 16:47:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.341 2013/07/12 08:09:56 patrick Exp $
+
+ 12 Jul 2013; Patrick Lauer <patrick@gentoo.org> kwin-4.10.4.ebuild,
+ kwin-4.10.5.ebuild:
+ Adapting deps for upcoming qt-4.8.5
*kwin-4.10.5 (02 Jul 2013)
diff --git a/kde-base/kwin/kwin-4.10.4.ebuild b/kde-base/kwin/kwin-4.10.4.ebuild
index 9c3ee2bbf3f8..83d636bd4dad 100644
--- a/kde-base/kwin/kwin-4.10.4.ebuild
+++ b/kde-base/kwin/kwin-4.10.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.4.ebuild,v 1.5 2013/07/02 08:06:51 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.4.ebuild,v 1.6 2013/07/12 08:09:56 patrick Exp $
EAPI=5
@@ -19,6 +19,7 @@ COMMONDEPEND="
$(add_kdebase_dep kephal)
$(add_kdebase_dep libkworkspace)
$(add_kdebase_dep liboxygenstyle)
+ || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11
diff --git a/kde-base/kwin/kwin-4.10.5.ebuild b/kde-base/kwin/kwin-4.10.5.ebuild
index 92e73193ea06..a5ac0586e074 100644
--- a/kde-base/kwin/kwin-4.10.5.ebuild
+++ b/kde-base/kwin/kwin-4.10.5.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.5.ebuild,v 1.1 2013/07/02 16:47:53 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.10.5.ebuild,v 1.2 2013/07/12 08:09:56 patrick Exp $
EAPI=5
@@ -19,6 +19,7 @@ COMMONDEPEND="
$(add_kdebase_dep kephal)
$(add_kdebase_dep libkworkspace)
$(add_kdebase_dep liboxygenstyle)
+ || ( <dev-qt/qtgui-4.8.5:4 ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer ) )
x11-libs/libICE
x11-libs/libSM
x11-libs/libX11