Version bump KDE SC 4.11.3

Package-Manager: portage-2.2.7/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 187 insertions, 8 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 3b53abc1a916..4a85a5984e92 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.367 2013/10/10 03:56:21 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.368 2013/11/05 22:23:22 dilfridge Exp $
+
+*kdm-4.11.3 (05 Nov 2013)
+
+  05 Nov 2013; Andreas K. Huettel <dilfridge@gentoo.org> +kdm-4.11.3.ebuild:
+  Version bump KDE SC 4.11.3
 
   10 Oct 2013; Chris Reffett <creffett@gentoo.org>
   files/kdm-4-gentoo-xinitrc.d.patch, files/kdm-logrotate, files/kdm.service:
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index bc7ee985a1e7..c04e01388bde 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -7,16 +7,28 @@ AUX kdm-logrotate 111 SHA256 516523c6db0b85d33f0a90d284e707ed4d2ba426b154872af2e
 AUX kdm.service 262 SHA256 0ef99310cc6527fa49a81fc227f521d44347f3333ef6dd226f17b84e4120c003 SHA512 4a8cbf8398f1c72a7f1497bd08e3eb2118de0b7259cbcc0bf9200a01fed0a2769e10d6ecfc0938efb90e581df68bb0003678be072034ffe0daae256f598f2e17 WHIRLPOOL 171698de9503798655503ca998ff51ffe1d2177fbb542218b64e36991177cb5043cbf85df847d82441028efef251719c7a67220ea16f9387e9eaa09b13ccf722
 DIST kde-workspace-4.10.5.tar.xz 13569732 SHA256 a346420258f96475b47a7e3a78945fc38c10d4732b01d8fc371d11dcad56e875 SHA512 b90d015a91298cf98aebda60f08d18ff8afdfc813b4d27aa245fd2d3cc5bd31c3fcd57ce85fc188c167cd33b6d9ca537dbd5349871182062542ef526c360f0ff WHIRLPOOL 4a2448eb586c5223a9b86be5206f037de1765fe625a5fa0d222c35a1a61376b42625b52db453e2db1e88eb7efdea94fb375622d6db79ec29b0038eed3a6df331
 DIST kde-workspace-4.11.2.tar.xz 13870828 SHA256 260e46f30b8faaa1ad834d9fa69465ab1f565cb18a174bd814327083bb28d917 SHA512 8d034e147ebb630941465b77e302aa2385c2f1419847e8a65ac19d445846435b61d78323fdb094b9a71089ab183c96af141db93c7c9c53a9b30c84ae69bddf2a WHIRLPOOL 0db07ef64caf873c0aa6398a28b92fdc9334eb04897c9a71ed0e3c54ad77e9e8dc23b13b6343844650a2ec7c2784664185f01cf64424d694a8c33167affb5720
+DIST kde-workspace-4.11.3.tar.xz 13870924 SHA256 4c9c7c70f94c917c4ab6b877bfa64b32f89f0cd4406268d593123863715cc04b SHA512 23f540688bf8522a89f6dab1a966bfbac49f7111531e59b05b1f1a5f142da858a5051031864a21774c6dd6afaf19fed20458365537e24828ac020f8e605d857c WHIRLPOOL 50a45e874a85f983ceaf945daecc27a094c5fd20b871556fac35330bd6ba0f9cc8e22b1ebd6c05384f5ba281dec010708a6a4b6cbce8ee007dccadb1e57be340
 EBUILD kdm-4.10.5-r1.ebuild 4369 SHA256 48bdae57f6a7bc850bb8a5401b114aaae7e583b3fe073e9e663a8a543893a1f9 SHA512 2cd7fc0d810ffca2e0bf9cc0cd1028a8ef59d234784ad88f5052852c10ce342dabcb0b7f3e00dc2ddcd5813949e7ecf214f82fbc2ccef2d0ebc626309bf7c338 WHIRLPOOL 375a3b2504068f036bf3e6a1cd9f5a65c92dd0fa6b333c06677dd397f88cc22b101ca7dcdbe448b13e315e6d88f1f6722f2a327698f0dc0166b17329d1162f2e
 EBUILD kdm-4.11.2.ebuild 4434 SHA256 61e9d60edcbb35f2b530fc1267b7c61e05e3c0fc03fdb7d5592541a24382fc46 SHA512 61e08ea7386e50f01f2f61607e5a754072534e105cb973e9d06f70d3eb48bfe1c3776fb2ab20f8e5da592e49a854dd8c65849d710178a8417a2491f5cd3081e7 WHIRLPOOL 826f73572284d6b0081eb46e5fb95a2b70e72a6e7db6dd38f099703d9b14d25a9701233ad024528c2d7eeeb60434439e78bca7f1e4b2b5f82a5d0e47d4ebc41b
-MISC ChangeLog 47592 SHA256 7c6c9daeb057da1bbd6ff7b7be81591c0bd15dfc470b290c508233142ede0813 SHA512 d3e769be11df122e765263030219fb745bf1ce3e1dcafcc61e97d13e30794a4c80db5ebe29fa30d6dca7b4fa5373842e1a751654b6fc4bd04be0fc0834124fec WHIRLPOOL 86031a2228f405f4b2af35af407bf5f1d156447075c05a6945ebbbbdabb2df49358df27ecb3ce766f753743bc1912830c6cffbf445b6de08aef802fff0511263
+EBUILD kdm-4.11.3.ebuild 4434 SHA256 d15afc780221f30eb1454cae13d17026ea5c552c306c43764f6590e206f6db93 SHA512 f9192ab0914275d5765103c0e4447e4f30c9a1a1ce65461a70fb8eb1fbdc6e7cc5df59594100df320e8e881eb8b0fc38aa5d8e21a8eb63d1f39f551e143683b2 WHIRLPOOL c83e6fd391c4935de26de24dd7c91c9ed1221d8a71fab3c6da910043eb1c239ef10f9e8deb73e2c0495e4b6332a0b7d9c9ba96167ab16e68aad53c6b3c19c9fc
+MISC ChangeLog 47727 SHA256 d2478ee9b6e63a7392cf64f1b8e514340216244f07acf2fbd01541c954853c83 SHA512 ccc9379b5efa8f7c7ee43a8979704a0711861bd8aff94f0296d360b37ddff3627644b3541f054522963094ea0c5e99330c93c5edba6e814656155faff8f82fb6 WHIRLPOOL fa8f8300d0f7f54b81e2b7d0006b1339d4d8b92d472980b8059ed66f1cf7d23d0f06c0a248cd03969e46a12268436a756f78b5e2bfb5f3767406c134d4251093
 MISC metadata.xml 253 SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba SHA512 06787f52d5746dd3d5549c5fa2094f178e471c2684ec15b3e958ce0c36e84c2cc46156f688eb5f4ae7ab7802401d6e9208126dbea30aea81437848a6b8dc8eb6 WHIRLPOOL 134a8c5cd7eb97f9d9b75f95183a92d8b8c57bfbb840de26eb9df1d74468dbef47ab4714bccd9109cde2a11354ba34ea78edb7578312c530656cfab8ba03ecfe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iKYEAREIAGYFAlJWOqVfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
-bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
-Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1SfFQCdFV7H9ZCmcWjRUi0N/vSkX0M4
-JycAn15OzOXNMS4czSJI304NB47RbfBW
-=CC0v
+iQJ8BAEBCABmBQJSeXBIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcAkQQAIvP3gXAgLqtNfeKKT1+xViF
+F1a3enITdSD8Lpm7E9ayVur2nBWxrD+xSW4XwTvCZ6vS2hL2+7vTx0eW6kyp5Gw0
+qvgDVGmcrwsR0t6xo58sX0lgaY1YTNqNec0yIsOv/wahnh3R2k+xzrpJPglkAYw9
+AB1NuhADpVtoAa/KKehwJs15m8pQfpmterhZReP+mlOtuPr+ypM09a6jsTcv5Wir
+3wheEtsnU73bwt4jMQ30sHos9oxcs6Hdvd6XQ854KQQjG9XurHgRzfHxSS7aIxc5
+7xFE12HHiaCPIOMfICrkJpyFC9qfwnTBCBNwuQwIgw8szxEWTWPOoCWeGSqKCR05
+xV9PgTSx0UXQD3bW/b8bfoXOX/2Rto7SWxOjVHPQS+TIJDRyJICFXb2L+DChHKZC
+pc9p1AghLQJo3RjQuvGVdJGpO4Rmg0b7CdgJIUtxJ1Rl0EjX7pUKQrNb3fqfiFvx
+0ZrO4qx2fT9B0yF2x1cjV6sV2sFtjhcoaD6AATtvpGeVGj2gNY8jvyUwyFa/8i0+
+6yEFyFb5gSNaplXBfg9vFWyG6Dmuz2q50xeB51DMQtn1Vu1yyZG3VQwa4HWsk+dW
+gPos9XHx5fZxgzEpxw9D5r0PktrJEzKLP+7dgdiHo2oiJniLq/fHo7kDal9A8Him
+fAz0IfAe4Pu3j1IOT+XC
+=7i6x
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.11.3.ebuild b/kde-base/kdm/kdm-4.11.3.ebuild
new file mode 100644
index 000000000000..d0a384fb559d
--- /dev/null
+++ b/kde-base/kdm/kdm-4.11.3.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.11.3.ebuild,v 1.1 2013/11/05 22:23:22 dilfridge 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 ~arm ~ppc ~ppc64 ~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
+}