public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in kde-base/kdm: ChangeLog kdm-4.4.2.ebuild
@ 2010-03-30 20:56 Dror Levin (spatz)
  0 siblings, 0 replies; 2+ messages in thread
From: Dror Levin (spatz) @ 2010-03-30 20:56 UTC (permalink / raw
  To: gentoo-commits

spatz       10/03/30 20:56:29

  Modified:             ChangeLog
  Added:                kdm-4.4.2.ebuild
  Log:
  Version bump KDE 4.4.2
  (Portage version: 2.2_rc67/cvs/Linux x86_64, RepoMan options: --force)

Revision  Changes    Path
1.206                kde-base/kdm/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -r1.205 -r1.206
--- ChangeLog	11 Mar 2010 18:38:08 -0000	1.205
+++ ChangeLog	30 Mar 2010 20:56:29 -0000	1.206
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.205 2010/03/11 18:38:08 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.206 2010/03/30 20:56:29 spatz Exp $
+
+*kdm-4.4.2 (30 Mar 2010)
+
+  30 Mar 2010; Dror Levin <spatz@gentoo.org> +kdm-4.4.2.ebuild:
+  Version bump
 
   11 Mar 2010; Brent Baude <ranger@gentoo.org> kdm-4.3.5.ebuild:
   Marking kdm-4.3.5 ppc stable for bug 300393



1.1                  kde-base/kdm/kdm-4.4.2.ebuild

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

Index: kdm-4.4.2.ebuild
===================================================================
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.2.ebuild,v 1.1 2010/03/30 20:56:29 spatz Exp $

EAPI="3"

KMNAME="kdebase-workspace"
inherit kde4-meta flag-o-matic

DESCRIPTION="KDE login manager, similar to xdm and gdm"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~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? (
		$(add_kdebase_dep kcheckpass)
		virtual/pam
	)
"
RDEPEND="${DEPEND}
	$(add_kdebase_dep kdepasswd)
	>=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"
)

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

	# Customize the kdmrc configuration
	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
		"${ED}"/${PREFIX}/share/config/kdm/kdmrc \
		|| die "Failed to set SessionsDirs correctly."

	# Don't install empty dir
	rmdir "${ED}${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 "${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon" ]]; then
		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/default1.png" \
			"${EROOT}${KDEDIR}/share/apps/kdm/faces/.default.face.icon"
	fi
	if [[ ! -e "${EROOT}${KDEDIR}/share/apps/kdm/faces/root.face.icon" ]]; then
		mkdir -p "${EROOT}${KDEDIR}/share/apps/kdm/faces"
		cp "${EROOT}${KDEDIR}/share/apps/kdm/pics/users/root1.png" \
			"${EROOT}${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
}






^ permalink raw reply	[flat|nested] 2+ messages in thread

* [gentoo-commits] gentoo-x86 commit in kde-base/kdm: ChangeLog kdm-4.4.2.ebuild
@ 2010-04-09  3:39 Theo Chatzimichos (tampakrap)
  0 siblings, 0 replies; 2+ messages in thread
From: Theo Chatzimichos (tampakrap) @ 2010-04-09  3:39 UTC (permalink / raw
  To: gentoo-commits

tampakrap    10/04/09 03:39:20

  Modified:             ChangeLog kdm-4.4.2.ebuild
  Log:
  Set ServerTimeout=30 in kdmrc, bug 257445
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.208                kde-base/kdm/ChangeLog

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

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- ChangeLog	31 Mar 2010 22:34:55 -0000	1.207
+++ ChangeLog	9 Apr 2010 03:39:20 -0000	1.208
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdm
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.207 2010/03/31 22:34:55 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.208 2010/04/09 03:39:20 tampakrap Exp $
+
+  09 Apr 2010; Theo Chatzimichos <tampakrap@gentoo.org> kdm-4.4.2.ebuild:
+  Set ServerTimeout=30 in kdmrc, bug 257445
 
   31 Mar 2010; Dror Levin <spatz@gentoo.org> -kdm-4.3.4.ebuild,
   -kdm-4.4.0.ebuild:



1.2                  kde-base/kdm/kdm-4.4.2.ebuild

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

Index: kdm-4.4.2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdm-4.4.2.ebuild	30 Mar 2010 20:56:29 -0000	1.1
+++ kdm-4.4.2.ebuild	9 Apr 2010 03:39:20 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.2.ebuild,v 1.1 2010/03/30 20:56:29 spatz Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/kdm-4.4.2.ebuild,v 1.2 2010/04/09 03:39:20 tampakrap Exp $
 
 EAPI="3"
 
@@ -63,9 +63,11 @@
 	kde4-meta_src_install
 
 	# Customize the kdmrc configuration
-	sed -i -e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
+	sed -i \
+	-e "s:^.*SessionsDirs=.*$:#&\nSessionsDirs=${EPREFIX}/usr/share/xsessions:" \
+	-e "s:#ServerTimeout=15:ServerTimeout=30:" \
 		"${ED}"/${PREFIX}/share/config/kdm/kdmrc \
-		|| die "Failed to set SessionsDirs correctly."
+		|| die "Failed to set ServerTimeout and SessionsDir correctly in kdmrc."
 
 	# Don't install empty dir
 	rmdir "${ED}${KDEDIR}"/share/config/kdm/sessions






^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2010-04-09  3:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-30 20:56 [gentoo-commits] gentoo-x86 commit in kde-base/kdm: ChangeLog kdm-4.4.2.ebuild Dror Levin (spatz)
  -- strict thread matches above, loose matches on Subject: below --
2010-04-09  3:39 Theo Chatzimichos (tampakrap)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox