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

Package-Manager: portage-2.1.1

5 files changed, 111 insertions, 9 deletions

diff --git a/kde-base/kdesktop/Manifest b/kde-base/kdesktop/Manifest
index aa45e69b3397..d3cb1f77510c 100644
--- a/kde-base/kdesktop/Manifest
+++ b/kde-base/kdesktop/Manifest
@@ -2,6 +2,7 @@ AUX kdesktop-3.5.3-screensaver.patch 3336 RMD160 f8ac6f039ea14dbbf1f8579cd610a8f
 MD5 c1c21846f3ff96630e1faebbd6a450c8 files/kdesktop-3.5.3-screensaver.patch 3336
 RMD160 f8ac6f039ea14dbbf1f8579cd610a8f5e0f26bd2 files/kdesktop-3.5.3-screensaver.patch 3336
 SHA256 0e6fa9e399914805c72042ddb358ea3760f30f6d1b2b782f744a3fe20d9c18d8 files/kdesktop-3.5.3-screensaver.patch 3336
+DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
 DIST kdebase-3.5.4.tar.bz2 23636847 RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 SHA1 18f2bb3643a40f937bf260d5969d6919aa52abf4 SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420
@@ -17,14 +18,18 @@ EBUILD kdesktop-3.5.3.ebuild 1521 RMD160 569239b21b86a408556214c227bed6a9f58b2b6
 MD5 3be09ebe33e99425e047778020be411e kdesktop-3.5.3.ebuild 1521
 RMD160 569239b21b86a408556214c227bed6a9f58b2b62 kdesktop-3.5.3.ebuild 1521
 SHA256 469b04b6e8c0451f53282a6aaf0a79e560be90ad17858c9a6412e769392eba9b kdesktop-3.5.3.ebuild 1521
+EBUILD kdesktop-3.5.4-r1.ebuild 1661 RMD160 97d297fbbc645c2d362e83f621a5a63a8d428bd6 SHA1 2fd87dab19da4a7f96c230a9dade56cc2c41bb62 SHA256 67a1f886d6fd9898dc4f7657ac892b27f17f11a302d7a503cfe7e62a5bc5cf0f
+MD5 eeda355094709a9d893ddef5cdac00bd kdesktop-3.5.4-r1.ebuild 1661
+RMD160 97d297fbbc645c2d362e83f621a5a63a8d428bd6 kdesktop-3.5.4-r1.ebuild 1661
+SHA256 67a1f886d6fd9898dc4f7657ac892b27f17f11a302d7a503cfe7e62a5bc5cf0f kdesktop-3.5.4-r1.ebuild 1661
 EBUILD kdesktop-3.5.4.ebuild 1527 RMD160 6acc836e88234c99f0794555c1dba29dadf9d490 SHA1 b35ab74eb6bdd4fce16e9a5ba7317279c839ab01 SHA256 02c770c4a9914cdf80eb3f1b0898169672c248b7cd35c0e5e7dbbde703d610f9
 MD5 ded46428d7d526f8fd0d350efcc1ea48 kdesktop-3.5.4.ebuild 1527
 RMD160 6acc836e88234c99f0794555c1dba29dadf9d490 kdesktop-3.5.4.ebuild 1527
 SHA256 02c770c4a9914cdf80eb3f1b0898169672c248b7cd35c0e5e7dbbde703d610f9 kdesktop-3.5.4.ebuild 1527
-MISC ChangeLog 7771 RMD160 eb2d7812d91730d6370644a8c095ba0edce995a4 SHA1 e02fb284a6da7a02f776376a3270d54e9bf6504a SHA256 84359ede814358d613622e8afc02cb76868ef4d40da5557a55259dbd043ac883
-MD5 aa8e66475b4c5fc433d2e2cd72feae8c ChangeLog 7771
-RMD160 eb2d7812d91730d6370644a8c095ba0edce995a4 ChangeLog 7771
-SHA256 84359ede814358d613622e8afc02cb76868ef4d40da5557a55259dbd043ac883 ChangeLog 7771
+MISC ChangeLog 7964 RMD160 2222020df909d597168d551fa3ae27b03fc81058 SHA1 487935d681bbacd504bae218a4622105b284b49a SHA256 efb07fbe70780cced73e8737d2fbe52c8008ab35ae12a3d8fa15cdfd9b364aa3
+MD5 45a0100bd093a9611eb8aae7f199ea91 ChangeLog 7964
+RMD160 2222020df909d597168d551fa3ae27b03fc81058 ChangeLog 7964
+SHA256 efb07fbe70780cced73e8737d2fbe52c8008ab35ae12a3d8fa15cdfd9b364aa3 ChangeLog 7964
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -41,3 +46,6 @@ SHA256 fbadbab6d9ca54d395d9e1f91808dadbb485cbeffbaf1b50b90f1e5efd772f27 files/di
 MD5 bde197069a871b30d86101bcf804b28f files/digest-kdesktop-3.5.4 250
 RMD160 a476573af6620325dc0f2ebef9d1ece778566ad9 files/digest-kdesktop-3.5.4 250
 SHA256 b707b2d4d2479a72a3fdffaeae923b9a5941e9a9b59affa98d0b785c351a0764 files/digest-kdesktop-3.5.4 250
+MD5 e412fe194e54f05f8d3c77b2cd54836d files/digest-kdesktop-3.5.4-r1 521
+RMD160 a570272acfcf2790d9e331230f6e5a52acc78f65 files/digest-kdesktop-3.5.4-r1 521
+SHA256 57967b3edb5abfc41e2ac6b719634e3326019f8d3f65de0b0065ed4e8eb2d7e0 files/digest-kdesktop-3.5.4-r1 521
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/Manifest b/kde-base/kdm/Manifest
index 88fb14005e8a..4a1f479a4537 100644
--- a/kde-base/kdm/Manifest
+++ b/kde-base/kdm/Manifest
@@ -24,6 +24,7 @@ RMD160 0b223a8e364540d6c9e877e5f560fe855b50030f files/post-3.5.0-kdebase-kdm.dif
 SHA256 95cc8feb448616e63eae37e3093bbdee690d04f8542f7f04aeab7926a6cffcf2 files/post-3.5.0-kdebase-kdm.diff 508
 DIST kdebase-3.5-patchset-01.tar.bz2 5552 RMD160 196f2f57924ccab4109061794d09f579917f4ed1 SHA1 6cf289b7d30f2b7899aac092989cccca5992cecf SHA256 10b635594c7936f618abf3a9b41785fb1cb2c2d2a4be5bb889abff518b8e5ee0
 DIST kdebase-3.5-patchset-02.tar.bz2 7118 RMD160 ea3c7215e68754e8acac03e9fafea8aa9c6d1202 SHA1 ff7a1d707c894d94d0ca36b352cbdaacd0362a10 SHA256 459e2ce09a7151fd5f52bf77570dccd2447f00a604dab65adf7dfb5da431ac1b
+DIST kdebase-3.5-patchset-03.tar.bz2 21409 RMD160 941b919097d03347b10bccb51db2fa5e89d7ba16 SHA1 9ac59cdfc4cd8d43b6d0e6dbebc5b28d7a33e35f SHA256 59c691754627f78daf7693e82496d808cf1cc31e2d6f32af829ec4ccfd776574
 DIST kdebase-3.5.2.tar.bz2 23590820 RMD160 216ff59c49bb4fee2aa3b7d976ec40a8cccff107 SHA1 16cddd8766c3bd8821044fe9cce66f5291c8412b SHA256 21150b7e553e83487e70e70e3d13ce107c6c5d57133b40f413807887a9e431f7
 DIST kdebase-3.5.3.tar.bz2 23634194 RMD160 ef55c72b97577dd86e5c64bf589ff9b2d556ec07 SHA1 93f1566343af114b24987ee7b8e0e80877b57f25 SHA256 5a2b9bc5e2682684519dbae89b3bd73fbf5de1f1effd3ca072173a9638dc3ff8
 DIST kdebase-3.5.4.tar.bz2 23636847 RMD160 29f763ec9de2cf3437b94567b317642e7df5e295 SHA1 18f2bb3643a40f937bf260d5969d6919aa52abf4 SHA256 71e3b45d91f2237ca5a66858b06e897e1f60e3042d4c54d828ba590daaa5b420
@@ -39,14 +40,18 @@ EBUILD kdm-3.5.4-r1.ebuild 2512 RMD160 7b5764fb2ff55416c1d50865f3758f568a7cb319
 MD5 8647de9267a436f71a436d1a63bbd3df kdm-3.5.4-r1.ebuild 2512
 RMD160 7b5764fb2ff55416c1d50865f3758f568a7cb319 kdm-3.5.4-r1.ebuild 2512
 SHA256 dfbaf5590b367de63abe09421cb5a681f3807aa3290748874af0674ca3667f1b kdm-3.5.4-r1.ebuild 2512
+EBUILD kdm-3.5.4-r2.ebuild 2491 RMD160 93feb7c3112ccf18287c179a2ad5f49da1b12baf SHA1 2119cd6ca2e745d7d326a3424eb76cf9dd456f55 SHA256 21d89e08e9734272c7d1a3cfa929919f5fad94ddf79abfa3a78cf8c8fc427656
+MD5 c61cc106b55a9b2c3e2bc1fcf16a8a3e kdm-3.5.4-r2.ebuild 2491
+RMD160 93feb7c3112ccf18287c179a2ad5f49da1b12baf kdm-3.5.4-r2.ebuild 2491
+SHA256 21d89e08e9734272c7d1a3cfa929919f5fad94ddf79abfa3a78cf8c8fc427656 kdm-3.5.4-r2.ebuild 2491
 EBUILD kdm-3.5.4.ebuild 2463 RMD160 227bb27a32170723e5e4a9fd350c9d8a8ccc32ac SHA1 be8b86304a192702c214a50f0ac15b4a2b6e4f72 SHA256 22b68d441f5551992aa71965cf69a0400a24f77b37462fcd57667970d1f36e64
 MD5 7bd3e0e517fed89f2ef37a51aa16675e kdm-3.5.4.ebuild 2463
 RMD160 227bb27a32170723e5e4a9fd350c9d8a8ccc32ac kdm-3.5.4.ebuild 2463
 SHA256 22b68d441f5551992aa71965cf69a0400a24f77b37462fcd57667970d1f36e64 kdm-3.5.4.ebuild 2463
-MISC ChangeLog 9722 RMD160 bd439456ccbec0ba33457bb372dc6a7ff5d5d626 SHA1 a189e77c4e7655d175de86387ce64fc8eeff5ebd SHA256 adb1d5746ccac5f946a6b4b0bfa2e0a1485bf7655431577e572a55eb3f2dac04
-MD5 5dce0a37dcd2e914c651a507aa35d677 ChangeLog 9722
-RMD160 bd439456ccbec0ba33457bb372dc6a7ff5d5d626 ChangeLog 9722
-SHA256 adb1d5746ccac5f946a6b4b0bfa2e0a1485bf7655431577e572a55eb3f2dac04 ChangeLog 9722
+MISC ChangeLog 9880 RMD160 adbdb730fbff7c9d350f8b10ed48ff37756d27ee SHA1 6a345998012c03c62eb56697db1cf4b4ee577d42 SHA256 34134d98981af3f7d994acf28de3d5398b586f6fb41d5eb06a413b5082f5657b
+MD5 e731b4e715ef1ca7e82a8216d6385638 ChangeLog 9880
+RMD160 adbdb730fbff7c9d350f8b10ed48ff37756d27ee ChangeLog 9880
+SHA256 34134d98981af3f7d994acf28de3d5398b586f6fb41d5eb06a413b5082f5657b ChangeLog 9880
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -63,3 +68,6 @@ SHA256 8b4afa58e5d6c0863d55164c28b5bdb5e7cf7890e77d67957fa0d01d16930bbf files/di
 MD5 425303bc57c521473647c0068422baa7 files/digest-kdm-3.5.4-r1 518
 RMD160 eed94e31e0e0aea46b977992f5d896d01d4e2159 files/digest-kdm-3.5.4-r1 518
 SHA256 8b4afa58e5d6c0863d55164c28b5bdb5e7cf7890e77d67957fa0d01d16930bbf files/digest-kdm-3.5.4-r1 518
+MD5 e412fe194e54f05f8d3c77b2cd54836d files/digest-kdm-3.5.4-r2 521
+RMD160 a570272acfcf2790d9e331230f6e5a52acc78f65 files/digest-kdm-3.5.4-r2 521
+SHA256 57967b3edb5abfc41e2ac6b719634e3326019f8d3f65de0b0065ed4e8eb2d7e0 files/digest-kdm-3.5.4-r2 521
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
+}