Version bump, drop old

(Portage version: 2.2.6-r1/cvs/Linux x86_64, signed Manifest commit with key 0x35899067)

2 files changed, 15 insertions, 28 deletions

diff --git a/dev-libs/efl/ChangeLog b/dev-libs/efl/ChangeLog
index fa5a67d8906c..0c67291aa801 100644
--- a/dev-libs/efl/ChangeLog
+++ b/dev-libs/efl/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/efl
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.10 2014/03/28 16:32:40 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/ChangeLog,v 1.11 2014/04/17 14:55:34 tommy Exp $
+
+*efl-1.9.3 (17 Apr 2014)
+
+  17 Apr 2014; Thomas Sachau (Tommy[D]) <tommy@gentoo.org> +efl-1.9.3.ebuild,
+  -efl-1.9.0.ebuild:
+  Version bump, drop old
 
 *efl-1.9.2 (28 Mar 2014)
 
diff --git a/dev-libs/efl/efl-1.9.0.ebuild b/dev-libs/efl/efl-1.9.3.ebuild
index 848a08c5ef84..fa6f5241b53a 100644
--- a/dev-libs/efl/efl-1.9.0.ebuild
+++ b/dev-libs/efl/efl-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.0.ebuild,v 1.3 2014/03/06 01:04:33 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/efl/efl-1.9.3.ebuild,v 1.1 2014/04/17 14:55:34 tommy Exp $
 
 EAPI="5"
 
@@ -25,18 +25,17 @@ DESCRIPTION="Enlightenment Foundation Libraries all-in-one package"
 LICENSE="BSD-2 GPL-2 LGPL-2.1 ZLIB"
 KEYWORDS="~amd64 ~arm ~x86"
 
-IUSE="audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xcb xim xine xpm"
+IUSE="audio +bmp debug drm +eet egl fbcon +fontconfig fribidi gif gles glib gnutls gstreamer harfbuzz +ico ibus jp2k +jpeg oldlua opengl ssl physics pixman +png +ppm +psd pulseaudio scim sdl systemd tga tiff tslib v4l2 wayland webp X xim xine xpm"
 
 REQUIRED_USE="
-	X?		( !xcb )
 	pulseaudio?	( audio )
-	opengl?		( || ( X xcb sdl wayland ) )
-	gles?		( || ( X xcb sdl wayland ) )
+	opengl?		( || ( X sdl wayland ) )
+	gles?		( || ( X wayland ) )
+	gles?		( !sdl )
 	gles?		( egl )
-	xcb?		( pixman )
-	sdl?		( || ( opengl gles ) )
+	sdl?		( opengl )
 	wayland?	( egl !opengl gles )
-	xim?		( || ( X xcb ) )
+	xim?		( X )
 "
 
 RDEPEND="
@@ -103,23 +102,6 @@ RDEPEND="
 			virtual/opengl
 		)
 	)
-	xcb? (
-		x11-libs/libxcb
-
-		opengl? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			x11-libs/xcb-util-renderutil
-		)
-
-		gles? (
-			x11-libs/libX11
-			x11-libs/libXrender
-			virtual/opengl
-			x11-libs/xcb-util-renderutil
-		)
-	)
 	xine? ( >=media-libs/xine-lib-1.1.1 )
 	xpm? ( x11-libs/libXpm )
 
@@ -194,10 +176,9 @@ src_configure() {
 	local enable_graphics=""
 
 	use X && x11="xlib"
-	use xcb && x11="xcb"
 
 	local MY_ECONF
-	( use X || use xcb ) && MY_ECONF+=" --with-x"
+	 use X && MY_ECONF+=" --with-x"
 
 	local opengl="none"