Add patch to disable libxss support conditional to xscreensaver useflag.

(Portage version: 2529-svn)

3 files changed, 44 insertions, 3 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index b70199c037bc..2ee590d4299d 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.249 2006/01/11 19:26:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.250 2006/01/11 19:58:40 flameeyes Exp $
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kdesktop-3.5.0-xscreensaver.patch, kdebase-3.5.0-r1.ebuild:
+  Add patch to disable libxss support conditional to xscreensaver useflag.
 
   11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   +files/kwin-3.5.0-composite.patch, kdebase-3.5.0-r1.ebuild:
diff --git a/kde-base/kdebase/files/kdesktop-3.5.0-xscreensaver.patch b/kde-base/kdebase/files/kdesktop-3.5.0-xscreensaver.patch
new file mode 100644
index 000000000000..ee427436837b
--- /dev/null
+++ b/kde-base/kdebase/files/kdesktop-3.5.0-xscreensaver.patch
@@ -0,0 +1,25 @@
+Index: kdebase-3.5.0/kdesktop/configure.in.in
+===================================================================
+--- kdebase-3.5.0/kdesktop/configure.in.in	(revision 497039)
++++ kdebase-3.5.0/kdesktop/configure.in.in	(working copy)
+@@ -3,7 +3,11 @@
+ 
+ LIB_XSS=
+ 
+-KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
++AC_ARG_WITH([xscreensaver],
++  AS_HELP_STRING([--without-xscreensaver], [Disable XScreenSaver support (default: check)]) )
++
++if test "x$with_xscreensaver" != "xno"; then
++  KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
+     [
+     AC_CHECK_LIB(Xext,XScreenSaverQueryInfo,
+ 	[
+@@ -29,6 +33,7 @@
+      [
+      #include <X11/Xlib.h>
+      ] )
++fi
+ 
+ AC_SUBST(LIB_XSS)
+ LDFLAGS="$xss_save_ldflags"
diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
index 726ddd84408b..0b0b6db33a9d 100644
--- a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.9 2006/01/11 19:29:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.10 2006/01/11 19:58:40 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="KDE base packages: the desktop, panel, window manager, konqueror...
 
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="arts cups java ldap ieee1394 hal lm_sensors logitech-mouse openexr opengl
-pam samba ssl zeroconf xcomposite"
+pam samba ssl zeroconf xcomposite xscreensaver"
 # hal: enables hal backend for 'media:' ioslave
 
 DEPEND="arts? ( ~kde-base/arts-${PV} )
@@ -42,6 +42,10 @@ RDEPEND="${DEPEND}
 			x11-libs/libXcomposite
 			x11-libs/libXdamage
 			) <=x11-base/xorg-x11-6.9 )
+		)
+	xscreensaver? ( || ( (
+			x11-libs/libXScrnSaver
+			) virtual/x11 )
 		)"
 
 DEPEND="${DEPEND}
@@ -50,6 +54,10 @@ DEPEND="${DEPEND}
 			x11-proto/damageproto
 			) <=x11-base/xorg-x11-6.9 )
 		)
+	xscreensaver? ( || ( (
+			x11-proto/scrnsaverproto
+			) virtual/x11 )
+		)
 	dev-util/pkgconfig"
 
 src_unpack() {
@@ -77,6 +85,9 @@ src_unpack() {
 	# Add --without-composite option to disable kompmgr.
 	epatch "${FILESDIR}/kwin-3.5.0-composite.patch"
 
+	# Add --without-xscreenserver option to disable libXSS support
+	epatch "${FILESDIR}/kdesktop-3.5.0-xscreensaver.patch"
+
 	# For the noimake patch.
 	make -f admin/Makefile.common || die
 }
@@ -90,6 +101,7 @@ src_compile() {
 	              $(use_with ieee1394 libraw1394) $(use_with hal)
 	              $(use_enable zeroconf dnssd)
 				  $(use_with xcomposite composite)
+				  $(use_with xscreensaver)
 				  --with-usbids=/usr/share/misc/usb.ids"
 
 	if use pam; then