From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id BC3E313877A for ; Sat, 26 Jul 2014 09:03:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 503FCE0D60; Sat, 26 Jul 2014 09:03:41 +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 B7E21E0D54 for ; Sat, 26 Jul 2014 09:03:40 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D4E083400A1 for ; Sat, 26 Jul 2014 09:03:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9C6C418DCD for ; Sat, 26 Jul 2014 09:03:38 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1406365392.0855533d35065ec7c200752415cb827a9998483a.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/ X-VCS-Repository: proj/qt X-VCS-Files: x11-misc/sddm/metadata.xml x11-misc/sddm/sddm-9999.ebuild X-VCS-Directories: x11-misc/sddm/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 0855533d35065ec7c200752415cb827a9998483a X-VCS-Branch: master Date: Sat, 26 Jul 2014 09:03:38 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6f33cc21-aea1-4a22-abe1-a71d92ed97dc X-Archives-Hash: 2be3bbfab949e0a91ec4f4ed7676f472 commit: 0855533d35065ec7c200752415cb827a9998483a Author: Davide Pesavento gentoo org> AuthorDate: Sat Jul 26 09:03:12 2014 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Sat Jul 26 09:03:12 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0855533d [x11-misc/sddm] Partial sync with portage. Fixes upower dependency wrt bug 517230. Package-Manager: portage-2.2.10 --- x11-misc/sddm/metadata.xml | 3 ++- x11-misc/sddm/sddm-9999.ebuild | 22 ++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml index dbd986c..d867da7 100644 --- a/x11-misc/sddm/metadata.xml +++ b/x11-misc/sddm/metadata.xml @@ -1,12 +1,13 @@ + lxqt jauhien@gentoo.org Jauhien Piatlicki - Enable ConsoleKit support + Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support) SDDM is a modern display manager for X11 aiming to be fast, simple diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild index f079a17..f317bb7 100644 --- a/x11-misc/sddm/sddm-9999.ebuild +++ b/x11-misc/sddm/sddm-9999.ebuild @@ -13,8 +13,10 @@ KEYWORDS="" LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" SLOT="0" IUSE="consolekit +qt4 qt5 systemd +upower" -REQUIRED_USE="^^ ( qt4 qt5 ) - ?? ( upower systemd )" +REQUIRED_USE=" + ^^ ( qt4 qt5 ) + ?? ( upower systemd ) +" RDEPEND="sys-libs/pam sys-auth/qauth[qt4?,qt5?] @@ -24,11 +26,18 @@ RDEPEND="sys-libs/pam qt5? ( dev-qt/qtdeclarative:5 dev-qt/qtdbus:5 ) systemd? ( sys-apps/systemd:= ) - upower? ( sys-power/upower:= )" + upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )" DEPEND="${RDEPEND} >=sys-devel/gcc-4.7.0 virtual/pkgconfig" +pkg_pretend() { + if [[ ${MERGE_TYPE} != binary ]]; then + [[ $(gcc-version) < 4.7 ]] && \ + die 'The active compiler needs to be gcc 4.7 (or newer)' + fi +} + src_prepare() { use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" @@ -38,13 +47,6 @@ src_prepare() { -i CMakeLists.txt || die 'sed failed' } -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-version) < 4.7 ]] && \ - die 'The active compiler needs to be gcc 4.7 (or newer)' - fi -} - src_configure() { local mycmakeargs=( $(cmake-utils_use_use qt5 QT5)