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

Package-Manager: portage-2.1_pre5-r1

4 files changed, 78 insertions, 16 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/Manifest b/net-im/kopete/Manifest
index bd8956caaf87..66bd9ceda68c 100644
--- a/net-im/kopete/Manifest
+++ b/net-im/kopete/Manifest
@@ -1,22 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 6641e76c4272fea1e282e0d922ab53bf ChangeLog 466
-RMD160 932ee552a1726e8837f62e8067ca4ebe3d4c3f0d ChangeLog 466
-SHA256 990075a6918e78567844a883066321571cdb6299d5df631ea5cf520038b3f496 ChangeLog 466
+MD5 d1cd8a130dde4f16e578c50ed8b09187 ChangeLog 700
+RMD160 d71c7ba8aa6883bf80de9c1193703af4bc27cfc1 ChangeLog 700
+SHA256 2cbcb81a33d50708b36979cb703dca28ff5f1362738559153334c45096a5edd8 ChangeLog 700
 MD5 2bb6391984e53ddbe3c8c9de934bfd0d files/digest-kopete-0.12_alpha1 262
 RMD160 1c5fb4556e6ae2ed77df50e392b985a1861f4bb7 files/digest-kopete-0.12_alpha1 262
 SHA256 5358f4ff86350539ce50fceb27dbafdda7513fe3cef9b588b8b25877f24c08b6 files/digest-kopete-0.12_alpha1 262
-MD5 96da63e66c003864f409b8543ef63d43 kopete-0.12_alpha1.ebuild 1028
-RMD160 b3c9e1ad917a42c5c9694073cf58fab117ca79dc kopete-0.12_alpha1.ebuild 1028
-SHA256 ffef7eebbba0bc8c36b6f3f2e8eb8e6769ff265f0cbb7ea91ca7693ab538e748 kopete-0.12_alpha1.ebuild 1028
+MD5 638d3cc679fc614b53fbeff0c41aa05c files/kopete-0.12_alpha1-xscreensaver.patch 778
+RMD160 d188f074982191f6f961c7e32ec97a79746e73df files/kopete-0.12_alpha1-xscreensaver.patch 778
+SHA256 2152d2d2d1ed29b986d5b7f80a6f7bcabd56e5580146298973b4114353b5686d files/kopete-0.12_alpha1-xscreensaver.patch 778
+MD5 41f2829e280c45903652efb9a55aa831 kopete-0.12_alpha1.ebuild 1732
+RMD160 c83396b5b59caaf8517c5b9472630ee9a26f62c6 kopete-0.12_alpha1.ebuild 1732
+SHA256 91dfb9ba4ba1ae4e3c0d1e028fc97f03712ac098885d595c555b8674d903db44 kopete-0.12_alpha1.ebuild 1732
 MD5 64e213d0db015eb97e16b31ec6e748c3 metadata.xml 254
 RMD160 ddca3e329213be86e7b2d62c52078a77ea308f4a metadata.xml 254
 SHA256 addaf999f171c0e580a0399105382e9b213e14f3bd85b74671742b41f41c2261 metadata.xml 254
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFD+ypeAiZjviIA2XgRAjx+AJ0Wk4efDTaaw+WyjZNPL4C5aNrSAgCgwGmy
-MTsM6fb2yD227c8WRuf6jGc=
-=w5pm
+iD8DBQFEBLeCAiZjviIA2XgRAt8MAJ9ilxsRaCfweIa3p8Z2LkhXcftz0QCdEz5V
+Ppe7KDChagcIi+OxuJ2OiQE=
+=m1yb
 -----END PGP SIGNATURE-----
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
 }