gentoo resync : 28.04.2021

5 files changed, 126 insertions, 27 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 3cb1e60d09a8..eb83b5cee032 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 9f49a7db9a37..9f606c464b97 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,6 @@
 DIST sway-1.5.1.tar.gz 5536721 BLAKE2B 4dcb6ca380ef8451ab9219a584598928a79e999bc0b1de0599cb7867c8fd94d54c55a2be9585635b4fd230fd83852141d6fd41ef35dbc4a8fef1bcc2828b3be4 SHA512 3b937249db2875100bc22e99f955a3300d3294a296fb37006fa1468a3986bf4fa8e5197279e3587bd8dc29f31adff8fbdc9ddc840e7be982b73331a05cd06ba5
-EBUILD sway-1.5.1-r1.ebuild 3029 BLAKE2B 1800f4f242090e14d2fc1c86d02ed231832553a21bfd5a7b5a0fbe31f57fc097e9f0189982e6d849e060e98b66bbfea61ffb8ed459589c2f25253844879cde65 SHA512 352a5a24dfb12ca3ada32d5fd67f483517bb8c30178931c27653460ab6ba21f5121ead00b607f00c44ca99c6aed286515704407bf9cdeb58be32f19fdf1f8e76
-EBUILD sway-9999.ebuild 3032 BLAKE2B 48f9ca249b3e85cf1dcb493fa2ac7dbc598ac3310292bddf5d80d55bbc0ade09cfdec3cd98a04d8355379d0597fbb6bfc76487902935ea394a2e01a865a9c8b0 SHA512 bf916dd627afb1ebfc416e62261d3cace2c6f52e031d41b53303341ff6275d02c112b8b455116bdf58698a1f24935c326d0f5697f213229e6d76983e386e180a
+DIST sway-1.6.tar.gz 5549909 BLAKE2B ee0d7aad2fe8c57061e23e9b875ebb8e991e2fb30483dee6cf7d7faa3ec782a3f28676bf9fe2183c0e643b5ed744535eba07d7e5cf20ec0756c8e5407c0f34e2 SHA512 f62477aa4a20de99c41078c6866ec67d04d0d1824f4cb21a0c40213dbadf6394e31cd239b74376bf604d20d03ce047ba97f1728043568fd49fcef43f5101c750
+EBUILD sway-1.5.1-r1.ebuild 3022 BLAKE2B 9e515a7e22b572dda8fac4d6edb7d3b07b631e7ccf1a3beb11dda60c63590f12e16a9119ae20a52fd7797bb3ca74e308233414ce4e5c48d6d7774d8c3a0269ac SHA512 356aea4f4ddefb7ebc6a1b4a1e2a1910643dbfde50faa02b4c7b69a7989f055c6c7578bf105e1ef5bdf11cf0508a8dbfdb576c9a50354b484b3c6879c975181b
+EBUILD sway-1.6.ebuild 3079 BLAKE2B 6ee3a064d02281ba9b8cfdc2c1d2d731ae980893ee0e0099aa88c5f682cd4f8957be3b4c469507a84e5a1200aea6e4dd4c96b0bcbf719d18ca70e8cd2e9d4c9d SHA512 358661221d2378f1a990cc9069c78149d52f7db774ae10e8e6f8a0f95ed20dfd92edef40d5c48bf5d6faaf763507f312a856a23b82c0014ae0f0129d094dd327
+EBUILD sway-9999.ebuild 2418 BLAKE2B 5c67dab5bec00b8db60bb3827d9bdd6fe0c2c16afde3c5b99f4cef3557c6b8f8567c4c67eec4bb09f8b58173e6af3b2d79d0b2768f124130b9ac8acd718a8d92 SHA512 c22c6bb6a0c91ced2f8b1bbd18c0440937a57c01be4fe10e6694cf0a262ee28947dc592e6723f05f4297750a211f481b7b2b567963296fc297ca2418d274ac17
 MISC metadata.xml 2428 BLAKE2B 6dbfafb29a5e926b761a60d6d12658dfc59ed75c16e01907c6842c14ae97eaf7d3ceebc805f19a9c783a393b33360eb81b7ad3564d5cb2b0270425ce43616123 SHA512 e49f4e6514b8fd171423ded89c516e3c706141da132b28a2419f9b145627706b6cac9066a51f46ecfc3c1df15bd749bdf40168a3841d3789d13550894b184f7a
diff --git a/gui-wm/sway/sway-1.5.1-r1.ebuild b/gui-wm/sway/sway-1.5.1-r1.ebuild
index 8bca083a1508..904873166d60 100644
--- a/gui-wm/sway/sway-1.5.1-r1.ebuild
+++ b/gui-wm/sway/sway-1.5.1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils meson
+inherit meson
 
 DESCRIPTION="i3-compatible Wayland window manager"
 HOMEPAGE="https://swaywm.org"
diff --git a/gui-wm/sway/sway-1.6.ebuild b/gui-wm/sway/sway-1.6.ebuild
new file mode 100644
index 000000000000..e5febb24e88b
--- /dev/null
+++ b/gui-wm/sway/sway-1.6.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit 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 seatd 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 )
+	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.13:=[elogind=,seatd=,systemd=,X=]
+		<gui-libs/wlroots-0.14:=[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 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 d03dab5a9bc0..c6a53ff0d87b 100644
--- a/gui-wm/sway/sway-9999.ebuild
+++ b/gui-wm/sway/sway-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit eutils meson
+inherit meson
 
 DESCRIPTION="i3-compatible Wayland window manager"
 HOMEPAGE="https://swaywm.org"
@@ -20,13 +20,12 @@ 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 seatd systemd ) )"
+IUSE="fish-completion +man +swaybar +swaybg +swayidle +swaylock +swaymsg +swaynag tray wallpapers X zsh-completion"
 
 DEPEND="
 	>=dev-libs/json-c-0.13:0=
 	>=dev-libs/libinput-1.6.0:0=
+	sys-auth/seatd:=
 	dev-libs/libpcre
 	dev-libs/wayland
 	x11-libs/cairo
@@ -34,20 +33,19 @@ DEPEND="
 	x11-libs/pango
 	x11-libs/pixman
 	media-libs/mesa[gles2,libglvnd(+)]
-	elogind? ( >=sys-auth/elogind-239 )
 	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=]"
+	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
 else
 	DEPEND+="
-		=gui-libs/wlroots-0.12.0*:=[elogind=,seatd=,systemd=,X=]
+		>=gui-libs/wlroots-0.14:=[X=]
+		<gui-libs/wlroots-0.15:=[X=]
 	"
 fi
 RDEPEND="
@@ -96,19 +94,3 @@ src_configure() {
 
 	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 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
-}