gentoo christmass resync : 25.12.2020

3 files changed, 121 insertions, 3 deletions

diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 2f1c21d6c135..11ff1467cfac 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,6 +1,7 @@
 DIST sway-1.5.1.tar.gz 5536721 BLAKE2B 4dcb6ca380ef8451ab9219a584598928a79e999bc0b1de0599cb7867c8fd94d54c55a2be9585635b4fd230fd83852141d6fd41ef35dbc4a8fef1bcc2828b3be4 SHA512 3b937249db2875100bc22e99f955a3300d3294a296fb37006fa1468a3986bf4fa8e5197279e3587bd8dc29f31adff8fbdc9ddc840e7be982b73331a05cd06ba5
 DIST sway-1.5.tar.gz 5535966 BLAKE2B e863e97ee897dcd1652d363a09b712932de55da08c88b4858f0aadc29b2cb19d2bda1e5e1184f4e4be6fa54a0136463556f9072f32e2b952d4f12ffd0ee9baf9 SHA512 702e44f8923a4ca05d831dd7ed76165654f113a8b2754d332c509ee844528f47c52b7f21deca78d4a79dad465cbcd0934574fff4ad9bb7a45aec3124dea5bca4
+EBUILD sway-1.5.1-r1.ebuild 3148 BLAKE2B 0c71e5d52ca525bd7c25e28108da95d6d86dc419dbca0ec97cdff6b88688ce2ccc0226773bf22b296ac66116c4c5b129613af02a30c5f7dc9ef2396688591fec SHA512 b95e2e5c6f45aeaf62372d8dbbdff3d57f48980051d301bd23c1105da8e3ce597e624132e3b116e6bce09e484b753d1b187c345b21b5148c7c5719c7c8076435
 EBUILD sway-1.5.1.ebuild 3123 BLAKE2B e6b31593b2dc7f47edb561b95ff74562f29604e24dfafd603c4f343e8e91641ccf76402aa4608879fdc410a691b47a35f412ecc130c8ef79772a1bc14497864e SHA512 df481568d43bfbc64bb1ff293ee94c126d40e2379e50217f383ac1a315f48bb7a4d22fd1fa69abc7b526f2bf317811a97ff99ecae8e9ec78c6ee344be1f23885
 EBUILD sway-1.5.ebuild 3124 BLAKE2B 62294350697990792f27d39c7c720455b50434bfbf805fd67b4c474750af3c7319e3877f2bd00b033a4a82cd8dcd5ae4cac5fcbd6c754d769c25d7e9a6b0f77c SHA512 6f991e0e9f8fc39f3d833e1636b529d8fb0e9b002a990ceefb43864db1febbd8657084a8e8849a11af4a4b00a721f14955ade2d1742ac051c68d1d1934939a09
-EBUILD sway-9999.ebuild 3126 BLAKE2B eccd23c8a4c57d9c8e05e41115b6038193e27c9fc3ff68ca70b4c04ecffb796abf95d1fe8990d324b49c27fe647a96dc51b6292d656face5e33c934afccfd2ff SHA512 bdbe1568aee63184c8a240c63090b929f12ee30dd246ddfa570d0c20b1f90dded9c233619a949f035ed997d03f3025836f07380df750d1aa642d32699f39a106
+EBUILD sway-9999.ebuild 3148 BLAKE2B 0c71e5d52ca525bd7c25e28108da95d6d86dc419dbca0ec97cdff6b88688ce2ccc0226773bf22b296ac66116c4c5b129613af02a30c5f7dc9ef2396688591fec SHA512 b95e2e5c6f45aeaf62372d8dbbdff3d57f48980051d301bd23c1105da8e3ce597e624132e3b116e6bce09e484b753d1b187c345b21b5148c7c5719c7c8076435
 MISC metadata.xml 2468 BLAKE2B dc1da35dc84c5c977c7ecdd44972bea616119c166a5b4d138895a7c4327f8465db94f4b039afe4e1cab119063fa0d050a7ef9ef25ed77c22c3776098560cb7dd SHA512 1abe7b4a3871350e6573fb2eb88de1c2b908a13c18661a19a4a192e73ba5860bfdf268f10761413110c9eedea67c811c3a4dc0ce700ad9c59713b5c6546ddc0e
diff --git a/gui-wm/sway/sway-1.5.1-r1.ebuild b/gui-wm/sway/sway-1.5.1-r1.ebuild
new file mode 100644
index 000000000000..1d2aa6e981d5
--- /dev/null
+++ b/gui-wm/sway/sway-1.5.1-r1.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2020 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 ~arm64 ~ppc64 ~x86"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag seatd 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
+	media-libs/mesa[gles2,libglvnd(+)]
+	elogind? ( >=sys-auth/elogind-239[policykit] )
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	systemd? ( >=sys-apps/systemd-239[policykit] )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[elogind=,seatd=,systemd=,X=]"
+else
+	DEPEND+="
+		=gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
+	"
+fi
+RDEPEND="
+	x11-misc/xkeyboard-config
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	>=dev-util/meson-0.53.0
+	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 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; then
+		emesonargs+=("-Dgdk-pixbuf=enabled")
+	else
+		emesonargs+=("-Dgdk-pixbuf=disabled")
+	fi
+
+	meson_src_configure
+}
+
+pkg_preinst() {
+	if ! use systemd && ! use elogind && ! use seatd; then
+		fowners root:0 /usr/bin/sway
+		fperms 4511 /usr/bin/sway
+	fi
+}
+
+pkg_postinst() {
+	if ! use systemd && ! use elogind && ! use seatd; 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 ffac4374950d..1d2aa6e981d5 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -34,12 +34,12 @@ DEPEND="
 	x11-libs/pango
 	x11-libs/pixman
 	media-libs/mesa[gles2,libglvnd(+)]
-	elogind? ( >=sys-auth/elogind-239 )
+	elogind? ( >=sys-auth/elogind-239[policykit] )
 	swaybar? ( x11-libs/gdk-pixbuf:2 )
 	swaybg? ( gui-apps/swaybg )
 	swayidle? ( gui-apps/swayidle )
 	swaylock? ( gui-apps/swaylock )
-	systemd? ( >=sys-apps/systemd-239 )
+	systemd? ( >=sys-apps/systemd-239[policykit] )
 	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
 	X? ( x11-libs/libxcb:0= )
 "