Add patch to disable xscreensaver and add a useflag to map it with. Also fix modular x dependencies.

(Portage version: 2.1_pre5-r1)

3 files changed, 66 insertions, 7 deletions

diff --git a/net-im/kopete/ChangeLog b/net-im/kopete/ChangeLog
index 31c9d937b142..5e1b7aa52987 100644
--- a/net-im/kopete/ChangeLog
+++ b/net-im/kopete/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/kopete
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.50 2006/02/21 14:56:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/ChangeLog,v 1.51 2006/02/28 20:49:42 flameeyes Exp $
+
+  28 Feb 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kopete-0.12_alpha1-xscreensaver.patch, kopete-0.12_alpha1.ebuild:
+  Add patch to disable xscreensaver and add a useflag to map it with. Also fix
+  modular x dependencies.
 
 *kopete-0.12_alpha1 (21 Feb 2006)
 
diff --git a/net-im/kopete/files/kopete-0.12_alpha1-xscreensaver.patch b/net-im/kopete/files/kopete-0.12_alpha1-xscreensaver.patch
new file mode 100644
index 000000000000..2052d30cb450
--- /dev/null
+++ b/net-im/kopete/files/kopete-0.12_alpha1-xscreensaver.patch
@@ -0,0 +1,25 @@
+Index: kopete-0.12-alpha1/kopete/libkopete/configure.in.in
+===================================================================
+--- kopete-0.12-alpha1.orig/kopete/libkopete/configure.in.in
++++ kopete-0.12-alpha1/kopete/libkopete/configure.in.in
+@@ -4,7 +4,11 @@ LDFLAGS="$X_LDFLAGS"
+ 
+ LIB_XSS=
+ 
+-KDE_CHECK_HEADER(X11/extensions/scrnsaver.h,
++AC_ARG_WITH([xscreensaver],
++  AC_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,
+ 	[
+@@ -27,6 +31,7 @@ KDE_CHECK_HEADER(X11/extensions/scrnsave
+      [
+      #include <X11/Xlib.h>
+      ] )
++fi
+ 
+ AC_SUBST(LIB_XSS)
+ LDFLAGS="$xss_save_ldflags"
diff --git a/net-im/kopete/kopete-0.12_alpha1.ebuild b/net-im/kopete/kopete-0.12_alpha1.ebuild
index b9632f3bfb22..9015371398ab 100644
--- a/net-im/kopete/kopete-0.12_alpha1.ebuild
+++ b/net-im/kopete/kopete-0.12_alpha1.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/net-im/kopete/kopete-0.12_alpha1.ebuild,v 1.1 2006/02/21 14:56:59 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/kopete/kopete-0.12_alpha1.ebuild,v 1.2 2006/02/28 20:49:43 flameeyes Exp $
 
 inherit kde eutils
 
@@ -11,29 +11,58 @@ HOMEPAGE="http://kopete.kde.org/"
 LICENSE="GPL-2"
 
 KEYWORDS="~amd64"
-IUSE="sametime ssl xmms"
+IUSE="sametime ssl xmms xscreensaver"
 
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 S="${WORKDIR}/${MY_P}"
 
-DEPEND="dev-libs/libxslt
+# The kernel_linux? ( ) conditional dependencies are for webcams, not supported
+# on other kernels AFAIK
+BOTH_DEPEND="dev-libs/libxslt
 	dev-libs/libxml2
+	net-dns/libidn
 	>=dev-libs/glib-2
+	app-crypt/qca
 	sametime? ( =net-libs/meanwhile-0.4* )
-	xmms? ( media-sound/xmms )"
-RDEPEND="$DEPEND
+	xmms? ( media-sound/xmms )
+	|| ( (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender
+		xscreensaver? ( x11-libs/libXScrnSaver )
+		) virtual/x11 )
+	kernel_linux? ( virtual/opengl )"
+
+RDEPEND="${BOTH_DEPEND}
 	ssl? ( app-crypt/qca-tls )
 	!kde-base/kopete"
 
+DEPEND="${BOTH_DEPEND}
+	kernel_linux? ( virtual/os-headers )
+	|| ( (
+			x11-proto/videoproto
+			x11-proto/xextproto
+			x11-proto/xproto
+			kernel_linux? ( x11-libs/libXv )
+			xscreensaver? ( x11-proto/scrnsaverproto )
+		) virtual/x11 )"
+
 need-kde 3.4
 
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}/${P}-xscreensaver.patch"
+	rm -f ${S}/configure
+}
+
 src_compile() {
 	# External libgadu support - doesn't work, kopete requires a specific development snapshot of libgadu.
 	# Maybe we can enable it in the future.
 	# The nowlistening plugin has xmms support.
 	local myconf="$(use_enable sametime sametime-plugin)
-	              $(use_with xmms) --without-external-libgadu"
+	              $(use_with xmms) --without-external-libgadu
+	              $(use_with xscreensaver)"
 
 	kde_src_compile
 }