Fix bug #143375.

Package-Manager: portage-2.1.2.3

5 files changed, 91 insertions, 23 deletions

diff --git a/kde-base/kdebase-kioslaves/Manifest b/kde-base/kdebase-kioslaves/Manifest
index 28c36d3a00b0..5ca7ec60fc55 100644
--- a/kde-base/kdebase-kioslaves/Manifest
+++ b/kde-base/kdebase-kioslaves/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX kdebase-kioslaves-3.5.5-fstab.patch 3103 RMD160 53a4f0ded4d368f93eb29650d12d266735d7bf9e SHA1 1ffe0d67e77970774a5a2420f79b0579716dc8a7 SHA256 6a17470a3245a59c6e84a0142e64633e74b2bb12649e9c46c0903dd8fa4edb29
 MD5 76bc9dcbf83bccc0cbb0aaaf8560772e files/kdebase-kioslaves-3.5.5-fstab.patch 3103
 RMD160 53a4f0ded4d368f93eb29650d12d266735d7bf9e files/kdebase-kioslaves-3.5.5-fstab.patch 3103
@@ -12,14 +9,18 @@ EBUILD kdebase-kioslaves-3.5.5-r1.ebuild 1790 RMD160 c4086ccab5560a78809cf2a652e
 MD5 e0c34a293c67a93cc0e732467fe0af95 kdebase-kioslaves-3.5.5-r1.ebuild 1790
 RMD160 c4086ccab5560a78809cf2a652ea9d67f7dc8f01 kdebase-kioslaves-3.5.5-r1.ebuild 1790
 SHA256 e734ec5e304073b6a051dd29b49acbfb05a3c1bbdd1f65355d83b5a3ae308d71 kdebase-kioslaves-3.5.5-r1.ebuild 1790
+EBUILD kdebase-kioslaves-3.5.6-r1.ebuild 2165 RMD160 4eab740c65f84b8c9c7109d08f302a3333572f78 SHA1 d4327607abfa9961c67930e8e001bb85f9cd9eec SHA256 93a8b0d02b0df0717b761a6df79a15fc10a4dcb662d5279fdeff80da8a1247a0
+MD5 0f6b5b6529b20d3a423791f0961d3944 kdebase-kioslaves-3.5.6-r1.ebuild 2165
+RMD160 4eab740c65f84b8c9c7109d08f302a3333572f78 kdebase-kioslaves-3.5.6-r1.ebuild 2165
+SHA256 93a8b0d02b0df0717b761a6df79a15fc10a4dcb662d5279fdeff80da8a1247a0 kdebase-kioslaves-3.5.6-r1.ebuild 2165
 EBUILD kdebase-kioslaves-3.5.6.ebuild 1758 RMD160 51aeebf24d8e89cd2c3a3c8f5aa6d5e549dc62ac SHA1 35d13cb2ccb7c7ea0c62898b06a3398e65d2e50f SHA256 e37fee2c85a8f7ec57d60915e61a25b398b6cacda46fae2056d2ba8a2010ee21
 MD5 3923635773746cb2d87f4a4cccb75f70 kdebase-kioslaves-3.5.6.ebuild 1758
 RMD160 51aeebf24d8e89cd2c3a3c8f5aa6d5e549dc62ac kdebase-kioslaves-3.5.6.ebuild 1758
 SHA256 e37fee2c85a8f7ec57d60915e61a25b398b6cacda46fae2056d2ba8a2010ee21 kdebase-kioslaves-3.5.6.ebuild 1758
-MISC ChangeLog 12708 RMD160 fbfd41eb5313191de60de469cc5b44aec7741df3 SHA1 2bef3aa769265d275c550503e4cb03c989c5bf84 SHA256 3e70716c2935b9d2e37e327b0dabd8a4ccd88fe6e5e5d2d2bfb307a7751c4296
-MD5 24e905f4fa5ef53b68bb8ac0b3968ac2 ChangeLog 12708
-RMD160 fbfd41eb5313191de60de469cc5b44aec7741df3 ChangeLog 12708
-SHA256 3e70716c2935b9d2e37e327b0dabd8a4ccd88fe6e5e5d2d2bfb307a7751c4296 ChangeLog 12708
+MISC ChangeLog 12875 RMD160 5e5fefe3db42278179dde6220e4420ea2a6907ab SHA1 276e6810fb903ffb5b1be435a81bf23e997124d4 SHA256 4f2f7719b21007fdb15fed86598493193ad19b375b1df91d3418863653d93240
+MD5 5fbc915749701149c44e5f93dc5785df ChangeLog 12875
+RMD160 5e5fefe3db42278179dde6220e4420ea2a6907ab ChangeLog 12875
+SHA256 4f2f7719b21007fdb15fed86598493193ad19b375b1df91d3418863653d93240 ChangeLog 12875
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -30,10 +31,6 @@ SHA256 f8d736f629130da8e0d90a8ebd0a550634334af2739900a17d0e04c688b248e2 files/di
 MD5 ee171b889b6d1bf06db7b9807b6ecd54 files/digest-kdebase-kioslaves-3.5.6 521
 RMD160 b1bca8eff5d846ea0f0d76494fc35c512f14ddba files/digest-kdebase-kioslaves-3.5.6 521
 SHA256 95625db1a4a2c6cd94814f008a4518537d78318c35aff50d1f295ad9944965be files/digest-kdebase-kioslaves-3.5.6 521
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
-
-iD8DBQFFxySYAiZjviIA2XgRAkY7AKCShAXSjDui6TXBLdMnBKqXZ+7LdQCfaDou
-KKtOklHGLINGu5AxyHbg3U0=
-=x7jw
------END PGP SIGNATURE-----
+MD5 ee171b889b6d1bf06db7b9807b6ecd54 files/digest-kdebase-kioslaves-3.5.6-r1 521
+RMD160 b1bca8eff5d846ea0f0d76494fc35c512f14ddba files/digest-kdebase-kioslaves-3.5.6-r1 521
+SHA256 95625db1a4a2c6cd94814f008a4518537d78318c35aff50d1f295ad9944965be files/digest-kdebase-kioslaves-3.5.6-r1 521
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index 4d5c9331a820..d639b55b6818 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -41,14 +41,14 @@ EBUILD kdebase-3.5.5-r3.ebuild 6043 RMD160 89340896ed7e34a4fa23994001746bb4b6571
 MD5 48792113ed02e4f784ab914387bc946d kdebase-3.5.5-r3.ebuild 6043
 RMD160 89340896ed7e34a4fa23994001746bb4b6571248 kdebase-3.5.5-r3.ebuild 6043
 SHA256 3755fd2abaca9cea5e7bedbb0b6c35980e081459761fb6c9a260edc663f1b934 kdebase-3.5.5-r3.ebuild 6043
-EBUILD kdebase-3.5.6-r1.ebuild 5814 RMD160 13414835db1fa9cffd572aac334d11f4c98782d4 SHA1 85631cd787e6268d31973ef2c2a373741e0dbe5e SHA256 473471fcea1bb48cdc188e32d55754e14fcc118dc3eb6964007bd6f3e8456922
-MD5 c7612873f743a53adf0e118203ac8acf kdebase-3.5.6-r1.ebuild 5814
-RMD160 13414835db1fa9cffd572aac334d11f4c98782d4 kdebase-3.5.6-r1.ebuild 5814
-SHA256 473471fcea1bb48cdc188e32d55754e14fcc118dc3eb6964007bd6f3e8456922 kdebase-3.5.6-r1.ebuild 5814
-MISC ChangeLog 60130 RMD160 b55e8bfcee9ff637b98acb0b3f994a4ca3968274 SHA1 206bb0896a02507684986354b6c1911f5743fb05 SHA256 6932700ce4bbde878f4477addc26be29d27f4232b77e5d6f41455cef32cf6d40
-MD5 af2bc9e1b25402219881f8381c1b112e ChangeLog 60130
-RMD160 b55e8bfcee9ff637b98acb0b3f994a4ca3968274 ChangeLog 60130
-SHA256 6932700ce4bbde878f4477addc26be29d27f4232b77e5d6f41455cef32cf6d40 ChangeLog 60130
+EBUILD kdebase-3.5.6-r1.ebuild 6114 RMD160 4385e70b76213dd0ce4cb792676b8fafc3b1c2bb SHA1 cd3a5e56e067cc3e6ba0a662c927091f1212dcdf SHA256 82aa44c59dc5e829cc216094bc005c24ab7e190074f91f7de4a53d8cb163e23f
+MD5 283c96acb3f631b8568d6d79a076f328 kdebase-3.5.6-r1.ebuild 6114
+RMD160 4385e70b76213dd0ce4cb792676b8fafc3b1c2bb kdebase-3.5.6-r1.ebuild 6114
+SHA256 82aa44c59dc5e829cc216094bc005c24ab7e190074f91f7de4a53d8cb163e23f kdebase-3.5.6-r1.ebuild 6114
+MISC ChangeLog 60228 RMD160 8fa0ff23b3bbe4bc22c2f45feb91f397757fdb8e SHA1 80c921c0e2891b1388f13d6e0c356671d8e5d7c6 SHA256 8fd74bcd3d81aa6d2070980adce786fe9e6034cca4abb982ecedc90857a9b1ef
+MD5 9acb0b18e65bc5479ecccd5352ecbb3d ChangeLog 60228
+RMD160 8fa0ff23b3bbe4bc22c2f45feb91f397757fdb8e ChangeLog 60228
+SHA256 8fd74bcd3d81aa6d2070980adce786fe9e6034cca4abb982ecedc90857a9b1ef ChangeLog 60228
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
diff --git a/kde-base/kdesktop/ChangeLog b/kde-base/kdesktop/ChangeLog
index 3728188defbd..f19723cb2aa3 100644
--- a/kde-base/kdesktop/ChangeLog
+++ b/kde-base/kdesktop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdesktop
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.87 2007/02/09 15:31:21 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/ChangeLog,v 1.88 2007/04/15 22:46:08 carlo Exp $
+
+*kdesktop-3.5.6-r1 (15 Apr 2007)
+
+  15 Apr 2007; Carsten Lohrke <carlo@gentoo.org> +kdesktop-3.5.6-r1.ebuild:
+  Fix bug #143375.
 
   09 Feb 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   kdesktop-3.5.5-r1.ebuild:
diff --git a/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r1 b/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r1
new file mode 100644
index 000000000000..7f2b669fe56f
--- /dev/null
+++ b/kde-base/kdesktop/files/digest-kdesktop-3.5.6-r1
@@ -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 a53f589f58012e655a52220a6a151019 kdebase-3.5.6.tar.bz2 24155599
+RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c kdebase-3.5.6.tar.bz2 24155599
+SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e kdebase-3.5.6.tar.bz2 24155599
diff --git a/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild b/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild
new file mode 100644
index 000000000000..6f6b0f7480b2
--- /dev/null
+++ b/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdesktop/kdesktop-3.5.6-r1.ebuild,v 1.1 2007/04/15 22:46:08 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="KDesktop is the KDE interface that handles the icons, desktop popup menus and the screensaver system."
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="kdehiddenvisibility xscreensaver"
+
+DEPEND="$(deprange $PV $MAXKDEVER kde-base/libkonq)
+	$(deprange $PV $MAXKDEVER kde-base/kcontrol)
+	xscreensaver? ( || ( x11-proto/scrnsaverproto <virtual/x11-7 ) )"
+	# Requires the desktop background settings module,
+	# so until we separate the kcontrol modules into separate ebuilds :-),
+	# there's a dep here
+RDEPEND="${DEPEND}
+	$(deprange $PV $MAXKDEVER kde-base/kcheckpass)
+	$(deprange 3.5.5 $MAXKDEVER kde-base/kdialog)
+	$(deprange $PV $MAXKDEVER kde-base/konqueror)
+	xscreensaver? ( || ( x11-libs/libXScrnSaver <virtual/x11-7 ) )"
+
+KMCOPYLIB="libkonq libkonq/"
+KMEXTRACTONLY="kcheckpass/kcheckpass.h
+	libkonq/
+	kdm/kfrontend/themer/
+	kioslave/thumbnail/configure.in.in" # for the HAVE_LIBART test
+KMCOMPILEONLY="kcontrol/background
+	kdmlib/"
+KMNODOCS=true
+
+PATCHES="${FILESDIR}/${PN}-3.5.5-seli-xinerama.patch"
+
+src_unpack() {
+	kde-meta_src_unpack
+	# see bug #143375
+	sed  -e "s:SUBDIRS = . lock pics patterns programs init:SUBDIRS = . lock pics patterns programs:" \
+		-i kdesktop/Makefile.am
+}
+src_compile() {
+	myconf="${myconf} $(use_with xscreensaver)"
+	kde-meta_src_compile
+}
+
+src_install() {
+	# ugly, needs fixing: don't install kcontrol/background
+	kde-meta_src_install
+
+	rmdir "${D}/${PREFIX}/share/templates/.source/emptydir"
+}
+
+pkg_postinst() {
+	mkdir -p "${PREFIX}/share/templates/.source/emptydir"
+}