[kde-base/kdm] Backport set

(Portage version: 2.2_rc44/cvs/Linux x86_64)

4 files changed, 144 insertions, 2 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 1f050205b8f4..51617e23b6e4 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.177 2009/10/06 19:18:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.178 2009/10/06 21:00:55 alexxy Exp $
+
+*kdm-4.3.1-r2 (06 Oct 2009)
+
+  06 Oct 2009; Alexey Shvetsov <alexxy@gentoo.org> +kdm-4.3.1-r2.ebuild,
+  +files/kdm-4.3.1-set-grub-default.patch, kdm-4.3.2.ebuild:
+  Backport set default in grub patch, fixes bug 242736
 
 *kdm-4.3.2 (06 Oct 2009)
 
diff --git a/kde-base/kdm/files/kdm-4.3.1-set-grub-default.patch b/kde-base/kdm/files/kdm-4.3.1-set-grub-default.patch
new file mode 100644
index 000000000000..54843d51803b
--- /dev/null
+++ b/kde-base/kdm/files/kdm-4.3.1-set-grub-default.patch
@@ -0,0 +1,37 @@
+Index: kdm/backend/bootman.c
+===================================================================
+--- kdm/backend/bootman.c	(revision 1030992)
++++ kdm/backend/bootman.c	(revision 1030993)
+@@ -80,7 +80,7 @@
+ 	int len;
+ 	char line[1000];
+ 
+-	if (!grub && !(grub = locate( "grub" )))
++	if (!grub && !(grub = locate( "grub-set-default" )))
+ 		return BO_NOMAN;
+ 
+ 	*def = 0;
+@@ -130,19 +130,15 @@
+ static void
+ commitGrub( void )
+ {
+-	FILE *f;
+-	int pid;
+-	static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
++	char index[16];
++	const char *args[3] = { grub, index, 0 };
+ 
+ 	if (sdRec.bmstamp != mTime( GRUB_MENU ) &&
+ 	    setGrub( sdRec.osname, &sdRec ) != BO_OK)
+ 		return;
+ 
+-	args[0] = grub;
+-	if ((f = pOpen( (char **)args, 'w', &pid ))) {
+-		fprintf( f, "savedefault --default=%d --once\n", sdRec.osindex );
+-		pClose( f, &pid );
+-	}
++	sprintf( index, "%d", sdRec.osindex );
++	runAndWait( (char **)args, environ );
+ }
+ 
+ static char *lilo;
diff --git a/kde-base/kdm/kdm-4.3.1-r2.ebuild b/kde-base/kdm/kdm-4.3.1-r2.ebuild
new file mode 100644
index 000000000000..e630ccf6a8ae
--- /dev/null
+++ b/kde-base/kdm/kdm-4.3.1-r2.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.1-r2.ebuild,v 1.1 2009/10/06 21:00:55 alexxy Exp $
+
+EAPI="2"
+
+KMNAME="kdebase-workspace"
+inherit kde4-meta flag-o-matic
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="consolekit debug +handbook kerberos pam"
+
+DEPEND="
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXtst
+	consolekit? (
+		>=sys-apps/dbus-1.0.2
+		sys-auth/consolekit
+	)
+	kerberos? ( virtual/krb5 )
+	pam? (
+		>=kde-base/kcheckpass-${PV}:${SLOT}[kdeprefix=]
+		virtual/pam
+	)
+"
+RDEPEND="${DEPEND}
+	>=kde-base/kdepasswd-${PV}:${SLOT}[kdeprefix=]
+	>=x11-apps/xinit-1.0.5-r2
+	x11-apps/xmessage
+"
+
+KMEXTRACTONLY="
+	kcontrol/kdm/
+"
+KMEXTRA="
+	libs/kdm/
+"
+
+PATCHES=(
+	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
+	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+	"${FILESDIR}/${P}-set-grub-default.patch"
+)
+
+src_configure() {
+	# genkdmconf breaks with -O3
+	# last checked in 4.2.95
+	replace-flags -O3 -O2
+
+	mycmakeargs="${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
+	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=/usr/share/xsessions:" \
+		"${D}"/${PREFIX}/share/config/kdm/kdmrc \
+		|| die "Failed to set SessionsDirs correctly."
+
+	# Don't install empty dir
+	rmdir "${D}${KDEDIR}"/share/config/kdm/sessions
+}
+
+pkg_postinst() {
+	kde4-meta_pkg_postinst
+
+	# 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
+	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]];	then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
+	fi
+	if [[ ! -e "${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
+		mkdir -p "${ROOT}${KDEDIR}/share/apps/kdm/faces"
+		cp "${ROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
+			"${ROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon"
+	fi
+
+	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.3.2.ebuild b/kde-base/kdm/kdm-4.3.2.ebuild
index edb35446db61..d8bb43941f02 100644
--- a/kde-base/kdm/kdm-4.3.2.ebuild
+++ b/kde-base/kdm/kdm-4.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.2.ebuild,v 1.1 2009/10/06 19:18:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.2.ebuild,v 1.2 2009/10/06 21:00:55 alexxy Exp $
 
 EAPI="2"
 
@@ -41,6 +41,7 @@ KMEXTRA="
 PATCHES=(
 	"${FILESDIR}/kdebase-4.0.2-pam-optional.patch"
 	"${FILESDIR}/${PN}-4-gentoo-xinitrc.d.patch"
+	"${FILESDIR}/${PN}-4.3.1-set-grub-default.patch"
 )
 
 src_configure() {