Excluded problematic patches. Fixes bug 196507.

Package-Manager: portage-2.1.3.15

4 files changed, 29 insertions, 34 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index 947f479ab522..1a511aa3b2f3 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.395 2007/10/19 22:18:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.396 2007/10/20 12:40:42 philantrop Exp $
+
+  20 Oct 2007; Wulf C. Krueger <philantrop@gentoo.org> kdebase-3.5.8.ebuild:
+  Excluded problematic patches. Fixes bug 196507.
 
 *kdebase-3.5.8 (19 Oct 2007)
 
diff --git a/kde-base/kdebase/Manifest b/kde-base/kdebase/Manifest
index db36ebe690b9..bef971ad1636 100644
--- a/kde-base/kdebase/Manifest
+++ b/kde-base/kdebase/Manifest
@@ -73,7 +73,7 @@ DIST kdebase-3.5-patchset-07.tar.bz2 22868 RMD160 37e81cd0bc3943cbbdc100634d79a8
 DIST kdebase-3.5.5.tar.bz2 23851886 RMD160 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 SHA1 f9f1907ce71fd2f934cf7404f1db1d350c2b9544 SHA256 f77632e44214648e2d0adfe1a79dd61a6a738c21fe5abb0baff16b72432baaa0
 DIST kdebase-3.5.6.tar.bz2 24155599 RMD160 d3cbdcd148ea4c08d254f48faa10fc693517394c SHA1 0b37cae9637692c123a28c405dea8540e6b935c5 SHA256 245b35f8b2e1533f9ae92b3b07bee5339a716dfb8db363d0126d2e7409b7bd7e
 DIST kdebase-3.5.7.tar.bz2 24395088 RMD160 f43070b5428c3099c0abceed56041e5b4ff3c656 SHA1 833a35e4bbec2852f0f5267e680590be0c986594 SHA256 3c6d739abefc55b6cb64e1cf37b79f5993b666a5b40492471754794416b5c28d
-DIST kdebase-3.5.8.tar.bz2 2501632 RMD160 718e72b4b990eea04763298cadae9e7103ae1808 SHA1 926670b01c4c0c767aecabc4b30dc7a1f0f6e348 SHA256 90f5070737c638c3a0cbce416ae2cfd471140ca4108056c8f8a3449b951f22dd
+DIST kdebase-3.5.8.tar.bz2 24200172 RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea SHA1 07f2e33aef101e97237676719ef2bf8418d894b2 SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493
 EBUILD kdebase-3.5.5-r1.ebuild 5818 RMD160 09cdea68dc41b597c3a9719e43336b1d77cd5148 SHA1 3bb06df79f5601c23102c8cd129bb012454b6308 SHA256 2eb1f965409f5c97087eb3c0302f90ab04f04d9bf258fd6898ee770d19b8c206
 MD5 1faefc1c0f5904c52edf6e26d49df7ff kdebase-3.5.5-r1.ebuild 5818
 RMD160 09cdea68dc41b597c3a9719e43336b1d77cd5148 kdebase-3.5.5-r1.ebuild 5818
@@ -122,14 +122,14 @@ EBUILD kdebase-3.5.7.ebuild 6847 RMD160 1590a7650da88fe4f803bca917607486c359ce60
 MD5 6a4ddfc4f66484c756001dc2b3442d5d kdebase-3.5.7.ebuild 6847
 RMD160 1590a7650da88fe4f803bca917607486c359ce60 kdebase-3.5.7.ebuild 6847
 SHA256 2d99aa76a3685bf1a3b734fb7653a99aeee5e110721ba668ed180b8691f84a2a kdebase-3.5.7.ebuild 6847
-EBUILD kdebase-3.5.8.ebuild 7291 RMD160 786190234f7c00dbbcd66bbc932d53c977d043ec SHA1 a9eac308e3f35a6cbd46139dfe6a9db9eda36b6b SHA256 aa6be054e45f0b2885685c58f78fd50d6359d94fc385bfdb47316687631ee93e
-MD5 47d3ef33a40c5b3b7ed5b6493ffa88d9 kdebase-3.5.8.ebuild 7291
-RMD160 786190234f7c00dbbcd66bbc932d53c977d043ec kdebase-3.5.8.ebuild 7291
-SHA256 aa6be054e45f0b2885685c58f78fd50d6359d94fc385bfdb47316687631ee93e kdebase-3.5.8.ebuild 7291
-MISC ChangeLog 66766 RMD160 c4d5e717647d231222bcc53178f61186f2dbd0b4 SHA1 a9ebe86484e79cb4aac42c4381996ff3ce66d15a SHA256 8e70c07286720282ee765746500f231bc5cff147a432895466d38c30b0a3a101
-MD5 6a85cda897b7a056bd8f3b01a917331a ChangeLog 66766
-RMD160 c4d5e717647d231222bcc53178f61186f2dbd0b4 ChangeLog 66766
-SHA256 8e70c07286720282ee765746500f231bc5cff147a432895466d38c30b0a3a101 ChangeLog 66766
+EBUILD kdebase-3.5.8.ebuild 7057 RMD160 a36be048cfc1e5c3e541144f620602a936f7e194 SHA1 4b2778672c2923e1c4307a8cb987219d0547ada0 SHA256 4d570c37aebc295654cce5682d5267da3d6b2c48a2e25123d6e8f6f041589a86
+MD5 187b9f9ba2b4ff6d54c9f1964f584beb kdebase-3.5.8.ebuild 7057
+RMD160 a36be048cfc1e5c3e541144f620602a936f7e194 kdebase-3.5.8.ebuild 7057
+SHA256 4d570c37aebc295654cce5682d5267da3d6b2c48a2e25123d6e8f6f041589a86 kdebase-3.5.8.ebuild 7057
+MISC ChangeLog 66894 RMD160 01080c2d245c27febcf9cc1c3e56382ec97873e5 SHA1 91e9b8951ec60afd7b83f990d43fb98cbf859caf SHA256 110c15841bee689fd56eea94dd30a2b107e8d8a43da11923604b51bad948ddd1
+MD5 f28a37c9f1fab3ef36acb56ba94f484f ChangeLog 66894
+RMD160 01080c2d245c27febcf9cc1c3e56382ec97873e5 ChangeLog 66894
+SHA256 110c15841bee689fd56eea94dd30a2b107e8d8a43da11923604b51bad948ddd1 ChangeLog 66894
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -170,13 +170,13 @@ SHA256 b2ab263435b90f12fd375094bcf566dd243d79fac6262318859828f5dcdcd01c files/di
 MD5 91031e1db8acedf8afd843e7ba6b0a2b files/digest-kdebase-3.5.7-r4 521
 RMD160 24faa4a41734d82086e89a067beb842df88fef78 files/digest-kdebase-3.5.7-r4 521
 SHA256 b2ab263435b90f12fd375094bcf566dd243d79fac6262318859828f5dcdcd01c files/digest-kdebase-3.5.7-r4 521
-MD5 5d86f5a3559f8272a235935d7cc0f38f files/digest-kdebase-3.5.8 518
-RMD160 904772f7f197ce4f6517b45a59b0ab6e5e05e251 files/digest-kdebase-3.5.8 518
-SHA256 b2efaffc7cef7e5e9cf7f18712f38c7d3588f2bcde60554ddd8f4b9d41da138f files/digest-kdebase-3.5.8 518
+MD5 eec70bee63e8bcfd158f0f2bf824f107 files/digest-kdebase-3.5.8 521
+RMD160 f22d489d2345df03e9226ad9a8580f5b7e8f7efe files/digest-kdebase-3.5.8 521
+SHA256 e9eb779c6a6a1a3ed40fc91cad12baadc95c34ec483c25806ffb3145db6f09da files/digest-kdebase-3.5.8 521
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHGS1XCkvF58q80IkRAjsTAJ9D79tINsDQt+wwf8FLq97UpaLuqgCdFeto
-+JAVv8upZt2FuetzD7rn1H8=
-=a7Yx
+iD8DBQFHGfdhCkvF58q80IkRApufAJ9xnuk6ZM06flbg2hS5gYsGnrVNAQCffy1f
+/6zMKDDmgqEMAPXVqj9Se6s=
+=Pver
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdebase/files/digest-kdebase-3.5.8 b/kde-base/kdebase/files/digest-kdebase-3.5.8
index 0526176ce932..f0fb6455d46c 100644
--- a/kde-base/kdebase/files/digest-kdebase-3.5.8
+++ b/kde-base/kdebase/files/digest-kdebase-3.5.8
@@ -1,6 +1,6 @@
 MD5 9a0c6a4983427e41226dee8d0ce23369 kdebase-3.5-patchset-07.tar.bz2 22868
 RMD160 37e81cd0bc3943cbbdc100634d79a8eeed73503b kdebase-3.5-patchset-07.tar.bz2 22868
 SHA256 fca283e0719231b0716f333034e29727b4d1e1f30cead4e1ae1bca330f00c81b kdebase-3.5-patchset-07.tar.bz2 22868
-MD5 10950c172c1d9529c621a000c6b39d10 kdebase-3.5.8.tar.bz2 2501632
-RMD160 718e72b4b990eea04763298cadae9e7103ae1808 kdebase-3.5.8.tar.bz2 2501632
-SHA256 90f5070737c638c3a0cbce416ae2cfd471140ca4108056c8f8a3449b951f22dd kdebase-3.5.8.tar.bz2 2501632
+MD5 9990c669229daaaa8fca4c5e354441fd kdebase-3.5.8.tar.bz2 24200172
+RMD160 6441b5eaead5fff5c42c532fb11c0d37001cb6ea kdebase-3.5.8.tar.bz2 24200172
+SHA256 0f1876d1c68f01ed8fee346c1bae4f53dd2c1dc56db94e309b3d1adfc6138493 kdebase-3.5.8.tar.bz2 24200172
diff --git a/kde-base/kdebase/kdebase-3.5.8.ebuild b/kde-base/kdebase/kdebase-3.5.8.ebuild
index 361ab81e05ea..0ac2abd485d5 100644
--- a/kde-base/kdebase/kdebase-3.5.8.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.8.ebuild,v 1.1 2007/10/19 22:18:41 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.8.ebuild,v 1.2 2007/10/20 12:40:42 philantrop Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="${SRC_URI}
 DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror..."
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="branding cups dbus java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
+IUSE="branding cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
 pam samba xcomposite xscreensaver xinerama kdehiddenvisibility"
 
 # hal: enables hal backend for 'media:' ioslave
@@ -37,9 +37,7 @@ DEPEND=">=media-libs/freetype-2
 	x11-libs/libXtst
 	x11-libs/libXext
 	xscreensaver? ( x11-libs/libXScrnSaver )
-	xinerama? ( x11-libs/libXinerama )
-	dbus? ( sys-apps/dbus )
-	hal? ( sys-apps/hal )"
+	xinerama? ( x11-libs/libXinerama )"
 
 RDEPEND="${DEPEND}
 	sys-apps/usbutils
@@ -67,6 +65,9 @@ DEPEND="${DEPEND}
 
 need-kde 3.5.8
 
+EPATCH_EXCLUDE="ksmserver-3.5.8-ksmserver_suspend.diff
+				ksmserver-3.5.8-suspend_configure.diff"
+
 pkg_setup() {
 	kde_pkg_setup
 	if use hal && has_version '<sys-apps/dbus-0.90' && ! built_with_use sys-apps/dbus qt3; then
@@ -113,9 +114,7 @@ src_compile() {
 					$(use_with samba)
 					$(use_with xcomposite composite)
 					$(use_with xinerama)
-					$(use_with xscreensaver)
-					$(use_enable hal)
-					$(use_enable dbus)"
+					$(use_with xscreensaver)"
 
 	if ! use pam && use elibc_glibc; then
 		myconf="${myconf} --with-shadow"
@@ -221,11 +220,4 @@ pkg_postinst() {
 		elog "This is NOT a bug."
 		echo
 	fi
-	if use dbus && use hal ; then
-		echo
-		elog "If you don't see any icons next to the suspend/hibernate buttons,"
-		elog "make sure you use an iconset that provides the files"
-		elog "\"suspend.png\" and \"hibernate.png\"."
-		echo
-	fi
 }