Add USE flag support for wayland, fixes bug 459872

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

3 files changed, 242 insertions, 1 deletions

diff --git a/dev-libs/ecore/ChangeLog b/dev-libs/ecore/ChangeLog
index 68cfc47f149c..80425e806cdb 100644
--- a/dev-libs/ecore/ChangeLog
+++ b/dev-libs/ecore/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/ecore
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ChangeLog,v 1.15 2013/01/04 18:09:30 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ChangeLog,v 1.16 2013/04/02 08:59:48 tommy Exp $
+
+*ecore-1.7.5-r1 (02 Apr 2013)
+
+  02 Apr 2013; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +ecore-1.7.5-r1.ebuild, metadata.xml:
+  Add USE flag support for wayland, fixes bug 459872
 
 *ecore-1.7.5 (04 Jan 2013)
 
diff --git a/dev-libs/ecore/ecore-1.7.5-r1.ebuild b/dev-libs/ecore/ecore-1.7.5-r1.ebuild
new file mode 100644
index 000000000000..525192cbdcd4
--- /dev/null
+++ b/dev-libs/ecore/ecore-1.7.5-r1.ebuild
@@ -0,0 +1,233 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/ecore/ecore-1.7.5-r1.ebuild,v 1.1 2013/04/02 08:59:48 tommy Exp $
+
+EAPI=2
+
+#virtualx is required for tests, which are currently broken
+#inherit virtualx
+inherit autotools enlightenment eutils
+
+DESCRIPTION="Enlightenment's core event abstraction layer and OS abstraction layer"
+SRC_URI="http://download.enlightenment.org/releases/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="ares curl directfb +evas examples fbcon gles glib gnutls +inotify ipv6 opengl sdl ssl static-libs +threads tslib wayland +X xcb xinerama xprint xscreensaver"
+
+RDEPEND=">=dev-libs/eina-1.7.0
+	ares? ( net-dns/c-ares )
+	glib? ( dev-libs/glib )
+	curl? ( net-misc/curl )
+	gnutls? ( net-libs/gnutls )
+	!gnutls? ( ssl? ( dev-libs/openssl ) )
+	evas? (
+		>=media-libs/evas-1.7.5[directfb?,fbcon?,opengl?,X?,xcb?]
+		opengl? ( virtual/opengl )
+		wayland? (
+			>=media-libs/evas-1.7.5[directfb?,fbcon?,gles?,opengl?,wayland?,X?,xcb?]
+		)
+	)
+	directfb? ( >=dev-libs/DirectFB-0.9.16 )
+	tslib? ( x11-libs/tslib )
+	sdl? ( media-libs/libsdl )
+	wayland? ( dev-libs/wayland )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcomposite
+		x11-libs/libXcursor
+		x11-libs/libXdamage
+		x11-libs/libXext
+		x11-libs/libXfixes
+		x11-libs/libXi
+		x11-libs/libXrender
+		x11-libs/libXtst
+		xinerama? ( x11-libs/libXinerama x11-libs/libXrandr )
+		xprint? ( x11-libs/libXp )
+		xscreensaver? ( x11-libs/libXScrnSaver )
+	)
+	!X? ( xcb? ( x11-libs/xcb-util ) )"
+DEPEND="${RDEPEND}"
+
+#tests depend on temp data from eina WORKDIR
+RESTRICT=test
+
+src_prepare() {
+
+	sed -i "s:1.7.5:1.7.4:g" configure.ac
+	eautoreconf
+}
+
+src_configure() {
+	local SSL_FLAGS="" EVAS_FLAGS="" X_FLAGS=""
+
+	if use gnutls; then
+		if use ssl; then
+			einfo "You have enabled both 'ssl' and 'gnutls', so we will use"
+			einfo "gnutls and not openssl for ecore-con support"
+		fi
+		SSL_FLAGS="
+		  --disable-openssl
+		  --enable-gnutls
+		"
+	elif use ssl; then
+		SSL_FLAGS="
+		  --enable-openssl
+		  --disable-gnutls
+		"
+	else
+		SSL_FLAGS="
+		  --disable-openssl
+		  --disable-gnutls
+		"
+	fi
+
+	local x_or_xcb=""
+	if use X; then
+		x_or_xcb="X"
+	elif use xcb; then
+		x_or_xcb="xcb"
+	fi
+
+	if use evas; then
+
+		if use opengl && [[ -z "$x_or_xcb" ]]; then
+			ewarn "Ecore/Evas usage of OpenGL requires X11."
+			ewarn "Compile dev-libs/ecore with USE=X or xcb."
+			ewarn "Compiling without opengl support."
+			EVAS_FLAGS+="
+				--disable-ecore-evas-software-x11
+				--disable-ecore-evas-software-16-x11
+			"
+		else
+			EVAS_FLAGS+="
+				--enable-ecore-evas-software-x11
+				--enable-ecore-evas-software-16-x11
+			"
+		fi
+		EVAS_FLAGS+="
+			$(use_enable directfb ecore-evas-directfb)
+			$(use_enable fbcon ecore-evas-fb)
+			$(use_enable opengl ecore-evas-opengl-x11)
+		"
+		if use wayland ; then
+			EVAS_FLAGS+="
+				--enable-ecore-evas-wayland-shm
+			"
+			if use gles ; then
+				EVAS_FLAGS+="
+					--enable-ecore-evas-wayland-egl
+				"
+			else
+				EVAS_FLAGS+="
+					--enable-ecore-evas-wayland-egl
+				"
+			fi
+		else
+			EVAS_FLAGS+="
+				--disable-ecore-evas-wayland-egl
+				--disable-ecore-evas-wayland-shm
+			"
+		fi
+	else
+		EVAS_FLAGS+="
+			--disable-ecore-evas-directfb
+			--disable-ecore-evas-fb
+			--disable-ecore-evas-software-x11
+			--disable-ecore-evas-software-16-x11
+			--disable-ecore-evas-opengl-x11
+			--disable-ecore-evas-wayland-egl
+			--disable-ecore-evas-wayland-shm
+		"
+		if use opengl; then
+			ewarn "Ecore usage of OpenGL is dependent on media-libs/evas."
+			ewarn "Compile dev-libs/ecore with USE=evas."
+		fi
+	fi
+
+	if use X; then
+		if use xcb; then
+			ewarn "You have enabled both 'X' and 'xcb', so we will use"
+			ewarn "X as it's considered the most stable for ecore-x"
+		fi
+		X_FLAGS="
+		  --enable-ecore-x
+		  --disable-ecore-x-xcb
+		"
+
+	elif use xcb; then
+		X_FLAGS="
+		  --enable-ecore-x
+		  --enable-ecore-x-xcb
+		"
+	else
+		X_FLAGS="
+		  --disable-ecore-x
+		  --disable-ecore-x-xcb
+		"
+	fi
+
+	if [[ ! -z "$x_or_xcb" ]]; then
+		X_FLAGS+="
+			$(use_enable xinerama ecore-x-xinerama)
+			$(use_enable xprint ecore-x-xprint)
+			$(use_enable xscreensaver ecore-x-screensaver)
+		"
+	else
+		X_FLAGS+="
+			--disable-ecore-x-xinerama
+			--disable-ecore-x-xprint
+			--disable-ecore-x-screensaver
+		"
+	fi
+
+	if use tslib && ! use fbcon; then
+		ewarn "Ecore just uses tslib for framebuffer input."
+		ewarn "Compile dev-libs/ecore with USE=fbcon."
+	fi
+
+	MY_ECONF="
+	--enable-ecore-con
+	--enable-ecore-ipc
+	--enable-ecore-file
+	--enable-ecore-imf
+	--enable-ecore-input
+	--disable-ecore-win32
+	--disable-ecore-wince
+	--disable-ecore-evas-software-gdi
+	--disable-ecore-evas-software-ddraw
+	--disable-ecore-evas-direct3d
+	--disable-ecore-evas-opengl-glew
+	--disable-ecore-evas-software-16-ddraw
+	--disable-ecore-evas-software-16-wince
+	--disable-ecore_imf_scim
+	$(use_enable ares cares)
+	$(use_enable curl)
+	$(use_enable directfb ecore-directfb)
+	$(use_enable doc)
+	$(use_enable examples build-examples)
+	$(use_enable examples install-examples)
+	$(use_enable evas ecore-evas)
+	$(use_enable evas ecore-input-evas)
+	$(use_enable evas ecore-imf-evas)
+	$(use_enable evas ecore-evas-software-buffer)
+	$(use_enable fbcon ecore-fb)
+	$(use_enable glib)
+	$(use_enable inotify)
+	$(use_enable ipv6)
+	$(use_enable sdl ecore-sdl)
+	$(use_enable test tests)
+	$(use_enable threads posix-threads)
+	$(use_enable tslib)
+	$(use_enable wayland ecore-wayland)
+	$(use_enable X xim)
+	${SSL_FLAGS}
+	${EVAS_FLAGS}
+	${X_FLAGS}
+	"
+	enlightenment_src_configure
+}
+
+src_test() {
+	Xemake check
+}
diff --git a/dev-libs/ecore/metadata.xml b/dev-libs/ecore/metadata.xml
index 8c60c11fde06..0d3f182ac50c 100644
--- a/dev-libs/ecore/metadata.xml
+++ b/dev-libs/ecore/metadata.xml
@@ -4,11 +4,13 @@
 <herd>enlightenment</herd>
 <use>
  <flag name="ares">Enables support for asynchronous DNS using the <pkg>net-dns/c-ares</pkg> library</flag>
+ <flag name="gles">Add gles support to the ecore-evas-wayland module</flag>
  <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
  <flag name="xprint">Enable X11 Xprint support</flag>
  <flag name="inotify">Enable support for inotify</flag>
  <flag name="evas">Provides easy to use canvas by gluing <pkg>media-libs/evas</pkg> and various input/output systems.</flag>
  <flag name="tslib">Build with tslib support for touchscreen devices.</flag>
+ <flag name="wayland">Add support for <pkg>dev-libs/wayland</pkg></flag>
 </use>
 <longdescription>
 Ecore is a clean and tiny event loop library with many modules to do