gentoo resync : 16.02.1018

6 files changed, 86 insertions, 166 deletions

diff --git a/dev-libs/wlroots/Manifest b/dev-libs/wlroots/Manifest
index 9c35e0601f8a..856802476a2b 100644
--- a/dev-libs/wlroots/Manifest
+++ b/dev-libs/wlroots/Manifest
@@ -1,8 +1,6 @@
-DIST wlroots-0.1.tar.gz 436459 BLAKE2B 8545adb7a9ffe1c4b071ddad1093472f45b24638b29b3c2898b4aa3629c364936be7bec348c9aac5a7d3ecda677df108361fbef08cda8fca9c6bb21639883c86 SHA512 43897ac5a512ea26ad9703182dab5de9c714a087449b108472f638148538a632a67cfc778edf3e77940fdd7bdba91d64a4dc4e4ed1903a150f13ca59237ce01e
 DIST wlroots-0.2.tar.gz 437638 BLAKE2B dd7ca737ba2dfc00e30c83e973616cefb77fccb793161794361422a2fcbdf7299aacea8d794b910fdf06c9a191a89f7f1530d312545d08d126a729be41eeb424 SHA512 b7727b29ed7e5188d5fa6099687f8e6f48b6b3f17f7a6e136956ad6b607054595de3779118bffd4b9730115eaca2f00c2d30d52f4915b2753a749432ec0c3f2a
 DIST wlroots-0.3.tar.gz 473490 BLAKE2B 552bcc5d8bb847dbac5caaddeac830a4de25b4cc80abb6c8b8e610b5e40cc20ff50a145fdfb6bb5f0aa53d218400777ca7a5982c74eb01bd973109b2f8fd7938 SHA512 ccec1426e6ac86fa63f82763d123162fca5be25fb37bbb44a5de651a7764f5325ef21cbe2cf698cb315f0de4719a6bac8eb0ceeffe2111de7c9f4b59e019aaaa
-EBUILD wlroots-0.1.ebuild 2626 BLAKE2B 9f4a1587211f67948f6a8cccf173318231f76dde8fa39ccb329b7cc91579872870486e41eb064cbabdeb53708b6bb120dcd2ba138b263c7e457eb3fa5f6d5fd3 SHA512 4990121b1a5ef0d24361997ce6a2d41378c462f14c83b021cc03d19e4f4661cb48e2b9becbfbcd2891ed30e1690b6bf3f4d86f0b83889a96056f5ac233b2fefb
-EBUILD wlroots-0.2.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
-EBUILD wlroots-0.3.ebuild 2577 BLAKE2B 4f369df76534a7b0d12f57f20ce9384fdafe7ac8327b42db7dccbf114a9c791d251f225c154b495e9df50ede94cd5d652450bd49dfc006a114ed76281248664c SHA512 a1a9c9a6a8cfd4bc829bb58ee9e0d1091dd68ff4535798518a12cfac646fde519b86f19e5fd01a919a14a4e840db06d845b449b6cd858d9fef3de63620ee6a78
-EBUILD wlroots-9999.ebuild 2572 BLAKE2B 81fe3641a8f35a9198d9312f8408f74f55bba972e7dbe88dec460868d686c4834a35cfd0d371ed261e33697e5a5bd9448091a2c8185326fcae44f1263b1414a4 SHA512 8f918c4d90938a0c78790c5541a8568766b30384c4f8a6a838de2ae3b8b45ad41cb7dab3aaa31f75458c2cb85b29fd7dd68e41deb18826232a6e65d31097d770
-MISC metadata.xml 1672 BLAKE2B 6972ecf01e4d0981aed6b3c60e8f549e04c3662e77ea38a226acc37dedfa6ed04dbda33d4ac451e18b4a889200973bdf6f25c75e4b14e1c3e2b328c04de85a8d SHA512 34654dad23535a63b5891ae658c67bb1d7ba3a61126e1d9f31b10817c134964ce751aac46036ec1d11590f42a4be2c858d5fe44c4760279cfa401826f5ffcf92
+EBUILD wlroots-0.2.ebuild 2556 BLAKE2B 5081d65b136626ea245b9b847eec1ec7d2c4e2566467f78394f93e889e22ed9abb63267233fd42faa2ec8763e9870a693050547cd7e7d495eb512434172958d7 SHA512 a8960892a10d12e007d9a010f98ad935b109c10433fa3510dd88c38f51519077d33076e35b6890121b7c1eb06c81f22a1c1dfd628cc85f8bac089c0f825f3efe
+EBUILD wlroots-0.3.ebuild 2556 BLAKE2B 00e108c5beda97a66f08ca08e57761a89763b1a1767239c12734eb937156fad57917fe777a10fc9f19e12a2d1ad593520768f97885a7633d04f2234f48352a42 SHA512 ebc9b1bc9473120b10ddf7a94db75209788601b41b8d88d375b75022778a477fc4970979bed478359a95119e703f14b9d896a261f6b9e753f3254d8372e8972d
+EBUILD wlroots-9999.ebuild 2556 BLAKE2B 00e108c5beda97a66f08ca08e57761a89763b1a1767239c12734eb937156fad57917fe777a10fc9f19e12a2d1ad593520768f97885a7633d04f2234f48352a42 SHA512 ebc9b1bc9473120b10ddf7a94db75209788601b41b8d88d375b75022778a477fc4970979bed478359a95119e703f14b9d896a261f6b9e753f3254d8372e8972d
+MISC metadata.xml 1682 BLAKE2B 5713fb5006f1c178ba401ff4831ff991ec1e2270bf7d7961a0727a8934cf9262654fa12b9e13cd14803a8ace50c04dcdcdd37ff6162239fb22c30c84970b1f7a SHA512 88263936158e8d423f79ac9932286674e0b7e6e50f0279cefc07fa3961cda5c65874b14029553ce8b93dd22a7715ca40b1db32d239498d144fc6c901000e5018
diff --git a/dev-libs/wlroots/metadata.xml b/dev-libs/wlroots/metadata.xml
index c5b96abdf826..5fb5999bdba5 100644
--- a/dev-libs/wlroots/metadata.xml
+++ b/dev-libs/wlroots/metadata.xml
@@ -9,7 +9,7 @@
 		<email>speedjack95@gmail.com</email>
 		<name>Niccolò Scatena</name>
 	</maintainer>
-	<longdescription>
+	<longdescription lang="en">
 		Pluggable, composable, unopinionated modules for building a Wayland
 		compositor.
 
diff --git a/dev-libs/wlroots/wlroots-0.1.ebuild b/dev-libs/wlroots/wlroots-0.1.ebuild
deleted file mode 100644
index eae2493458cd..000000000000
--- a/dev-libs/wlroots/wlroots-0.1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# 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=[xkb] )
-	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)
-		-Dxcb-xkb=$(usex x11-backend 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-0.2.ebuild b/dev-libs/wlroots/wlroots-0.2.ebuild
index c3bccd9f7fe9..a3427d6c6fc3 100644
--- a/dev-libs/wlroots/wlroots-0.2.ebuild
+++ b/dev-libs/wlroots/wlroots-0.2.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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"
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="elogind icccm rootston systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND=">=dev-libs/libinput-1.7.0:0=
+DEPEND="
+	>=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
@@ -36,10 +36,16 @@ RDEPEND=">=dev-libs/libinput-1.7.0:0=
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/meson-0.48
-	virtual/pkgconfig"
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.15
+	virtual/pkgconfig
+"
 
 FILECAPS=( cap_sys_admin usr/bin/rootston )
 
@@ -51,13 +57,13 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		-Drootston=$(usex rootston true false)
+		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
-	if use systemd ; then
+	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind ; then
+	elif use elogind; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
 	else
 		emesonargs+=("-Dlogind=disabled")
@@ -67,7 +73,7 @@ src_configure() {
 }
 
 src_install() {
-	if use rootston ; then
+	if use rootston; then
 		dobin "${BUILD_DIR}"/rootston/rootston
 		newdoc rootston/rootston.ini.example rootston.ini
 	fi
@@ -78,13 +84,13 @@ 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
+	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
+		if ! use systemd && ! use elogind; then
 			elog ""
 			elog "If you use ConsoleKit2, remember to launch rootston using:"
 			elog "exec ck-launch-session rootston"
diff --git a/dev-libs/wlroots/wlroots-0.3.ebuild b/dev-libs/wlroots/wlroots-0.3.ebuild
index c762765d60bc..c96b1fcfc3fe 100644
--- a/dev-libs/wlroots/wlroots-0.3.ebuild
+++ b/dev-libs/wlroots/wlroots-0.3.ebuild
@@ -3,27 +3,27 @@
 
 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"
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="elogind icccm rootston systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND=">=dev-libs/libinput-1.7.0:0=
+DEPEND="
+	>=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
@@ -32,14 +32,20 @@ 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=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/meson-0.48
-	virtual/pkgconfig"
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.16
+	virtual/pkgconfig
+"
 
 FILECAPS=( cap_sys_admin usr/bin/rootston )
 
@@ -51,13 +57,13 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		-Drootston=$(usex rootston true false)
+		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
-	if use systemd ; then
+	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind ; then
+	elif use elogind; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
 	else
 		emesonargs+=("-Dlogind=disabled")
@@ -67,7 +73,7 @@ src_configure() {
 }
 
 src_install() {
-	if use rootston ; then
+	if use rootston; then
 		dobin "${BUILD_DIR}"/rootston/rootston
 		newdoc rootston/rootston.ini.example rootston.ini
 	fi
@@ -78,13 +84,13 @@ 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
+	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
+		if ! use systemd && ! use elogind; then
 			elog ""
 			elog "If you use ConsoleKit2, remember to launch rootston using:"
 			elog "exec ck-launch-session rootston"
diff --git a/dev-libs/wlroots/wlroots-9999.ebuild b/dev-libs/wlroots/wlroots-9999.ebuild
index c3bccd9f7fe9..c96b1fcfc3fe 100644
--- a/dev-libs/wlroots/wlroots-9999.ebuild
+++ b/dev-libs/wlroots/wlroots-9999.ebuild
@@ -1,29 +1,29 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 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"
 
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
 LICENSE="MIT"
 SLOT="0"
 IUSE="elogind icccm rootston systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
-RDEPEND=">=dev-libs/libinput-1.7.0:0=
+DEPEND="
+	>=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
@@ -36,10 +36,16 @@ RDEPEND=">=dev-libs/libinput-1.7.0:0=
 	X? (
 		x11-base/xorg-server[wayland]
 		x11-libs/libxcb:0=
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND=">=dev-util/meson-0.48
-	virtual/pkgconfig"
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.16
+	virtual/pkgconfig
+"
 
 FILECAPS=( cap_sys_admin usr/bin/rootston )
 
@@ -51,13 +57,13 @@ src_configure() {
 		-Dxcb-icccm=$(usex icccm enabled disabled)
 		-Dxwayland=$(usex X enabled disabled)
 		-Dx11-backend=$(usex x11-backend enabled disabled)
-		-Drootston=$(usex rootston true false)
+		$(meson_use rootston)
 		"-Dexamples=false"
 		"-Dwerror=false"
 	)
-	if use systemd ; then
+	if use systemd; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
-	elif use elogind ; then
+	elif use elogind; then
 		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
 	else
 		emesonargs+=("-Dlogind=disabled")
@@ -67,7 +73,7 @@ src_configure() {
 }
 
 src_install() {
-	if use rootston ; then
+	if use rootston; then
 		dobin "${BUILD_DIR}"/rootston/rootston
 		newdoc rootston/rootston.ini.example rootston.ini
 	fi
@@ -78,13 +84,13 @@ 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
+	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
+		if ! use systemd && ! use elogind; then
 			elog ""
 			elog "If you use ConsoleKit2, remember to launch rootston using:"
 			elog "exec ck-launch-session rootston"