Added patches from bug 179905 to allow for building with libXScrnSaver. Thanks, pva and jmbsvicetto, for the patches.

Package-Manager: portage-2.1.2.7

4 files changed, 38 insertions, 15 deletions

diff --git a/kde-base/kdeutils/ChangeLog b/kde-base/kdeutils/ChangeLog
index 76599e60b13d..68aa93aa4a3c 100644
--- a/kde-base/kdeutils/ChangeLog
+++ b/kde-base/kdeutils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kdeutils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.201 2007/05/25 13:53:18 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/ChangeLog,v 1.202 2007/05/28 22:23:26 philantrop Exp $
+
+  28 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/klaptopdaemon-3.5.7-libXss-linking.patch, kdeutils-3.5.7.ebuild:
+  Added patches from bug 179905 to allow for building with libXScrnSaver.
+  Thanks, pva and jmbsvicetto, for the patches.
 
   25 May 2007; Marcus D. Hanwell <cryos@gentoo.org> kdeutils-3.5.7.ebuild:
   Exclude obsolete patch that no longer applies cleanly. Closes bug 179553.
diff --git a/kde-base/kdeutils/Manifest b/kde-base/kdeutils/Manifest
index c781d5882930..c0d614296479 100644
--- a/kde-base/kdeutils/Manifest
+++ b/kde-base/kdeutils/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX klaptopdaemon-3.5.7-libXss-linking.patch 629 RMD160 49f69d98b3addf18d264aba8f10f7286e8726a20 SHA1 892b9b6178ba8667d771cdfbb12f9a96a5ad2336 SHA256 356c94da4a3e4c94c0097d65db4dc6203d582dacf225b87c4181f554031ad80b
+MD5 98d40e51d61be53e054fcd4d608fb590 files/klaptopdaemon-3.5.7-libXss-linking.patch 629
+RMD160 49f69d98b3addf18d264aba8f10f7286e8726a20 files/klaptopdaemon-3.5.7-libXss-linking.patch 629
+SHA256 356c94da4a3e4c94c0097d65db4dc6203d582dacf225b87c4181f554031ad80b files/klaptopdaemon-3.5.7-libXss-linking.patch 629
 DIST kdeutils-3.5-patchset-01.tar.bz2 2746 RMD160 e452bd68da2a58df5a796c325915745631d64a0e SHA1 a4b2e7718dcc3c42da1ccf122f6b1b944102a0b8 SHA256 271b4a355c17cbe010aa49799c78773773e14065a15afdd3654b0a5e7eba6892
 DIST kdeutils-3.5-patchset-02.tar.bz2 3019 RMD160 b4598488995ed7dc7a86349cd68da426e2238773 SHA1 37542dd16a3e66b69b2f960805d65dc4a04fd266 SHA256 54ddfbec990e3bff3139abf42755be24a450a8969eb77d41a5b0da4dc72580d6
 DIST kdeutils-3.5.5.tar.bz2 2988542 RMD160 28ba45da550fd81f2ff9670cc0a98f7d965c3e92 SHA1 9f81cf7987e23b12861635cfeb69dc46f87f050f SHA256 38914c84c8829ba7beb8a0e0c0ef8b4c7eee29b588c6529ff39c0bc0370f0457
@@ -18,14 +22,14 @@ EBUILD kdeutils-3.5.6.ebuild 1183 RMD160 b3495e5f7e638411911172c57fe7dcdbec9c865
 MD5 e1275d672e07c682216ea3cced95ba78 kdeutils-3.5.6.ebuild 1183
 RMD160 b3495e5f7e638411911172c57fe7dcdbec9c865d kdeutils-3.5.6.ebuild 1183
 SHA256 41dfacc22d6447a37b78d0ecd9ddb3d80c4b601c3ace6950d4d3410c634b923f kdeutils-3.5.6.ebuild 1183
-EBUILD kdeutils-3.5.7.ebuild 1249 RMD160 0f233f4cb2d6667afa1593f13f34ee27d62989d6 SHA1 c20846c1bf409a9ddf46f0f885dd2ceff061fe7b SHA256 586d8107b6ecea676f4588ecbcefd84db3042830fa32f18c730622252f3eb0d7
-MD5 242c32b55300073c2dde7ddab8637b0c kdeutils-3.5.7.ebuild 1249
-RMD160 0f233f4cb2d6667afa1593f13f34ee27d62989d6 kdeutils-3.5.7.ebuild 1249
-SHA256 586d8107b6ecea676f4588ecbcefd84db3042830fa32f18c730622252f3eb0d7 kdeutils-3.5.7.ebuild 1249
-MISC ChangeLog 23803 RMD160 2f165bf93f52432d05e4179a2a3f441c3ee9d561 SHA1 d72520cc614afae0411b4b0d8c6f891ffef92573 SHA256 515e3cf89881bb79463dc619c241fb289c6371ebd41e6da0b7edc8ff6ec65b90
-MD5 b45fcf96595256e3a7dcac0e93221fdc ChangeLog 23803
-RMD160 2f165bf93f52432d05e4179a2a3f441c3ee9d561 ChangeLog 23803
-SHA256 515e3cf89881bb79463dc619c241fb289c6371ebd41e6da0b7edc8ff6ec65b90 ChangeLog 23803
+EBUILD kdeutils-3.5.7.ebuild 1416 RMD160 f60d5172b7d4f44279882076c6bdb6aa562e9d33 SHA1 0f66bb36db2835199a932cdaa1a3c54d4b3864d5 SHA256 63a35e6e660030ba873b38d27e1527819107a7df605293115ff9d8591c2044bf
+MD5 9dfdffdf152a7c23493ae48c4c2241a3 kdeutils-3.5.7.ebuild 1416
+RMD160 f60d5172b7d4f44279882076c6bdb6aa562e9d33 kdeutils-3.5.7.ebuild 1416
+SHA256 63a35e6e660030ba873b38d27e1527819107a7df605293115ff9d8591c2044bf kdeutils-3.5.7.ebuild 1416
+MISC ChangeLog 24060 RMD160 b4e73a2d8604024f3e6765e39a12edf0af49993c SHA1 eb5a14c1b560f893d3087b71a682f2a46db34c27 SHA256 0d7451796532c3d6f342a888a65a5fb4c003ac0072b954c79522d0070e14ea7b
+MD5 e07bd5ac95528293dda40116e8a6d27f ChangeLog 24060
+RMD160 b4e73a2d8604024f3e6765e39a12edf0af49993c ChangeLog 24060
+SHA256 0d7451796532c3d6f342a888a65a5fb4c003ac0072b954c79522d0070e14ea7b ChangeLog 24060
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 metadata.xml 156
@@ -45,7 +49,7 @@ SHA256 bbc34c0763584ef1da811fb4b3dee8d9a0bed32b306d649b67dfdb14b83485fa files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVupVntT9W3vfTuoRAmy1AKCxicSJp1u6obcL02aGLQmUFqGEXwCffLfq
-cQMu8HIXD874DSw3DlFXtcQ=
-=Vt1X
+iD8DBQFGW1ZlCkvF58q80IkRAsMrAJ4nhsVDYE6cBnYVNwFcFW2XFLlK9QCfRsMM
+2S8q9rFHW7exW8fG4dNMR3A=
+=hQU2
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch b/kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch
new file mode 100644
index 000000000000..190b7f95401e
--- /dev/null
+++ b/kde-base/kdeutils/files/klaptopdaemon-3.5.7-libXss-linking.patch
@@ -0,0 +1,11 @@
+--- ./klaptopdaemon/Makefile.am.orig	2007-05-27 19:35:43.000000000 +0400
++++ ./klaptopdaemon/Makefile.am	2007-05-27 19:41:26.000000000 +0400
+@@ -10,7 +10,7 @@
+ MESSAGE_SOURCES = laptop_daemon.cpp kpcmcia.cpp xautolock.cc kpcmciainfo.cpp daemondock.cpp xautolock_diy.c xautolock_engine.c
+ kded_klaptopdaemon_la_SOURCES = $(MESSAGE_SOURCES) laptop_daemon.skel  
+ kded_klaptopdaemon_la_LDFLAGS = $(all_libraries) -module -avoid-version  -lXtst
+-kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) libkcmlaptop.la
++kded_klaptopdaemon_la_LIBADD   = $(LIB_KDEUI) libkcmlaptop.la $(LIB_XSS)
+ 
+ klaptop_acpi_helper_SOURCES = acpi_helper.cpp
+ 
diff --git a/kde-base/kdeutils/kdeutils-3.5.7.ebuild b/kde-base/kdeutils/kdeutils-3.5.7.ebuild
index 843c6c374e3e..2e2285a94635 100644
--- a/kde-base/kdeutils/kdeutils-3.5.7.ebuild
+++ b/kde-base/kdeutils/kdeutils-3.5.7.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/kdeutils/kdeutils-3.5.7.ebuild,v 1.2 2007/05/25 13:53:18 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdeutils/kdeutils-3.5.7.ebuild,v 1.3 2007/05/28 22:23:26 philantrop Exp $
 
 inherit kde-dist eutils
 
@@ -10,7 +10,7 @@ SRC_URI="${SRC_URI}
 DESCRIPTION="KDE utilities."
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="crypt kdehiddenvisibility pbbuttonsd snmp"
+IUSE="crypt kdehiddenvisibility pbbuttonsd snmp xscreensaver"
 
 BOTH_DEPEND="~kde-base/kdebase-${PV}
 	snmp? ( net-analyzer/net-snmp )
@@ -24,10 +24,12 @@ RDEPEND="${BOTH_DEPEND}
 	!x11-misc/superkaramba"
 
 DEPEND="${BOTH_DEPEND}
+	xscreensaver? ( x11-libs/libXScrnSaver )
 	x11-libs/libX11
 	x11-proto/xproto
 	virtual/os-headers"
 
+PATCHES="${FILESDIR}/klaptopdaemon-3.5.7-libXss-linking.patch"
 EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff"
 
 src_unpack() {
@@ -37,7 +39,8 @@ src_unpack() {
 
 src_compile() {
 	local myconf="$(use_with snmp) $(use_with pbbuttonsd powerbook)
-				  --without-xmms"
+					--without-xmms"
+	myconf="${myconf} $(use_with xscreensaver)"
 
 	use crypt || export DO_NOT_COMPILE="${DO_NOT_COMPILE} kgpg"