Don't make xinerama optional as the configure does not support --disable-xinerama (yet).

(Portage version: 2.1.1_pre1-r5)

3 files changed, 14 insertions, 11 deletions

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 4dccd1b73b1a..45baf7318f40 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.125 2006/06/07 19:48:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.126 2006/06/30 23:41:50 flameeyes Exp $
+
+  30 Jun 2006; Diego Pettenò <flameeyes@gentoo.org>
+  xine-ui-0.99.4-r5.ebuild, xine-ui-0.99.4-r6.ebuild:
+  Don't make xinerama optional as the configure does not support
+  --disable-xinerama (yet).
 
 *xine-ui-0.99.4-r6 (07 Jun 2006)
 
diff --git a/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild b/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild
index db9fa58e433e..22df963c6a77 100644
--- a/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.4-r5.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/xine-ui/xine-ui-0.99.4-r5.ebuild,v 1.9 2006/05/28 19:59:39 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r5.ebuild,v 1.10 2006/06/30 23:41:50 flameeyes Exp $
 
 inherit eutils toolchain-funcs flag-o-matic autotools
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ~hppa ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="X nls lirc aalib libcaca readline curl ncurses xinerama vdr"
+IUSE="X nls lirc aalib libcaca readline curl ncurses vdr"
 
 RDEPEND="media-libs/libpng
 	>=media-libs/xine-lib-1.0
@@ -32,7 +32,7 @@ RDEPEND="media-libs/libpng
 			x11-libs/libXv
 			x11-libs/libXtst
 			x11-libs/libXft
-			xinerama? ( x11-libs/libXinerama )
+			x11-libs/libXinerama
 		) virtual/x11 ) )"
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
@@ -43,7 +43,7 @@ DEPEND="${RDEPEND}
 			x11-proto/xextproto
 			x11-proto/xproto
 			x11-proto/xf86vidmodeproto
-			xinerama? ( x11-proto/xineramaproto )
+			x11-proto/xineramaproto
 		) virtual/x11 ) )"
 
 src_unpack() {
@@ -63,7 +63,6 @@ src_compile() {
 	econf \
 		$(use_enable lirc) \
 		$(use_enable nls) \
-		$(use_enable xinerama) \
 		$(use_enable vdr vdr-keys) \
 		$(use_with X x) \
 		$(use_with aalib) \
diff --git a/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild b/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild
index 8877de3ed402..17aea732162f 100644
--- a/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.4-r6.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/xine-ui/xine-ui-0.99.4-r6.ebuild,v 1.1 2006/06/07 19:48:43 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.4-r6.ebuild,v 1.2 2006/06/30 23:41:50 flameeyes Exp $
 
 inherit eutils toolchain-funcs flag-o-matic autotools
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xine/${P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="X nls lirc aalib libcaca readline curl ncurses xinerama vdr"
+IUSE="X nls lirc aalib libcaca readline curl ncurses vdr"
 
 RDEPEND="media-libs/libpng
 	>=media-libs/xine-lib-1.0
@@ -32,7 +32,7 @@ RDEPEND="media-libs/libpng
 			x11-libs/libXv
 			x11-libs/libXtst
 			x11-libs/libXft
-			xinerama? ( x11-libs/libXinerama )
+			x11-libs/libXinerama
 		) virtual/x11 ) )
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
@@ -44,7 +44,7 @@ DEPEND="${RDEPEND}
 			x11-proto/xextproto
 			x11-proto/xproto
 			x11-proto/xf86vidmodeproto
-			xinerama? ( x11-proto/xineramaproto )
+			x11-proto/xineramaproto
 		) virtual/x11 ) )"
 
 src_unpack() {
@@ -73,7 +73,6 @@ src_compile() {
 	econf \
 		$(use_enable lirc) \
 		$(use_enable nls) \
-		$(use_enable xinerama) \
 		$(use_enable vdr vdr-keys) \
 		$(use_with X x) \
 		$(use_with aalib) \