Add patch to disable xinerama support and add xinerama useflag, also add dependencies where needed.

Package-Manager: portage-2529-svn

4 files changed, 51 insertions, 7 deletions

diff --git a/media-video/kaffeine/ChangeLog b/media-video/kaffeine/ChangeLog
index 9c1cc8351f0b..e5731e4961ed 100644
--- a/media-video/kaffeine/ChangeLog
+++ b/media-video/kaffeine/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kaffeine
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.40 2006/01/09 19:36:21 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/ChangeLog,v 1.41 2006/01/11 22:45:32 flameeyes Exp $
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kaffeine-0.7.1-xinerama.patch, kaffeine-0.7.1-r1.ebuild:
+  Add patch to disable xinerama support and add xinerama useflag, also add
+  dependencies where needed.
 
   09 Jan 2006; Markus Rothe <corsair@gentoo.org> kaffeine-0.7.1.ebuild:
   Stable on ppc64
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 7f3b39ecab78..182dca0a30b5 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,10 +1,21 @@
-MD5 386f2802cabf73fde78708492a2b5779 ChangeLog 5800
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 947d3ad0b7fc888309275a8e5db0c7c9 ChangeLog 6026
 MD5 0fc6c600e680a127863fc22e097daec4 files/digest-kaffeine-0.6-r1 66
 MD5 297331248320491bcc0f2926e32ccacc files/digest-kaffeine-0.7.1 68
 MD5 297331248320491bcc0f2926e32ccacc files/digest-kaffeine-0.7.1-r1 68
 MD5 3b5f1da0e1ceab40aabee361a20e6ae5 files/kaffeine-0.6-formats.patch 3420
 MD5 34ae486ff059c3c8e8f80ae6597429b3 files/kaffeine-0.7.1-systemproto.patch 489
+MD5 7eb46dd81c8493beac19e7078813bfc3 files/kaffeine-0.7.1-xinerama.patch 863
 MD5 eb11794e0440683d63c7663fe8ae5cdc kaffeine-0.6-r1.ebuild 737
-MD5 fc90b7e40225b903fdb1d2fca764c43a kaffeine-0.7.1-r1.ebuild 981
+MD5 66281fafae47f5f771bb1e65423f1079 kaffeine-0.7.1-r1.ebuild 1179
 MD5 fb7a9e726cceb5c271ee71fd97ac2c0c kaffeine-0.7.1.ebuild 928
 MD5 f252d0d8aaea067fe6be5e09527ab18e metadata.xml 175
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDxYqYAiZjviIA2XgRAr/bAKDMc2fIPCM/Y6SYExnAGcsNcgZj+QCgu9QP
+vKtl0xKPtKdKDxPeLkU46oI=
+=RpM9
+-----END PGP SIGNATURE-----
diff --git a/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch b/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch
new file mode 100644
index 000000000000..9fc37002f9d1
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-0.7.1-xinerama.patch
@@ -0,0 +1,22 @@
+Index: kaffeine/configure.in.in
+===================================================================
+--- kaffeine/configure.in.in	(revision 497089)
++++ kaffeine/configure.in.in	(working copy)
+@@ -26,11 +26,16 @@
+ dnl
+ dnl Checks for Xinerama extension
+ dnl
+-AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
++AC_ARG_WITH([xinerama],
++  AS_HELP_STRING([--without-xinerama], [Disable xinerama support (defaut: check)]))
++
++if test "x$with_xinerama" != "xno"; then
++  AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+              X_PRE_LIBS="$X_PRE_LIBS -lXinerama"
+              AC_DEFINE(HAVE_XINERAMA,,[Define this if you have libXinerama installed])
+              ac_have_xinerama="yes",,
+              $X_LIBS $X_PRE_LIBS -lXext $X_EXTRA_LIBS)
++fi
+ AM_CONDITIONAL(HAVE_XINERAMA, test x$ac_have_xinerama = "xyes")
+ 
+ dnl ---------------------------------------------
diff --git a/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild b/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild
index e36a18e53249..b4b929472a8e 100644
--- a/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild
+++ b/media-video/kaffeine/kaffeine-0.7.1-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/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild,v 1.1 2006/01/03 16:27:15 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kaffeine/kaffeine-0.7.1-r1.ebuild,v 1.2 2006/01/11 22:45:32 flameeyes Exp $
 
 inherit eutils kde
 
@@ -11,26 +11,32 @@ LICENSE="GPL-2"
 
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="dvb gstreamer"
+IUSE="dvb gstreamer xinerama"
 
 RDEPEND="|| ( x11-base/xorg-server
 	      >=x11-base/xorg-x11-6.8.0-r4 )
 	>=media-libs/xine-lib-1
 	gstreamer? ( =media-libs/gstreamer-0.8*
-		=media-libs/gst-plugins-0.8* )"
+		=media-libs/gst-plugins-0.8* )
+	xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )"
 
 DEPEND="${RDEPEND}
+	xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
 	dvb? ( >=sys-kernel/linux-headers-2.6 )
 	dev-util/pkgconfig"
 
 # the dependency on xorg-x11 is meant to avoid bug #59746
 
-PATCHES="${FILESDIR}/${P}-systemproto.patch"
+PATCHES="${FILESDIR}/${P}-systemproto.patch
+	${FILESDIR}/${P}-xinerama.patch"
 
 need-kde 3.2
 
 src_compile() {
+	rm ${S}/configure
+
 	myconf="${myconf}
+		$(use_with xinerama)
 		$(use_with dvb)
 		$(use_with gstreamer)"