Version bump KDE SC 4.10.4

Package-Manager: portage-2.2.0_alpha177/cvs/Linux x86_64
Manifest-Sign-Key: 0xF3CFD2BD

3 files changed, 175 insertions, 16 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 6ac199d873f8..e1c17181471d 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.340 2013/06/04 13:06:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.341 2013/06/04 18:22:14 johu Exp $
+
+*kdm-4.10.4 (04 Jun 2013)
+
+  04 Jun 2013; Johannes Huber <johu@gentoo.org> +kdm-4.10.4.ebuild:
+  Version bump KDE SC 4.10.4
 
   04 Jun 2013; Agostino Sarubbo <ago@gentoo.org> kdm-4.10.3.ebuild:
   Stable for amd64, wrt to bug #471392
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index a41cf5543d37..33db318c57d5 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -6,25 +6,21 @@ AUX kdm-logrotate 111 SHA256 516523c6db0b85d33f0a90d284e707ed4d2ba426b154872af2e
 AUX kdm.service 262 SHA256 0ef99310cc6527fa49a81fc227f521d44347f3333ef6dd226f17b84e4120c003 SHA512 4a8cbf8398f1c72a7f1497bd08e3eb2118de0b7259cbcc0bf9200a01fed0a2769e10d6ecfc0938efb90e581df68bb0003678be072034ffe0daae256f598f2e17 WHIRLPOOL 171698de9503798655503ca998ff51ffe1d2177fbb542218b64e36991177cb5043cbf85df847d82441028efef251719c7a67220ea16f9387e9eaa09b13ccf722
 DIST kde-workspace-4.10.2.tar.xz 13564908 SHA256 36e429113b62b196ee2f259f0d16c19746c2705ebe225dec920aee49797b6867 SHA512 aa4b5b89026587282b34382e5d48e2ca51dd65b580f606d1f03dface3163c99d00d7ec6bbd234d886b00585534c294d1b8a5bfe368570a1fccae0e861c7c4dff WHIRLPOOL 78a9447f910a9e602e45867e0934970115307a94e363a6a20a64eb5bf0c5f3ee118107cedece6656b7ffc0fa3e5d708dc9644a98a895f507d4f03259614ac741
 DIST kde-workspace-4.10.3.tar.xz 13569364 SHA256 d870db2f39dcec6d4c11ccaef53d24978c1249a9426814414a90456d9cfce49d SHA512 d7e29ec5401e9aeb38e57257ada8060d0f684b2c057df809f519d8e89d94b39b9ef88435104caa8a056ec6337c54799909109d73d81104e27bc671e6099310ea WHIRLPOOL 476398ba07427979c253507dac6ca5b4ea29c4136b1fdd5613d5e017f8eab5930a614bb50efedd5f2ecea9e12e3527311ea9eb3aab0919e987b447d696f6096a
+DIST kde-workspace-4.10.4.tar.xz 13426036 SHA256 55b9c79829fbbe781653951eb0b94dcfbb21fa46102c0c15db40521c143f22d1 SHA512 ff5ca4d9675b9a8577b30f5725222b66e464496e438d64f0c528bb782c3d62cc5382e414c0c8884948733061cd6c181b74cf5e3c04ae137a9bb9f86fda8ee934 WHIRLPOOL 919297e61928dd7b555d42fb7a0890485755106d85ac18015b262109eb6ce34b00b82c16b224a6218abe53fec01e9f66f7c6fe9189507ea4231f0e6e905265d1
 EBUILD kdm-4.10.2-r1.ebuild 4371 SHA256 e47efd994f6fa9b2d67ad2cbd87caa359c791a6af81df0d89959afec64170a2c SHA512 86c12bf100eafbb0ca0056d1e048cdbaa3ed314e8759f0142d56978883f51e84ffc1a27caac0943d75f1d250616d1eccc3e473145722d8ebbe6a046a1835d39e WHIRLPOOL c17a2f4343edb1de97c62afd2350b8d4af4690ceba2f2626330d62061a4adf81f5d533d69e6c1313d1bfa9a87dc38a2371e38e34d21e23e30c361e75fdc59de6
 EBUILD kdm-4.10.2.ebuild 4307 SHA256 5c75a1d703cab73644c256d5c0efa3150b20f8e3e5fd797b9eb56d60bb72317e SHA512 fac6cfa568a2d3d9e1df37aed8e179bd216b86dd18c565227af42e8e350798571cdf7e6a19779563f37ee7de0e3923b6f40bc14ff7866e462f8d1352551c1bee WHIRLPOOL 80c30b0c0776ad13df88bf41b7df5b22dd70993827ad8c679605d7b17cb03ce98ea1c281fd611dbbe1f1ce84eb1c0ee9b49743838368598c3697a93490cb6079
 EBUILD kdm-4.10.3.ebuild 4298 SHA256 0e0c7ac96c005cbb44233ed2eb8b633656bec0a7351b32c9045fd25fa44f93cb SHA512 150c4c6d01e6857e8ed1166c293a3cfe4b4e38a5be9d6603acc181ececd5e091f4f1caa8be269586e1a74acf8119b173b511203e428785cf9d57012f4400e175 WHIRLPOOL 1476d8c88f7fedda0c45c17cf74210db486ee594c924e973d9990632ad7bfe04a391ce8b99af50f7f12aba78cf5eea2691097981617fc57178f6b63434fc1258
-MISC ChangeLog 44061 SHA256 94a5f9ab4f6f3a269a47d61dd80c3c3137b5f3296d868aa49398039bce35dfe8 SHA512 048843bfdeb3cd55305798a3bcdf2977fe26063c583b83d0386d84a91045b8690908b86acd5e190cc532cdb862e4cba4a211517913abcc88cd2eddb61708550f WHIRLPOOL 9a391b0740e5e9b9a1c0b6f532731ab90a8479a8a6d5231b6bd5ca1f5feaec19621fb202daa7b31407d8fefae954c9f309e64220cec0d5e9bdba0f6f64196a1d
+EBUILD kdm-4.10.4.ebuild 4301 SHA256 5620ecf3dd83b735f1ab90af14edaec3121b8f32c821bb21d069372b881e80d8 SHA512 12c1b14635eb288048fa13fa518fdfc6c9732ad3d445308c5b2ec33c4dec4e83cdea8c29942ad519fc419b3388bab9205e753a4d57d7a7b0f82daf56f31433e6 WHIRLPOOL dfa3e96076dc84e6c979ba9b194f24abd2a306b9ecdb9db968669d87b7861112acc77c3d06d5e9e3f6a607cd15dca624965195a6beed9730fc5a5d047b9adbc8
+MISC ChangeLog 44187 SHA256 a464a4b74974150423d3f84493bd9882b32d9cef9cd1a3712d0453e0027b52b5 SHA512 2c4aaff8fe78c8782f3121875fb3513551f2966ed23f90bb15901fb3e89eb5e5e3b91f4fc418a79360f03b3562c4481baa0c173f352aae1be441774678105957 WHIRLPOOL 0e7cade85f30555e4f76ac9ca53c002db1a544c0740af685a553fea7fb5f293e24049092909a30768d27791621cfd26b392a70f2c105d7e2a3482c9201a515a2
 MISC metadata.xml 253 SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba SHA512 06787f52d5746dd3d5549c5fa2094f178e471c2684ec15b3e958ce0c36e84c2cc46156f688eb5f4ae7ab7802401d6e9208126dbea30aea81437848a6b8dc8eb6 WHIRLPOOL 134a8c5cd7eb97f9d9b75f95183a92d8b8c57bfbb840de26eb9df1d74468dbef47ab4714bccd9109cde2a11354ba34ea78edb7578312c530656cfab8ba03ecfe
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRrebLAAoJELp701BxlEWfVbUP/ApVxoqo4zt0OzCNuk9ny2gQ
-TgG3xpD5lmg48G1QTjCXCEvKnDlJCVGNQzIX8yntEb/3Ytx1KLHXrj8Wz7pjdbzc
-ZFFiQfrZWwVdi4dsdUyyUQ8GXBuxOoZ/b41WlU0Z0WnSFG5Gwnhf6heRwjr825l+
-zODaizK0PaWA4MgYmkiQOh7PL1z8eAojGlRbQauR2v37d1/XO7jaY9caIvSDz0Dg
-K4vr/Gum+z7nIl3krY1kTguV/k846+6g/0tF0oW8gzVfEZCVott/ETtpyx1hiBIe
-8fF2pQPeY0JJYIf4i9iG1KjTL7rX+YElt/eHThYzd6pzPCSFbnx3ircBfGzRlMYO
-akPC+1A3t8g37lhIV5Uep/mLR6SLrOqn+fIyCt6kvkkcpZEWV4Je9m2oSUc5uN9b
-i3MpInZ3QtbZGOTUMISTgelrUeZUv9XbgZoMOJTrEgeOWXcyyevvi0kVXgVz6xl7
-WbY7WiCwbHhrkuhyZ+aWORZhJwGnetueNlhRv/XNXWYxnZqxjXVPg+K3aA6dylMu
-C0IRAdD23zAnO/QW8W5CLXWqHQjgFmmyemeY4W9k7Q9W+3Vuo0/DjeJ7wr9zcmY3
-47+V0oq3MlLepvnU2q5x1A5+zovdhUjsuIuonQkJhGT/sHLceYCIGTvb+UKGBN8G
-z3sdu3Sfs2qmoOsBwjeU
-=bLC2
+iQEcBAEBCAAGBQJRrjCXAAoJEO+t9ga+3I3a14cIAMuvwyh87PAyr+smmBAkRfZJ
+Itw7JM1tXz4ejq9DpjuQQ4688k1DfBIYKfPJdROqPQN7KZFesuUeMwZiMj6nkKaC
+tKiExmAIb/uInsJJmFri4L3SbEju9Jvargl4iZmdyKA1gm9+2inXxsY+Knmnlxyk
+a/Tg3nExtKsYKc7V0NzSup0D9Wf4hznP5oh08DjpO03qM+//ay8n9Pb5swh+NLe6
+G3ELQ3PiyPqL5+IcoTXdTNDaYLxbatPh+FWFALLo5LT2DZnQ+1fa3Iyakw4TrW0l
+bUQloWBLRFeonCeJxtNABVmEHRWQXPQUaeF0FJKwtWQiLodrJCEvDtkFpuRZjpg=
+=JhJD
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.10.4.ebuild b/kde-base/kdm/kdm-4.10.4.ebuild
new file mode 100644
index 000000000000..19a1854f9786
--- /dev/null
+++ b/kde-base/kdm/kdm-4.10.4.ebuild
@@ -0,0 +1,158 @@
+# 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.10.4.ebuild,v 1.1 2013/06/04 18:22:14 johu 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="+consolekit debug kerberos pam"
+
+DEPEND="
+	$(add_kdebase_dep libkworkspace)
+	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
+	)
+"
+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
+}