Bump KDE SC 4.11.5

Package-Manager: portage-2.2.8/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x42618354

3 files changed, 178 insertions, 16 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 5e8d480a58e8..5d3e5e7c9257 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.377 2013/12/14 22:03:07 johu Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.378 2014/01/10 04:21:27 creffett Exp $
+
+*kdm-4.11.5 (10 Jan 2014)
+
+  10 Jan 2014; Chris Reffett <creffett@gentoo.org> +kdm-4.11.5.ebuild,
+  files/kdm-4-gentoo-xinitrc.d.patch, files/kdm-logrotate, files/kdm.service:
+  Bump KDE SC 4.11.5
 
   14 Dec 2013; Johannes Huber <johu@gentoo.org> -files/kdm-4.10.4-crypt.patch:
   Remove unused patch.
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 537ba1e5dfb2..fd83fa0ae41d 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -6,24 +6,18 @@ AUX kdm-logrotate 111 SHA256 516523c6db0b85d33f0a90d284e707ed4d2ba426b154872af2e
 AUX kdm.service 262 SHA256 0ef99310cc6527fa49a81fc227f521d44347f3333ef6dd226f17b84e4120c003 SHA512 4a8cbf8398f1c72a7f1497bd08e3eb2118de0b7259cbcc0bf9200a01fed0a2769e10d6ecfc0938efb90e581df68bb0003678be072034ffe0daae256f598f2e17 WHIRLPOOL 171698de9503798655503ca998ff51ffe1d2177fbb542218b64e36991177cb5043cbf85df847d82441028efef251719c7a67220ea16f9387e9eaa09b13ccf722
 DIST kde-workspace-4.11.2.tar.xz 13870828 SHA256 260e46f30b8faaa1ad834d9fa69465ab1f565cb18a174bd814327083bb28d917 SHA512 8d034e147ebb630941465b77e302aa2385c2f1419847e8a65ac19d445846435b61d78323fdb094b9a71089ab183c96af141db93c7c9c53a9b30c84ae69bddf2a WHIRLPOOL 0db07ef64caf873c0aa6398a28b92fdc9334eb04897c9a71ed0e3c54ad77e9e8dc23b13b6343844650a2ec7c2784664185f01cf64424d694a8c33167affb5720
 DIST kde-workspace-4.11.4.tar.xz 13879576 SHA256 13420aeac5a6e0143f497fe988e6396f62d12862ae33ea1e1139d8137c07f16f SHA512 3b279f69b676d50e6b893e1b00f48d3ec7316c9d247128a253bfac1d7ef1e70c67d598b04a59766a4046beafe8eccf9436e9cd0c564ede7ed6464d8f30dc9c02 WHIRLPOOL f3129b4c1099bd3bb49a9363f8851492bfdda97a8416fd56cf7327c11b585e7a157f48acf8a2a8bc39209c3afc45fb064ad88132a02c273b6df1e86df122b2de
+DIST kde-workspace-4.11.5.tar.xz 13714748 SHA256 3b99a3991d6d8b1aa4158da67ead30cabb815c07a6c8ee10751307f97d8613cf SHA512 311ef4f13a35f5e5d4b2eb60491d76aa8a47a25c7a565d7378c653b4d01d0d21d867deef9c658dff9bd14a02f1834d4781fed80129b5dc05d1490d34c656a281 WHIRLPOOL 3a853bc77e4beed8e1524a34061ba518b3ebe429e7873d58b30705516b743bcabc79124d01e59a2b9e1dc83cfd5128e8fc2d9fa5f2addb362a44ee53b4685c2d
 EBUILD kdm-4.11.2.ebuild 4424 SHA256 54be2153dde91d3f19965728e1039d917f9369461444bd8ed949a54060680008 SHA512 4129c553ca8d7cf91d8996c9043c342cdcf8f428b867f11930a3e0893aaead5c3e8b07f409b75f7bd9ea05d51f207bbc3ed6e0e2376b1bf86e87a82c77e1a3d8 WHIRLPOOL 91c057bbd3fd5adca13cb25e8e18b2d3f36cb31d9409b0cc6c2ff88f92a7e8a1023dc37626568e41de88b1c0c237db764af87bd306db2e6a36074e9abad6a453
 EBUILD kdm-4.11.4.ebuild 4430 SHA256 7ed1bc06fc1c6b31b674bcfb5bf3507850fc6d1a2e36b90d1db4ed6ebc884927 SHA512 0e00432c8d9ffa6fe66d0ccc4c49869c651590b1c350b536ee08a9e14124f0b1b40ddc3e4481915ad66e7ef0a2f17984a893315428ae012eec3ad1af8e24d814 WHIRLPOOL 5d9334d1498114d86c5025774fbe7f7927cbaa5fd359d2062f43b5d710a296237094027497c1b36b6bddaba1517d0baa3e24d3cabebf7fe66cd7f2476074f4b5
-MISC ChangeLog 48647 SHA256 dfa65bb595fffaf2f167171fbc07be5660c8e0811909e83c115e595b7f717899 SHA512 e7028f33c98eece4252dce399cdec6f68f85fbb80745f7cb7336227d650540af2feef168383a0659b195b8a5b01062ec2d8ddb155e5160007a177f86de1171d2 WHIRLPOOL 10f5ab97b87e205f08a2018148ce35fc88ffc14ba46126ac8bdabc458eb68da358b37ba780f724effd9ec3ac734729dc31d69c7b922155329079dccb8d9ab943
+EBUILD kdm-4.11.5.ebuild 4417 SHA256 398589e4f73bfe5e3cfc1ca4031bab2cfc697e999b0cada461073511fb720682 SHA512 6739b99771672a1f8e2584b7cb64f6bdf63048839885dc02432c058804a3216a3fbda7c58641fb36cc18181e8f7141a74e5eedd7f6194c3366162d156a688f07 WHIRLPOOL 3b90c5cc801b2fa5ac69ecffed2f3c48f0f5b002f2ec25faed7541facfb630bda7d4ca9901611b4ea54694aa7d81bbb1ba780f8af294cb19e4424a67564d4eb7
+MISC ChangeLog 48849 SHA256 4a64d09203eecad6cda1a1d3ef4803fd0139b795ed62accf8c3f90f62af1f4c0 SHA512 5243abbb3f2ab83ecd9d450690ad9900ba9b2bad6913057597e26ea19f82a32d5a5bd725a8f384a4e2e7566aa585e0eb02f7d34c69319c9c89592ddae7ab0fbf WHIRLPOOL 2175b75b063813864e54158ba4dac0ab3f4719a742a7848cc0acc0e3da7419b1e557f5fc832d356de4030c734d7b1878e41cb1178df86b9d5c78e7d1e0b2aace
 MISC metadata.xml 253 SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba SHA512 06787f52d5746dd3d5549c5fa2094f178e471c2684ec15b3e958ce0c36e84c2cc46156f688eb5f4ae7ab7802401d6e9208126dbea30aea81437848a6b8dc8eb6 WHIRLPOOL 134a8c5cd7eb97f9d9b75f95183a92d8b8c57bfbb840de26eb9df1d74468dbef47ab4714bccd9109cde2a11354ba34ea78edb7578312c530656cfab8ba03ecfe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSrNWcAAoJEGVpnaTzz9K9qa8P/2zJziapuxEjgDhrJsuCXDqW
-2D2xBsngGxS6Sk7eouBexYC68/vP0PFmuGhBupZ2JkMg6XtFCLNQFl2uQSIfOlis
-JUZDHP54gjwa3S0fJHy6YAqe+nHJsTNbShRw+XZMoVqTmNYBjIiIYRJ+10llk7NA
-ALrRmk7u5L5t8yljioGiXh0u1OBsT5Sb2TJWeS3J4KLNtLtk7Zj7k6uBgNbSKlFq
-3wNZ7DCxr/YtYoatufpUcvDHaHj8LAaV5hF6Nf5C2v393uYEoN5/lzbQ+uUSOwKM
-JP+P8FPQTwldD2ATgtYFvLFZXDnxkwAPudv3+2KLO35vwaye840uLrDyZBK5ndI2
-zr73InbgURFA1U9a/hrg9TwyuQZNZXY0bP7c8kKDliOwZAD8grHYG7CdrDKBTEtB
-CmiI+ETLoxmt7NIO0N9ODUje6hazqwWEmK5IpdpcSQQgNYs5R1KwWO+qdsZKvvIu
-VbtEGxgx1BatKSbaYw1lHZ4szQtRs5Mpcbwz7v8I7fd9t2ryy5nfOxlQPfBXgLdu
-D6wyvn/l5y3SCvsnHyiunjJ2KMmrdLwQHpfGHq0bB1XWpg2ZX2kVviyxGJSi2aH9
-jNtnDFq9FzvWKq8q4NbSfstSJlt8uBtOjyx9jNnGiSmg4OfuJyjBunNcH7TpZrM/
-F3ZlEBP9yx1BIg0Lv15E
-=3cKV
+iKYEAREIAGYFAlLPdk1fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1QaqwCfUUzJ5mCComNuLQa0ladYPUjj
+WkUAn3W+KEBfQdhjiki24Q+CExr1aNBg
+=umTe
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.11.5.ebuild b/kde-base/kdm/kdm-4.11.5.ebuild
new file mode 100644
index 000000000000..3a56adb6f232
--- /dev/null
+++ b/kde-base/kdm/kdm-4.11.5.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.11.5.ebuild,v 1.1 2014/01/10 04:21:27 creffett Exp $
+
+EAPI=5
+
+KDE_HANDBOOK="optional"
+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="debug +consolekit kerberos pam systemd"
+
+REQUIRED_USE="consolekit? ( !systemd ) systemd? ( !consolekit )"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	media-libs/qimageblitz
+	x11-libs/libX11
+	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 )
+"
+RDEPEND="${DEPEND}
+	$(add_kdebase_dep kdepasswd)
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage
+"
+
+KMEXTRA="
+	libs/kdm/
+"
+
+PATCHES=(
+	"${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() {
+	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
+
+	systemd_dounit "${FILESDIR}"/kdm.service
+}
+
+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
+}