public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Davide Pesavento" <pesa@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/
Date: Sat, 26 Jul 2014 09:03:38 +0000 (UTC)	[thread overview]
Message-ID: <1406365392.0855533d35065ec7c200752415cb827a9998483a.pesa@gentoo> (raw)

commit:     0855533d35065ec7c200752415cb827a9998483a
Author:     Davide Pesavento <pesa <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 26 09:03:12 2014 +0000
Commit:     Davide Pesavento <pesa <AT> gentoo <DOT> 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>lxqt</herd>
   <maintainer>
     <email>jauhien@gentoo.org</email>
     <name>Jauhien Piatlicki</name>
   </maintainer>
   <use>
-    <flag name="consolekit">Enable ConsoleKit support</flag>
+    <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag>
   </use>
   <longdescription lang="en">
     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)


             reply	other threads:[~2014-07-26  9:03 UTC|newest]

Thread overview: 39+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-26  9:03 Davide Pesavento [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-01 21:49 [gentoo-commits] proj/qt:master commit in: x11-misc/sddm/ Andreas Sturmlechner
2024-07-01 21:49 Andreas Sturmlechner
2024-07-01 21:49 Andreas Sturmlechner
2024-05-27 22:18 Andreas Sturmlechner
2024-03-08 23:03 Andreas Sturmlechner
2024-02-22 11:32 Andreas Sturmlechner
2023-11-27 10:51 Andreas Sturmlechner
2023-03-22 19:24 Andreas Sturmlechner
2023-03-10 22:08 Andreas Sturmlechner
2023-02-13  7:53 Andreas Sturmlechner
2023-02-08 19:33 Andreas Sturmlechner
2023-02-05 16:24 Andreas Sturmlechner
2023-02-04 13:00 Andreas Sturmlechner
2023-02-04 13:00 Andreas Sturmlechner
2023-02-04 13:00 Andreas Sturmlechner
2022-10-08 10:52 Andreas Sturmlechner
2021-09-22 17:41 Andreas Sturmlechner
2021-08-13 15:13 Jimi Huotari
2019-12-31 16:44 Andreas Sturmlechner
2017-08-27  5:52 [gentoo-commits] proj/qt:qtbase59 " Michael Palimaka
2017-08-27  5:50 ` [gentoo-commits] proj/qt:master " Michael Palimaka
2015-10-01 14:27 Michael Palimaka
2014-09-22  0:08 Davide Pesavento
2014-08-04 12:47 Jauhien Piatlicki
2014-08-04 10:44 Jauhien Piatlicki
2014-07-24 17:01 Michael Palimaka
2014-06-18 13:00 Michael Palimaka
2014-06-04 13:41 Davide Pesavento
2014-05-31 16:02 Davide Pesavento
2014-02-14 19:48 Johannes Huber
2013-07-22 15:17 Ben de Groot
2013-04-29  9:09 Michael Palimaka
2013-03-24  6:58 Ben de Groot
2013-03-19 12:46 Ben de Groot
2013-03-18 14:32 Ben de Groot
2013-03-18 11:31 Ben de Groot
2013-03-18 11:04 Ben de Groot
2013-02-08 12:55 Michael Palimaka
2013-01-27 14:56 Ben de Groot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1406365392.0855533d35065ec7c200752415cb827a9998483a.pesa@gentoo \
    --to=pesa@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox