Add patch to disable xcomposite support and xcomposite useflag to enable/disable it.

Package-Manager: portage-2529-svn

4 files changed, 89 insertions, 13 deletions

diff --git a/kde-base/kicker/ChangeLog b/kde-base/kicker/ChangeLog
index e8bf09083ed5..ad6f44c5a62b 100644
--- a/kde-base/kicker/ChangeLog
+++ b/kde-base/kicker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/kicker
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.35 2005/12/17 09:32:46 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/ChangeLog,v 1.36 2006/01/11 20:21:38 flameeyes Exp $
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kicker-3.5.0-composite.patch, kicker-3.5.0.ebuild:
+  Add patch to disable xcomposite support and xcomposite useflag to
+  enable/disable it.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> kicker-3.5.0.ebuild:
   Added ~ppc64
diff --git a/kde-base/kicker/Manifest b/kde-base/kicker/Manifest
index 71a05b77a5fc..2104d1c98003 100644
--- a/kde-base/kicker/Manifest
+++ b/kde-base/kicker/Manifest
@@ -1,11 +1,22 @@
-MD5 a17dc0738b0c74d5d553871895466b8f ChangeLog 4190
-MD5 3f169df7532dad28d299bdb3c4683484 kicker-3.4.1.ebuild 680
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
-MD5 cc9e587f4748ebb5f8aadab99eba7b8f kicker-3.4.2.ebuild 693
-MD5 b20ed87b60ff2dc2058c88eedbe44fec kicker-3.4.3.ebuild 687
-MD5 69517d85657b07e5407c06bd59e7945a kicker-3.5.0.ebuild 659
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 bb2dafcbb68142b2b318c71d35824677 ChangeLog 4395
 MD5 07e3f3f7982d29e2317f32f209e06573 files/applets-configure.in.in.diff 606
 MD5 b22a687fe2e8cf06cd5147f1ec68efb7 files/digest-kicker-3.4.1 212
 MD5 7deca5e51240260b2976fbbe9326ed6d files/digest-kicker-3.4.2 287
 MD5 b334b621242eaf5a23035e870f09dea6 files/digest-kicker-3.4.3 68
 MD5 389ef34a2d6ba65f5836f68c0a904cf9 files/digest-kicker-3.5.0 68
+MD5 b91aa3f99533b486954c5227dbdd758c files/kicker-3.5.0-composite.patch 1685
+MD5 3f169df7532dad28d299bdb3c4683484 kicker-3.4.1.ebuild 680
+MD5 cc9e587f4748ebb5f8aadab99eba7b8f kicker-3.4.2.ebuild 693
+MD5 b20ed87b60ff2dc2058c88eedbe44fec kicker-3.4.3.ebuild 687
+MD5 184b1ab7ac27a3a407ea71fc9d9ad73f kicker-3.5.0.ebuild 997
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDxWjfAiZjviIA2XgRAr/GAJ9PW1ZsT22JeklTk5MyDqHXS8LNMgCdHHgQ
+uq1XL2DZuVf9aD/UkGQNDxE=
+=Qq/d
+-----END PGP SIGNATURE-----
diff --git a/kde-base/kicker/files/kicker-3.5.0-composite.patch b/kde-base/kicker/files/kicker-3.5.0-composite.patch
new file mode 100644
index 000000000000..fb8543d9c6b6
--- /dev/null
+++ b/kde-base/kicker/files/kicker-3.5.0-composite.patch
@@ -0,0 +1,43 @@
+Index: kicker/taskmanager/configure.in.in
+===================================================================
+--- kicker/taskmanager/configure.in.in	(revision 492938)
++++ kicker/taskmanager/configure.in.in	(working copy)
+@@ -1,14 +1,16 @@
+-dnl XComposite check
+-KDE_CHECK_HEADER(X11/extensions/Xcomposite.h, [xcomposite_h=yes], [xcomposite_h=no], [#include <X11/Xlib.h>])
+-if test "$xcomposite_h" = yes; then
+-  KDE_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [
+-    LIB_XCOMPOSITE=-lXcomposite
+-    AC_DEFINE_UNQUOTED(HAVE_XCOMPOSITE, 1, [Define if you have the XComposite extension])
+-  ], [], -lXext -X11 $X_EXTRA_LIBS)
+-else
+-  LIB_XCOMPOSITE=
++if test "x$with_composite" != "xno"; then
++  dnl XComposite check
++  KDE_CHECK_HEADER(X11/extensions/Xcomposite.h, [xcomposite_h=yes], [xcomposite_h=no], [#include <X11/Xlib.h>])
++  if test "$xcomposite_h" = yes; then
++    KDE_CHECK_LIB(Xcomposite, XCompositeQueryExtension, [
++      LIB_XCOMPOSITE=-lXcomposite
++      AC_DEFINE_UNQUOTED(HAVE_XCOMPOSITE, 1, [Define if you have the XComposite extension])
++    ], [], -lXext -X11 $X_EXTRA_LIBS)
++  else
++    LIB_XCOMPOSITE=
++  fi
++  AC_SUBST(LIB_XCOMPOSITE)
+ fi
+-AC_SUBST(LIB_XCOMPOSITE)
+ 
+ dnl XFixes check
+ KDE_CHECK_HEADER(X11/extensions/Xfixes.h, [xfixes_h=yes], [xfixes_h=no], [#include <X11/Xlib.h>])
+Index: configure.in.in
+===================================================================
+--- configure.in.in	(revision 492938)
++++ configure.in.in	(working copy)
+@@ -275,3 +275,7 @@
+ AC_SUBST(LIBART_LIBS)
+ AC_SUBST(LIBART_CFLAGS)
+ AC_SUBST(LIBART_RPATH)
++
++AC_ARG_WITH([composite],
++  AS_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) )
++
diff --git a/kde-base/kicker/kicker-3.5.0.ebuild b/kde-base/kicker/kicker-3.5.0.ebuild
index 698086dba48c..a8311822421e 100644
--- a/kde-base/kicker/kicker-3.5.0.ebuild
+++ b/kde-base/kicker/kicker-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.0.ebuild,v 1.4 2005/12/17 09:32:46 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kicker/kicker-3.5.0.ebuild,v 1.5 2006/01/11 20:21:38 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -9,14 +9,31 @@ inherit kde-meta eutils
 
 DESCRIPTION="KDE panel housing varous applets"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="xcomposite"
 PATCHES="$FILESDIR/applets-configure.in.in.diff"
 
-DEPEND="
+RDEPEND="
 $(deprange $PV $MAXKDEVER kde-base/libkonq)
-$(deprange $PV $MAXKDEVER kde-base/kdebase-data)"
+$(deprange $PV $MAXKDEVER kde-base/kdebase-data)
+	xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+
+DEPEND="${RDEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			) <=x11-base/xorg-x11-6.9 )
+		)"
 
 KMCOPYLIB="libkonq libkonq"
 KMEXTRACTONLY="libkonq
 	kdm/kfrontend/themer/"
 KMCOMPILEONLY="kdmlib/"
+
+PATCHES="${FILESDIR}/${P}-composite.patch"
+
+src_compile() {
+	myconf="$myconf $(use_with xcomposite composite)"
+	kde-meta_src_compile
+}