[gentoo-commits] gentoo-x86 commit in kde-base/kdm: kdm-4.3.1-r2.ebuild kdm-4.3.2.ebuild ChangeLog

[Alexey Shvetsov (alexxy)]

alexxy      09/10/06 21:00:55

  Modified:             kdm-4.3.2.ebuild ChangeLog
  Added:                kdm-4.3.1-r2.ebuild
  Log:
  [kde-base/kdm] Backport set
  (Portage version: 2.2_rc44/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  kde-base/kdm/kdm-4.3.2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/kdm-4.3.2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/kdm-4.3.2.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/kdm-4.3.2.ebuild?r1=1.1&r2=1.2

Index: kdm-4.3.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.3.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdm-4.3.2.ebuild	6 Oct 2009 19:18:39 -0000	1.1
+++ kdm-4.3.2.ebuild	6 Oct 2009 21:00:55 -0000	1.2
@@ -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 @@
 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() {



1.178                kde-base/kdm/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.178&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/ChangeLog?rev=1.178&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/ChangeLog?r1=1.177&r2=1.178

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- ChangeLog	6 Oct 2009 19:18:39 -0000	1.177
+++ ChangeLog	6 Oct 2009 21:00:55 -0000	1.178
@@ -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@g.o> +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)
 



1.1                  kde-base/kdm/kdm-4.3.1-r2.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/kdm-4.3.1-r2.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kdm/kdm-4.3.1-r2.ebuild?rev=1.1&content-type=text/plain

Index: kdm-4.3.1-r2.ebuild
===================================================================
# 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
}