Version bump, drop old

Package-Manager: portage-2.2.6-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x35899067

3 files changed, 23 insertions, 36 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/Manifest b/dev-libs/efl/Manifest
index 07f9823ddebb..63a4a11f825f 100644
--- a/dev-libs/efl/Manifest
+++ b/dev-libs/efl/Manifest
@@ -3,20 +3,20 @@ Hash: SHA256
 
 DIST efl-1.8.5.tar.bz2 28175735 SHA256 4456ce34bdc8294336c451a44e12f2f928ac9b857040da6d72c10432611646de SHA512 155542aa900980c59745dd2b25244d52b38de0de400b8432f9183c53c9770efdbca9d6e31f3305cf16d19357660ff8383447442d6a08c9ddec2e83a5b054e6df WHIRLPOOL d8efbc474a6d62837ab94c7ab6a060c1440fa16a2e798c2d722d6029ac17421afb8b07b3cf614c94fa9fed9f55fad8994377bc7a37b1e024fcf28423b45221a0
 DIST efl-1.8.6.tar.bz2 28101148 SHA256 0cc0a559ee7b249000771734e4c037695284d4980839436b57ac3afbaffb2089 SHA512 8bd02faa155500cdeab5dab878e7884c05829c5e6e7c645cd4802ffe597bb4abca8e783e771595be56a72ba2a10c8e361626b51f94292a05a8747985dbba064e WHIRLPOOL 35353c081872fb316e61f4a379a650be18bd61c213872715c4b363d3664afc92bdb2f90d454862b31e0523739071a716d1e4bbe7d25482ff82ba2681f611e098
-DIST efl-1.9.0.tar.bz2 28182561 SHA256 9641cad419a07efabb5657b166502d04f0e867341128ed30c73cd147aa29b553 SHA512 35c52cafa3f051865efb65ab145c6bfd8a6c2b03a08690b2a5c8b2e5a2d2613b43577cd49288d1b9d3638d3f15b896b3a0c500f758ab42bef9f494530312f85b WHIRLPOOL c09a649e1b0fdc92a6c8977c6a24c92fa2b5b9a5b33902bcd5a6fba5cc19bcb9bd66e632b8d5a240ee5ec095cc6ee3a59bce3913b669f3d755e3db1de8d79681
 DIST efl-1.9.2.tar.bz2 28193583 SHA256 5dbeb99e1d26ccc74c9d054de5607a7e1020052b313c4b60c9a9794b45307501 SHA512 d93ae726bf814e8e21e6584ad1d38c1733f7f1782aa6ca7d0ccedfbdbe6455bc62f965d5dcb85e55a1041ccb6b997395bb4ba433345cfa089280d3a293d59751 WHIRLPOOL b2eaefdf8a9e2f548255e222ef087ae9857308ac0dc3d1e712b1fa0db59a7736f16b1aee3985a1b4a911374fd3103d0e5be9ccc718fb8a37cb9cb690e058cd38
+DIST efl-1.9.3.tar.bz2 28181470 SHA256 1a911ababb7786969a361628f972db1158c25dc0b62ca55e12a00d6c290b6e15 SHA512 7920010ef736ab041ea71584e6767420cff8b4bd5f1cfecfff90768ce37f7b137aa7ebe1b6b3fa0d4a3b5cdda0ac44d510320a3f654e0777072cd9bb862d36da WHIRLPOOL 47119accab0ca8eb0fcec5efa65afacc63096dec5b0c0ae50488e496c48f4a5006b2e06d237ea526a924cd583147ee292e4f87d9c2b86bf46d1e8ad09181eb09
 EBUILD efl-1.8.5.ebuild 6332 SHA256 13db3984f7118f4465b3495521c5d54c8a45cad6766da97da7c8d9160022b5b8 SHA512 2f2993ee4d88a9267420f773d031d28d6ba8ec2058eeb0ee5de4b16bd57032d2f33cca18687038282b518db8b3ab4a7fe4da39ff6aaedf6dce9ba03ef3b2443c WHIRLPOOL 27272167cca7b8f38e727eebfd62abda47e0aa0e6ba6309081620d171186e44c98c28aa9991a89d9891e3b2abc31bedfbbc55d670d9f356d7b6569d635cabd10
 EBUILD efl-1.8.6.ebuild 6332 SHA256 8d5b5bdb578200a253ded4374cfebf952ba745870c6349d28f8ec5d457d6a114 SHA512 b9e5ed0b68ee6236a60e9b2afd39318275abbaf3b9d8ec5c36084828a4e9b4c399f5ef126bda4c90182fdaf7e6addc440e5f08a46150c29b5fb115b357e533ec WHIRLPOOL 43b60354164a9fa5337e93afba93c922ffe2a0b7965470ce629969a62c1a2101f82724ba17f6afb8df6f03a62052fca77035910673e0003f80f207cd70d72243
-EBUILD efl-1.9.0.ebuild 6808 SHA256 a93ada62415d5b3498795374a75e83ba5723d4aeb13777acfb7946fd4dd4268c SHA512 62d3f6313c6cf467aa886ad4f7427b05901cfdfed6ff58395a93ab67f808bfc157ed0b8227007a8792c248cd18ceb2f4629978e16abfa5e042d4d6075211b7ef WHIRLPOOL ed0f3db982d62b6bca5b391d5de350ab3954e858923130006bc278705ac1e2a021d086a85d48b4451c35764233e3661c22aa37399aaf2f4faf70ea9ab9568e50
 EBUILD efl-1.9.2.ebuild 6469 SHA256 0025536d914f6c4213c5ad47ee9a60b865a3cebb61fd4c505094a3ce9a0ceafa SHA512 e5e73a1952c107b76f5cd0a825550592d7a76524232dd777391a7433a3c0a2f2da23dc7296083d6c8de27c19dd9edb47e082c1eb25a65abaed7389d340ead240 WHIRLPOOL 3ee726e1546e0b5d0014d81ebd77fa6410b33c9360ce871bde8f4256aaeb62a0e90e683d05d2d6cba790e69166fca6f8fe2228ea82e590d17836c485b339aa30
-MISC ChangeLog 2043 SHA256 b2353a750b9dd52f763cb1be9529aecc86ac4852837f142ea4e04b154ca3528a SHA512 9a81d2bc1939c236518b7ab451e5c9ab1e07ac0268e29b49309c3be9e9107588ef60d95add8760941c47266c216e0769fa06ecf821db79fb389ab74d62df7483 WHIRLPOOL c1a218cde18419686eebacf8bcc1431c4dfd99b5c50a62894437acad20b33553b872d179abedb8e0f7b0256302f62c7622a846d88e8f5e9fec770ffbcbd2b541
+EBUILD efl-1.9.3.ebuild 6469 SHA256 d27ce222369e7f68a895491779b283b72904c7b4d7e81840a4378616a4f37667 SHA512 e58be0215dfb6769fa6b514ee5aef6771ed900ef9bdac39404f22d37323998b883a4d60c2890bded1a9b223b30f000f5c188dc3c782d62a9cd6dae74e41c2d8c WHIRLPOOL 0d7887c058fb8f7cea7dd6e13f60b686b4c5b9276dde2541090b4a0d763da4285a8469ab703a26b9046d3a502ccf3f353a447d082f0131665bfab593b5e5bbce
+MISC ChangeLog 2194 SHA256 7035cf6c3c57a6006fb5f3659449a6c7995d4737b9815d8b6c0f6c67becb1b22 SHA512 330a65beb70daf702e093f1084b565724ca5195e339429c6aa2878f01eaba1d74c779432644b0ddd29c371fff476cdfe948263f8b89a0b0ce5bae730f3f4fea1 WHIRLPOOL 9eb1f3a759abeb5c48ea892e0fddd8f3cf7e240e5946de0c78c596084d1ef937b739429e037f7ecf5ca5d9c370f3fe3242ab227fed131df8dc8c8c93bb0aee54
 MISC metadata.xml 1541 SHA256 91a338d398a7e49894eae40880f09c029b31e15b8a1be8968aa7e28ae8a20a2f SHA512 c66c241389cd0b4465102b2aab3d7384d7b8cb2b4106b6bbf61b94d53f13ba79d4794a3ca43f850b8671ce55a44b363a6c05d12618ca1e27a3e7fbd758e225a8 WHIRLPOOL 7d6d90847e711a7ae7315b6b6c90d5df260317d47173cf07c3edd5def9ec898feb0002b20f9392999827cad0da809b089d7a18f45e3533a3a3497fc677437abe
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iJwEAQEIAAYFAlM1pC4ACgkQG7kqcTWJkGfCnwQAwFbdip7WiSfo7gZfbmnMkgYQ
-1qaovKXUu3z7yMk3gX/YWq68AG0FC5h4/mxMzqlZuMvntSeEJKtfe+YgkqMFLzV1
-k/1MSL6jv5l8He3xMubXH77iiKqjKNY6y7OLzmAprjOJhPi5gJdXZl5YmJsOZ2i3
-fS2joaKbbW6pdFBX2tY=
-=5e+8
+iJwEAQEIAAYFAlNP624ACgkQG7kqcTWJkGcxUAQAsK0BLIPPl4XCNy+5zzdTiktK
+db7wESFcgo2NQTsIK3gkKmWKeQfidYq0Sz5UTQUFiHBjCy9rAuJhjBX+rPSNzT0U
+SGpyM2MEqSrzhG49YmBKgCFPD71AHUYzkIf01t12pdeg/ycgHqKRFEEGC25H2Q5t
+aoYRALRxjofdKdCKTyQ=
+=1qJr
 -----END PGP SIGNATURE-----
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"