| 1 |
commit: 0855533d35065ec7c200752415cb827a9998483a |
| 2 |
Author: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 26 09:03:12 2014 +0000 |
| 4 |
Commit: Davide Pesavento <pesa <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 26 09:03:12 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=0855533d |
| 7 |
|
| 8 |
[x11-misc/sddm] Partial sync with portage. |
| 9 |
|
| 10 |
Fixes upower dependency wrt bug 517230. |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.10 |
| 13 |
|
| 14 |
--- |
| 15 |
x11-misc/sddm/metadata.xml | 3 ++- |
| 16 |
x11-misc/sddm/sddm-9999.ebuild | 22 ++++++++++++---------- |
| 17 |
2 files changed, 14 insertions(+), 11 deletions(-) |
| 18 |
|
| 19 |
diff --git a/x11-misc/sddm/metadata.xml b/x11-misc/sddm/metadata.xml |
| 20 |
index dbd986c..d867da7 100644 |
| 21 |
--- a/x11-misc/sddm/metadata.xml |
| 22 |
+++ b/x11-misc/sddm/metadata.xml |
| 23 |
@@ -1,12 +1,13 @@ |
| 24 |
<?xml version="1.0" encoding="UTF-8"?> |
| 25 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 26 |
<pkgmetadata> |
| 27 |
+ <herd>lxqt</herd> |
| 28 |
<maintainer> |
| 29 |
<email>jauhien@g.o</email> |
| 30 |
<name>Jauhien Piatlicki</name> |
| 31 |
</maintainer> |
| 32 |
<use> |
| 33 |
- <flag name="consolekit">Enable ConsoleKit support</flag> |
| 34 |
+ <flag name="consolekit">Use ck-launch-session from sys-auth/consolekit by default in Xsession (no native support)</flag> |
| 35 |
</use> |
| 36 |
<longdescription lang="en"> |
| 37 |
SDDM is a modern display manager for X11 aiming to be fast, simple |
| 38 |
|
| 39 |
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild |
| 40 |
index f079a17..f317bb7 100644 |
| 41 |
--- a/x11-misc/sddm/sddm-9999.ebuild |
| 42 |
+++ b/x11-misc/sddm/sddm-9999.ebuild |
| 43 |
@@ -13,8 +13,10 @@ KEYWORDS="" |
| 44 |
LICENSE="GPL-2+ MIT CC-BY-3.0 public-domain" |
| 45 |
SLOT="0" |
| 46 |
IUSE="consolekit +qt4 qt5 systemd +upower" |
| 47 |
-REQUIRED_USE="^^ ( qt4 qt5 ) |
| 48 |
- ?? ( upower systemd )" |
| 49 |
+REQUIRED_USE=" |
| 50 |
+ ^^ ( qt4 qt5 ) |
| 51 |
+ ?? ( upower systemd ) |
| 52 |
+" |
| 53 |
|
| 54 |
RDEPEND="sys-libs/pam |
| 55 |
sys-auth/qauth[qt4?,qt5?] |
| 56 |
@@ -24,11 +26,18 @@ RDEPEND="sys-libs/pam |
| 57 |
qt5? ( dev-qt/qtdeclarative:5 |
| 58 |
dev-qt/qtdbus:5 ) |
| 59 |
systemd? ( sys-apps/systemd:= ) |
| 60 |
- upower? ( sys-power/upower:= )" |
| 61 |
+ upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )" |
| 62 |
DEPEND="${RDEPEND} |
| 63 |
>=sys-devel/gcc-4.7.0 |
| 64 |
virtual/pkgconfig" |
| 65 |
|
| 66 |
+pkg_pretend() { |
| 67 |
+ if [[ ${MERGE_TYPE} != binary ]]; then |
| 68 |
+ [[ $(gcc-version) < 4.7 ]] && \ |
| 69 |
+ die 'The active compiler needs to be gcc 4.7 (or newer)' |
| 70 |
+ fi |
| 71 |
+} |
| 72 |
+ |
| 73 |
src_prepare() { |
| 74 |
use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch" |
| 75 |
|
| 76 |
@@ -38,13 +47,6 @@ src_prepare() { |
| 77 |
-i CMakeLists.txt || die 'sed failed' |
| 78 |
} |
| 79 |
|
| 80 |
-pkg_pretend() { |
| 81 |
- if [[ ${MERGE_TYPE} != binary ]]; then |
| 82 |
- [[ $(gcc-version) < 4.7 ]] && \ |
| 83 |
- die 'The active compiler needs to be gcc 4.7 (or newer)' |
| 84 |
- fi |
| 85 |
-} |
| 86 |
- |
| 87 |
src_configure() { |
| 88 |
local mycmakeargs=( |
| 89 |
$(cmake-utils_use_use qt5 QT5) |
Archives