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, 43 insertions, 14 deletions

diff --git a/kde-base/klaptopdaemon/ChangeLog b/kde-base/klaptopdaemon/ChangeLog
index a74bf6a74a4a..82262cd5c995 100644
--- a/kde-base/klaptopdaemon/ChangeLog
+++ b/kde-base/klaptopdaemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/klaptopdaemon
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.78 2007/05/25 13:48:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/ChangeLog,v 1.79 2007/05/28 20:07:33 philantrop Exp $
+
+  28 May 2007; Wulf C. Krueger <philantrop@gentoo.org>
+  +files/klaptopdaemon-3.5.7-libXss-linking.patch,
+  klaptopdaemon-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>
   klaptopdaemon-3.5.7.ebuild:
diff --git a/kde-base/klaptopdaemon/Manifest b/kde-base/klaptopdaemon/Manifest
index f9d91e3e36c8..e1754b98e541 100644
--- a/kde-base/klaptopdaemon/Manifest
+++ b/kde-base/klaptopdaemon/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 klaptopdaemon-3.5.6.ebuild 687 RMD160 e63eacec13ded5fe14630e6aac278a76e66
 MD5 15fb81b2a5c12d79c3bc57eba426a445 klaptopdaemon-3.5.6.ebuild 687
 RMD160 e63eacec13ded5fe14630e6aac278a76e6601e79 klaptopdaemon-3.5.6.ebuild 687
 SHA256 86a07e6144124bbcaf8c3a5e2d031d079e49dd4bfd8e49f1a093c256b56c23de klaptopdaemon-3.5.6.ebuild 687
-EBUILD klaptopdaemon-3.5.7.ebuild 730 RMD160 4fb4ce9876c9e8497ba38b971e4d95fde7e6eca3 SHA1 42c7947085d8f933014df1043ef1b14daee48cde SHA256 868c9864a0ca02e14eec0c5641c3e9b529a0028c4d8a5f11b6e32c10bba354c6
-MD5 c3ac81571863aac992c66da80203018d klaptopdaemon-3.5.7.ebuild 730
-RMD160 4fb4ce9876c9e8497ba38b971e4d95fde7e6eca3 klaptopdaemon-3.5.7.ebuild 730
-SHA256 868c9864a0ca02e14eec0c5641c3e9b529a0028c4d8a5f11b6e32c10bba354c6 klaptopdaemon-3.5.7.ebuild 730
-MISC ChangeLog 10497 RMD160 89422f728bb8ae99e4f90fe75dca6ced98d081ef SHA1 6376a44af8200de5fc96e7712937b4a4b5de16a5 SHA256 93267a13be458f948193fb2575f8264875182a892a795b8295a4915e52271f83
-MD5 67fa9a2ea8838fa5ea710c28df6fc12a ChangeLog 10497
-RMD160 89422f728bb8ae99e4f90fe75dca6ced98d081ef ChangeLog 10497
-SHA256 93267a13be458f948193fb2575f8264875182a892a795b8295a4915e52271f83 ChangeLog 10497
+EBUILD klaptopdaemon-3.5.7.ebuild 920 RMD160 a5282f7081941edd57a237422129e84457d9a501 SHA1 71930d1ac00ba918af9340603ecd98873ef6eaf1 SHA256 907e189a735662eff4f7293065a5166115bfa2089cc382cf7144171dc3235aa7
+MD5 f99f09405e519181cd16cd516cbcd957 klaptopdaemon-3.5.7.ebuild 920
+RMD160 a5282f7081941edd57a237422129e84457d9a501 klaptopdaemon-3.5.7.ebuild 920
+SHA256 907e189a735662eff4f7293065a5166115bfa2089cc382cf7144171dc3235aa7 klaptopdaemon-3.5.7.ebuild 920
+MISC ChangeLog 10761 RMD160 f5bb90b9fb5774a15cf59f5c5d8c44f0275f1afb SHA1 d6632b46ff0e90cb5f815c3a5803ce990c23b16f SHA256 14dda00fd48c93fa5d89dd40ad5ababc9b1dc2c32202dd1b4c3176c5efec0ae2
+MD5 40678b0b2c99f5112426906c003afcf0 ChangeLog 10761
+RMD160 f5bb90b9fb5774a15cf59f5c5d8c44f0275f1afb ChangeLog 10761
+SHA256 14dda00fd48c93fa5d89dd40ad5ababc9b1dc2c32202dd1b4c3176c5efec0ae2 ChangeLog 10761
 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)
 
-iD8DBQFGVukqntT9W3vfTuoRAuCaAJ45W6DBIxxEd4hbquJ5Y3zEj9pEBwCfX03L
-D8bBdmj10z1vPqHBKAAHQWk=
-=ow8g
+iD8DBQFGWzaNCkvF58q80IkRAifQAJwKYSDjkZbygVq8TaydfBptcmLBtACfS22J
+W64RPrhD6Tds4NKlQkVHlGE=
+=9Yrx
 -----END PGP SIGNATURE-----
diff --git a/kde-base/klaptopdaemon/files/klaptopdaemon-3.5.7-libXss-linking.patch b/kde-base/klaptopdaemon/files/klaptopdaemon-3.5.7-libXss-linking.patch
new file mode 100644
index 000000000000..190b7f95401e
--- /dev/null
+++ b/kde-base/klaptopdaemon/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/klaptopdaemon/klaptopdaemon-3.5.7.ebuild b/kde-base/klaptopdaemon/klaptopdaemon-3.5.7.ebuild
index 66a006b7279c..7e54ee122921 100644
--- a/kde-base/klaptopdaemon/klaptopdaemon-3.5.7.ebuild
+++ b/kde-base/klaptopdaemon/klaptopdaemon-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/klaptopdaemon/klaptopdaemon-3.5.7.ebuild,v 1.2 2007/05/25 13:48:14 cryos Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/klaptopdaemon/klaptopdaemon-3.5.7.ebuild,v 1.3 2007/05/28 20:07:33 philantrop Exp $
 
 KMNAME=kdeutils
 MAXKDEVER=$PV
@@ -12,13 +12,21 @@ SRC_URI="${SRC_URI}
 
 DESCRIPTION="KLaptopdaemon - KDE battery monitoring and management for laptops."
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="kdehiddenvisibility"
+IUSE="kdehiddenvisibility xscreensaver"
 
 RDEPEND="x11-libs/libXtst"
 
 DEPEND="${RDEPEND}
+	xscreensaver? ( x11-libs/libXScrnSaver )
 	x11-libs/libX11
 	x11-proto/xproto
 	virtual/os-headers"
 
+PATCHES="${FILESDIR}/${P}-libXss-linking.patch"
 EPATCH_EXCLUDE="klaptopdaemon-3.5-suspend2+xsession-errors.diff"
+
+src_compile() {
+	myconf="${myconf} $(use_with xscreensaver)"
+
+	kde_src_compile
+}