gentoo resync : 18.11.2018

4 files changed, 171 insertions, 14 deletions

diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest
index 92acdfb9aa6b..54c2158566f6 100644
--- a/dev-libs/weston/Manifest
+++ b/dev-libs/weston/Manifest
@@ -1,5 +1,7 @@
 AUX README.gentoo 383 BLAKE2B a0d8fef2d1f0deebe46ed85065a09057a620aa7af4e7aa901f1fef7b75d15e2ca9d2be1b9367a651a2edf3b4265441ce47af832f423cf9725c78e61836a4f982 SHA512 e4d8f8e0edeb6773dd7ef6329074d1e40b694b9e7e10b6a429d8c5dd4fe1170594f447a42eb41446ec2355829a1da1606bf6c544434551c5c931b0794422e786
 DIST weston-3.0.0.tar.xz 1300340 BLAKE2B 38b46ecca03ffee7832a561348cb1d6604db7e0add8b5629141ce61593ae250625d71c6716f02296157ea5a61764ff10561fa7ffc8f3c1426a4c86589b13b5c3 SHA512 b824c39f2a884f6d50d607613f447090621f684c96f7d905f25f6e500dabd03ecb2b1cd1030babc193c3417223cb220103abb792437e1a5ead7229a76b5c7a58
+DIST weston-5.0.0.tar.xz 1467496 BLAKE2B 514bc4c4f09dc8bc5b068c66cf14b86687bee1e691f7dfcb251a5ae7fe02389b48626ed02c97eff9334b43e227ea8b83beef48c53a83b4691f59a65af53ad61d SHA512 b6f97eca014ea47f3de0c5ddd89712f896cd66423d0eb499e1d88d35aab616cef1e735ebb8e0cefd8b60085314b6ec3d56b39d7c4776188bb56d58efc84a52cf
 EBUILD weston-3.0.0.ebuild 3460 BLAKE2B 3831b7e40fdf6a767a8c4686ce935f6323e1250e9338e7a2e4aaaaa94753098bf28ca3f37e6b05e20eea3feeef3079f889b31f0b44fc66b9be2443b912f8df30 SHA512 3ee0b31c75053f23a0e558a9e83ae737137e24682ef8905c54e2f3437306e6a46137f4300014f9c2471bd7958eb7078c69c8762ea18e79e84d618583b1ad72c6
-EBUILD weston-9999.ebuild 3450 BLAKE2B 32f9b8b7f712e7a948bd6addc68792234684314c3dcb59db31f0884432805a3dc64fb79f82225fca22043384af9532e34d7f5872424af180ecc768111348f3f6 SHA512 e56e09138148f71d36f2d6543bcfee9389d8df903def4ee23f3f326a1e47950dac07899a66234adfcea841a2e2b248741a4d5bdc73586761a43f116340540b02
-MISC metadata.xml 1245 BLAKE2B ee9948ac519b55c804770a134bddcc0f2a9656dd948b2eca13919f3d8d059db373bddb711b4a763e43bd4cfcc931e06503bb3a4f917baa5ab3a9c19db8091724 SHA512 668357837485ffcce4eb49d4dcd0d0b5de24fcac5f9cc22f6fbc63df951d37cc5dca6d2ff5f17d5a574e273167fff462e142c873893d2e9c517463d9fbc1883f
+EBUILD weston-5.0.0.ebuild 3382 BLAKE2B 78cea378bfb77c2145306ff46b621c18ea814ffcf2a069c2ab7ab85137b38cdc6c01af09be1c0891ddc2742e9967103f5a0505f4da66142c3a99efc71f156c25 SHA512 713f940e5f067270493a06752a6d1d8d051149c196de3b35d86ce5d592964daaca5a192ae17cf94a75f0be959040ca09458db431d97c9f3d3fd563030b2326ee
+EBUILD weston-9999.ebuild 3495 BLAKE2B e51f4a911ffb00a2d573324ba03d1b4207b0a5acedbbdc1804bc3b18055ed20222d61d88e085c7fe28004684885658d130a04f64658da884e828cf14f1587ad1 SHA512 9dc9ab5301ef0f3249dee521dd3231805b8fd40746dd3db5b43b48a9abbdf7cf0aa740ba42cf93603d806f0d2bcca4ee1a349196dc0254549fee533cd77f7aa3
+MISC metadata.xml 1360 BLAKE2B 0ce06161e748f11ded0baf006473ef73c5fc1f5f63a6554821c8389c65747463808738648b7508c416e6db48f35f290ef8b9e212b91992224dae146ad65cae47 SHA512 d4b17a918dac982654ed9a46e84d6d27b99426a693a23cb93f1b10dd73d7a8cf5bc6d5176a732400c6c1047449ea1a9c3bfb26803ea7247ff0e76c430d676cd1
diff --git a/dev-libs/weston/metadata.xml b/dev-libs/weston/metadata.xml
index c1c3e3956fa3..c976a4437cfc 100644
--- a/dev-libs/weston/metadata.xml
+++ b/dev-libs/weston/metadata.xml
@@ -15,6 +15,7 @@
 	<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="remoting">Enable plugin to stream output to remote hosts using <pkg>media-libs/gstreamer</pkg></flag>
 	<flag name="resize-optimization">Increase performance, allocate more RAM. Recommended to disable on Raspberry Pi</flag>
 	<flag name="screen-sharing">Enable screen-sharing through RDP</flag>
 	<flag name="unwind">Enable libunwind usage for backtraces</flag>
diff --git a/dev-libs/weston/weston-5.0.0.ebuild b/dev-libs/weston/weston-5.0.0.ebuild
new file mode 100644
index 000000000000..61c5f7776cc6
--- /dev/null
+++ b/dev-libs/weston/weston-5.0.0.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/wayland/weston.git"
+	GIT_ECLASS="git-r3"
+	EXPERIMENTAL="true"
+fi
+
+inherit autotools readme.gentoo-r1 toolchain-funcs $GIT_ECLASS
+
+DESCRIPTION="Wayland reference compositor"
+HOMEPAGE="https://wayland.freedesktop.org/"
+
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+	KEYWORDS=""
+else
+	SRC_URI="https://wayland.freedesktop.org/releases/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="MIT CC-BY-SA-3.0"
+SLOT="0"
+
+IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
+
+REQUIRED_USE="
+	drm? ( gles2 )
+	screen-sharing? ( rdp )
+	systemd? ( dbus )
+	test? ( headless xwayland )
+	wayland-compositor? ( gles2 )
+"
+
+RDEPEND="
+	>=dev-libs/libinput-0.8.0
+	>=dev-libs/wayland-1.12.0
+	>=dev-libs/wayland-protocols-1.13
+	lcms? ( media-libs/lcms:2 )
+	media-libs/libpng:0=
+	webp? ( media-libs/libwebp:0= )
+	jpeg? ( virtual/jpeg:0= )
+	>=x11-libs/cairo-1.11.3
+	>=x11-libs/libdrm-2.4.68
+	>=x11-libs/libxkbcommon-0.5.0
+	>=x11-libs/pixman-0.25.2
+	x11-misc/xkeyboard-config
+	fbdev? (
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	colord? ( >=x11-misc/colord-0.1.27 )
+	dbus? ( >=sys-apps/dbus-1.6 )
+	drm? (
+		>=media-libs/mesa-17.1[gbm]
+		>=sys-libs/mtdev-1.1.0
+		>=virtual/udev-136
+	)
+	editor? ( x11-libs/pango )
+	gles2? (
+		media-libs/mesa[gles2,wayland]
+	)
+	rdp? ( >=net-misc/freerdp-1.1.0:= )
+	systemd? (
+		sys-auth/pambase[systemd]
+		>=sys-apps/systemd-209[pam]
+	)
+	launch? ( sys-auth/pambase )
+	X? (
+		>=x11-libs/libxcb-1.9
+		x11-libs/libX11
+	)
+	xwayland? (
+		x11-base/xorg-server[wayland]
+		x11-libs/cairo[xcb]
+		>=x11-libs/libxcb-1.9
+		x11-libs/libXcursor
+	)
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	if [[ ${PV} = 9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myconf=()
+
+	if use examples || use test; then
+		myconf+=( --enable-simple-clients )
+	else
+		myconf+=( --disable-simple-clients )
+	fi
+
+	econf \
+		$(use_enable examples demo-clients-install) \
+		$(use_enable fbdev fbdev-compositor) \
+		$(use_enable dbus) \
+		$(use_enable drm drm-compositor) \
+		$(use_enable headless headless-compositor) \
+		$(use_enable ivi ivi-shell) \
+		$(use_enable lcms) \
+		$(use_enable rdp rdp-compositor) \
+		$(use_enable wayland-compositor) \
+		$(use_enable X x11-compositor) \
+		$(use_enable launch weston-launch) \
+		$(use_enable colord) \
+		$(use_enable gles2 egl) \
+		$(use_enable resize-optimization) \
+		$(use_enable screen-sharing) \
+		$(use_enable suid setuid-install) \
+		$(use_enable systemd systemd-login) \
+		$(use_enable systemd systemd-notify) \
+		$(use_enable xwayland) \
+		$(use_enable xwayland xwayland-test) \
+		$(use_with jpeg) \
+		$(use_with webp) \
+		--with-cairo=image \
+		--disable-junit-xml \
+		--disable-simple-dmabuf-drm-client \
+		--disable-simple-dmabuf-v4l-client \
+		--disable-simple-egl-clients \
+		--disable-vaapi-recorder \
+		"${myconf[@]}"
+}
+
+src_test() {
+	export XDG_RUNTIME_DIR="${T}/runtime-dir"
+	mkdir "${XDG_RUNTIME_DIR}" || die
+	chmod 0700 "${XDG_RUNTIME_DIR}" || die
+
+	cd "${BUILD_DIR}" || die
+	emake check
+}
+
+src_install() {
+	default
+
+	readme.gentoo_create_doc
+}
diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild
index 44880eb96399..40aa43e4412b 100644
--- a/dev-libs/weston/weston-9999.ebuild
+++ b/dev-libs/weston/weston-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,7 +25,7 @@ fi
 LICENSE="MIT CC-BY-SA-3.0"
 SLOT="0"
 
-IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp +resize-optimization screen-sharing static-libs +suid systemd test unwind wayland-compositor webp +X xwayland"
+IUSE="colord dbus +drm editor examples fbdev +gles2 headless ivi jpeg +launch lcms rdp remoting +resize-optimization screen-sharing static-libs +suid systemd test wayland-compositor webp +X xwayland"
 
 REQUIRED_USE="
 	drm? ( gles2 )
@@ -38,13 +38,13 @@ REQUIRED_USE="
 RDEPEND="
 	>=dev-libs/libinput-0.8.0
 	>=dev-libs/wayland-1.12.0
-	>=dev-libs/wayland-protocols-1.8
+	>=dev-libs/wayland-protocols-1.14
 	lcms? ( media-libs/lcms:2 )
 	media-libs/libpng:0=
 	webp? ( media-libs/libwebp:0= )
 	jpeg? ( virtual/jpeg:0= )
 	>=x11-libs/cairo-1.11.3
-	>=x11-libs/libdrm-2.4.30
+	>=x11-libs/libdrm-2.4.68
 	>=x11-libs/libxkbcommon-0.5.0
 	>=x11-libs/pixman-0.25.2
 	x11-misc/xkeyboard-config
@@ -55,7 +55,7 @@ RDEPEND="
 	colord? ( >=x11-misc/colord-0.1.27 )
 	dbus? ( >=sys-apps/dbus-1.6 )
 	drm? (
-		media-libs/mesa[gbm]
+		>=media-libs/mesa-17.1[gbm]
 		>=sys-libs/mtdev-1.1.0
 		>=virtual/udev-136
 	)
@@ -63,13 +63,16 @@ RDEPEND="
 	gles2? (
 		media-libs/mesa[gles2,wayland]
 	)
-	rdp? ( >=net-misc/freerdp-1.1.0_beta1_p20130710 )
+	rdp? ( >=net-misc/freerdp-1.1.0:= )
+	remoting? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
 	systemd? (
 		sys-auth/pambase[systemd]
 		>=sys-apps/systemd-209[pam]
 	)
 	launch? ( sys-auth/pambase )
-	unwind? ( sys-libs/libunwind )
 	X? (
 		>=x11-libs/libxcb-1.9
 		x11-libs/libX11
@@ -95,11 +98,12 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf
+	local myconf=()
+
 	if use examples || use test; then
-		myconf="--enable-simple-clients"
+		myconf+=( --enable-simple-clients )
 	else
-		myconf="--disable-simple-clients"
+		myconf+=( --disable-simple-clients )
 	fi
 
 	econf \
@@ -116,7 +120,7 @@ src_configure() {
 		$(use_enable launch weston-launch) \
 		$(use_enable colord) \
 		$(use_enable gles2 egl) \
-		$(use_enable unwind libunwind) \
+		$(use_enable remoting) \
 		$(use_enable resize-optimization) \
 		$(use_enable screen-sharing) \
 		$(use_enable suid setuid-install) \
@@ -132,7 +136,7 @@ src_configure() {
 		--disable-simple-dmabuf-v4l-client \
 		--disable-simple-egl-clients \
 		--disable-vaapi-recorder \
-		${myconf}
+		"${myconf[@]}"
 }
 
 src_test() {