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>jauh...@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)
