gentoo resync : 10.11.2019

5 files changed, 10 insertions, 36 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index a40307d4c972..ac930d8f6117 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index b5a1e70fe641..673c273dee31 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,6 +1,5 @@
-DIST wlroots-0.6.0.tar.gz 497934 BLAKE2B a0b631831752e533f83ed62e402ef69b0994df050fd643cf2ef89556face4a822b3936bc758b70ab160eedda8ced16c0992dc209600914095784bba97bd26ee2 SHA512 c205d4303a381e11ef2f4db2faac1ddf9ad85c675824aae9cfe62d9f8bd313f1568d4810db1d006416783b50c8364198648a46d1ba453a0d8f659d6920618286
-DIST wlroots-0.7.0.tar.gz 446392 BLAKE2B ed69ae2e5484428222cd430d7c74935b0801044cacab804ffe3673c5ecf08104a5fbfbaa930c8ef4df3e43de1073910ba970028307a0a3c57483c5d502832292 SHA512 20e7e81bb945cc683c793f1258e83dbeea5e933faa066125f16a24aa7151000c620f9f47cad21540f8bea7d053d181cb89a2803c30fac1b1b9f3345065b9ba9c
-EBUILD wlroots-0.6.0.ebuild 2560 BLAKE2B 76b28e33dbe932fe89160a4806a46d3f1de2118ea05545d2248f3c7ddf59609bcd339dbe34673054943e7ca37360d3dec773630f0e2a4dde803062aa14facab3 SHA512 aebd49d399a8989d56bd2e08291da1af80432ec9cf642446bc5aa6f71c8c63d9f3467243fd43d216693831dfa432e1ba4be494a79b999254e6a741e730559ff6
-EBUILD wlroots-0.7.0.ebuild 1830 BLAKE2B b7a1d2a78a1ef76efc740d820920ea89ee6e47c085a398f2780c5ea33c10c1a4278ed9396a9cd07d3a5657908a7d31da1617541c55f59031b4598d33ae5dc2c9 SHA512 42fc760d1fede8e2c2749fac23d5ded9042617ee2ecf7d4a7c2afb3f4afa968e315a4b8567ca9f0f043819b654724e38716e5d758932cfd52bc768ed7ed1c937
+DIST wlroots-0.8.1.tar.gz 451814 BLAKE2B 85f221ba9068839f326e09df616f6182f518b9a129730dda794103305e3c0786d609a7cc6cb60a90c9d51cb77e3dbbc5993901271dcf1bd656c7744260561b06 SHA512 da41513de48e00303b31fde620463389103215011c6cc49b9a2420a1529889722aa54f26a211179c528709edb6b90ba2efdae5e4bcef18147d9516f3a94e365a
+EBUILD wlroots-0.8.1-r1.ebuild 1884 BLAKE2B 700c130f84f1b46033a94be0f4322443cac7d5ed6b787a5dc8e124b615190701589e1509fc48a79839bdc8edb74e2502ae431b6f5c19e306be9afb84f3e72d3f SHA512 0e8437ccde986819667cafb5ebf303b1cd9abe7cba61631732be247d56e88f1c468cfb3463ef80a634980b0efff628efffc2302cf4027ed1d9b5e1ddd36144d1
+EBUILD wlroots-0.8.1.ebuild 1833 BLAKE2B edb5df931fcae891e93bc0b1cec73fe91e2ecb591247e8c393b87aa66ceb4428e69bfbd1fef32c0ea3f455bc0275d157544fa068b4e1e37b90cbdf03dd4afa23 SHA512 59103f8f703ff1a08a057d0745b0ebef61e32b4a921a06c93ab66618ede37ef16bdf10ec1652d12af5e5ac7b826b1a5ebb418773c6e505785f27289bab67aeed
 EBUILD wlroots-9999.ebuild 1836 BLAKE2B f18c1cba6f5a79b8824fa62280360efbd4c89c67f0b4ae1a83fc3aa5fd2a9dc5e5e12855c8e6a542b66b682405dd98c479d7043b2e687f7bf8b37305c7d6c6f3 SHA512 291b7060c3f782d26176fc38af7286c902283b3b20c64a50726368549f048e26b1b6666e442dc445f7a54a6f266f2e525cfd42a1e0615d52e4010108f217da81
-MISC metadata.xml 1680 BLAKE2B efccd1082ca2c3a0b815c52b1879ba2b98eddf23fd0fe493084b174b2dd04cf91857df06b9e4751df102af1fa9162575e0912949421f72036b59fe725d39f82a SHA512 85106bc31308eebe98a297c5860734a756005ed80d9e2b3506d3785e96cb4b0424d622f926330883178e4020b902eafee9ce696eee3f16103ce058ca053f341e
+MISC metadata.xml 1611 BLAKE2B a52787db83324cc424c28255d7a6db05fa6ea7f92f2d5d7cd6ac4121e89f77b9e642be4ecccdb5b75be2f4ac9b1434f98d40743ae86be8044165f70cc59add65 SHA512 b04fbd1afea30e057f0feea17d05195fb76bf872aa80b5d5d6f20ac47a99c08c3703bee65b2352587a6ac588974a7da375228b439c82f861bdefa41537278a99
diff --git a/gui-libs/wlroots/metadata.xml b/gui-libs/wlroots/metadata.xml
index 49eee235ecbd..25975bbdb159 100644
--- a/gui-libs/wlroots/metadata.xml
+++ b/gui-libs/wlroots/metadata.xml
@@ -23,7 +23,6 @@
 	<use>
 		<flag name="elogind">Enable support for rootless session via elogind</flag>
 		<flag name="icccm">Use xcb-icccm (from <pkg>x11-libs/xcb-util-wm</pkg>) util library for improved Xwayland introspection</flag>
-		<flag name="rootston">Build the rootston example compositor</flag>
 		<flag name="x11-backend">Enable support for handling input/output devices through <pkg>x11-libs/libxcb</pkg></flag>
 		<flag name="X">Enable support for X11 applications (XWayland)</flag>
 	</use>
diff --git a/gui-libs/wlroots/wlroots-0.6.0.ebuild b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
index 99d9b05be6f3..50a4262598f9 100644
--- a/gui-libs/wlroots/wlroots-0.6.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.8.1-r1.ebuild
@@ -17,8 +17,8 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0"
-IUSE="elogind icccm rootston systemd x11-backend X"
+SLOT="0/8"
+IUSE="elogind icccm rdp systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -31,6 +31,7 @@ DEPEND="
 	x11-libs/pixman
 	elogind? ( >=sys-auth/elogind-237 )
 	icccm? ( x11-libs/xcb-util-wm )
+	rdp? ( net-misc/freerdp )
 	systemd? ( >=sys-apps/systemd-237 )
 	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
@@ -41,14 +42,13 @@ DEPEND="
 "
 RDEPEND="
 	${DEPEND}
+	media-video/ffmpeg:0=
 "
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.17
 	virtual/pkgconfig
 "
 
-FILECAPS=( cap_sys_admin usr/bin/rootston )
-
 src_configure() {
 	# xcb-util-errors is not on Gentoo Repository (and upstream seems inactive?)
 	local emesonargs=(
@@ -57,7 +57,6 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
@@ -72,30 +71,7 @@ src_configure() {
 	meson_src_configure
 }
 
-src_install() {
-	if use rootston; then
-		dobin "${BUILD_DIR}"/rootston/rootston
-		newdoc rootston/rootston.ini.example rootston.ini
-	fi
-
-	meson_src_install
-}
-
 pkg_postinst() {
 	elog "You must be in the input group to allow your compositor"
 	elog "to access input devices via libinput."
-	if use rootston; then
-		elog ""
-		elog "You should copy (and decompress) the example configuration file"
-		elog "from ${EROOT:-${ROOT}}/usr/share/doc/${PF}/rootston.ini"
-		elog "to the working directory from where you launch rootston"
-		elog "(or pass the '-C path-to-config' option to rootston)."
-		if ! use systemd && ! use elogind; then
-			elog ""
-			elog "If you use ConsoleKit2, remember to launch rootston using:"
-			elog "exec ck-launch-session rootston"
-
-			fcaps_pkg_postinst
-		fi
-	fi
 }
diff --git a/gui-libs/wlroots/wlroots-0.7.0.ebuild b/gui-libs/wlroots/wlroots-0.8.1.ebuild
index 9dcae89da2db..fb0cf5f0576d 100644
--- a/gui-libs/wlroots/wlroots-0.7.0.ebuild
+++ b/gui-libs/wlroots/wlroots-0.8.1.ebuild
@@ -13,11 +13,11 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm64 x86"
+	KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="MIT"
-SLOT="0/7"
+SLOT="0/8"
 IUSE="elogind icccm systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"