[kde-base/kdm] Backport set

Package-Manager: portage-2.2_rc44/cvs/Linux x86_64

5 files changed, 151 insertions, 7 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/Manifest b/kde-base/kdm/Manifest
index 0796bb725652..892374d935e8 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -6,6 +6,7 @@ AUX kdm-3.5.7-bsd-shutdown.patch 486 RMD160 da3ef89c1783f9eb357a9404f083d696df0e
 AUX kdm-3.5.9-respect-cflags.patch 669 RMD160 23bace1d034c9051fadf9d29886e824bff57dad3 SHA1 a3fff3c118266f999a91abfb7f4496694c311f5c SHA256 1dd4b590955dafd0484b04102872d0de58c3fd2bf0b6d44362d2ffc2d3244656
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
 AUX kdm-4.3.0-oxygen-theme-installation.patch 1650 RMD160 2f69528c4c5d087e6f5fec70e2d94d85ca59caf1 SHA1 ef7e7509e054e8b7a9518cf0f44f4b349895804c SHA256 14bca81419554379a99b70c47c8f104e414f7e9ad2dc4d8b48ebc91bb1530f95
+AUX kdm-4.3.1-set-grub-default.patch 953 RMD160 c5cae2d7e2dd6dc8592ba257442cb6074d65d8c3 SHA1 c0610cd3442c11290a203c5cab9d59a7f353ebfc SHA256 0c890850869d048d15e13687d3bb889c2941280cc9ca3d62c57a2d0ea3674273
 DIST kdebase-3.5-patchset-04.tar.bz2 8502 RMD160 419e527c8c2b00ca49eb395793374b3459989897 SHA1 f7549db15ffcf29fad372b00ab66f0b257225302 SHA256 e16b356bfa224f7c97b57f3a3bdec9ba0701209459a880bae81556d070b2a961
 DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
@@ -21,14 +22,15 @@ EBUILD kdm-4.2.4.ebuild 2492 RMD160 422fd2676797812034efb3dc9d8c416e46d0cbbd SHA
 EBUILD kdm-4.3.0-r1.ebuild 2603 RMD160 0607e94d1538bb1499d3e9e9079aa22783ebd474 SHA1 9997a93d4e868454f601a278e3192610ec8eab5a SHA256 8adabc761112cf96db76cb53fbd3607861a58727ee5cd415b06fb63f11034d9e
 EBUILD kdm-4.3.0.ebuild 2547 RMD160 611ef84cfd22fe800a7fe6249ace23ba777c459c SHA1 2b26475428410ded2119664c592d91b5eaa35e32 SHA256 e92e9954c7b02f5f25fc5721fef6ea8f1ff5169e3832cdb8d77f15fb091f7f5a
 EBUILD kdm-4.3.1-r1.ebuild 2603 RMD160 a34272d56c27b944911450f0b30c665b63d8439d SHA1 6d06951c6dd8c286b625b311299545a3a9d536d9 SHA256 cbc9f259fb0eec587c06f198b1775f0a5bb0d319fab181440946506cb875ecf0
+EBUILD kdm-4.3.1-r2.ebuild 2641 RMD160 69cb4b47715e5bf0eb0008ef67659242abdbcdf0 SHA1 97c5b313da1be08d8ca3d640a83eb78ade3a44b5 SHA256 92c721fa40954831ba6af6b5288c58d651238bd6abfc70a6bee6611dcae92f9d
 EBUILD kdm-4.3.1.ebuild 2551 RMD160 6d8f38abf423e2e5f1d7fd22744a1d08dd2e5ca8 SHA1 05a6e8f47d86505b34cd760afc569f2f11133865 SHA256 c15cc2ec090449e6c88407db23a5053d7007e718c7d6503eab715666b5dab6ed
-EBUILD kdm-4.3.2.ebuild 2595 RMD160 9246c771ceaf0d19464ad60fa2b2449bb84fa4e4 SHA1 918b99195960b197b0c8ea916bcd0e663442dfce SHA256 6cf884e75643aba909fe4679c2871bfcc7759533923cee341a43f6507f0a3757
-MISC ChangeLog 23940 RMD160 a74a3fd2ba44d51dde165cd6b2d2e7880f3fd3ba SHA1 df799451e7859234ffff45ecfcdbeebfa04c911d SHA256 bd9adb28e5c8d2d6f0525a16e1172d873dbf192216b878bd264254a513f296ea
+EBUILD kdm-4.3.2.ebuild 2645 RMD160 2d73ad8aa99c4bb5ed24a4405421be92f7ce72b0 SHA1 1f3a95151889a15268c3c4994fb249a48aa26dde SHA256 94088d6e2084543946e3b59d0feb199bc1d3b1ae6f45485139b71199139d8c72
+MISC ChangeLog 24159 RMD160 641d866b99e33d3ebe62b2cffe75fb2198d46f7f SHA1 156f2ed30a0d7593c5c16f06bfe104ea4457edd4 SHA256 31b668e11c4057995d4d9c5fecd9a3d75a4654c8302d70ff465177d31eb84ec0
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkrLmCUACgkQ5BmOA85PVLgF/QCgli/XYGoB4UxoHZHws3QFv2Ee
-FEwAoKG845Dj8JVS95l1WlN/xxsVfO+d
-=NlDy
+iEYEARECAAYFAkrLsBwACgkQ5BmOA85PVLgbPACeNZzJ04W3KWC3+k4am1Oso19a
+J8sAn28otYqIHf0KQbeG+EiHv8s60ZnZ
+=iYc1
 -----END PGP SIGNATURE-----
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() {