Regenerated and included a new grub-set-default patch as requested in bug #153544.

(Portage version: 2.1.2_rc1-r3)

4 files changed, 126 insertions, 1 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index fab2435f68ef..d9722e64e986 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.76 2006/10/07 16:46:29 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.77 2006/11/05 02:24:09 deathwing00 Exp $
+
+*kdm-3.5.5-r1 (05 Nov 2006)
+
+  05 Nov 2006; Ioannis Aslanidis <deathwing00@gentoo.org>
+  +files/kdm-3.5.5-grub-patch.diff, +kdm-3.5.5-r1.ebuild:
+  Regenerated and included a new grub-set-default patch as requested in bug
+  #153544.
 
   07 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> Manifest:
   Regenerate digest (this time hopefully..).
diff --git a/kde-base/kdm/files/digest-kdm-3.5.5-r1 b/kde-base/kdm/files/digest-kdm-3.5.5-r1
new file mode 100644
index 000000000000..f51965cf1cbe
--- /dev/null
+++ b/kde-base/kdm/files/digest-kdm-3.5.5-r1
@@ -0,0 +1,6 @@
+MD5 420445e2dbddfd83ebc25e85a9b9cdda kdebase-3.5-patchset-03.tar.bz2 21409
+RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 kdebase-3.5-patchset-03.tar.bz2 21409
+SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574 kdebase-3.5-patchset-03.tar.bz2 21409
+MD5 0c685af1cbca75f9c77b3ed231ba0468 kdebase-3.5.5.tar.bz2 23851886
+RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 kdebase-3.5.5.tar.bz2 23851886
+SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0 kdebase-3.5.5.tar.bz2 23851886
diff --git a/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff b/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff
new file mode 100644
index 000000000000..3dace6dd0677
--- /dev/null
+++ b/kde-base/kdm/files/kdm-3.5.5-grub-patch.diff
@@ -0,0 +1,35 @@
+diff -Naur kdm-3.5.5-orig/kdm/backend/bootman.c kdm-3.5.5/kdm/backend/bootman.c
+--- kdm-3.5.5-orig/kdm/backend/bootman.c	2006-10-01 19:32:15.000000000 +0200
++++ kdm-3.5.5/kdm/backend/bootman.c	2006-11-05 03:03:54.000000000 +0100
+@@ -82,7 +82,7 @@
+ 	int len;
+ 	char line[1000];
+ 
+-	if (!grub && !(grub = locate( "grub" )))
++	if (!grub && !(grub = locate( "grub-set-default" )))
+ 		return BO_NOMAN;
+ 
+ 	*def = 0;
+@@ -132,19 +132,14 @@
+ static void
+ commitGrub( void )
+ {
+-	FILE *f;
+-	int pid;
+-	static const char *args[] = { 0, "--batch", "--no-floppy", 0 };
++	char command[256];
+ 
+ 	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(command, "%s %d", grub, sdRec.osindex);
++	system(command);
+ }
+ 
+ static char *lilo;
diff --git a/kde-base/kdm/kdm-3.5.5-r1.ebuild b/kde-base/kdm/kdm-3.5.5-r1.ebuild
new file mode 100644
index 000000000000..d294aba3ec74
--- /dev/null
+++ b/kde-base/kdm/kdm-3.5.5-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-3.5.5-r1.ebuild,v 1.1 2006/11/05 02:24:09 deathwing00 Exp $
+
+KMNAME=kdebase
+MAXKDEVER=$PV
+KM_DEPRANGE="$PV $MAXKDEVER"
+inherit kde-meta eutils
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/kdebase-3.5-patchset-03.tar.bz2"
+
+DESCRIPTION="KDE login manager, similar to xdm and gdm"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="pam elibc_glibc"
+
+KMEXTRA="kdmlib/"
+# kioslave/thumbnail/configure.in.in is to have HAVE_LIBART. Can be dropped on
+# 3.5_beta1.
+KMEXTRACTONLY="libkonq/konq_defaults.h"
+#		kioslave/thumbnail/configure.in.in"
+KMCOMPILEONLY="kcontrol/background"
+DEPEND="pam? ( kde-base/kdebase-pam )
+	$(deprange $PV $MAXKDEVER kde-base/kcontrol)"
+	# Requires the desktop background settings and kdm kcontrol modules
+RDEPEND="${DEPEND}
+	|| ( (	x11-apps/xinit x11-apps/xmessage )
+		<virtual/x11-7 )
+	kde-base/kdepasswd"
+PDEPEND="$(deprange $PV $MAXKDEVER kde-base/kdesktop)"
+
+PATCHES="${FILESDIR}/${P}-grub-patch.diff"
+
+src_unpack() {
+	kde-meta_src_unpack
+
+	# Avoid using imake (kde bug 114466)
+	epatch "${WORKDIR}/patches/kdebase-3.5.0_beta2-noimake.patch"
+}
+
+src_compile() {
+	local myconf="--with-x-binaries-dir=/usr/bin $(use_with pam)"
+
+	if ! use pam && use elibc_glibc; then
+		myconf="${myconf} --with-shadow"
+	fi
+
+	export USER_LDFLAGS="${LDFLAGS}"
+
+	kde-meta_src_compile myconf configure
+	kde_remove_flag kdm/kfrontend -fomit-frame-pointer
+	kde-meta_src_compile make
+}
+
+src_install() {
+	kde-meta_src_install
+	cd ${S}/kdm && make DESTDIR=${D} GENKDMCONF_FLAGS="--no-old --no-backup --no-in-notice" install
+
+	# Customize the kdmrc configuration
+	sed -i -e "s:#SessionsDirs=:SessionsDirs=/usr/share/xsessions\n#SessionsDirs=:" \
+		${D}/${KDEDIR}/share/config/kdm/kdmrc || die
+}
+
+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
+}