Fix a mem leak. Dependency changes, fixes bug #140582.

(Portage version: 2.1.1)

3 files changed, 87 insertions, 1 deletions

diff --git a/kde-base/kdm/ChangeLog b/kde-base/kdm/ChangeLog
index b5791fd654a4..8599b4633555 100644
--- a/kde-base/kdm/ChangeLog
+++ b/kde-base/kdm/ChangeLog
@@ -1,6 +1,11 @@
 # 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.71 2006/09/17 22:53:00 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdm/ChangeLog,v 1.72 2006/09/18 01:05:56 carlo Exp $
+
+*kdm-3.5.4-r2 (18 Sep 2006)
+
+  18 Sep 2006; Carsten Lohrke <carlo@gentoo.org> +kdm-3.5.4-r2.ebuild:
+  Fix a mem leak. Dependency changes, fixes bug #140582.
 
   17 Sep 2006; Carsten Lohrke <carlo@gentoo.org> -kdm-3.4.3-r1.ebuild,
   -kdm-3.4.3-r2.ebuild:
diff --git a/kde-base/kdm/files/digest-kdm-3.5.4-r2 b/kde-base/kdm/files/digest-kdm-3.5.4-r2
new file mode 100644
index 000000000000..6f288113b784
--- /dev/null
+++ b/kde-base/kdm/files/digest-kdm-3.5.4-r2
@@ -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 882a9729c08b197caef2c8712c980d9c kdebase-3.5.4.tar.bz2 23636847
+RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 kdebase-3.5.4.tar.bz2 23636847
+SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420 kdebase-3.5.4.tar.bz2 23636847
diff --git a/kde-base/kdm/kdm-3.5.4-r2.ebuild b/kde-base/kdm/kdm-3.5.4-r2.ebuild
new file mode 100644
index 000000000000..29a20a13c031
--- /dev/null
+++ b/kde-base/kdm/kdm-3.5.4-r2.ebuild
@@ -0,0 +1,75 @@
+# 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.4-r2.ebuild,v 1.1 2006/09/18 01:05:56 carlo 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)"
+
+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
+}