Add patch to fix grub:2 support by Egor Y. Egorov <egorov_egor@bk.ru> wrt bug #413585.

Package-Manager: portage-2.2.0_alpha101/cvs/Linux i686

4 files changed, 196 insertions, 7 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index 2c0ccf0934ac..0cf873964bd1 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,13 @@
 # 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.288 2012/04/18 21:59:03 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.289 2012/04/26 11:09:22 johu Exp $
+
+*kdm-4.8.2-r1 (26 Apr 2012)
+
+  26 Apr 2012; Johannes Huber <johu@gentoo.org> +files/kdm-4.8.2-grub2.patch,
+  +kdm-4.8.2-r1.ebuild:
+  Add patch to fix grub:2 support by Egor Y. Egorov <egorov_egor@bk.ru> wrt bug
+  #413585.
 
   18 Apr 2012; Markus Meier <maekke@gentoo.org> kdm-4.8.1.ebuild:
   x86 stable, bug #409403
diff --git a/kde-base/kdm/Manifest b/kde-base/kdm/Manifest
index 2dc87f05b0ff..1ec7d1dfb7b7 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -1,10 +1,11 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX kdebase-4.0.2-pam-optional.patch 979 RMD160 abdb7293c02507dfd0a032e72f3e449405b6d8a0 SHA1 33e2f936f0548f9b19fe541c0f71db06f9daaf63 SHA256 efa4e0132687dbaa68ab5c8a5911c4a08b5d4e9eb4d2a04879f765b8e44ba9ea
 AUX kdm-4-gentoo-xinitrc.d.patch 793 RMD160 1e22f23d7cbd4764b4a7675968e0a387de2fc09a SHA1 226db506807a31b565da598458faed4a3ce3ddb7 SHA256 7ddeaa5b5446ed9e4f94cfc474032ee7d450df3748b378a4803c5b7b2bdce684
 AUX kdm-4.7.3-revertcrashlogic.patch 4452 RMD160 27f96bf067fc2f45919b9114f74f998c236a2e5b SHA1 108c6acb5dd9fb042a5f4e9c4e3c5d9916fd7f94 SHA256 74f339d17e61c8431726b1c3975423b4cf19ea569990db35e83bf23d1a4b6d1f
 AUX kdm-4.8.2-gold.patch 1229 RMD160 8bbdb5f0c3aa9566a161797422d94bd5de365f81 SHA1 34ae4734415df7dc0511ec1047684d7dc76707fb SHA256 27cbd95f7f6a5281c8af54392cc442a022c03bc553fbd4f2c94d6db8314bf023
+AUX kdm-4.8.2-grub2.patch 526 RMD160 ce22b42fe994ec5db8a29176d99b703620b67da7 SHA1 593243a4a5f9d1682ab1efa97e73d46da6e94b24 SHA256 e1b5dfddbde5150bc80379806e886024b699943a807925df7566bed80a69867b
 AUX kdm-logrotate 111 RMD160 dfdebb05a456a2a6a83faa86e47ff847618634dd SHA1 af020c65a8a27f49b178bb1cb42e9786cf6a578b SHA256 516523c6db0b85d33f0a90d284e707ed4d2ba426b154872af2e8e9389e4ef089
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kde-workspace-4.8.1.tar.xz 33575180 RMD160 e10ff44ca7281bb89b87441d10c68aa2234db9c0 SHA1 675df4befd736e770e3029af8d38800c9018e888 SHA256 d8d15fb8ea47f4424ba97f252a79fb486794848dbe58417d2137ab466deff4b3
@@ -12,13 +13,18 @@ DIST kde-workspace-4.8.2.tar.xz 34081864 RMD160 3afa0b2bb7b037cadee947382b009a76
 EBUILD kdm-4.7.4-r1.ebuild 4335 RMD160 45587843f7234cf138f4e46edcc1f8800d94a050 SHA1 04315397419449be942466b8ae0b111f55f2b946 SHA256 1fa4dd50ccbeb1e9ccf2539ec0e05103a015568b0d10ca33c25cdfe8901d22b7
 EBUILD kdm-4.7.4.ebuild 4379 RMD160 9564ca6c929911f8dadea0140f1b990a6910eace SHA1 d1100959df3ee92a8ed633ca2b3202c1ee6de7fa SHA256 3ef143f353a2b53359babbe419c2d0559084a4a5015a3ad0dc0b8d3ff82549bb
 EBUILD kdm-4.8.1.ebuild 4382 RMD160 53ecdb612d49ee61bffe2785d2aae3050bbe7693 SHA1 c51f8f456dbcb2f4cae9c395e4f434e2c2b6a5d6 SHA256 6982ea078b624096dd3ee521c55a79bd447d4d93ec655c25e0ce9700437f3f53
+EBUILD kdm-4.8.2-r1.ebuild 4424 RMD160 183448733292a568e52dcea4f00e7c65124ae418 SHA1 f38b6ddc497198f3c9059bc2c8d1dea0d32103eb SHA256 533219d27d9dc89ce06e158bba5b0d7159d9a2c1047f4a588d6f69a23a822bd6
 EBUILD kdm-4.8.2.ebuild 4382 RMD160 d0c7f2058188b375e79636f7e9aad944d7c9cd20 SHA1 ef608d2a7aefa055b0beb5e03d32225e5010875e SHA256 24f60874a8c3e0fb81e1e6a2f4e5f187313f3cdf5ed97ae6f508ff8b361c3af2
-MISC ChangeLog 38145 RMD160 7e47b9b1870bed5005916616614446bb3c93c688 SHA1 d86f808b506631d78d4736330a7d406d4d941614 SHA256 ac2372ea96660716b528044b7cee6af5462e13f0ffd57d70bce961a154c3b1fa
+MISC ChangeLog 38366 RMD160 514173e94abbddc15a48f45de7cd3f062ed4c9d4 SHA1 91da2386db81e2c8a0f61c3c257d5c53f9504a4b SHA256 29d953cd036d74f1ca1521bb35787deb49d0705cb738b5b14e68be8820a801ca
 MISC metadata.xml 253 RMD160 dbe3d0cc1778dad287767c5dee6b46b42ccf20ec SHA1 b4723a2baaec997efee2cdc543248a2aad8f1a7e SHA256 955ffc185b3b01315be94542ea43ae1180d5f61ea539a317c45c5746b463eeba
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk+POdkACgkQkKaRLQcq0GIyMACgoDa4qiCZUHkNrPzgyeJHjcTU
-luAAn2Mr1NKR+2eRc0bjbaV7TkoxILUF
-=gdnF
+iQEcBAEBCgAGBQJPmS0cAAoJEO+t9ga+3I3akagIALDtlib67HUmF39GViuy2vrn
+wjQfO2yYdnaKQdBP/WbdNZnuj8EgXUs17ZdZm83hWhRSW0omusHyLfy2n/aqeERg
+VqcP7U75QnT8zPCzUNUWnF/K8BZVpnU/cf9lIZ9Nyd18p8hRnox0vwaIstI0LgM2
+ii2dIfoRXaxP3nxqg3+QHmK7IWS5LXinSocFL2aWeRJDeWY+Nuz7xkDVP/AMRbEQ
+kQxlj6mEYLVGN1Pgw8WQPQmJp/L9Pj+sZh9yosf9F3Cq0DEJUalFRqivJbkeRj0g
+YDPDyuFosA4QkzMPKIGgc+G5f0C8YRaMQ2bbvBAAkv8O8HmAyedoVGLSpZwZR14=
+=u3km
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdm/files/kdm-4.8.2-grub2.patch b/kde-base/kdm/files/kdm-4.8.2-grub2.patch
new file mode 100644
index 000000000000..d48bd106f56c
--- /dev/null
+++ b/kde-base/kdm/files/kdm-4.8.2-grub2.patch
@@ -0,0 +1,14 @@
+diff -uNr kdm-4.8.2_orig/kdm/backend/bootman.c kdm-4.8.2/kdm/backend/bootman.c
+--- kdm-4.8.2_orig/kdm/backend/bootman.c	2012-03-30 05:02:31.000000000 +0700
++++ kdm-4.8.2/kdm/backend/bootman.c	2012-04-26 09:33:58.683462475 +0700
+@@ -224,8 +224,8 @@
+ static int
+ getGrub2(char ***opts, int *def, int *cur)
+ {
+-    grubConfig = "/boot/grub/grub.cfg";
+-    return getGrub2OrBurg(opts, def, cur, "grub-reboot");
++    grubConfig = "/boot/grub2/grub.cfg";
++    return getGrub2OrBurg(opts, def, cur, "grub2-reboot");
+ }
+ 
+ static int
diff --git a/kde-base/kdm/kdm-4.8.2-r1.ebuild b/kde-base/kdm/kdm-4.8.2-r1.ebuild
new file mode 100644
index 000000000000..6bb72f748e9c
--- /dev/null
+++ b/kde-base/kdm/kdm-4.8.2-r1.ebuild
@@ -0,0 +1,162 @@
+# 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.2-r1.ebuild,v 1.1 2012/04/26 11:09:22 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 ~x86 ~amd64-linux ~x86-linux"
+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"
+	"${FILESDIR}/${PN}-4.8.2-gold.patch"
+	"${FILESDIR}/${PN}-4.8.2-grub2.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
+}