[gentoo-commits] proj/kde:master commit in: kde-base/kdm/

["Johannes Huber" <johu@gentoo.org>]

commit:     ff677e258d6b137844460197de5853634ad5d538
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 22:13:42 2013 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 22:13:42 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=ff677e25

[kde-base/kdm] Restore consolekit use flag.

Package-Manager: portage-2.2.0_alpha184

---
 kde-base/kdm/kdm-4.10.80.ebuild | 16 +++++++++-------
 kde-base/kdm/kdm-9999.ebuild    | 16 +++++++++-------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/kde-base/kdm/kdm-4.10.80.ebuild b/kde-base/kdm/kdm-4.10.80.ebuild
index 5d0b7d3..9483027 100644
--- a/kde-base/kdm/kdm-4.10.80.ebuild
+++ b/kde-base/kdm/kdm-4.10.80.ebuild
@@ -10,7 +10,9 @@ inherit systemd kde4-meta flag-o-matic user
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="debug kerberos pam systemd"
+IUSE="debug +consolekit kerberos pam systemd"
+
+REQUIRED_USE="systemd? ( !consolekit )"
 
 DEPEND="
 	$(add_kdebase_dep libkworkspace)
@@ -18,16 +20,16 @@ DEPEND="
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
 	kerberos? ( virtual/krb5 )
 	pam? (
 		$(add_kdebase_dep kcheckpass)
 		virtual/pam
 	)
 	systemd? ( sys-apps/systemd )
-	!systemd? (
-		>=sys-apps/dbus-1.0.2
-		sys-auth/consolekit
-	)
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepasswd)
@@ -56,7 +58,7 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
 		$(cmake-utils_use_with pam)
-		$(cmake-utils_use_with !systemd CkConnector)
+		$(cmake-utils_use_with consolekit CkConnector)
 	)
 
 	kde4-meta_src_configure
@@ -150,7 +152,7 @@ pkg_postinst() {
 	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
 	chmod 1770 "${EROOT}${KDM_HOME}"
 
-	if use !systemd; then
+	if use consolekit; then
 		echo
 		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
 		elog "make sure consolekit daemon is running and started at login time"

diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index defbac9..3e6ec0c 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -10,7 +10,9 @@ inherit systemd kde4-meta flag-o-matic user
 
 DESCRIPTION="KDE login manager, similar to xdm and gdm"
 KEYWORDS=""
-IUSE="debug kerberos pam systemd"
+IUSE="debug +consolekit kerberos pam systemd"
+
+REQUIRED_USE="systemd? ( !consolekit )"
 
 DEPEND="
 	$(add_kdebase_dep libkworkspace)
@@ -18,16 +20,16 @@ DEPEND="
 	x11-libs/libXau
 	x11-libs/libXdmcp
 	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
 	kerberos? ( virtual/krb5 )
 	pam? (
 		$(add_kdebase_dep kcheckpass)
 		virtual/pam
 	)
 	systemd? ( sys-apps/systemd )
-	!systemd? (
-		>=sys-apps/dbus-1.0.2
-		sys-auth/consolekit
-	)
 "
 RDEPEND="${DEPEND}
 	$(add_kdebase_dep kdepasswd)
@@ -56,7 +58,7 @@ src_configure() {
 	mycmakeargs=(
 		$(cmake-utils_use kerberos KDE4_KRB5AUTH)
 		$(cmake-utils_use_with pam)
-		$(cmake-utils_use_with !systemd CkConnector)
+		$(cmake-utils_use_with consolekit CkConnector)
 	)
 
 	kde4-meta_src_configure
@@ -150,7 +152,7 @@ pkg_postinst() {
 	use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
 	chmod 1770 "${EROOT}${KDM_HOME}"
 
-	if use !systemd; then
+	if use consolekit; then
 		echo
 		elog "You have compiled 'kdm' with consolekit support. If you want to use kdm,"
 		elog "make sure consolekit daemon is running and started at login time"