* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2012-05-22 20:52 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2012-05-22 20:52 UTC (permalink / raw
To: gentoo-commits
commit: b6382ae031dc69b3c3952684e7fe7f0e422452b9
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue May 22 20:50:03 2012 +0000
Commit: Michael Palimaka <kensington <AT> astralcloak <DOT> net>
CommitDate: Tue May 22 20:51:41 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b6382ae0
[kde-base/kdm] Explicitly inherit 'user' eclass.
(Portage version: 2.1.10.62/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kdm/kdm-4.8.49.9999.ebuild | 2 +-
kde-base/kdm/kdm-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild
index 3244c0b..89852f3 100644
--- a/kde-base/kdm/kdm-4.8.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
KDE_HANDBOOK="optional"
KMNAME="kde-workspace"
-inherit kde4-meta flag-o-matic
+inherit kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 3244c0b..89852f3 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
KDE_HANDBOOK="optional"
KMNAME="kde-workspace"
-inherit kde4-meta flag-o-matic
+inherit kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2015-03-15 13:27 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2015-03-15 13:27 UTC (permalink / raw
To: gentoo-commits
commit: a0b0e3e867cfe62adc4a55b8b28cbb5044581775
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Mar 14 17:25:43 2015 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 13:27:21 2015 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=a0b0e3e8
[kde-base/kdm] RDEPEND on kde-base/libkgreeter
Package-Manager: portage-2.2.14
kde-base/kdm/{kdm-4.11.17.ebuild => kdm-4.11.17-r1.ebuild} | 7 ++++---
kde-base/kdm/kdm-4.11.49.9999.ebuild | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/kde-base/kdm/kdm-4.11.17.ebuild b/kde-base/kdm/kdm-4.11.17-r1.ebuild
similarity index 97%
rename from kde-base/kdm/kdm-4.11.17.ebuild
rename to kde-base/kdm/kdm-4.11.17-r1.ebuild
index 64094cd..3eaf2bd 100644
--- a/kde-base/kdm/kdm-4.11.17.ebuild
+++ b/kde-base/kdm/kdm-4.11.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -34,12 +34,13 @@ DEPEND="
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepasswd)
+ $(add_kdebase_dep libkgreeter)
>=x11-apps/xinit-1.0.5-r2
x11-apps/xmessage
"
-KMEXTRA="
- libs/kdm/
+KMEXTRACTONLY="
+ libs/kdm/kgreeterplugin.h
"
PATCHES=(
diff --git a/kde-base/kdm/kdm-4.11.49.9999.ebuild b/kde-base/kdm/kdm-4.11.49.9999.ebuild
index b24547a..37977cc 100644
--- a/kde-base/kdm/kdm-4.11.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.11.49.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -34,12 +34,13 @@ DEPEND="
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepasswd)
+ $(add_kdebase_dep libkgreeter)
>=x11-apps/xinit-1.0.5-r2
x11-apps/xmessage
"
-KMEXTRA="
- libs/kdm/
+KMEXTRACTONLY="
+ libs/kdm/kgreeterplugin.h
"
PATCHES=(
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2014-03-16 9:10 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2014-03-16 9:10 UTC (permalink / raw
To: gentoo-commits
commit: d6d3b078a5d89fb82b70b577b250afb37f76bfed
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 16 09:09:28 2014 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Mar 16 09:09:28 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d6d3b078
[kde-base/kdm] Revert changes which turned out not to be so good wrt bug #479426.
This reverts commit de1917538387e956d24b3cd2950bac0d9863db7f.
---
kde-base/kdm/kdm-4.11.49.9999.ebuild | 5 +----
kde-base/kdm/kdm-9999.ebuild | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/kde-base/kdm/kdm-4.11.49.9999.ebuild b/kde-base/kdm/kdm-4.11.49.9999.ebuild
index 082b63f..e27e1f1 100644
--- a/kde-base/kdm/kdm-4.11.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.11.49.9999.ebuild
@@ -30,10 +30,7 @@ DEPEND="
$(add_kdebase_dep kcheckpass)
virtual/pam
)
- systemd? (
- sys-apps/systemd
- sys-apps/systemd-sysv-utils
- )
+ systemd? ( sys-apps/systemd )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepasswd)
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 082b63f..e27e1f1 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -30,10 +30,7 @@ DEPEND="
$(add_kdebase_dep kcheckpass)
virtual/pam
)
- systemd? (
- sys-apps/systemd
- sys-apps/systemd-sysv-utils
- )
+ systemd? ( sys-apps/systemd )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepasswd)
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2014-03-15 9:08 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2014-03-15 9:08 UTC (permalink / raw
To: gentoo-commits
commit: de1917538387e956d24b3cd2950bac0d9863db7f
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 15 09:08:06 2014 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Sat Mar 15 09:08:17 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=de191753
[kde-base/kdm] DEPEND on sys-apps/systemd-sysv-utils to fix bug #479426. Thanks to Manuel "Sput" Nickschas for the hint.
Package-Manager: portage-2.2.8-r1
---
kde-base/kdm/kdm-4.11.49.9999.ebuild | 5 ++++-
kde-base/kdm/kdm-9999.ebuild | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/kde-base/kdm/kdm-4.11.49.9999.ebuild b/kde-base/kdm/kdm-4.11.49.9999.ebuild
index e27e1f1..082b63f 100644
--- a/kde-base/kdm/kdm-4.11.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.11.49.9999.ebuild
@@ -30,7 +30,10 @@ DEPEND="
$(add_kdebase_dep kcheckpass)
virtual/pam
)
- systemd? ( sys-apps/systemd )
+ systemd? (
+ sys-apps/systemd
+ sys-apps/systemd-sysv-utils
+ )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepasswd)
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index e27e1f1..082b63f 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -30,7 +30,10 @@ DEPEND="
$(add_kdebase_dep kcheckpass)
virtual/pam
)
- systemd? ( sys-apps/systemd )
+ systemd? (
+ sys-apps/systemd
+ sys-apps/systemd-sysv-utils
+ )
"
RDEPEND="${DEPEND}
$(add_kdebase_dep kdepasswd)
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2013-08-21 18:41 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2013-08-21 18:41 UTC (permalink / raw
To: gentoo-commits
commit: 9daa8ee27af38611b3f4afce14484e86bdb6365e
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 21 18:37:48 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Aug 21 18:37:48 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=9daa8ee2
[kde-base/kdm] Add missing dependency.
Package-Manager: portage-2.2.0
---
kde-base/kdm/kdm-4.11.49.9999.ebuild | 1 +
kde-base/kdm/kdm-9999.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/kde-base/kdm/kdm-4.11.49.9999.ebuild b/kde-base/kdm/kdm-4.11.49.9999.ebuild
index d83548b..1299037 100644
--- a/kde-base/kdm/kdm-4.11.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.11.49.9999.ebuild
@@ -16,6 +16,7 @@ REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
DEPEND="
$(add_kdebase_dep libkworkspace)
+ media-libs/qimageblitz
x11-libs/libX11
x11-libs/libXau
x11-libs/libXdmcp
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index d83548b..1299037 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -16,6 +16,7 @@ REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
DEPEND="
$(add_kdebase_dep libkworkspace)
+ media-libs/qimageblitz
x11-libs/libX11
x11-libs/libXau
x11-libs/libXdmcp
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2013-08-18 10:25 Andreas Hüttel
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Hüttel @ 2013-08-18 10:25 UTC (permalink / raw
To: gentoo-commits
commit: cf0995aab04467abd388080adc5735e61ac0eb3e
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 18 10:28:04 2013 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 18 10:28:04 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cf0995aa
[kde-base/kdm] Adhere to coding conventions
Package-Manager: portage-2.2.0
---
kde-base/kdm/kdm-4.11.49.9999.ebuild | 4 +---
kde-base/kdm/kdm-9999.ebuild | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/kde-base/kdm/kdm-4.11.49.9999.ebuild b/kde-base/kdm/kdm-4.11.49.9999.ebuild
index d1a215f..d83548b 100644
--- a/kde-base/kdm/kdm-4.11.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.11.49.9999.ebuild
@@ -98,9 +98,7 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}"/kdm-logrotate kdm
- if use systemd; then
- systemd_dounit "${FILESDIR}"/kdm.service
- fi
+ systemd_dounit "${FILESDIR}"/kdm.service
}
pkg_postinst() {
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index d1a215f..d83548b 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -98,9 +98,7 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}"/kdm-logrotate kdm
- if use systemd; then
- systemd_dounit "${FILESDIR}"/kdm.service
- fi
+ systemd_dounit "${FILESDIR}"/kdm.service
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2013-07-25 22:16 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2013-07-25 22:16 UTC (permalink / raw
To: gentoo-commits
commit: 3aa25d9216b373648feb37ff1424ed8ad6834fa0
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 25 22:16:03 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Thu Jul 25 22:16:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=3aa25d92
[kde-base/kdm] Adjust REQUIRED_USE as decided in meeting wrt bug #468500.
Package-Manager: portage-2.2.0_alpha188
---
kde-base/kdm/kdm-4.10.97.ebuild | 4 ++--
kde-base/kdm/kdm-4.11.49.9999.ebuild | 2 +-
kde-base/kdm/kdm-9999.ebuild | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kde-base/kdm/kdm-4.10.97.ebuild b/kde-base/kdm/kdm-4.10.97.ebuild
index 0c2f2b2..25d1acc 100644
--- a/kde-base/kdm/kdm-4.10.97.ebuild
+++ b/kde-base/kdm/kdm-4.10.97.ebuild
@@ -9,10 +9,10 @@ KMNAME="kde-workspace"
inherit systemd kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS=" ~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug +consolekit kerberos pam systemd"
-REQUIRED_USE="systemd? ( !consolekit )"
+REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
DEPEND="
$(add_kdebase_dep libkworkspace)
diff --git a/kde-base/kdm/kdm-4.11.49.9999.ebuild b/kde-base/kdm/kdm-4.11.49.9999.ebuild
index 3e6ec0c..d1a215f 100644
--- a/kde-base/kdm/kdm-4.11.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.11.49.9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
IUSE="debug +consolekit kerberos pam systemd"
-REQUIRED_USE="systemd? ( !consolekit )"
+REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
DEPEND="
$(add_kdebase_dep libkworkspace)
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 3e6ec0c..d1a215f 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
IUSE="debug +consolekit kerberos pam systemd"
-REQUIRED_USE="systemd? ( !consolekit )"
+REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
DEPEND="
$(add_kdebase_dep libkworkspace)
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2013-06-24 22:14 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2013-06-24 22:14 UTC (permalink / raw
To: gentoo-commits
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"
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2013-06-24 21:51 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2013-06-24 21:51 UTC (permalink / raw
To: gentoo-commits
commit: 5e86150891daa9ee34c9e562f143ab89c1f2a2fc
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 24 21:49:59 2013 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 24 21:50:59 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5e861508
[kde-base/kdm] systemd-logind supported by upstream, #bug #451954.
Package-Manager: portage-2.2.0_alpha184
---
kde-base/kdm/kdm-4.10.80.ebuild | 21 ++++++++++++---------
kde-base/kdm/kdm-9999.ebuild | 19 +++++++++++--------
2 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/kde-base/kdm/kdm-4.10.80.ebuild b/kde-base/kdm/kdm-4.10.80.ebuild
index a7e4a22..5d0b7d3 100644
--- a/kde-base/kdm/kdm-4.10.80.ebuild
+++ b/kde-base/kdm/kdm-4.10.80.ebuild
@@ -9,8 +9,8 @@ KMNAME="kde-workspace"
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="+consolekit debug kerberos pam"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug kerberos pam systemd"
DEPEND="
$(add_kdebase_dep libkworkspace)
@@ -18,15 +18,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)
@@ -55,7 +56,7 @@ src_configure() {
mycmakeargs=(
$(cmake-utils_use kerberos KDE4_KRB5AUTH)
$(cmake-utils_use_with pam)
- $(cmake-utils_use_with consolekit CkConnector)
+ $(cmake-utils_use_with !systemd CkConnector)
)
kde4-meta_src_configure
@@ -95,7 +96,9 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}"/kdm-logrotate kdm
- systemd_dounit "${FILESDIR}"/kdm.service
+ if use systemd; then
+ systemd_dounit "${FILESDIR}"/kdm.service
+ fi
}
pkg_postinst() {
@@ -147,7 +150,7 @@ pkg_postinst() {
use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
chmod 1770 "${EROOT}${KDM_HOME}"
- if use consolekit; then
+ if use !systemd; 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 16ffb13..defbac9 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -10,7 +10,7 @@ inherit systemd kde4-meta flag-o-matic user
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
-IUSE="+consolekit debug kerberos pam"
+IUSE="debug kerberos pam systemd"
DEPEND="
$(add_kdebase_dep libkworkspace)
@@ -18,15 +18,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)
@@ -55,7 +56,7 @@ src_configure() {
mycmakeargs=(
$(cmake-utils_use kerberos KDE4_KRB5AUTH)
$(cmake-utils_use_with pam)
- $(cmake-utils_use_with consolekit CkConnector)
+ $(cmake-utils_use_with !systemd CkConnector)
)
kde4-meta_src_configure
@@ -95,7 +96,9 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}"/kdm-logrotate kdm
- systemd_dounit "${FILESDIR}"/kdm.service
+ if use systemd; then
+ systemd_dounit "${FILESDIR}"/kdm.service
+ fi
}
pkg_postinst() {
@@ -147,7 +150,7 @@ pkg_postinst() {
use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
chmod 1770 "${EROOT}${KDM_HOME}"
- if use consolekit; then
+ if use !systemd; 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"
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2013-04-28 23:59 David Heidelberger
0 siblings, 0 replies; 23+ messages in thread
From: David Heidelberger @ 2013-04-28 23:59 UTC (permalink / raw
To: gentoo-commits
commit: cfdd4f29dd98a02d0caefdd77655e91fedabfe86
Author: David Heidelberger <david.heidelberger <AT> ixit <DOT> cz>
AuthorDate: Sun Apr 28 23:59:07 2013 +0000
Commit: David Heidelberger <d.okias <AT> gmail <DOT> com>
CommitDate: Sun Apr 28 23:59:07 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=cfdd4f29
[kde-base/kdm] remove workaround for -O3, tested on amd64, seems fine. Issue spotted last before kdm-4.3 release
---
kde-base/kdm/kdm-4.10.49.9999.ebuild | 4 ----
kde-base/kdm/kdm-9999.ebuild | 4 ----
2 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/kde-base/kdm/kdm-4.10.49.9999.ebuild b/kde-base/kdm/kdm-4.10.49.9999.ebuild
index 0ae5d18..4abbd31 100644
--- a/kde-base/kdm/kdm-4.10.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.10.49.9999.ebuild
@@ -52,10 +52,6 @@ pkg_setup() {
}
src_configure() {
- # genkdmconf breaks with -O3
- # last checked in 4.2.95
- replace-flags -O3 -O2
-
mycmakeargs=(
$(cmake-utils_use kerberos KDE4_KRB5AUTH)
$(cmake-utils_use_with pam)
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 0ae5d18..4abbd31 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -52,10 +52,6 @@ pkg_setup() {
}
src_configure() {
- # genkdmconf breaks with -O3
- # last checked in 4.2.95
- replace-flags -O3 -O2
-
mycmakeargs=(
$(cmake-utils_use kerberos KDE4_KRB5AUTH)
$(cmake-utils_use_with pam)
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2013-04-09 14:30 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2013-04-09 14:30 UTC (permalink / raw
To: gentoo-commits
commit: 5aa8e8f667fffef59853f057c522b598ef6a357d
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 9 14:29:13 2013 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Apr 9 14:29:13 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=5aa8e8f6
[kde-base/kdm] Add missing dependency.
Package-Manager: portage-2.1.11.60
---
kde-base/kdm/kdm-4.10.49.9999.ebuild | 1 +
kde-base/kdm/kdm-9999.ebuild | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdm/kdm-4.10.49.9999.ebuild b/kde-base/kdm/kdm-4.10.49.9999.ebuild
index 4e14fdb..0ae5d18 100644
--- a/kde-base/kdm/kdm-4.10.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.10.49.9999.ebuild
@@ -14,6 +14,7 @@ IUSE="+consolekit debug kerberos pam"
DEPEND="
$(add_kdebase_dep libkworkspace)
+ x11-libs/libX11
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXtst
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 4e14fdb..0ae5d18 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -14,6 +14,7 @@ IUSE="+consolekit debug kerberos pam"
DEPEND="
$(add_kdebase_dep libkworkspace)
+ x11-libs/libX11
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXtst
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2012-06-26 11:38 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2012-06-26 11:38 UTC (permalink / raw
To: gentoo-commits
commit: 926f247e98d1aeae24674a23ff149a70ae581bff
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 26 11:37:46 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 11:37:46 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=926f247e
[kde-base/kdm] Remove patch for issue backported to KDE/4.8
See: http://quickgit.kde.org/index.php?p=kde-workspace.git&a=commit&h=da6e2b49fd2a30aca167ae37ef3e3fd1c7d3bc58
(Portage version: 2.1.11.2/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kdm/kdm-4.8.49.9999.ebuild | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild
index 89852f3..7f76b66 100644
--- a/kde-base/kdm/kdm-4.8.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild
@@ -39,7 +39,6 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
- "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2012-06-15 11:31 Michael Palimaka
0 siblings, 0 replies; 23+ messages in thread
From: Michael Palimaka @ 2012-06-15 11:31 UTC (permalink / raw
To: gentoo-commits
commit: bf32923954c94894870d06ce77fc8e6b13190526
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 15 11:29:01 2012 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Jun 15 11:29:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=bf329239
[kde-base/kdm] Remove patch for issue that is fixed upstream, wrt bug #421047.
Upstream commit: a4ef19c9491e7c5b3ff5a7e18915b6b14f71fe3f
See: https://bugs.kde.org/show_bug.cgi?id=281862
(Portage version: 2.1.10.65/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kdm/kdm-9999.ebuild | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 89852f3..7f76b66 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -39,7 +39,6 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
- "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2012-05-01 11:21 Johannes Huber
0 siblings, 0 replies; 23+ messages in thread
From: Johannes Huber @ 2012-05-01 11:21 UTC (permalink / raw
To: gentoo-commits
commit: eb948f0357eff2d7d03cf84e48700cbdf954cc41
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Tue May 1 11:18:13 2012 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Tue May 1 11:18:13 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=eb948f03
[kde-base/kdm] Cleanup header.
(Portage version: 2.2.0_alpha101/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kdm/kdm-4.8.3.ebuild | 2 +-
kde-base/kdm/kdm-4.8.49.9999.ebuild | 2 +-
kde-base/kdm/kdm-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-base/kdm/kdm-4.8.3.ebuild b/kde-base/kdm/kdm-4.8.3.ebuild
index 2a97531..d52c181 100644
--- a/kde-base/kdm/kdm-4.8.3.ebuild
+++ b/kde-base/kdm/kdm-4.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $Header: $
EAPI=4
diff --git a/kde-base/kdm/kdm-4.8.49.9999.ebuild b/kde-base/kdm/kdm-4.8.49.9999.ebuild
index 93e9fec..3244c0b 100644
--- a/kde-base/kdm/kdm-4.8.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.8.49.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $Header: $
EAPI=4
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 93e9fec..3244c0b 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
+# $Header: $
EAPI=4
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-11-20 21:53 Andreas Hüttel
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Hüttel @ 2011-11-20 21:53 UTC (permalink / raw
To: gentoo-commits
commit: d353f4c1104ce336e22a22cf34c376d689144270
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Nov 20 22:53:49 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 20 22:53:49 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d353f4c1
[kde-base/kdm] Moved 4.7.3 to tree, added patch in newer
(Portage version: 2.1.10.36/git/Linux x86_64, unsigned Manifest commit)
---
kde-base/kdm/kdm-4.7.3-r1.ebuild | 161 -----------------------------------
kde-base/kdm/kdm-4.7.49.9999.ebuild | 3 +-
kde-base/kdm/kdm-4.7.80.ebuild | 3 +-
kde-base/kdm/kdm-9999.ebuild | 3 +-
4 files changed, 6 insertions(+), 164 deletions(-)
diff --git a/kde-base/kdm/kdm-4.7.3-r1.ebuild b/kde-base/kdm/kdm-4.7.3-r1.ebuild
deleted file mode 100644
index 7e04b3f..0000000
--- a/kde-base/kdm/kdm-4.7.3-r1.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
-
-EAPI=4
-
-KDE_HANDBOOK="optional"
-KMNAME="kde-workspace"
-inherit kde4-meta flag-o-matic
-
-DESCRIPTION="KDE login manager, similar to xdm and gdm"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="+consolekit debug kerberos pam"
-
-DEPEND="
- $(add_kdebase_dep libkworkspace)
- 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
- )
-"
-RDEPEND="${DEPEND}
- $(add_kdebase_dep kdepasswd)
- >=x11-apps/xinit-1.0.5-r2
- x11-apps/xmessage
-"
-
-KMEXTRA="
- libs/kdm/
-"
-
-PATCHES=(
- "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
- "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
- "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
-)
-
-pkg_setup() {
- kde4-meta_pkg_setup
-
- # Create kdm:kdm user
- KDM_HOME=/var/lib/kdm
- enewgroup kdm
- enewuser kdm -1 -1 "${KDM_HOME}" kdm
-}
-
-src_configure() {
- # genkdmconf breaks with -O3
- # last checked in 4.2.95
- replace-flags -O3 -O2
-
- mycmakeargs=(
- $(cmake-utils_use kerberos KDE4_KRB5AUTH)
- $(cmake-utils_use_with pam)
- $(cmake-utils_use_with consolekit CkConnector)
- )
-
- kde4-meta_src_configure
-}
-
-src_install() {
- export GENKDMCONF_FLAGS="--no-old --no-backup"
-
- kde4-meta_src_install
-
- # an equivalent file is already installed by kde-base/startkde, bug 377151
- rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
-
- # Customize the kdmrc configuration:
- # - SessionDirs set to /usr/share/xsessions
- # - increase server timeout to 30s
- # - TerminateServer=true to workaround X server regen bug, bug 278473
- # - DataDir set to /var/lib/kdm
- # - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
- -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
- -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
- -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
- -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
- -i "${ED}"/usr/share/config/kdm/kdmrc \
- || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
-
- # Don't install empty dir
- rmdir "${ED}"/usr/share/config/kdm/sessions
-
- # Set up permissions to kdm work directory
- keepdir "${KDM_HOME}"
- fowners root:kdm "${KDM_HOME}"
- fperms 1770 "${KDM_HOME}"
-
- # install logrotate file
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/kdm-logrotate kdm
-}
-
-pkg_postinst() {
- kde4-meta_pkg_postinst
-
- local file src dest dir old_dirs=(
- /var/lib/kdm-live
- /var/lib/kdm-4.6
- /var/lib/kdm-4.5
- /var/lib/kdm-4.4
- /usr/share/apps/kdm
- /usr/kde/4.4/share/apps/kdm
- /usr/kde/4.3/share/apps/kdm
- /usr/kde/4.2/share/apps/kdm
- )
-
- mkdir -p "${EROOT}${KDM_HOME}/faces"
- # Set the default kdm face icon if it's not already set by the system admin
- # because this is user-overrideable in that way, it's not in src_install
- for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
- src=${file#*:}
- dest=${file%:*}
- if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
- for dir in "${old_dirs[@]}"; do
- if [[ -e ${EROOT}${dir}/${dest} ]]; then
- cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
- break 2
- fi
- done
- if [[ -n ${src} ]]; then
- cp "${EROOT}/usr/share/apps/kdm/pics/users/${src}" \
- "${EROOT}${KDM_HOME}/${dest}"
- fi
- fi
- done
- for dir in "${old_dirs[@]}"; do
- if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
- echo
- elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
- elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
- echo
- elog "After doing so, you may delete the directory."
- echo
- fi
- done
-
- # Make sure permissions are correct -- old installations may have
- # gotten this wrong
- use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
- chmod 1770 "${EROOT}${KDM_HOME}"
-
- 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"
- elog
- elog "rc-update add consolekit default && /etc/init.d/consolekit start"
- echo
- fi
-}
diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.49.9999.ebuild
index a63e162..ce9a6a7 100644
--- a/kde-base/kdm/kdm-4.7.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
EAPI=4
@@ -40,6 +40,7 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+ "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
)
pkg_setup() {
diff --git a/kde-base/kdm/kdm-4.7.80.ebuild b/kde-base/kdm/kdm-4.7.80.ebuild
index 19ea40e..d3a5af4 100644
--- a/kde-base/kdm/kdm-4.7.80.ebuild
+++ b/kde-base/kdm/kdm-4.7.80.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
EAPI=4
@@ -40,6 +40,7 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+ "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
)
pkg_setup() {
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index a63e162..ce9a6a7 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.3.ebuild,v 1.1 2011/11/02 20:48:16 alexxy Exp $
EAPI=4
@@ -40,6 +40,7 @@ KMEXTRA="
PATCHES=(
"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+ "${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-10-28 17:43 Andreas Hüttel
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Hüttel @ 2011-10-28 17:43 UTC (permalink / raw
To: gentoo-commits
commit: c0449c90f09a9afae2c3c49694f336f9c1c5822d
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Oct 28 17:43:10 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Oct 28 17:43:10 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=c0449c90
[kde-base/kdm] Remove duplicate X session file
(Portage version: 2.1.10.31/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
kde-base/kdm/kdm-4.7.49.9999.ebuild | 3 +++
kde-base/kdm/kdm-9999.ebuild | 3 +++
2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.49.9999.ebuild
index 81651b5..a63e162 100644
--- a/kde-base/kdm/kdm-4.7.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild
@@ -70,6 +70,9 @@ src_install() {
kde4-meta_src_install
+ # an equivalent file is already installed by kde-base/startkde, bug 377151
+ rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
+
# Customize the kdmrc configuration:
# - SessionDirs set to /usr/share/xsessions
# - increase server timeout to 30s
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 81651b5..a63e162 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -70,6 +70,9 @@ src_install() {
kde4-meta_src_install
+ # an equivalent file is already installed by kde-base/startkde, bug 377151
+ rm "${ED}/usr/share/apps/kdm/sessions/kde-plasma.desktop" || die
+
# Customize the kdmrc configuration:
# - SessionDirs set to /usr/share/xsessions
# - increase server timeout to 30s
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-09-07 21:43 Alexey Shvetsov
0 siblings, 0 replies; 23+ messages in thread
From: Alexey Shvetsov @ 2011-09-07 21:43 UTC (permalink / raw
To: gentoo-commits
commit: 7d72b5d96381df3bd2c1752f3525516a67123976
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 7 21:27:08 2011 +0000
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Wed Sep 7 21:27:08 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=7d72b5d9
[kde-base/kdm] Drop old blockers
(Portage version: 2.2.0_alpha54/git/Linux x86_64, signed Manifest commit with key F82F92E6)
---
kde-base/kdm/kdm-4.7.49.9999.ebuild | 2 --
kde-base/kdm/kdm-9999.ebuild | 2 --
2 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.49.9999.ebuild
index 0493bbf..81651b5 100644
--- a/kde-base/kdm/kdm-4.7.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild
@@ -33,8 +33,6 @@ RDEPEND="${DEPEND}
x11-apps/xmessage
"
-add_blocker systemsettings '<4.5.80'
-
KMEXTRA="
libs/kdm/
"
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 0493bbf..81651b5 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -33,8 +33,6 @@ RDEPEND="${DEPEND}
x11-apps/xmessage
"
-add_blocker systemsettings '<4.5.80'
-
KMEXTRA="
libs/kdm/
"
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-07-25 20:54 Andreas Hüttel
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Hüttel @ 2011-07-25 20:54 UTC (permalink / raw
To: gentoo-commits
commit: f745a204c38f9994879f572fe6f129eda2dba08f
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Mon Jul 25 21:25:01 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 25 21:25:01 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=f745a204
[kde-base/kdm] Re-add support for session files in /usr/share/xsessions, was dropped accidentally
(Portage version: 2.1.10.7/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
kde-base/kdm/kdm-4.7.0.ebuild | 2 +-
kde-base/kdm/kdm-4.7.49.9999.ebuild | 2 +-
kde-base/kdm/kdm-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-base/kdm/kdm-4.7.0.ebuild b/kde-base/kdm/kdm-4.7.0.ebuild
index ea10b41..2feb693 100644
--- a/kde-base/kdm/kdm-4.7.0.ebuild
+++ b/kde-base/kdm/kdm-4.7.0.ebuild
@@ -78,7 +78,7 @@ src_install() {
# - TerminateServer=true to workaround X server regen bug, bug 278473
# - DataDir set to /var/lib/kdm
# - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.49.9999.ebuild
index f32f406..0493bbf 100644
--- a/kde-base/kdm/kdm-4.7.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild
@@ -78,7 +78,7 @@ src_install() {
# - TerminateServer=true to workaround X server regen bug, bug 278473
# - DataDir set to /var/lib/kdm
# - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index f32f406..0493bbf 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -78,7 +78,7 @@ src_install() {
# - TerminateServer=true to workaround X server regen bug, bug 278473
# - DataDir set to /var/lib/kdm
# - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions,${EPREFIX}/usr/share/xsessions|" \
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-07-12 20:53 Andreas Hüttel
0 siblings, 0 replies; 23+ messages in thread
From: Andreas Hüttel @ 2011-07-12 20:53 UTC (permalink / raw
To: gentoo-commits
commit: d0d51424f72a7e74ed94cad759e396c9c675006d
Author: Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 12 20:51:32 2011 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 12 20:53:11 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=d0d51424
[kde-base/kdm] Use the session files from kdm, bug 364861
(Portage version: 2.1.10.4/git/Linux x86_64, signed Manifest commit with key 7887F787)
---
kde-base/kdm/kdm-4.6.95.ebuild | 2 +-
kde-base/kdm/kdm-4.7.49.9999.ebuild | 2 +-
kde-base/kdm/kdm-9999.ebuild | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kde-base/kdm/kdm-4.6.95.ebuild b/kde-base/kdm/kdm-4.6.95.ebuild
index d611a06..d2d599f 100644
--- a/kde-base/kdm/kdm-4.6.95.ebuild
+++ b/kde-base/kdm/kdm-4.6.95.ebuild
@@ -78,7 +78,7 @@ src_install() {
# - TerminateServer=true to workaround X server regen bug, bug 278473
# - DataDir set to /var/lib/kdm
# - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions|" \
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
diff --git a/kde-base/kdm/kdm-4.7.49.9999.ebuild b/kde-base/kdm/kdm-4.7.49.9999.ebuild
index a61ab7a..f32f406 100644
--- a/kde-base/kdm/kdm-4.7.49.9999.ebuild
+++ b/kde-base/kdm/kdm-4.7.49.9999.ebuild
@@ -78,7 +78,7 @@ src_install() {
# - TerminateServer=true to workaround X server regen bug, bug 278473
# - DataDir set to /var/lib/kdm
# - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions|" \
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index a61ab7a..f32f406 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -78,7 +78,7 @@ src_install() {
# - TerminateServer=true to workaround X server regen bug, bug 278473
# - DataDir set to /var/lib/kdm
# - FaceDir set to /var/lib/kdm/faces
- sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions|" \
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/apps/kdm/sessions|" \
-e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
-e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
-e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-05-24 5:57 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 23+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2011-05-24 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 164ee8b3825e0eaa77a317d9abd1ad4cb2fe66cb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 05:45:47 2011 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue May 24 05:45:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=164ee8b3
[kde-base/kdm] 4.6.80 version bump.
(Portage version: 2.2.0_alpha34/git/Linux x86_64, signed Manifest commit with key BB0E6E98)
---
kde-base/kdm/kdm-4.6.80.ebuild | 159 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 159 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdm/kdm-4.6.80.ebuild b/kde-base/kdm/kdm-4.6.80.ebuild
new file mode 100644
index 0000000..210f6fd
--- /dev/null
+++ b/kde-base/kdm/kdm-4.6.80.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-workspace"
+inherit kde4-meta flag-o-matic
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="+consolekit debug kerberos pam"
+
+DEPEND="
+ $(add_kdebase_dep libkworkspace)
+ 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
+ )
+"
+RDEPEND="${DEPEND}
+ $(add_kdebase_dep kdepasswd)
+ >=x11-apps/xinit-1.0.5-r2
+ x11-apps/xmessage
+"
+
+add_blocker systemsettings '<4.5.80'
+
+KMEXTRA="
+ libs/kdm/
+"
+
+PATCHES=(
+ "${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+ "${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+)
+
+pkg_setup() {
+ kde4-meta_pkg_setup
+
+ # Create kdm:kdm user
+ KDM_HOME=/var/lib/kdm
+ enewgroup kdm
+ enewuser kdm -1 -1 "${KDM_HOME}" kdm
+}
+
+src_configure() {
+ # genkdmconf breaks with -O3
+ # last checked in 4.2.95
+ replace-flags -O3 -O2
+
+ mycmakeargs=(
+ $(cmake-utils_use kerberos KDE4_KRB5AUTH)
+ $(cmake-utils_use_with pam)
+ $(cmake-utils_use_with consolekit CkConnector)
+ )
+
+ kde4-meta_src_configure
+}
+
+src_install() {
+ export GENKDMCONF_FLAGS="--no-old --no-backup"
+
+ kde4-meta_src_install
+
+ # Customize the kdmrc configuration:
+ # - SessionDirs set to /usr/share/xsessions
+ # - increase server timeout to 30s
+ # - TerminateServer=true to workaround X server regen bug, bug 278473
+ # - DataDir set to /var/lib/kdm
+ # - FaceDir set to /var/lib/kdm/faces
+ sed -e "s|^.*SessionsDirs=.*$|#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions|" \
+ -e "/#ServerTimeout=/s/^.*$/ServerTimeout=30/" \
+ -e "/#TerminateServer=/s/^.*$/TerminateServer=true/" \
+ -e "s|^.*DataDir=.*$|#&\nDataDir=${EPREFIX}${KDM_HOME}|" \
+ -e "s|^.*FaceDir=.*$|#&\nFaceDir=${EPREFIX}${KDM_HOME}/faces|" \
+ -i "${ED}"/${KDEDIR}/share/config/kdm/kdmrc \
+ || die "Failed to set ServerTimeout and SessionsDirs correctly in kdmrc."
+
+ # Don't install empty dir
+ rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions
+
+ # Set up permissions to kdm work directory
+ keepdir "${KDM_HOME}"
+ fowners root:kdm "${KDM_HOME}"
+ fperms 1770 "${KDM_HOME}"
+
+ # install logrotate file
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}"/kdm-logrotate kdm
+}
+
+pkg_postinst() {
+ kde4-meta_pkg_postinst
+
+ local file src dest dir old_dirs=(
+ /var/lib/kdm-live
+ /var/lib/kdm-4.6
+ /var/lib/kdm-4.5
+ /var/lib/kdm-4.4
+ /usr/share/apps/kdm
+ /usr/kde/4.4/share/apps/kdm
+ /usr/kde/4.3/share/apps/kdm
+ /usr/kde/4.2/share/apps/kdm
+ )
+
+ mkdir -p "${EROOT}${KDM_HOME}/faces"
+ # Set the default kdm face icon if it's not already set by the system admin
+ # because this is user-overrideable in that way, it's not in src_install
+ for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+ src=${file#*:}
+ dest=${file%:*}
+ if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+ for dir in "${old_dirs[@]}"; do
+ if [[ -e ${EROOT}${dir}/${dest} ]]; then
+ cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+ break 2
+ fi
+ done
+ if [[ -n ${src} ]]; then
+ cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/${src}" \
+ "${EROOT}${KDM_HOME}/${dest}"
+ fi
+ fi
+ done
+ for dir in "${old_dirs[@]}"; do
+ if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+ echo
+ elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+ elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+ echo
+ elog "After doing so, you may delete the directory."
+ echo
+ fi
+ done
+
+ # Make sure permissions are correct -- old installations may have
+ # gotten this wrong
+ use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+ chmod 1770 "${EROOT}${KDM_HOME}"
+
+ 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"
+ elog
+ elog "rc-update add consolekit default && /etc/init.d/consolekit start"
+ echo
+ fi
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-05-19 16:20 Jonathan Callen
0 siblings, 0 replies; 23+ messages in thread
From: Jonathan Callen @ 2011-05-19 16:20 UTC (permalink / raw
To: gentoo-commits
commit: b741de87c2ae6e27eabbaf7f8b53ae860f96aa30
Author: Jonathan Callen <abcd <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 16:19:24 2011 +0000
Commit: Jonathan Callen <abcd <AT> gentoo <DOT> org>
CommitDate: Thu May 19 16:20:39 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=b741de87
[kde-base/kdm] Attempt to migrate some settings from older locations
(Portage version: 2.2.0_alpha34/git/Linux x86_64, signed Manifest commit with key 229E5838)
---
kde-base/kdm/kdm-4.6.9999.ebuild | 53 ++++++++++++++++++++++++++++++-------
kde-base/kdm/kdm-9999.ebuild | 53 ++++++++++++++++++++++++++++++-------
2 files changed, 86 insertions(+), 20 deletions(-)
diff --git a/kde-base/kdm/kdm-4.6.9999.ebuild b/kde-base/kdm/kdm-4.6.9999.ebuild
index adee0f2..0a99097 100644
--- a/kde-base/kdm/kdm-4.6.9999.ebuild
+++ b/kde-base/kdm/kdm-4.6.9999.ebuild
@@ -102,18 +102,51 @@ src_install() {
pkg_postinst() {
kde4-meta_pkg_postinst
+ local file src dest dir old_dirs=(
+ /var/lib/kdm-live
+ /var/lib/kdm-4.6
+ /var/lib/kdm-4.5
+ /var/lib/kdm-4.4
+ /usr/share/apps/kdm
+ /usr/kde/4.4/share/apps/kdm
+ /usr/kde/4.3/share/apps/kdm
+ /usr/kde/4.2/share/apps/kdm
+ )
+
+ mkdir -p "${EROOT}${KDM_HOME}/faces"
# Set the default kdm face icon if it's not already set by the system admin
# because this is user-overrideable in that way, it's not in src_install
- if [[ ! -e "${EPREFIX}${KDM_HOME}/faces/.default.face.icon" ]]; then
- mkdir -p "${EPREFIX}${KDM_HOME}/faces"
- cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
- "${EPREFIX}${KDM_HOME}/faces/.default.face.icon"
- fi
- if [[ ! -e "${EPREFIX}${KDM_HOME}/faces/root.face.icon" ]]; then
- mkdir -p "${EPREFIX}${KDM_HOME}/faces"
- cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
- "${EPREFIX}${KDM_HOME}/faces/root.face.icon"
- fi
+ for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+ src=${file#*:}
+ dest=${file%:*}
+ if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+ for dir in "${old_dirs[@]}"; do
+ if [[ -e ${EROOT}${dir}/${dest} ]]; then
+ cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+ break 2
+ fi
+ done
+ if [[ -n ${src} ]]; then
+ cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/${src}" \
+ "${EROOT}${KDM_HOME}/${dest}"
+ fi
+ fi
+ done
+ for dir in "${old_dirs[@]}"; do
+ if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+ echo
+ elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+ elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+ echo
+ elog "After doing so, you may delete the directory."
+ echo
+ fi
+ done
+
+ # Make sure permissions are correct -- old installations may have
+ # gotten this wrong
+ use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+ chmod 1770 "${EROOT}${KDM_HOME}"
if use consolekit; then
echo
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index adee0f2..0a99097 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -102,18 +102,51 @@ src_install() {
pkg_postinst() {
kde4-meta_pkg_postinst
+ local file src dest dir old_dirs=(
+ /var/lib/kdm-live
+ /var/lib/kdm-4.6
+ /var/lib/kdm-4.5
+ /var/lib/kdm-4.4
+ /usr/share/apps/kdm
+ /usr/kde/4.4/share/apps/kdm
+ /usr/kde/4.3/share/apps/kdm
+ /usr/kde/4.2/share/apps/kdm
+ )
+
+ mkdir -p "${EROOT}${KDM_HOME}/faces"
# Set the default kdm face icon if it's not already set by the system admin
# because this is user-overrideable in that way, it's not in src_install
- if [[ ! -e "${EPREFIX}${KDM_HOME}/faces/.default.face.icon" ]]; then
- mkdir -p "${EPREFIX}${KDM_HOME}/faces"
- cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
- "${EPREFIX}${KDM_HOME}/faces/.default.face.icon"
- fi
- if [[ ! -e "${EPREFIX}${KDM_HOME}/faces/root.face.icon" ]]; then
- mkdir -p "${EPREFIX}${KDM_HOME}/faces"
- cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
- "${EPREFIX}${KDM_HOME}/faces/root.face.icon"
- fi
+ for file in faces/.default.face.icon:default1.png faces/root.face.icon:root1.png kdmsts: ; do
+ src=${file#*:}
+ dest=${file%:*}
+ if [[ ! -e ${EROOT}${KDM_HOME}/$dest ]]; then
+ for dir in "${old_dirs[@]}"; do
+ if [[ -e ${EROOT}${dir}/${dest} ]]; then
+ cp "${EROOT}${dir}/${dest}" "${EROOT}${KDM_HOME}/${dest}"
+ break 2
+ fi
+ done
+ if [[ -n ${src} ]]; then
+ cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/${src}" \
+ "${EROOT}${KDM_HOME}/${dest}"
+ fi
+ fi
+ done
+ for dir in "${old_dirs[@]}"; do
+ if [[ ${dir} != /usr/* && -d ${EROOT}${dir} ]]; then
+ echo
+ elog "The directory ${EROOT%/}${dir} still exists from an older installation of KDE."
+ elog "You may wish to copy relevant settings into ${EROOT%/}${KDM_HOME}."
+ echo
+ elog "After doing so, you may delete the directory."
+ echo
+ fi
+ done
+
+ # Make sure permissions are correct -- old installations may have
+ # gotten this wrong
+ use prefix || chown root:kdm "${EROOT}${KDM_HOME}"
+ chmod 1770 "${EROOT}${KDM_HOME}"
if use consolekit; then
echo
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-04-01 8:41 Andreas K. Huettel
0 siblings, 0 replies; 23+ messages in thread
From: Andreas K. Huettel @ 2011-04-01 8:41 UTC (permalink / raw
To: gentoo-commits
commit: a4ad76e4ef5e6fc20958f48df3902bb3c2e70328
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Fri Apr 1 08:41:13 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 1 08:41:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=a4ad76e4
[kde-base/kdm] Make useflag consolekit default to on, as decided in kde meeting
(Portage version: 2.1.9.45/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
kde-base/kdm/kdm-4.6.9999.ebuild | 2 +-
kde-base/kdm/kdm-9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kde-base/kdm/kdm-4.6.9999.ebuild b/kde-base/kdm/kdm-4.6.9999.ebuild
index d85075f..fdf7818 100644
--- a/kde-base/kdm/kdm-4.6.9999.ebuild
+++ b/kde-base/kdm/kdm-4.6.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta flag-o-matic
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
-IUSE="consolekit debug kerberos pam"
+IUSE="+consolekit debug kerberos pam"
DEPEND="
$(add_kdebase_dep libkworkspace)
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index d85075f..fdf7818 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde4-meta flag-o-matic
DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS=""
-IUSE="consolekit debug kerberos pam"
+IUSE="+consolekit debug kerberos pam"
DEPEND="
$(add_kdebase_dep libkworkspace)
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] proj/kde:master commit in: kde-base/kdm/
@ 2011-02-27 13:32 Andreas K. Huettel
0 siblings, 0 replies; 23+ messages in thread
From: Andreas K. Huettel @ 2011-02-27 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 2f25cc2cb6e12e00305d3dd86f323ff8cf425138
Author: Andreas K. Huettel (dilfridge) <mail <AT> akhuettel <DOT> de>
AuthorDate: Sun Feb 27 13:33:17 2011 +0000
Commit: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 13:33:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/kde.git;a=commit;h=2f25cc2c
[kde-base/kdm] Add missing dependency on libkworkspace, bug 354987
(Portage version: 2.1.9.41/git/Linux x86_64, signed Manifest commit with key B6C5F7DE)
---
kde-base/kdm/kdm-4.6.1.ebuild | 1 +
kde-base/kdm/kdm-4.6.9999.ebuild | 1 +
kde-base/kdm/kdm-9999.ebuild | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/kde-base/kdm/kdm-4.6.1.ebuild b/kde-base/kdm/kdm-4.6.1.ebuild
index 4c48db1..aa5c5b5 100644
--- a/kde-base/kdm/kdm-4.6.1.ebuild
+++ b/kde-base/kdm/kdm-4.6.1.ebuild
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
IUSE="consolekit debug kerberos pam"
DEPEND="
+ $(add_kdebase_dep libkworkspace)
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXtst
diff --git a/kde-base/kdm/kdm-4.6.9999.ebuild b/kde-base/kdm/kdm-4.6.9999.ebuild
index 7d84d4f..d85075f 100644
--- a/kde-base/kdm/kdm-4.6.9999.ebuild
+++ b/kde-base/kdm/kdm-4.6.9999.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=""
IUSE="consolekit debug kerberos pam"
DEPEND="
+ $(add_kdebase_dep libkworkspace)
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXtst
diff --git a/kde-base/kdm/kdm-9999.ebuild b/kde-base/kdm/kdm-9999.ebuild
index 7d84d4f..d85075f 100644
--- a/kde-base/kdm/kdm-9999.ebuild
+++ b/kde-base/kdm/kdm-9999.ebuild
@@ -13,6 +13,7 @@ KEYWORDS=""
IUSE="consolekit debug kerberos pam"
DEPEND="
+ $(add_kdebase_dep libkworkspace)
x11-libs/libXau
x11-libs/libXdmcp
x11-libs/libXtst
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2015-03-15 13:27 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-22 20:52 [gentoo-commits] proj/kde:master commit in: kde-base/kdm/ Michael Palimaka
-- strict thread matches above, loose matches on Subject: below --
2015-03-15 13:27 Johannes Huber
2014-03-16 9:10 Michael Palimaka
2014-03-15 9:08 Johannes Huber
2013-08-21 18:41 Michael Palimaka
2013-08-18 10:25 Andreas Hüttel
2013-07-25 22:16 Johannes Huber
2013-06-24 22:14 Johannes Huber
2013-06-24 21:51 Johannes Huber
2013-04-28 23:59 David Heidelberger
2013-04-09 14:30 Michael Palimaka
2012-06-26 11:38 Michael Palimaka
2012-06-15 11:31 Michael Palimaka
2012-05-01 11:21 Johannes Huber
2011-11-20 21:53 Andreas Hüttel
2011-10-28 17:43 Andreas Hüttel
2011-09-07 21:43 Alexey Shvetsov
2011-07-25 20:54 Andreas Hüttel
2011-07-12 20:53 Andreas Hüttel
2011-05-24 5:57 Jorge Manuel B. S. Vicetto
2011-05-19 16:20 Jonathan Callen
2011-04-01 8:41 Andreas K. Huettel
2011-02-27 13:32 Andreas K. Huettel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox