dev-libs/weston: import dependency and USE flag changes from g-x86

2 files changed, 6 insertions, 6 deletions

diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index 0bf8f98c..be0b9a07 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>x11</herd>
 <use>
-	<flag name='clients'>Enable support for clients</flag>
 	<flag name='colord'>Allow setting color managment</flag>
 	<flag name='drm'>Enable drm compositor support</flag>
 	<flag name='editor'>Install wayland-editor example application</flag>
@@ -11,16 +10,16 @@
 	<flag name='fbdev'>Enable fbdev compositor support</flag>
 	<flag name='gles2'>Use GLESv2 cairo instead of full GL</flag>
 	<flag name='headless'>Headless backend and a noop renderer, mainly for testing purposes</flag>
+	<flag name='ivi'>Enable the IVI shell</flag>
 	<flag name='launch'>Install weston-launch utility</flag>
 	<flag name='rdp'>Enable Remote Desktop Protocol compositor support</flag>
 	<flag name='resize-optimization'>Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
 	<flag name='rpi'>Raspberry Pi GPU support</flag>
-	<flag name='simple-clients'>Enable simple-clients</flag>
+	<flag name='screen-sharing'>Enable screen-sharing through RDP</flag>
 	<flag name='tablet'>Enable interface for tablets</flag>
 	<flag name='unwind'>Enable libunwind usage for backtraces</flag>
 	<flag name='view'>Install wayland-view example application</flag>
 	<flag name='wayland-compositor'>Enable Wayland compositor support</flag>
-	<flag name='x11'>Enable X11 compositor support</flag>
 	<flag name='xwayland'>Enable ability support native X11 applications</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index ded31864..c4a43aba 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -26,7 +26,7 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~arm-linux"
-IUSE="colord dbus +drm +egl editor examples fbdev gles2 headless +opengl rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
+IUSE="colord dbus +drm +egl editor examples fbdev gles2 headless ivi +opengl rdp +resize-optimization rpi +launch screen-sharing static-libs +suid systemd test unwind wayland-compositor +X xwayland"
 
 REQUIRED_USE="
 	drm? ( egl )
@@ -38,7 +38,8 @@ REQUIRED_USE="
 "
 
 RDEPEND="
-	>=dev-libs/wayland-1.4.0
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.7.0
 	media-libs/lcms:2
 	media-libs/libpng:0=
 	media-libs/libwebp:0=
@@ -126,6 +127,7 @@ src_configure() {
 		$(use_enable dbus) \
 		$(use_enable drm drm-compositor) \
 		$(use_enable headless headless-compositor) \
+		$(use_enable ivi ivi-shell) \
 		$(use_enable rdp rdp-compositor) \
 		$(use_enable rpi rpi-compositor) \
 		$(use_enable wayland-compositor) \
@@ -139,7 +141,6 @@ src_configure() {
 		$(use_enable suid setuid-install) \
 		$(use_enable xwayland) \
 		$(use_enable xwayland xwayland-test) \
-		--disable-libinput-backend \
 		${myconf}
 }