gentoo resync : 29.06.2021

3 files changed, 98 insertions, 0 deletions

diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index 80b0d104fa4a..f543f50b2a89 100644
--- a/gui-wm/Manifest.gz
+++ b/gui-wm/Manifest.gz
diff --git a/gui-wm/sway/Manifest b/gui-wm/sway/Manifest
index 66311f3acf29..937228afb340 100644
--- a/gui-wm/sway/Manifest
+++ b/gui-wm/sway/Manifest
@@ -1,4 +1,6 @@
+DIST sway-1.6.1.tar.gz 5550126 BLAKE2B a4ecc93df0eb16fcd9037ce62dd39c63e1712b3bc9e8ae36331a815759b18576f4a2c1b78a26545922038974f226f02e2d91f78d6e3933125d9b808871b7a887 SHA512 7f37fea99970db42c5485277df06d69bef5225fa03d25be179893b14d73c1d681f0355a1bc74091b4173bbccc88994a63ad0f9322e070811ba963648cf68cdeb
 DIST sway-1.6.tar.gz 5549909 BLAKE2B ee0d7aad2fe8c57061e23e9b875ebb8e991e2fb30483dee6cf7d7faa3ec782a3f28676bf9fe2183c0e643b5ed744535eba07d7e5cf20ec0756c8e5407c0f34e2 SHA512 f62477aa4a20de99c41078c6866ec67d04d0d1824f4cb21a0c40213dbadf6394e31cd239b74376bf604d20d03ce047ba97f1728043568fd49fcef43f5101c750
+EBUILD sway-1.6.1.ebuild 2418 BLAKE2B 5c67dab5bec00b8db60bb3827d9bdd6fe0c2c16afde3c5b99f4cef3557c6b8f8567c4c67eec4bb09f8b58173e6af3b2d79d0b2768f124130b9ac8acd718a8d92 SHA512 c22c6bb6a0c91ced2f8b1bbd18c0440937a57c01be4fe10e6694cf0a262ee28947dc592e6723f05f4297750a211f481b7b2b567963296fc297ca2418d274ac17
 EBUILD sway-1.6.ebuild 3076 BLAKE2B 2d4a7a7ae42afcad33ba479954b2efc239f968590041c02e9106688ec0fa5cca1f37438694ba85858afeda9bfdcfc33e43166711414193eb996e8657d07ac5c9 SHA512 dc67030cb488cb4fbbd9af52a51cb7149a5aaaf9e3861704aa305af9a84d9a4dca20de0a25cf4002c89a46259e2a312096cb555c7e0d26cb21bb78f8f0e8fe22
 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.6.1.ebuild b/gui-wm/sway/sway-1.6.1.ebuild
new file mode 100644
index 000000000000..c6a53ff0d87b
--- /dev/null
+++ b/gui-wm/sway/sway-1.6.1.ebuild
@@ -0,0 +1,96 @@
+# 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="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
+	x11-libs/libxkbcommon
+	x11-libs/pango
+	x11-libs/pixman
+	media-libs/mesa[gles2,libglvnd(+)]
+	swaybar? ( x11-libs/gdk-pixbuf:2 )
+	swaybg? ( gui-apps/swaybg )
+	swayidle? ( gui-apps/swayidle )
+	swaylock? ( gui-apps/swaylock )
+	wallpapers? ( x11-libs/gdk-pixbuf:2[jpeg] )
+	X? ( x11-libs/libxcb:0= )
+"
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+="~gui-libs/wlroots-9999:=[X=]"
+else
+	DEPEND+="
+		>=gui-libs/wlroots-0.14:=[X=]
+		<gui-libs/wlroots-0.15:=[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
+}