gentoo resync : 08.06.2019

5 files changed, 5 insertions, 120 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 2fd928974a81..564012bf2cec 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 8d99f7686810..837922a13d96 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,8 +1,6 @@
 DIST sway-1.0.tar.gz 5474548 BLAKE2B bea0a72c374b75f027e466d83e8c06abe32205e0cda80776b0e48e327a6da4e965a6a575595e5a38bcb125294c509b5d9a1db17604dd9e9032acef404366bdb9 SHA512 57e2610244c8bcd2b09bb5396113176d118ee5a0688aea297d4c191eda70ce29b36ff64e05c57d1a32a31cc4f2ac2562fd3cb3890508a8f3c7cbcb9fb017171d
-DIST sway-1.0_rc5.tar.gz 5472917 BLAKE2B 33e01bd0da0a90ff7c09b9af0ebf9f9263be3789390777ee207d2e4297a55d79d4cc7fea28aab121820fffd3447f76d9af60a9c118e541f0ff85ffe9dc17ae48 SHA512 26eb5625e1f940a1705f2d675587ce142a7b07206187c851660bf1c405e9a76c0cc20cf616d471170578f50dae2fc322b504df1ea3ef722fc5992dd9803de8fb
-DIST sway-1.1_rc3.tar.gz 5480553 BLAKE2B 21623ffaeca39599f83fcd3e1888bfff8b7a67cf03ba47eb6df5a9d88a857b9c9b65872925e37b95c85e63612884a7e727129a69396aacce5287545a6e9f2b3f SHA512 425c0af31ecf64e3be45fd0a8592fd3fc57127fa8f5c9bf08ec059bbb396bc83e883b08a32dce24d3de9f7027301e3e8e85f0d3e1f261f93bf66ee0d6a8fd0d0
-EBUILD sway-1.0.ebuild 3038 BLAKE2B e883271f1a8e48ac932693b87c233d95c900ccee158dd6044bac72ee77ca594b738eb554e96f5660d0f5ea0bd8cd1208f3afa1e46acbef81899dcda1fc0cb060 SHA512 f4cd617c06f0807672a7db0b5d899d6b3c82d6bf313c3a82a1d43b65f54c982703ec17d4d08b0722453881831e5186efc2b57fd4c8515e3b83df28d7950c467a
-EBUILD sway-1.0_rc5.ebuild 3049 BLAKE2B 6be3b4e7dc5a58acdd6b9969075c9371ed581b2acdc3fcfd86730830572d9d98f16f98369bb74ffa5f395632948edde53c669421d95616d9afd8a722a19f0cbc SHA512 caaeee7f5ed66a86b6232e5ef6fb98b3e458ae9224f763a3f17f5de92d4e2aff3a2b803202940dc86433ab097a5f290421664e5723106feb09e7b423670f8a3e
-EBUILD sway-1.1_rc3.ebuild 2953 BLAKE2B 0146efd670edbafed4df718383d9c059cced7dc7178d407e46c3ee3a3b260464972e2a485fd34f511bfc276a1cd41e41ba14e2a76058a626c222c06e8a32fb02 SHA512 b6fc5f65a764a2fc6e31e8b828bcccfca3b85d5d6b1d39ee7096b0dee22de36385d9432bd4bd90358c84e6cf7d17efdcf077c0513ced9d0be4e18ed8467b6d68
+DIST sway-1.1.1.tar.gz 5480615 BLAKE2B 2cc55535a030d5d057c332a8b2647f394ec8f08a3a5aebe48e0bd21da718eac23bdbcc5a2ce26624efb9360518e5f14eaafe406e1c7d9b3eb81621bab7b6c39c SHA512 2585446ca0936df41c7959b6b48487b25c86f1a8a3bedcd146aab023a873a416ce750698e3cabcd9cb861e35bbd7e280574ff477152906669af9b17d3e54028e
+EBUILD sway-1.0.ebuild 3085 BLAKE2B 62c575e078c9078faca0d58cc0adc18fd52b10f648fdf6cc8cc18b5080fc8844d92a7bdf80141c03bae5d1dac8ccc62b0f263a05b82a407d4ee3e25c573470b5 SHA512 10aeba287ad9113010d60b1e07af1ba6291c575109f89c9501bd42370e8bc1afb148bb6604d95048b4d390b9d66213249c25b5f8867599e5cdce53db0967550b
+EBUILD sway-1.1.1.ebuild 2953 BLAKE2B 0146efd670edbafed4df718383d9c059cced7dc7178d407e46c3ee3a3b260464972e2a485fd34f511bfc276a1cd41e41ba14e2a76058a626c222c06e8a32fb02 SHA512 b6fc5f65a764a2fc6e31e8b828bcccfca3b85d5d6b1d39ee7096b0dee22de36385d9432bd4bd90358c84e6cf7d17efdcf077c0513ced9d0be4e18ed8467b6d68
 EBUILD sway-9999.ebuild 2953 BLAKE2B 0146efd670edbafed4df718383d9c059cced7dc7178d407e46c3ee3a3b260464972e2a485fd34f511bfc276a1cd41e41ba14e2a76058a626c222c06e8a32fb02 SHA512 b6fc5f65a764a2fc6e31e8b828bcccfca3b85d5d6b1d39ee7096b0dee22de36385d9432bd4bd90358c84e6cf7d17efdcf077c0513ced9d0be4e18ed8467b6d68
 MISC metadata.xml 2486 BLAKE2B 2d34da83a8d8726b91189d27a400e705a1b0259a1ca577a85e7c21784274a08a0adccc134cd523e193f8635b26dcb1802e37bfa1831f58c922285341b1eadd5e SHA512 9d382307136a126a614a8361828cb018865243b1a8c2a4dd08fbd484afc53320abf6d64dd82dd93a47d8de284552f1857c028c6c72db06199152e1458b636ec0
diff --git a/gui-wm/sway/sway-1.0.ebuild b/gui-wm/sway/sway-1.0.ebuild
index 9962383f238e..34a7896bb450 100644
--- a/gui-wm/sway/sway-1.0.ebuild
+++ b/gui-wm/sway/sway-1.0.ebuild
@@ -44,7 +44,8 @@ DEPEND="
 if [[ ${PV} == 9999 ]]; then
 	DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]"
 else
-	DEPEND+=">=gui-libs/wlroots-0.5.0[elogind=,systemd=,X=]"
+	DEPEND+=">=gui-libs/wlroots-0.5.0[elogind=,systemd=,X=]
+	<gui-libs/wlroots-0.6.0[elogind=,systemd=,X=]"
 fi
 RDEPEND="
 	x11-misc/xkeyboard-config
diff --git a/gui-wm/sway/sway-1.0_rc5.ebuild b/gui-wm/sway/sway-1.0_rc5.ebuild
deleted file mode 100644
index 9a8de212b485..000000000000
--- a/gui-wm/sway/sway-1.0_rc5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils meson
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="https://swaywm.org"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
-else
-	MY_PV=${PV/_rc/-rc}
-	SRC_URI="https://github.com/swaywm/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag systemd tray wallpapers X zsh-completion"
-REQUIRED_USE="?? ( elogind systemd )
-	tray? ( || ( elogind systemd ) )"
-
-DEPEND="
-	>=dev-libs/json-c-0.13:0=
-	>=dev-libs/libinput-1.6.0:0=
-	dev-libs/libpcre
-	dev-libs/wayland
-	x11-libs/cairo
-	x11-libs/libxkbcommon
-	x11-libs/pango
-	x11-libs/pixman
-	elogind? ( >=sys-auth/elogind-239 )
-	swaybar? ( x11-libs/gdk-pixbuf:2 )
-	swaybg? ( x11-libs/gdk-pixbuf:2 )
-	swayidle? ( gui-apps/swayidle )
-	swaylock? ( gui-apps/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
-	X? ( x11-libs/libxcb:0= )
-"
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]"
-else
-	DEPEND+=">=gui-libs/wlroots-0.4.1[elogind=,systemd=,X=]"
-fi
-RDEPEND="
-	x11-misc/xkeyboard-config
-	${DEPEND}
-"
-BDEPEND="
-	>=dev-libs/wayland-protocols-1.14
-	virtual/pkgconfig
-	man? ( >=app-text/scdoc-1.8.1 )
-"
-if [[ ${PV} == 9999 ]]; then
-	BDEPEND+="~app-text/scdoc-9999"
-else
-	BDEPEND+=">=app-text/scdoc-1.9.3"
-fi
-
-src_prepare() {
-	default
-
-	use swaybar || sed -e "s/subdir('swaybar')//g" -e "/sway-bar.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaybar/d" -i meson.build || die
-	use swaybg || sed -e "s/subdir('swaybg')//g" -i meson.build || die
-	use swaymsg || sed -e "s/subdir('swaymsg')//g" -e "/swaymsg.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaymsg/d" -i meson.build || die
-	use swaynag || sed -e "s/subdir('swaynag')//g" -e "/swaynag.[0-9].scd/d" \
-		-e "/completions\/[a-z]\+\/_\?swaynag/d" -i meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dman-pages=$(usex man enabled disabled)
-		-Dtray=$(usex tray enabled disabled)
-		-Dxwayland=$(usex X enabled disabled)
-		$(meson_use wallpapers default-wallpaper)
-		$(meson_use fish-completion fish-completions)
-		$(meson_use zsh-completion zsh-completions)
-		"-Dbash-completions=true"
-		"-Dwerror=false"
-	)
-
-	if use swaybar || use swaybg; then
-		emesonargs+=("-Dgdk-pixbuf=enabled")
-	else
-		emesonargs+=("-Dgdk-pixbuf=disabled")
-	fi
-
-	meson_src_configure
-}
-
-pkg_preinst() {
-	if ! use systemd && ! use elogind; then
-		fowners root:0 /usr/bin/sway
-		fperms 4511 /usr/bin/sway
-	fi
-}
-
-pkg_postinst() {
-	if ! use systemd && ! use elogind; then
-		elog ""
-		elog "If you use ConsoleKit2, remember to launch sway using:"
-		elog "exec ck-launch-session sway"
-		elog ""
-		elog "If your system does not set the XDG_RUNTIME_DIR environment"
-		elog "variable, you must set it manually to run Sway. See wiki"
-		elog "for details: https://wiki.gentoo.org/wiki/Sway"
-	fi
-}
diff --git a/gui-wm/sway/sway-1.1_rc3.ebuild b/gui-wm/sway/sway-1.1.1.ebuild
index 5293b993a7d5..5293b993a7d5 100644
--- a/gui-wm/sway/sway-1.1_rc3.ebuild
+++ b/gui-wm/sway/sway-1.1.1.ebuild