From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-837924-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 8D8121383E0 for <garchives@archives.gentoo.org>; Thu, 1 Oct 2015 16:39:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D23E121C001; Thu, 1 Oct 2015 16:39:57 +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 7BED021C001 for <gentoo-commits@lists.gentoo.org>; Thu, 1 Oct 2015 16:39:57 +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 91DA2340884 for <gentoo-commits@lists.gentoo.org>; Thu, 1 Oct 2015 16:39:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BEAE0395 for <gentoo-commits@lists.gentoo.org>; Thu, 1 Oct 2015 16:39:54 +0000 (UTC) From: "Kristian Fiskerstrand" <k_f@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, "Kristian Fiskerstrand" <k_f@gentoo.org> Message-ID: <1443717401.508c3df4a377ccc9d3700def69659fa8e396e47a.k_f@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: k_f X-VCS-Committer-Name: Kristian Fiskerstrand X-VCS-Revision: 508c3df4a377ccc9d3700def69659fa8e396e47a X-VCS-Branch: master Date: Thu, 1 Oct 2015 16:39:54 +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: 12448c0c-634e-4491-82ab-9a94abe2a784 X-Archives-Hash: bdd838370e5d82b143591c2db4852b8e commit: 508c3df4a377ccc9d3700def69659fa8e396e47a Author: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> AuthorDate: Thu Oct 1 16:35:32 2015 +0000 Commit: Kristian Fiskerstrand <k_f <AT> gentoo <DOT> org> CommitDate: Thu Oct 1 16:36:41 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=508c3df4 profiles: plasma: avoid app-crypt/pinentry REQUIRED_USE blocker app-crypt/pinentry since 0.9.6-r5 support installation of either qt4 or qt5 based pinentry, but this has to be explicitly set. Disabling -qt4 in plasma profile to avoid REQUIRED_USE blocker profiles/targets/desktop/plasma/package.use | 1 + 1 file changed, 1 insertion(+) diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use index 6954331..1850926 100644 --- a/profiles/targets/desktop/plasma/package.use +++ b/profiles/targets/desktop/plasma/package.use @@ -56,6 +56,7 @@ sys-auth/polkit-kde-agent minimal media-libs/phonon designer # Fix REQUIRED_USE conflicts: qt5? ( !qt4 ) +>=app-crypt/pinentry-0.9.6-r5 -qt4 app-office/akonadi-server -qt5 >=app-office/texmaker-4.4.1 -qt4 >=app-office/texstudio-2.9.4 -qt4