gentoo resync : 06.08.2019

6 files changed, 82 insertions, 31 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index 659243237d37..8338bc601fa8 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/libhandy/Manifest b/gui-libs/libhandy/Manifest
index d8de0083499f..1a0037ddc33f 100644
--- a/gui-libs/libhandy/Manifest
+++ b/gui-libs/libhandy/Manifest
@@ -1,3 +1,3 @@
 DIST libhandy-v0.0.9.tar.bz2 110100 BLAKE2B c1abf60b37d76a0b2f0ed82152decc9a87c9feff664af8df91ede192018a70003ac7ff3c1307668e7196089f59bb5dc21d1449ccc1deb3e2e362f32ff8f9f30b SHA512 d3256c2ff49a7fd0ccfec14ba3e34ed51577841c1670902d25f2a0166e63820428e689c722dddbccf787e1380c7f9a8ddc5b9042a1632b688b151ecce0f6d262
-EBUILD libhandy-0.0.9.ebuild 1488 BLAKE2B 6884b6ab7e679f9e377a07fade5656f0a6eff48c571c7e7a8705a745569bd1db9f04611567bfd92dcd4fb2fd47274671c6b3e1a4bf16b00dd3741c4d13f8e4ec SHA512 2316886ff4e88d850e1f2692536e25605e739a3347905ed010a17fbf06ea2e575184c5955f12ea5a931af3278616f78c897292efcbe9d5d554b1d1f4233c8afd
+EBUILD libhandy-0.0.9.ebuild 1495 BLAKE2B 7eb524a9c74404b33949bc8370794e5dde32301e30b9341960d53a329a952fe244e3d39d0c415d9640d019e7c779701722a5d1683beba0645b5c9bec46b03a4b SHA512 7a8aa99457caa98ce6aba13b5507df42ae16045bfe083519efd320cd22e4dd8e3f87c340db479b156a67c51c2022727c04e6ccf8cc2047f7fd9be89f5e3bfdf4
 MISC metadata.xml 474 BLAKE2B b8fba1ac64b79eaadbd70099133bc57a69be78738b9da3742ac9381286f62e5198b5b6dc5bf51dd5a11e0ea06819d3ccc00157f7f69939f18db18016db47705a SHA512 d9c79fbc1e8549dcdf6e42263040844efd729440d725df7c8f06bdf5e6c8da0de8f24186c94a2444e03f4396aaa1e4043d1893996770cfa2e5ea9f1b0ca71b4a
diff --git a/gui-libs/libhandy/libhandy-0.0.9.ebuild b/gui-libs/libhandy/libhandy-0.0.9.ebuild
index 06eafda4c3dc..5e89a43e4027 100644
--- a/gui-libs/libhandy/libhandy-0.0.9.ebuild
+++ b/gui-libs/libhandy/libhandy-0.0.9.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="LGPL-2.1+"
 SLOT="0.0/0" # It may or may not break ABI in future versions at this point; if new
 # SLOT happens, it'll likely file conflict on gtk-doc and glade library and catalog
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 
 IUSE="examples glade gtk-doc +introspection test vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 8df1a1788c27..41599b95fa79 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,8 +1,10 @@
 DIST wlroots-0.4.1.tar.gz 480127 BLAKE2B f193860ef9e0852b053270bdaa44b491a8c65a76dc01c71690f7a006eac46e606cca95675e6dec4d65487d9b98bcabb7cd12578f028a9cb9c5cd648e47754df4 SHA512 bd8863c7f285579d81b9372f1335c10eb2d0fd7b46b7589e6b2acad53fa373f2e3b549d2c31876d87d66851af0415a12a011a05953ffe2384b718db6d95cba2e
 DIST wlroots-0.5.0.tar.gz 481154 BLAKE2B 094c7c92191ea9c581debc90fa7b0117ed15328c11a098e53cec05b326e84c54481a69382ef9a592337ade370ffb55ea98b545794471808dee9f41ee9db8194f SHA512 4defecff91a6179d3a6b7d05c92c14b20c7fa69263a889869912e913a5d1e29f9fd4684f9816b03e2427a21c004d64236f35d8282e02e8d27d826442f1f8b3a7
 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.4.1.ebuild 2556 BLAKE2B 387bad0c2177db317674eca833112491e6a9fb78dfe1f6f652450a557bcc5ef65c575f0024b069e6b93122b94e6fc180f8d046ee4d83c2be571150458fdb8868 SHA512 4c57f85f868d258bbe8168137f4e5f639dd617ab994a93324a115ed31e3ff2dddd802bc787cada563df8df780cd7a4ad3d1a57cf2b64c6408c862ffa64178c41
 EBUILD wlroots-0.5.0.ebuild 2560 BLAKE2B 888dbb482966d512c7c448ef30061acf9bf19f311cb1cede67eb51d4969236f366980b2d13a852a6a19e5ed0dfd3969abb739796b3ba77556a70447245ec6ac2 SHA512 60e2b90b688e7e62e1a34077e5edbf07c1103da4d9198fb224b511b01a78c98011a835e6f547388646b337509f912d93ef674e919a08da2c24a6383ce74d0f21
 EBUILD wlroots-0.6.0.ebuild 2560 BLAKE2B 76b28e33dbe932fe89160a4806a46d3f1de2118ea05545d2248f3c7ddf59609bcd339dbe34673054943e7ca37360d3dec773630f0e2a4dde803062aa14facab3 SHA512 aebd49d399a8989d56bd2e08291da1af80432ec9cf642446bc5aa6f71c8c63d9f3467243fd43d216693831dfa432e1ba4be494a79b999254e6a741e730559ff6
-EBUILD wlroots-9999.ebuild 2563 BLAKE2B 3702306601cfb39e3d3e6719cfa75e6c23ee7f35814c804a4eb9997bcc004b5ff57f328d17625bd1313ca7898ee86211a3f1857c401886e39d9971443ccd478e SHA512 9c69220a61469efe672e06414dbdac04e7dbf25eb5b3e8cda4696752b0604421144b167cf5836ef413d500427edcc5a7d02dbc821027f3952bcb385cb310d6ad
+EBUILD wlroots-0.7.0.ebuild 1833 BLAKE2B 96d2a4b32d8edf49397d7fdcbedbbc1940779b8e3189ec3698ebd73edb60b6350f8afe1559b0aa05a8abf29ae4d491e1f44df23b96fd5f07c134110c5148cef6 SHA512 99359af1e856d3fcad3537784419ae30d9eb51c7e40be94c84ad271b259d33f283ba1b43517120add1a9806d4d6390bf345b24956e8044035b5fff4f428264a3
+EBUILD wlroots-9999.ebuild 1836 BLAKE2B f18c1cba6f5a79b8824fa62280360efbd4c89c67f0b4ae1a83fc3aa5fd2a9dc5e5e12855c8e6a542b66b682405dd98c479d7043b2e687f7bf8b37305c7d6c6f3 SHA512 291b7060c3f782d26176fc38af7286c902283b3b20c64a50726368549f048e26b1b6666e442dc445f7a54a6f266f2e525cfd42a1e0615d52e4010108f217da81
 MISC metadata.xml 1680 BLAKE2B efccd1082ca2c3a0b815c52b1879ba2b98eddf23fd0fe493084b174b2dd04cf91857df06b9e4751df102af1fa9162575e0912949421f72036b59fe725d39f82a SHA512 85106bc31308eebe98a297c5860734a756005ed80d9e2b3506d3785e96cb4b0424d622f926330883178e4020b902eafee9ce696eee3f16103ce058ca053f341e
diff --git a/gui-libs/wlroots/wlroots-0.7.0.ebuild b/gui-libs/wlroots/wlroots-0.7.0.ebuild
new file mode 100644
index 000000000000..2e9ec3279126
--- /dev/null
+++ b/gui-libs/wlroots/wlroots-0.7.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~arm64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0/7"
+IUSE="elogind icccm systemd x11-backend X"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	>=dev-libs/libinput-1.9.0:0=
+	>=dev-libs/wayland-1.17.0
+	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=
+		x11-libs/xcb-util-image
+	)
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.17
+	virtual/pkgconfig
+"
+
+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)
+		"-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
+}
+
+pkg_postinst() {
+	elog "You must be in the input group to allow your compositor"
+	elog "to access input devices via libinput."
+}
diff --git a/gui-libs/wlroots/wlroots-9999.ebuild b/gui-libs/wlroots/wlroots-9999.ebuild
index db03b0f1e012..b9431381dd79 100644
--- a/gui-libs/wlroots/wlroots-9999.ebuild
+++ b/gui-libs/wlroots/wlroots-9999.ebuild
@@ -17,8 +17,8 @@ else
 fi
 
 LICENSE="MIT"
-SLOT="0"
-IUSE="elogind icccm rootston systemd x11-backend X"
+SLOT="0/9999"
+IUSE="elogind icccm systemd x11-backend X"
 REQUIRED_USE="?? ( elogind systemd )"
 
 DEPEND="
@@ -47,8 +47,6 @@ BDEPEND="
 	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 +55,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 +69,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
 }