gentoo resync : 25.01.2020

3 files changed, 59 insertions, 8 deletions

diff --git a/gui-apps/swayidle/Manifest b/gui-apps/swayidle/Manifest
index 465c2ba65640..ccb65666a7c2 100644
--- a/gui-apps/swayidle/Manifest
+++ b/gui-apps/swayidle/Manifest
@@ -1,8 +1,10 @@
 DIST swayidle-1.2.tar.gz 9136 BLAKE2B e88eec89007deed59df30f3f89111352b8a1ed464141783cb25b0d0a484e8ea4cfd611f1bd80d9420368d7912979eb0536a6aa583d24504d32bac797a898dba5 SHA512 2539e80a45163bb3e76f7b41f6fd6a1d73d194b7e466f63178b5087d05470fceafba38a26d592a534a01b992a2c0cf0f8fb83805cdf41ee956fea5136cc8fe89
 DIST swayidle-1.3.tar.gz 9714 BLAKE2B 2f57576be0fc9343c2dcacb0acbb06f105143e98e26650de71c9031ecf6702f98bb4f54a3d32a46f0d425a398ece511d35ad696e59f9e9b4ec6b8046a76da49b SHA512 efdf391870cd6eb2b21ef6556d8cfdec3c76c059c1f1065a55719bef55d3aef2a7fb39f38f0ac3a8e2e8a1ffa9df38635d7dc3397add7adf255db69c55b4351b
 DIST swayidle-1.5.tar.gz 9715 BLAKE2B 85f4b2c4e813b8b17975e4c3f984e1eec1cdd64c2a81a4f0f829a5c788f26128c558f2028597ba180573b62d269501dd12bbf3009ee11be724bd5017fadc7855 SHA512 33bf73a3e8297770b301fb3a860a52d9ddc332eed0b84dbd78cfd94855e638bb116e365b825e3bec869b1f5e516f9c0c2b442ddb052dc937e9b31748b74a978e
+DIST swayidle-1.6.tar.gz 10131 BLAKE2B c0391d288c780c61b72b7a5ac612efc18c359cc7d622faa308e22b1e4359c064bc2824e7cb8fc14143ddde54fc6980bdc5d449d1f16a867b54aef9dfbaa4ff17 SHA512 c82b0d2aee06f87fd71e9e2208e917c0dc7afe80ab0b782c3165127519445021d8cf363292eee99f939165eb813909f2a4ee74153e776557c6d06672de2c1c82
 EBUILD swayidle-1.2.ebuild 1327 BLAKE2B 8d8d05bed875eae6b86984e92051a8da8e52b0fef07e42d0459baaef18d5efd0fd043b7251fe717c1514b25e249d65f10c7b1ee7da756c07d63592722dd81d0c SHA512 c8d544b8f4549770a58f6663207a0af73eea7186c18234e78744b60b598ee998ddc1ab90ad416b8a5775ab99fdda4ed8d35e3df2aa68ee2e479462b5151e779c
 EBUILD swayidle-1.3.ebuild 1327 BLAKE2B 8d8d05bed875eae6b86984e92051a8da8e52b0fef07e42d0459baaef18d5efd0fd043b7251fe717c1514b25e249d65f10c7b1ee7da756c07d63592722dd81d0c SHA512 c8d544b8f4549770a58f6663207a0af73eea7186c18234e78744b60b598ee998ddc1ab90ad416b8a5775ab99fdda4ed8d35e3df2aa68ee2e479462b5151e779c
 EBUILD swayidle-1.5.ebuild 1327 BLAKE2B 8d8d05bed875eae6b86984e92051a8da8e52b0fef07e42d0459baaef18d5efd0fd043b7251fe717c1514b25e249d65f10c7b1ee7da756c07d63592722dd81d0c SHA512 c8d544b8f4549770a58f6663207a0af73eea7186c18234e78744b60b598ee998ddc1ab90ad416b8a5775ab99fdda4ed8d35e3df2aa68ee2e479462b5151e779c
-EBUILD swayidle-9999.ebuild 1330 BLAKE2B 79fceac111b432e684b932303e55e92cbeb06f8a4f2210911e2c43f347b88e3d5924b8d17fdac06e081c86aa004d5124c63d1a16c40d7e5954ed353911734588 SHA512 3208a10066102103291b349c6251cfb4a3c7b8680f0315b7f57226d16131d0300c60acaef296e56a83aa586af768efb5d55b8dacd952c48faee16a773fed8cde
+EBUILD swayidle-1.6.ebuild 1273 BLAKE2B bbff1eb0b6121c74c1eb7404138ad81b2f060895a7eb71eda9a87e9eda79e6be0ae5477b070a6b4091220b78b9aa38783a52e5681cd01cf820eca9d663f577e0 SHA512 24ad9f33d30eec175a831a6503a47d446b8d7642e3e9827d47105b60d6099965f57094848372c2ca7b68dc1437bcf96efe450c6a9f305ee50bfd1bc022b54590
+EBUILD swayidle-9999.ebuild 1273 BLAKE2B bbff1eb0b6121c74c1eb7404138ad81b2f060895a7eb71eda9a87e9eda79e6be0ae5477b070a6b4091220b78b9aa38783a52e5681cd01cf820eca9d663f577e0 SHA512 24ad9f33d30eec175a831a6503a47d446b8d7642e3e9827d47105b60d6099965f57094848372c2ca7b68dc1437bcf96efe450c6a9f305ee50bfd1bc022b54590
 MISC metadata.xml 1067 BLAKE2B 059ead0c34aebcaa6f8ebd10db8b9b0aaf2df66f84a6ae10d16f3a32d680426aa4733c0788dfe61532bb90d3b92f4bb451e7fd1be822c6866205575fd3c4861a SHA512 99a60f4bcfb76aa7d2a6d4d2a7a6879d9f0ac17f0be3e37d59bef4a4b158b9e685dd5932a02e650b96756dc7f6cba2aac9b1eee95c6d56f4429c23e32a101ad4
diff --git a/gui-apps/swayidle/swayidle-1.6.ebuild b/gui-apps/swayidle/swayidle-1.6.ebuild
new file mode 100644
index 000000000000..8604bda55107
--- /dev/null
+++ b/gui-apps/swayidle/swayidle-1.6.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+DESCRIPTION="Idle management daemon for Wayland"
+HOMEPAGE="https://github.com/swaywm/swayidle"
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
+else
+	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="elogind fish-completion +man systemd zsh-completion"
+REQUIRED_USE="?? ( elogind systemd )"
+
+DEPEND="
+	dev-libs/wayland
+	elogind? ( >=sys-auth/elogind-237[policykit] )
+	systemd? ( >=sys-apps/systemd-237[policykit] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-libs/wayland-protocols-1.14
+	virtual/pkgconfig
+	man? ( app-text/scdoc )
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dman-pages=$(usex man enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+	if use systemd; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=systemd")
+	elif use elogind; then
+		emesonargs+=("-Dlogind=enabled" "-Dlogind-provider=elogind")
+	else
+		emesonargs+=("-Dlogind=disabled")
+	fi
+
+	meson_src_configure
+}
diff --git a/gui-apps/swayidle/swayidle-9999.ebuild b/gui-apps/swayidle/swayidle-9999.ebuild
index b338cccdbd2e..8604bda55107 100644
--- a/gui-apps/swayidle/swayidle-9999.ebuild
+++ b/gui-apps/swayidle/swayidle-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/swaywm/${PN}.git"
 else
 	SRC_URI="https://github.com/swaywm/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="MIT"
@@ -26,11 +26,7 @@ DEPEND="
 	elogind? ( >=sys-auth/elogind-237[policykit] )
 	systemd? ( >=sys-apps/systemd-237[policykit] )
 "
-RDEPEND="
-	${DEPEND}
-	!<=gui-wm/sway-1.0_beta1
-	!~gui-wm/sway-1.0_beta2[swayidle]
-"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
 	virtual/pkgconfig