gentoo resync : 24.12.2018

4 files changed, 104 insertions, 8 deletions

diff --git a/dev-libs/wlroots/Manifest b/dev-libs/wlroots/Manifest
index 318e2ea4afe4..01305239f254 100644
--- a/dev-libs/wlroots/Manifest
+++ b/dev-libs/wlroots/Manifest
@@ -1,4 +1,6 @@
 DIST wlroots-0.1.tar.gz 436459 BLAKE2B 8545adb7a9ffe1c4b071ddad1093472f45b24638b29b3c2898b4aa3629c364936be7bec348c9aac5a7d3ecda677df108361fbef08cda8fca9c6bb21639883c86 SHA512 43897ac5a512ea26ad9703182dab5de9c714a087449b108472f638148538a632a67cfc778edf3e77940fdd7bdba91d64a4dc4e4ed1903a150f13ca59237ce01e
+DIST wlroots-0.2.tar.gz 437638 BLAKE2B dd7ca737ba2dfc00e30c83e973616cefb77fccb793161794361422a2fcbdf7299aacea8d794b910fdf06c9a191a89f7f1530d312545d08d126a729be41eeb424 SHA512 b7727b29ed7e5188d5fa6099687f8e6f48b6b3f17f7a6e136956ad6b607054595de3779118bffd4b9730115eaca2f00c2d30d52f4915b2753a749432ec0c3f2a
 EBUILD wlroots-0.1.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
-EBUILD wlroots-9999.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
-MISC metadata.xml 1685 BLAKE2B b765b48a93cf34274cbb12f9ecf98aa5b51a6cc29800cd2871b37f2e04f1bb20ac9168dd2d1940bd7a3937de4dffa89125dadfaa139518f05cc3920b67aecaff SHA512 f815d97c115285f2c23f833979137e0622f14a38344e3c04da11075c13fd4d83fe3d2bec78c2da448fc88b09bb2259e66b2bbdf8479cebb5e0ff1443959ecf0a
+EBUILD wlroots-0.2.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
+EBUILD wlroots-9999.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
+MISC metadata.xml 1672 BLAKE2B 6972ecf01e4d0981aed6b3c60e8f549e04c3662e77ea38a226acc37dedfa6ed04dbda33d4ac451e18b4a889200973bdf6f25c75e4b14e1c3e2b328c04de85a8d SHA512 34654dad23535a63b5891ae658c67bb1d7ba3a61126e1d9f31b10817c134964ce751aac46036ec1d11590f42a4be2c858d5fe44c4760279cfa401826f5ffcf92
diff --git a/dev-libs/wlroots/metadata.xml b/dev-libs/wlroots/metadata.xml
index b97edbb562b5..c5b96abdf826 100644
--- a/dev-libs/wlroots/metadata.xml
+++ b/dev-libs/wlroots/metadata.xml
@@ -2,13 +2,13 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron Bauman</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Pluggable, composable, unopinionated modules for building a Wayland
 		compositor.
diff --git a/dev-libs/wlroots/wlroots-0.2.ebuild b/dev-libs/wlroots/wlroots-0.2.ebuild
new file mode 100644
index 000000000000..c3bccd9f7fe9
--- /dev/null
+++ b/dev-libs/wlroots/wlroots-0.2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/swaywm/wlroots.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/wlroots/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+inherit fcaps meson
+
+DESCRIPTION="Pluggable, composable, unopinionated modules for building a Wayland compositor"
+HOMEPAGE="https://github.com/swaywm/wlroots"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind icccm rootston systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+RDEPEND=">=dev-libs/libinput-1.7.0:0=
+	>=dev-libs/wayland-1.16.0
+	>=dev-libs/wayland-protocols-1.15
+	media-libs/mesa[egl,gles2,gbm]
+	virtual/libudev
+	x11-libs/libdrm
+	x11-libs/libxkbcommon
+	x11-libs/pixman
+	elogind? ( >=sys-auth/elogind-237 )
+	icccm? ( x11-libs/xcb-util-wm )
+	systemd? ( >=sys-apps/systemd-237 )
+	x11-backend? ( x11-libs/libxcb:0= )
+	X? (
+		x11-base/xorg-server[wayland]
+		x11-libs/libxcb:0=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/meson-0.48
+	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=(
+		"-Dxcb-errors=disabled"
+		-Dlibcap=$(usex filecaps enabled disabled)
+		-Dxcb-icccm=$(usex icccm enabled disabled)
+		-Dxwayland=$(usex X enabled disabled)
+		-Dx11-backend=$(usex x11-backend enabled disabled)
+		-Drootston=$(usex rootston true false)
+		"-Dexamples=false"
+		"-Dwerror=false"
+	)
+	if use systemd ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind ; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	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/dev-libs/wlroots/wlroots-9999.ebuild b/dev-libs/wlroots/wlroots-9999.ebuild
index eae2493458cd..c3bccd9f7fe9 100644
--- a/dev-libs/wlroots/wlroots-9999.ebuild
+++ b/dev-libs/wlroots/wlroots-9999.ebuild
@@ -32,7 +32,7 @@ RDEPEND=">=dev-libs/libinput-1.7.0:0=
 	elogind? ( >=sys-auth/elogind-237 )
 	icccm? ( x11-libs/xcb-util-wm )
 	systemd? ( >=sys-apps/systemd-237 )
-	x11-backend? ( x11-libs/libxcb:0=[xkb] )
+	x11-backend? ( x11-libs/libxcb:0= )
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
@@ -49,7 +49,6 @@ src_configure() {
 		"-Dxcb-errors=disabled"
 		-Dlibcap=$(usex filecaps enabled disabled)
 		-Dxcb-icccm=$(usex icccm enabled disabled)
-		-Dxcb-xkb=$(usex x11-backend enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
 		-Drootston=$(usex rootston true false)