Re-add support for window managers using make_session_desktop from

eutils.eclass (which installs to /usr/share/xsessions)

Package-Manager: portage-2.1.10.5/cvs/Linux x86_64

4 files changed, 25 insertions, 178 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index b954a958d6d0..2f2dfaf0fa7e 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.255 2011/07/12 20:49:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.256 2011/07/17 11:23:51 dilfridge Exp $
+
+*kdm-4.6.5-r2 (17 Jul 2011)
+
+  17 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kdm-4.6.5.ebuild,
+  -kdm-4.6.5-r1.ebuild, +kdm-4.6.5-r2.ebuild:
+  Re-add support for window managers using make_session_desktop from
+  eutils.eclass (which installs to /usr/share/xsessions)
 
 *kdm-4.6.5-r1 (12 Jul 2011)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 28668a0f71b6..5124a51559d1 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -11,24 +11,23 @@ DIST kdebase-workspace-4.6.4.tar.bz2 69240482 RMD160 a528bee8b8b36e30708f5efea08
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
 EBUILD kdm-4.6.3-r1.ebuild 4208 RMD160 7181bf4fa155590416b55cb923d9f63d9e1fa949 SHA1 5580a1576443e687a13b86dd18c67be7c0f86fef SHA256 80dcb740df6f9b6a8820c3d09686c337db41aaff0c3ad88ade2e3ac8724667b3
 EBUILD kdm-4.6.4.ebuild 4195 RMD160 c9174827f0b695736834ae8ad25bbeaec251173a SHA1 4deea8caaa05c1abee8b2e50e4b3604dbd24f75c SHA256 5653d503851d59957a6b9b2734fea625c6bc4be1fe470f23645caddaefad86e0
-EBUILD kdm-4.6.5-r1.ebuild 4206 RMD160 4c0d8038b85d9ffae00485a84be2b5cb01934c92 SHA1 5e524556de32db03440befa19e395cb277ba7a87 SHA256 4b71de0e43af8a214e71c7a056db49c1b65c2a8ec2e39f194c4438c115a3ad3b
-EBUILD kdm-4.6.5.ebuild 4192 RMD160 bdfe9ebd26010f6f811c9f2d36d30970537773ef SHA1 e2b979714258e9716203ba3e1bdb284488e25056 SHA256 52f88ec2d89287935b32949c2077241c641ca04f0c8646a631969ad563c81de8
-MISC ChangeLog 33936 RMD160 59df8c16e370bf007b97e3a0411430a485edd51e SHA1 a3d0b5c135a62e81952a795a9a9838070bcf98ea SHA256 8450b7975e311558df907cc610e81f931388c8148b0366435e939e52bb748ae3
+EBUILD kdm-4.6.5-r2.ebuild 4237 RMD160 2d5977f72e2c8728db15e4e2c4e75d4316232fa5 SHA1 033943c3fb0264335c1fc68b4de3acb8e8caa35f SHA256 3fac66ba3b3000563e51122a1879fc959a83a8285e742a0bd14d13c07e511bb5
+MISC ChangeLog 34214 RMD160 3658d59a2008402803f493b062c838aa1fec0e20 SHA1 8cd194bbe649c1db6999bd9eb9c656a7f616f189 SHA256 367a23f2a3c69efcc723941049b4a62256e2354273a5508864851bccf73ecde8
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOHLNTAAoJEEb+UGWnxTyHx2EP/3GSnLR2Y5YjqACloOMeEWLZ
-gE8HN9BSwvVankKSJ9Nfujzqxko/UsQJyeRLq5gybcTiIbmwmoG40707mEv6FxbT
-bXFdV14Joc8GMfDz3/F6gqd/+wf7UoWgG+/n/r7xsO+Ir+zxy30NzpD+EXq2fiGN
-Q+23spbqYwxFpk4+rXCmgu12LCn995F7kQhUcN6I3T61Fdgb97HmPJX1SddZzi7q
-2qYSZLlBqgWVSi6uQGfCZmyMTtxhRvBHMQIzgEog+n/My597l3ySM8i95o4Men5d
-/JBJvswKyEsgecENeZ1dwEdaaTTEknCb+QD9i3WQM0STYzuB/PfXeZbsZKq7f+2s
-MxgAVPkFm8E8gpp5pT4EuONnZWeoEfXjP6vmgShA7u0DCyHMUyqB66WVq9dx8t/3
-7zT7+M5A++Rf2jCm1MoT/ql1PmL1mFEoutYk8HARQgcTI74UDfKH8yl0QaIHW32h
-RCQ+y5VlVJhzMZ3Mpn1k/0mijXIimWX3iYUlyncyTMqZnR83HhfZCtpI5HamPN3R
-s3mNQdgbfIWKDnbdufOnmZmlYe4+D6E5iuV7fDcEyoBqEsQ0aq6uLOOO6XQxzcHU
-k62MucGvZQGjtnxtUS9C15WdfnWZ1KdbrKkKHJrUjolyOvCAmuABfEO//4OEJpfw
-N1DcotW8okllFFDI0ymM
-=hlVw
+iQIcBAEBCgAGBQJOIsZWAAoJEEb+UGWnxTyH9bIP/iD6aFJBbJAXmkr5RvY5i0gV
+5igyZfeqyCuweSFDJ/IplMCtjUJ4Tru0Wa4PvJcuNFpmHJqObprXGAxFPgAYwPSs
+9gglflcC7dD/WK9hlWpFvpA/+OWIvudjW64gSrzFuylPJFhzQjwhMoSwQtulx+uB
+5NTwc3MREcnxSCkft6Rsq16di0+3dVIuAubbBDNnjNYy4pgDr4CnuCCqagTipW2L
+OXXLpvcQ82YKsgOW1Oj6Sbq2kyN3aUi2qB5XZvLKNP9K2f+EMfjVT7TvpyP7AUs3
+HXo69rE/qrDNrPCW9sybZFrUKMSqQq6HdiIfIgsfrfiXucV1tm+pSEEEtIo5N4b0
+OgEk3sD8h26WgM3zvrFJr5HIVdfih3V/0B7hzr6dIdWXUbWSsxabjMyod/LwEbbY
+zPvDaDnfg2b3eE4FdqBu2O07moIOzkXitu6KDY6o/vFlyPCaHP+4vLv8iHmgqs04
+FghTf177qLwc+jQKrtlJwuhW6agXG8Wg6ReQHtheN3g/rNvFWBhhvQ4ARtf1Y72s
+ybvqSQkPqgqYZA957ATRkEw5sF2QlVg5jbY+f+n4Tn2HBpT6QJoVM1eyoOesrciz
+1NnkzrnExrz+NItPLUOxO8APQ/WH9msethPINQU6pKwudFZ1PEb+yR4eUFF6xTKQ
+eWr6t7txQpRjJVaotl9I
+=O9Fs
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.6.5-r1.ebuild b/kde-base/kdm/kdm-4.6.5-r2.ebuild
index 7556c8d7c707..f1a287e882f0 100644
--- a/kde-base/kdm/kdm-4.6.5-r1.ebuild
+++ b/kde-base/kdm/kdm-4.6.5-r2.ebuild
@@ -1,6 +1,6 @@
 # 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.6.5-r1.ebuild,v 1.1 2011/07/12 20:49:17 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.6.5-r2.ebuild,v 1.1 2011/07/17 11:23:51 dilfridge Exp $
 
 EAPI=4
 
@@ -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.6.5.ebuild b/kde-base/kdm/kdm-4.6.5.ebuild
deleted file mode 100644
index 3f16498028cc..000000000000
--- a/kde-base/kdm/kdm-4.6.5.ebuild
+++ /dev/null
@@ -1,159 +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.6.5.ebuild,v 1.1 2011/07/09 15:14:28 alexxy Exp $
-
-EAPI=4
-
-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="
-	$(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}"/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
-}