Add patch to make xinerama support optional depending on xinerama useflag. Drop X? conditional from dependencies (also of older ebuilds) as there's no more an X useflag not being possible to disable it at all.

(Portage version: 2529-svn)

8 files changed, 136 insertions, 26 deletions

diff --git a/media-video/gxine/ChangeLog b/media-video/gxine/ChangeLog
index 0626f2f3a610..5d24c61e2931 100644
--- a/media-video/gxine/ChangeLog
+++ b/media-video/gxine/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-video/gxine
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.61 2006/01/11 21:09:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/ChangeLog,v 1.62 2006/01/11 21:27:57 flameeyes Exp $
+
+*gxine-0.5.3-r1 (11 Jan 2006)
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/gxine-0.5.3-xinerama.patch, gxine-0.5.1-r1.ebuild,
+  gxine-0.5.2-r1.ebuild, gxine-0.5.3.ebuild, +gxine-0.5.3-r1.ebuild:
+  Add patch to make xinerama support optional depending on xinerama useflag.
+  Drop X? conditional from dependencies (also of older ebuilds) as there's no
+  more an X useflag not being possible to disable it at all.
 
   11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> gxine-0.4.5.ebuild,
   gxine-0.5.1-r1.ebuild, gxine-0.5.2-r1.ebuild, gxine-0.5.3.ebuild:
diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest
index 724dc64e51a1..4bf08a878ed8 100644
--- a/media-video/gxine/Manifest
+++ b/media-video/gxine/Manifest
@@ -1,23 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 55188b900cbefd8f29d1e42d6a771317 ChangeLog 9390
 MD5 fb579db8b42db43fb5c027ca8c78e951 files/digest-gxine-0.4.5 64
 MD5 b81fee13e52e93af9f5571f8babacf2e files/digest-gxine-0.5.1-r1 64
 MD5 c46aa3000139ed5d885183c1bda05075 files/digest-gxine-0.5.2-r1 64
 MD5 f07780db53fe899e0738622c41cdff62 files/digest-gxine-0.5.3 64
+MD5 f07780db53fe899e0738622c41cdff62 files/digest-gxine-0.5.3-r1 64
 MD5 0b50a3889d71fe54fb9249c53257d9d6 files/gxine-0.4.1-menu-fix.patch 873
 MD5 b15c6d10dbe3551c6692caf851c718b3 files/gxine-0.5.1-pixmap-fixup.patch 1013
 MD5 1c7eb906eb1d70dbb36ec8d8f3bd5c07 files/gxine-0.5.2-nolirc.patch 840
 MD5 cc8ca197c7768af9d0599c1b49f0867d gxine-0.4.5.ebuild 1524
 MD5 0ee2a02f3c3af284aa49eb8c8e437b46 gxine-0.5.1-r1.ebuild 1625
 MD5 84c6951d80b4322c33e12b7e15fc68cc gxine-0.5.2-r1.ebuild 1649
+MD5 6189fdb4ff18c135b0f1a5242e2ba37d gxine-0.5.3-r1.ebuild 1767
 MD5 ac82d4426ead16041ec59dde53485e6c gxine-0.5.3.ebuild 1565
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDxXQwAiZjviIA2XgRAuf8AKCt6u14AAKLOLb0z5sOsgvDkbtSDQCdH9jc
-nMmyHY6EQavmsg4Lr60kVRU=
-=nWAb
------END PGP SIGNATURE-----
diff --git a/media-video/gxine/files/digest-gxine-0.5.3-r1 b/media-video/gxine/files/digest-gxine-0.5.3-r1
new file mode 100644
index 000000000000..2ce7679b3495
--- /dev/null
+++ b/media-video/gxine/files/digest-gxine-0.5.3-r1
@@ -0,0 +1 @@
+MD5 01a2ba33aa03afd37878b3459251a7e0 gxine-0.5.3.tar.bz2 830273
diff --git a/media-video/gxine/files/gxine-0.5.3-xinerama.patch b/media-video/gxine/files/gxine-0.5.3-xinerama.patch
new file mode 100644
index 000000000000..5a307522572d
--- /dev/null
+++ b/media-video/gxine/files/gxine-0.5.3-xinerama.patch
@@ -0,0 +1,31 @@
+Index: gxine-0.5.3/configure.ac
+===================================================================
+--- gxine-0.5.3.orig/configure.ac
++++ gxine-0.5.3/configure.ac
+@@ -156,15 +156,20 @@ AM_CONDITIONAL([HAVE_XTESTEXTENSION], [t
+ dnl ---------------------------------------------
+ dnl Xinerama Extension
+ dnl ---------------------------------------------
+-saved_CFLAGS="$CFLAGS"
+-saved_LIBS="$LIBS"
+-CFLAGS="$CFLAGS $GTK2_CFLAGS"
+-AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
++AC_ARG_WITH([xinerama],
++  AS_HELP_STRING([--without-xinerama], [Disable xinerama extensions support (default: check)]) )
++
++if test "x$with_xinerama" != "xno"; then
++  saved_CFLAGS="$CFLAGS"
++  saved_LIBS="$LIBS"
++  CFLAGS="$CFLAGS $GTK2_CFLAGS"
++  AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+              AC_DEFINE(HAVE_XINERAMA,,[Define this if you have libXinerama])
+ 	     ac_have_xinerama="yes", ac_have_xinerama="no", $X_LIBS $X_PRE_LIBS -lXinerama $X_EXTRA_LIBS)
++  CFLAGS="$saved_CFLAGS"
++  LIBS="$saved_LIBS"
++fi
+ AM_CONDITIONAL([HAVE_XINERAMA], [test x$ac_have_xinerama = "xyes"])
+-CFLAGS="$saved_CFLAGS"
+-LIBS="$saved_LIBS"
+ 
+ dnl ---------------------------------------------
+ dnl debug cflags
diff --git a/media-video/gxine/gxine-0.5.1-r1.ebuild b/media-video/gxine/gxine-0.5.1-r1.ebuild
index 5df9fe1b0ef7..9bd362082c43 100644
--- a/media-video/gxine/gxine-0.5.1-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.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/gxine/gxine-0.5.1-r1.ebuild,v 1.4 2006/01/11 21:09:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.1-r1.ebuild,v 1.5 2006/01/11 21:27:57 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -14,22 +14,22 @@ RDEPEND="media-libs/libpng
 	>=dev-libs/glib-2.6
 	>=dev-lang/spidermonkey-1.5_rc6-r1
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11
+	|| ( ( x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXinerama
 		x11-libs/libXrender )
-		virtual/x11 ) )"
+		virtual/x11 )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig
-	X? ( || ( ( x11-base/xorg-server
+	|| ( ( x11-base/xorg-server
 		x11-libs/libX11
 		x11-libs/libXt
 		x11-libs/libXaw
 		x11-proto/xineramaproto
 		x11-proto/xproto
 		x11-proto/xextproto )
-		virtual/x11 ) )"
+		virtual/x11 )"
 
 IUSE="nls lirc nsplugin"
 
diff --git a/media-video/gxine/gxine-0.5.2-r1.ebuild b/media-video/gxine/gxine-0.5.2-r1.ebuild
index e5248d8504ad..be6e2f4fc38d 100644
--- a/media-video/gxine/gxine-0.5.2-r1.ebuild
+++ b/media-video/gxine/gxine-0.5.2-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/gxine/gxine-0.5.2-r1.ebuild,v 1.2 2006/01/11 21:09:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.2-r1.ebuild,v 1.3 2006/01/11 21:27:57 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -14,22 +14,22 @@ RDEPEND="media-libs/libpng
 	>=dev-libs/glib-2.6
 	>=dev-lang/spidermonkey-1.5_rc6-r1
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11
+	|| ( ( x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXinerama
 		x11-libs/libXrender )
-		virtual/x11 ) )"
+		virtual/x11 )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig
-	X? ( || ( ( x11-base/xorg-server
+	|| ( ( x11-base/xorg-server
 		x11-libs/libX11
 		x11-libs/libXt
 		x11-libs/libXaw
 		x11-proto/xineramaproto
 		x11-proto/xproto
 		x11-proto/xextproto )
-		virtual/x11 ) )"
+		virtual/x11 )"
 
 IUSE="nls lirc nsplugin"
 
diff --git a/media-video/gxine/gxine-0.5.3-r1.ebuild b/media-video/gxine/gxine-0.5.3-r1.ebuild
new file mode 100644
index 000000000000..1b150cfed7bf
--- /dev/null
+++ b/media-video/gxine/gxine-0.5.3-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.3-r1.ebuild,v 1.1 2006/01/11 21:27:57 flameeyes Exp $
+
+inherit eutils nsplugins fdo-mime autotools
+
+DESCRIPTION="GTK+ Front-End for libxine"
+HOMEPAGE="http://xine.sourceforge.net/"
+LICENSE="GPL-2"
+
+RDEPEND="media-libs/libpng
+	>=media-libs/xine-lib-1_beta10
+	>=x11-libs/gtk+-2.6
+	>=dev-libs/glib-2.6
+	>=dev-lang/spidermonkey-1.5_rc6-r1
+	lirc? ( app-misc/lirc )
+	|| ( ( x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXrender )
+		virtual/x11 )
+	xinerama? ( || ( ( x11-libs/libXinerama )
+		virtual/x11 ) )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	dev-util/pkgconfig
+	|| ( ( x11-base/xorg-server
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXaw
+		x11-proto/xproto
+		x11-proto/xextproto )
+		virtual/x11 )
+	xinerama? ( || ( ( x11-proto/xineramaproto )
+		virtual/x11 ) )"
+
+IUSE="nls lirc nsplugin xinerama"
+
+SLOT="0"
+# Those needs spidermonkey: ~sparc
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+SRC_URI="mirror://sourceforge/xine/${P}.tar.bz2"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch "${FILESDIR}/${P}-xinerama.patch"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable lirc) \
+		$(use_with nsplugin browser-plugin) \
+		$(use_with xinerama) \
+		--disable-gtk-compat \
+		--disable-dependency-tracking || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} \
+		docdir=/usr/share/doc/${PF} \
+		docsdir=/usr/share/doc/${PF} \
+		install || die
+
+	dodoc AUTHORS ChangeLog NEWS README
+
+	use nsplugin && inst_plugin /usr/$(get_libdir)/gxine/gxineplugin.so
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	fdo-mime_mime_database_update
+}
diff --git a/media-video/gxine/gxine-0.5.3.ebuild b/media-video/gxine/gxine-0.5.3.ebuild
index a560c6767a56..21df58ef6e7b 100644
--- a/media-video/gxine/gxine-0.5.3.ebuild
+++ b/media-video/gxine/gxine-0.5.3.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/gxine/gxine-0.5.3.ebuild,v 1.2 2006/01/11 21:09:55 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/gxine/gxine-0.5.3.ebuild,v 1.3 2006/01/11 21:27:57 flameeyes Exp $
 
 inherit eutils nsplugins fdo-mime
 
@@ -14,22 +14,22 @@ RDEPEND="media-libs/libpng
 	>=dev-libs/glib-2.6
 	>=dev-lang/spidermonkey-1.5_rc6-r1
 	lirc? ( app-misc/lirc )
-	X? ( || ( ( x11-libs/libX11
+	|| ( ( x11-libs/libX11
 		x11-libs/libXext
 		x11-libs/libXinerama
 		x11-libs/libXrender )
-		virtual/x11 ) )"
+		virtual/x11 )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
 	dev-util/pkgconfig
-	X? ( || ( ( x11-base/xorg-server
+	|| ( ( x11-base/xorg-server
 		x11-libs/libX11
 		x11-libs/libXt
 		x11-libs/libXaw
 		x11-proto/xineramaproto
 		x11-proto/xproto
 		x11-proto/xextproto )
-		virtual/x11 ) )"
+		virtual/x11 )"
 
 IUSE="nls lirc nsplugin"