Version bump KDE SC 4.5.5

3 files changed, 132 insertions, 23 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index a551ed23ae1e..0640f303af1a 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.234 2010/12/02 21:17:57 alexxy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.235 2011/01/10 11:53:31 tampakrap Exp $
+
+*kdm-4.5.5 (10 Jan 2011)
+
+  10 Jan 2011; Theo Chatzimichos <tampakrap@gentoo.org> +kdm-4.5.5.ebuild:
+  Version bump KDE SC 4.5.5
 
 *kdm-4.5.4 (02 Dec 2010)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index e7a77c705491..0b95127635ad 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,31 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
 AUX kdm-4.3.5-xdm-restart.patch 1593 RMD160 f6bf916ec09049ba7c7a3c65ec86b59302b8f3be SHA1 f70ae3f876f3840364c698d33d60b15395a457c4 SHA256 0f2f2d9dfba1c0a8a82c6b92cb55ff5afe77fc8b5cbe280fb7fbba19f8327866
 DIST kdebase-workspace-4.4.5.tar.bz2 77036766 RMD160 3f6e9ceb0df277b73ca6ec38de6c85f578077640 SHA1 d0defe431a760503f8fbb9ee2413b666b3c84cd7 SHA256 53475dacd95955ef01378d4de7e46602be13e81a1afac73fbed449bb367c20e6
 DIST kdebase-workspace-4.5.3.tar.bz2 65677114 RMD160 b7197d8f344db9e433e201fcb27f7d0811029f8b SHA1 7dda7cdd9162ea7ff9fc2a3ae0a1ded6610e8a94 SHA256 c2a675ee64b17e554c53de5c323c89e4455705390153f53b5a3f3e65afdc831c
 DIST kdebase-workspace-4.5.4.tar.bz2 65683870 RMD160 61844ad2d92ec0ee8796d35746077ad4ecd6400c SHA1 e362bceff622f39bf6949657d1e629ef541c6ae2 SHA256 1c629edc3b4a6e3a9606fe8a565907656c9dd7d291100175a364133e94964425
+DIST kdebase-workspace-4.5.5.tar.bz2 65688854 RMD160 351f05ae6a1b67b35de7460e1e4353ba3d16720e SHA1 38457b606bfc0b39842fb451566ddf49d145da82 SHA256 4d9090fe3b261debfce7b1db4799d7884097960464709866f6da840557d98091
 EBUILD kdm-4.4.5.ebuild 3159 RMD160 c5ad77d8c2684fc335125f37f046739dad22f509 SHA1 579aad408d7db94b93ae7acab2471ef8f49c3cf5 SHA256 68395306a459bf8d12bd5560febfaeb22fe205bcd67530ec34abfe12d5a7fd3d
 EBUILD kdm-4.5.3.ebuild 3281 RMD160 e4faa88797979015f8f42cac0ff3205fdbeda8cd SHA1 ebf2dbff2a740dc288047cd644976be8362cd4a0 SHA256 99b19e1781f9591542cc429c852d3e5fe054118790eb5fe1d5e96c6317b184f6
 EBUILD kdm-4.5.4.ebuild 3278 RMD160 c76a1c9dc491b20005d92d3fa96e4fcb5063aa9c SHA1 eebda2a0d1af4c2ef68f6814b90d23a41cb0b8fd SHA256 2ab5280affff5514804097cce18bd6623b80473a0fdb9c145d4fff2f93e77374
-MISC ChangeLog 31040 RMD160 390f3c56e01f4bb2bcf85866e161c141bd7c1257 SHA1 5918fc66afec84bf79759746513f852d2f06a500 SHA256 f6fc092178bf1ddbee31e52f05bf57926ca9fb39cc483c7bac87c6e429ca04b5
+EBUILD kdm-4.5.5.ebuild 3187 RMD160 4eaea1c673e1e89d27a5210e241997e63fb18441 SHA1 ee43e86c1db43adb5d93f2e51a5e5b897980c971 SHA256 d5ef7b786eba0fb4b74eb66ca85b2df008cbd0787656a30805d9eb9db7353432
+MISC ChangeLog 31170 RMD160 b4c10d2219e8096b98d4298ae5efb4caee8545d8 SHA1 7f9e3769d8b91b6fa2470db46e93b052dc98c986 SHA256 c6130c6701a8b194adb2b1d73bb889eea8a16495ee212ee694e7eaac8dc0af51
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBCAAGBQJM+A1EAAoJEOf+E+/4L5LmHxsP/jlhJgw/oJb5eU9PWk8dk4hB
-D6YDcCZMAgJ16rJSY6g3ApkNMwrjuWDvMx8jQQeysDFRCJ7Qf+mNJIhErxyd9ssx
-SX+zgy+x4Iq913CBWA1tW9XDb1yNaimppngn2nRZNkoarm6XVaw30sc5N17NAf/M
-hn/0GY+Ed2uWkIzz6eVCkUNdrkL4jVyXTbKl655Zx2k/VK8mTm/9njDmIMEHrB2q
-+O6LOxRekR3jU95FPn67HtDS6vR1qTsHftVXQ+NQZLafI89+VqFgiIw1NqZFjpLN
-lo2z/a82HrtsgCqTftNZRuu10fLd3M16kMz0QLIDqT/7AGuEf/p5PFMDMvpp1k5A
-ySxiL7sJixPj1KWmLGY6aqoAIERfSLTK55ks5rP0BcM7XTJ+TJ/MKgQ3itVZQvSx
-PBbqIUCEJS/ALP4BqHhy8r6/cWIBdrg4q0/ytoA+TLWmWrIveK4dm2xVcnMtz1iK
-IWHp08HtIx9K9GwtXUflvxgcUa8R8zjXY3knMlcZnqn+zaSnqIgIJ9A/UKA8R0xY
-0+ay2r4nCS7gyx5DCyTUtbDlcmUZbfeZnOciSPI/+sr4cgtBLmr7E3FZ1ZxEJqWV
-gmpDoXy7yqUY0ozcplX4vLEsLzjRBFbRG0NXXuS4EO9TeBtH8lrzXO1srwMA3040
-YodsgBLWf0wR8JI0LCuD
-=cocI
------END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.5.5.ebuild b/kde-base/kdm/kdm-4.5.5.ebuild
new file mode 100644
index 000000000000..641e7c8dbedd
--- /dev/null
+++ b/kde-base/kdm/kdm-4.5.5.ebuild
@@ -0,0 +1,122 @@
+# 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.5.5.ebuild,v 1.1 2011/01/10 11:53:31 tampakrap Exp $
+
+EAPI="3"
+
+KDE_HANDBOOK="optional"
+KMNAME="kdebase-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="
+	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
+"
+
+KMEXTRACTONLY="
+	kcontrol/kdm/
+"
+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-${SLOT}
+	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-${SLOT}
+	# - FaceDir set to /var/lib/kdm-${SLOT}/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}"
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	# 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
+
+	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
+}