gentoo resync : 19.03.2019

5 files changed, 235 insertions, 5 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index c1e5ebc18d99..8e9c5804ae45 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 95840ffe42b5..745215ccd0ff 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,10 +1,14 @@
+DIST sway-1.0.tar.gz 5474548 BLAKE2B bea0a72c374b75f027e466d83e8c06abe32205e0cda80776b0e48e327a6da4e965a6a575595e5a38bcb125294c509b5d9a1db17604dd9e9032acef404366bdb9 SHA512 57e2610244c8bcd2b09bb5396113176d118ee5a0688aea297d4c191eda70ce29b36ff64e05c57d1a32a31cc4f2ac2562fd3cb3890508a8f3c7cbcb9fb017171d
 DIST sway-1.0_rc1.tar.gz 5461910 BLAKE2B a9b3a14dfbb40a616b58fce896f0088dfc722e942129e12e7dae3f2121cb84ffcd565902ee49712275e01d6b6a344642d85d8cf394a35b151725dcc94d19b40d SHA512 6532bae679774fcdb1bcc3044740ff5c56f5f6a007a08e910f4d9ee43ac0488be7666a87106b493923432f975088c90ff47369fa1a01c5e1cb67d3a1f9b74bce
 DIST sway-1.0_rc2.tar.gz 5462530 BLAKE2B 95868df3d03a61be33e04602d6891a2827cd1b5eab08644f74e04c3cbae39e686ee046be5ae9762595774fd22190e2460e246b564db92c50509ad61a16bb0835 SHA512 78c93f2326952d9e56ebf38f5d6b646934230b1bf5fac50cf35f16b2c1753ffa31dd9ec874a05025ed0d1d828b9a8643c78e739abbcfba55301255b3d0ed4a3e
 DIST sway-1.0_rc3.tar.gz 5463453 BLAKE2B 2db52506e6f07f92ab02c48e0cc1b08bad55f355989226f07ed43392f3bfdc088cdd9183b76e349eb83eff331e5236456c1189208619748a9d78ed5ea8de7652 SHA512 95966bfc7431345a6c4c12bf4aa11980f56acc70fc902aa489bb88368bc5412953780ebaa9eae27908dbabf0ed96881ce3bf00cd51879815631b463801ce11cf
 DIST sway-1.0_rc4.tar.gz 5464422 BLAKE2B 38e24ea51d3787a6f46ea511ff7848786a84683ae208365dc353d77a65be3fa7f5959c7d7b3fbd5e3f1271db86721905613d9881d09281b3bac68b1b764033d2 SHA512 8c79be79a9ed0c659b07aadf8c4a1ea09848c36613ae73368d03264b402ec7226aff79bcaf79ae44cda71e9fb972fed2c3649e3fb049d81c3d0e232b8605d312
+DIST sway-1.0_rc5.tar.gz 5472917 BLAKE2B 33e01bd0da0a90ff7c09b9af0ebf9f9263be3789390777ee207d2e4297a55d79d4cc7fea28aab121820fffd3447f76d9af60a9c118e541f0ff85ffe9dc17ae48 SHA512 26eb5625e1f940a1705f2d675587ce142a7b07206187c851660bf1c405e9a76c0cc20cf616d471170578f50dae2fc322b504df1ea3ef722fc5992dd9803de8fb
+EBUILD sway-1.0.ebuild 3034 BLAKE2B 2e250fa4a8ae714386599255fc928f48abb06c7b2b82b81969f97035596ec390ce821e619f5a1538fa64db71583a5a16f77fcc80a33bbc11d0ad2cbb8af425f5 SHA512 475426196092c7ceca7a25692796d44d853b4b69cd219ae73d552ccfad6a0286d916dce0fc798415a31ae227c36c4d628b984e0d01f99cb8120338b927335d22
 EBUILD sway-1.0_rc1-r1.ebuild 3019 BLAKE2B fc276aef847122535ba4d0ee3726776a2fc01e3c90fc443712cb9c016a32fdae72bb98417333f87938a68f4f86d3a6ebd8c3074cec1f569201a27720bfd8a1aa SHA512 8f933e9976b5bc485386915b8b268919178bf620c7f14db4eaf6bc7e8f6efd84ab88b5db2e55dac74e25bb8a9097d262996bf1c92ed7e7e89eeeab5274a60327
 EBUILD sway-1.0_rc2.ebuild 2942 BLAKE2B d70c2f10e003bb16e9fc2518b6052f325547288072840a35d77c5f545260f93e2a22f007874417532308e6b41d07a2e11a1b8bb159084b125cd020ef2e3b20c8 SHA512 dea2cdc6979dd9bf3f5fc136a3c71c6fd74ace032c9e621367d3ad418643ab665a21af1fc92990f0eb702ec47622ddcf96be8a92fee30c9380de539c93bae7c0
 EBUILD sway-1.0_rc3.ebuild 2942 BLAKE2B d70c2f10e003bb16e9fc2518b6052f325547288072840a35d77c5f545260f93e2a22f007874417532308e6b41d07a2e11a1b8bb159084b125cd020ef2e3b20c8 SHA512 dea2cdc6979dd9bf3f5fc136a3c71c6fd74ace032c9e621367d3ad418643ab665a21af1fc92990f0eb702ec47622ddcf96be8a92fee30c9380de539c93bae7c0
 EBUILD sway-1.0_rc4.ebuild 2942 BLAKE2B 5d8353f8b9e430215a37c668ba79cdd52cc56e1cc6693a75326a75b1a4f1ffd0433841e95ad4ce5f5d3fa6112572310ff7b35048a5bb26dce85068fe1b83f5e1 SHA512 c514032163ebab5d544dede2968af73d0d17c7de245fcdf0680ad903db51e11c7257910fe3d76320a37f37c65e1592915de3fd2017f7a3cfc0823b6b6cf5042a
-EBUILD sway-9999.ebuild 3047 BLAKE2B 1ade9b48a40d59e0e3c44d5ee12933e56c2f2fb826958a5407d391cd43667284fff27d261fd22be110da158001fb9073a940516b8fcd674a0331ea679ceac90f SHA512 db4ce6f81f0d1f435b38a2dcc40d849636c354f1bfb9fbd53fc5737a8a39b006ca152e685f04bc6ac968b02b9a5a0d9e0ac38d0065e6d9025cdf88922dba69e6
+EBUILD sway-1.0_rc5.ebuild 3049 BLAKE2B 6be3b4e7dc5a58acdd6b9969075c9371ed581b2acdc3fcfd86730830572d9d98f16f98369bb74ffa5f395632948edde53c669421d95616d9afd8a722a19f0cbc SHA512 caaeee7f5ed66a86b6232e5ef6fb98b3e458ae9224f763a3f17f5de92d4e2aff3a2b803202940dc86433ab097a5f290421664e5723106feb09e7b423670f8a3e
+EBUILD sway-9999.ebuild 3034 BLAKE2B 2e250fa4a8ae714386599255fc928f48abb06c7b2b82b81969f97035596ec390ce821e619f5a1538fa64db71583a5a16f77fcc80a33bbc11d0ad2cbb8af425f5 SHA512 475426196092c7ceca7a25692796d44d853b4b69cd219ae73d552ccfad6a0286d916dce0fc798415a31ae227c36c4d628b984e0d01f99cb8120338b927335d22
 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
new file mode 100644
index 000000000000..0c258524b150
--- /dev/null
+++ b/gui-wm/sway/sway-1.0.ebuild
@@ -0,0 +1,113 @@
+# 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.5.0[elogind=,systemd=,X=]"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+"
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
+else
+	BDEPEND+="man? ( >=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.0_rc5.ebuild b/gui-wm/sway/sway-1.0_rc5.ebuild
new file mode 100644
index 000000000000..9a8de212b485
--- /dev/null
+++ b/gui-wm/sway/sway-1.0_rc5.ebuild
@@ -0,0 +1,114 @@
+# 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-9999.ebuild b/gui-wm/sway/sway-9999.ebuild
index 3680e46353ad..0c258524b150 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -44,7 +44,7 @@ DEPEND="
 if [[ ${PV} == 9999 ]]; then
 	DEPEND+="~gui-libs/wlroots-9999[elogind=,systemd=,X=]"
 else
-	DEPEND+=">=gui-libs/wlroots-0.4[elogind=,systemd=,X=]"
+	DEPEND+=">=gui-libs/wlroots-0.5.0[elogind=,systemd=,X=]"
 fi
 RDEPEND="
 	x11-misc/xkeyboard-config
@@ -53,12 +53,11 @@ RDEPEND="
 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"
+	BDEPEND+="man? ( ~app-text/scdoc-9999 )"
 else
-	BDEPEND+="~app-text/scdoc=-1.9.0"
+	BDEPEND+="man? ( >=app-text/scdoc-1.9.3 )"
 fi
 
 src_prepare() {