commit: 2cf83e435c3d4dbc5e4ae6b499744ad7ea634cd0
Author: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 4 10:35:46 2014 +0000
Commit: Jauhien Piatlicki <jauhien <AT> gentoo <DOT> org>
CommitDate: Mon Aug 4 10:35:46 2014 +0000
URL:
http://git.overlays.gentoo.org/gitweb/?p=proj/qt.git;a=commit;h=2cf83e43
[x11-misc/sddm] fix ebuild accordingly to upstream changes
---
x11-misc/sddm/sddm-9999.ebuild | 31 ++++++++++++++-----------------
1 file changed, 14 insertions(+), 17 deletions(-)
diff --git a/x11-misc/sddm/sddm-9999.ebuild b/x11-misc/sddm/sddm-9999.ebuild
index f317bb7..257a101 100644
--- a/x11-misc/sddm/sddm-9999.ebuild
+++ b/x11-misc/sddm/sddm-9999.ebuild
@@ -12,19 +12,16 @@ 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 )
-"
+IUSE="consolekit systemd +upower"
+REQUIRED_USE="?? ( upower systemd )"
RDEPEND="sys-libs/pam
- sys-auth/qauth[qt4?,qt5?]
+ sys-auth/qauth[qt5(-)]
x11-libs/libxcb[xkb(-)]
- qt4? ( dev-qt/qtdeclarative:4
- dev-qt/qtdbus:4 )
- qt5? ( dev-qt/qtdeclarative:5
- dev-qt/qtdbus:5 )
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/linguist-tools:5
systemd? ( sys-apps/systemd:= )
upower? ( || ( sys-power/upower:= sys-power/upower-pm-utils ) )"
DEPEND="${RDEPEND}
@@ -38,6 +35,13 @@ pkg_pretend() {
fi
}
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_no systemd SYSTEMD)
+ )
+ cmake-utils_src_configure
+}
+
src_prepare() {
use consolekit && epatch "${FILESDIR}/${P}-consolekit.patch"
@@ -47,13 +51,6 @@ src_prepare() {
-i CMakeLists.txt || die 'sed failed'
}
-src_configure() {
- local mycmakeargs=(
- $(cmake-utils_use_use qt5 QT5)
- )
- cmake-utils_src_configure
-}
-
pkg_postinst() {
if use consolekit; then
ewarn "This display manager doesn't have native built-in
ConsoleKit support."
