From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-828594-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 47D121385B0 for <garchives@archives.gentoo.org>; Sat, 15 Aug 2015 20:45:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1CD72E07F4; Sat, 15 Aug 2015 20:44:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AEC16E07F4 for <gentoo-commits@lists.gentoo.org>; Sat, 15 Aug 2015 20:44:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 54827340D74 for <gentoo-commits@lists.gentoo.org>; Sat, 15 Aug 2015 20:44:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F285315B for <gentoo-commits@lists.gentoo.org>; Sat, 15 Aug 2015 20:44:52 +0000 (UTC) From: "Johannes Huber" <johu@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Johannes Huber" <johu@gentoo.org> Message-ID: <1439671614.f4451b254f6b5ee0321ba3c99703ebef289379dd.johu@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/targets/desktop/plasma/ X-VCS-Repository: repo/gentoo X-VCS-Files: profiles/targets/desktop/plasma/package.use X-VCS-Directories: profiles/targets/desktop/plasma/ X-VCS-Committer: johu X-VCS-Committer-Name: Johannes Huber X-VCS-Revision: f4451b254f6b5ee0321ba3c99703ebef289379dd X-VCS-Branch: master Date: Sat, 15 Aug 2015 20:44:52 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: e876c768-6f7e-41ff-990b-17be7e567500 X-Archives-Hash: 92cc1073ad4e9a20aab0a4b9770f90a2 commit: f4451b254f6b5ee0321ba3c99703ebef289379dd Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> AuthorDate: Mon Aug 10 21:31:02 2015 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sat Aug 15 20:46:54 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4451b25 profiles: Update plasma package.use Signed-off-by: Johannes Huber <johu <AT> gentoo.org> profiles/targets/desktop/plasma/package.use | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index ba6abda..ba0d19a 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -51,3 +51,26 @@ sys-auth/polkit-kde-agent minimal # Required by app-office/libreoffice media-libs/phonon designer + +# Fix REQUIRED_USE conflicts: qt5? ( !qt4 ) +>=app-office/texmaker-4.4.1 -qt4 +>=app-office/texstudio-2.9.4 -qt4 +app-text/qpdfview -qt4 +dev-db/sqlitebrowser -qt4 +>=dev-games/openscenegraph-3.2.1-r1 -qt4 +>=dev-libs/qcustomplot-1.3.0 -qt4 +>=dev-libs/quazip-0.7.1 -qt4 +>=kde-misc/kdiff3-0.9.98-r1 -kde -qt4 +>=media-libs/opencv-3.0.0 -qt4 +>=media-video/smplayer-14.9.0.6690 -qt4 +media-video/vlc -qt4 +net-misc/owncloud-client -qt4 +net-news/rssguard -qt4 +>=net-news/quiterss-0.17.7 -qt4 +net-p2p/bitcoin-qt -qt4 +>=net-p2p/qbittorrent-3.2.0 -qt4 +>=sci-geosciences/qlandkartegt-1.8.0 -qt4 +sci-visualization/kst -qt4 +www-client/qupzilla -kde -qt4 +>=x11-libs/qtermwidget-0.6.0 -qt4 +>=x11-terms/qterminal-0.6.0 -qt4