Revision bump. Removes pam patch which has no effect. Is fixed in kde-base/libkworkspace bug #398333.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

4 files changed, 180 insertions, 12 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 1bd95646dad5..c18204eba41c 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.278 2012/01/25 18:16:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.279 2012/02/03 16:10:42 johu Exp $
+
+*kdm-4.8.0-r1 (03 Feb 2012)
+*kdm-4.7.4-r1 (03 Feb 2012)
+
+  03 Feb 2012; Johannes Huber <johu@gentoo.org> +kdm-4.7.4-r1.ebuild,
+  +kdm-4.8.0-r1.ebuild, -kdm-4.8.0.ebuild:
+  Revision bump. Removes pam patch which has no effect. Is fixed in kde-
+  base/libkworkspace bug #398333.
 
 *kdm-4.8.0 (25 Jan 2012)
 
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 7d5181d3cfc7..01ad7625643d 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -9,18 +9,19 @@ DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210
 DIST kde-workspace-4.8.0.tar.bz2 35364809 RMD160 05481e904d1ab00f6fbca54f37cf444ad7c513f3 SHA1 4c471b159315b084c65196b0c93c34981a9105c5 SHA256 116b9655984c1e6544a3b011960122c2ba821c0c21dced27518e8604ff04bbee
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 EBUILD kdm-4.6.3-r1.ebuild 4208 RMD160 7181bf4fa155590416b55cb923d9f63d9e1fa949 SHA1 5580a1576443e687a13b86dd18c67be7c0f86fef SHA256 80dcb740df6f9b6a8820c3d09686c337db41aaff0c3ad88ade2e3ac8724667b3
+EBUILD kdm-4.7.4-r1.ebuild 4335 RMD160 45587843f7234cf138f4e46edcc1f8800d94a050 SHA1 04315397419449be942466b8ae0b111f55f2b946 SHA256 1fa4dd50ccbeb1e9ccf2539ec0e05103a015568b0d10ca33c25cdfe8901d22b7
 EBUILD kdm-4.7.4.ebuild 4377 RMD160 251b03b7224e220ef61cfc470eec9345581957e9 SHA1 843194dfe90de53925bc9f56e173761a02e76e54 SHA256 56d6b1bc9d8b3d7cae78ddfae3569ce0142506a435706a94267a0c146fb7e8d5
-EBUILD kdm-4.8.0.ebuild 4387 RMD160 6aa0dfa6f4fc96e9df5edbe417fc3e9c6c96786e SHA1 841afd6cd15a3a1b16f45bac08f0189cffaa5f25 SHA256 e86626fa6e04cfdc059667459396baae431cec9e46d2cc737e2b245207497008
-MISC ChangeLog 36805 RMD160 a384d87f67565c821a7e69e37dac5a690dd37d1d SHA1 13f79e2f8db4e31dbb69cfa46b68b3babf2d588e SHA256 9d2a95ed931f04dd72637bb0d2f719a2224a6cdf84864d6379a99a34370f16cb
+EBUILD kdm-4.8.0-r1.ebuild 4342 RMD160 d6bfac053b6d8615d29af3a87e61a156f68f9d9e SHA1 57e019871417d815f2ef4cc48c42458882122503 SHA256 689bd693b8e42b1175e3c51f3bff25701e5e0a2ccbaada737f7ee61d58a398f2
+MISC ChangeLog 37083 RMD160 eeac92363720c98da47f5f3a70897cbd7f957267 SHA1 ed2c9e466a5deb734f83a4f672281e2e069129ce SHA256 f6e8580c2274eb057ab6e6d1c670a55e9abdf6b337b39e4c339febc8ef315e89
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPIEg2AAoJEO+t9ga+3I3asZUH+gKSdlyc769/GyyYPXK+gqpA
-3s14rU1rY6qPkLPtQkXFXvNTEfjzHgqCMG0CF8k/Vit/vyup7uC12qX9BorO0fut
-PQIPcgduDpPTJO6qlA6XfxsjxfyWE/GtzmdmdRFQ5Zn+18Cc2yRmOGBLYQXaj38h
-wHVGBUlrqGOzv0hDX8GWlGfq/OQ8pnJWoWC5t3QpANmcAUMRfkT16f0XVlLjZdfu
-3DIlrAqwQgzfv2qlyV5F4l/vCUrbEfez1c0oG7yBjXzP38mu8yYdWFVXKHfUmBwZ
-DQwWPwZ9djgnlmrg9C0gSn+2M91lppjVAoTP3FOFKZYwOQuE77dzERiZ1NIAJ6g=
-=K6P2
+iQEcBAEBCgAGBQJPLAbDAAoJEO+t9ga+3I3aqG4IALDzlEOt4pvLXu2XyCRvGQSF
+MjkQbxfkwE6gmr7mEa51HMvEeU3VMP27KIykguzcMXkokHdfEA1x6J48X7ZsLUGS
+TlIH97dfaf2TuGNBH5tarT64YU8EuL15uzk3xXpPZLiGeVxNTrAZXIQ3YCPawz2z
+V/50LRFa83zC+H0Ajhaeqp8itNxiNqotqYkph38zSoCBMpstEXgLrB4az9jKD9XF
+aJrWMOwR2vISGbsxym5R182GA2KqiVus2VJNSlJLqt/yYPeWiT0GwSEjhbt6z6+Z
+bjQKAWkQWuAyjnRg186jH2A5Vg8I6F/yf58WSBcFcUQlETeebNhE7uZsLg4Rdes=
+=YImJ
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/kdm-4.7.4-r1.ebuild b/kde-base/kdm/kdm-4.7.4-r1.ebuild
new file mode 100644
index 000000000000..1a6b618bb496
--- /dev/null
+++ b/kde-base/kdm/kdm-4.7.4-r1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.7.4-r1.ebuild,v 1.1 2012/02/03 16:10:42 johu Exp $
+
+EAPI=4
+
+KDE_HANDBOOK="optional"
+KMNAME="kde-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
+"
+
+KMEXTRA="
+	libs/kdm/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+	"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.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
+
+	# 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
+}
+
+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
+}
diff --git a/kde-base/kdm/kdm-4.8.0.ebuild b/kde-base/kdm/kdm-4.8.0-r1.ebuild
index 91dfc0adb92c..ca531c44ad6d 100644
--- a/kde-base/kdm/kdm-4.8.0.ebuild
+++ b/kde-base/kdm/kdm-4.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.0.ebuild,v 1.1 2012/01/25 18:16:50 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.8.0-r1.ebuild,v 1.1 2012/02/03 16:10:42 johu Exp $
 
 EAPI=4
 
@@ -38,7 +38,6 @@ KMEXTRA="
 "
 
 PATCHES=(
-	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
 	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
 	"${FILESDIR}/${PN}-4.7.3-revertcrashlogic.patch"
 )