gentoo resync : 25.01.2020

14 files changed, 199 insertions, 21 deletions

diff --git a/gui-apps/Manifest.gz b/gui-apps/Manifest.gz
index 296dbf30559f..92445e61389b 100644
--- a/gui-apps/Manifest.gz
+++ b/gui-apps/Manifest.gz
diff --git a/gui-apps/nm-tray/Manifest b/gui-apps/nm-tray/Manifest
new file mode 100644
index 000000000000..629908a604f6
--- /dev/null
+++ b/gui-apps/nm-tray/Manifest
@@ -0,0 +1,4 @@
+AUX nm-tray-0.4.3-missing-include-qmetaenum.patch 565 BLAKE2B 7542d3f95acb8157216d3526df0ee37c24b58316e1a044212ac5355c4030992e6169cf645fe283d00c4d52dd87739889b318b4e3692698628ed500b7453460f5 SHA512 0a11ec9013d1730ce593a17393ed32a76b072480c577bca6219fece1a1a77b1ebe50ef692d6cee93b9ab8fd8f3d83beb5f79cd3e4653218f8cf833f7dd21824b
+DIST nm-tray-0.4.3.tar.gz 44705 BLAKE2B 590e8b3a08e7543a1275d7e5e3264570fe78b6020435783b2b36d6acd1df36b0106f4537035d8b61c0d571451d27277874ec3ddc93cd6163c047666e7013ab2a SHA512 480511a6e5b075ff98b53e91b08f37b9344c81e89c0f580c74f4424b1657c156300c31cc85cc8f82478eec9efdf53589352c3757c16e386d6985828b9dfa819d
+EBUILD nm-tray-0.4.3.ebuild 760 BLAKE2B c23c2ada51c832f9b491044146bcb9a5701477d3323657b2cb4760f4fbf05ce2b738fedb5dc801daaf57cdfeb89dbd5bd0c98178bc7469714078e0be01588816 SHA512 3de13d1ff071eeecb4ca52dbd15c34a40f98a9f87e7f93f4f2f0da3a3e77f80b5e996d1094849af24c6cca2d658010b49ed3fc936bf04f1f0b75da5a35935917
+MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/gui-apps/nm-tray/files/nm-tray-0.4.3-missing-include-qmetaenum.patch b/gui-apps/nm-tray/files/nm-tray-0.4.3-missing-include-qmetaenum.patch
new file mode 100644
index 000000000000..6d319efa55b9
--- /dev/null
+++ b/gui-apps/nm-tray/files/nm-tray-0.4.3-missing-include-qmetaenum.patch
@@ -0,0 +1,21 @@
+From 4563dabee3cbee13bc9d23a4a5d0ddda1526b43f Mon Sep 17 00:00:00 2001
+From: Palo Kisa <palo.kisa@gmail.com>
+Date: Tue, 1 Oct 2019 12:03:43 +0200
+Subject: [PATCH] nmmodel: Add include for used class
+
+---
+ src/nmmodel.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/nmmodel.cpp b/src/nmmodel.cpp
+index d779801..ac70307 100644
+--- a/src/nmmodel.cpp
++++ b/src/nmmodel.cpp
+@@ -45,6 +45,7 @@ COPYRIGHT_HEADER*/
+ #include <NetworkManagerQt/ConnectionSettings>
+ #include <QDBusPendingCallWatcher>
+ #include <QInputDialog>
++#include <QMetaEnum>
+ 
+ namespace
+ {
diff --git a/gui-apps/nm-tray/metadata.xml b/gui-apps/nm-tray/metadata.xml
new file mode 100644
index 000000000000..c67d4dcaca5b
--- /dev/null
+++ b/gui-apps/nm-tray/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>bkohler@gentoo.org</email>
+		<name>Ben Kohler</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/gui-apps/nm-tray/nm-tray-0.4.3.ebuild b/gui-apps/nm-tray/nm-tray-0.4.3.ebuild
new file mode 100644
index 000000000000..d18f9b26f666
--- /dev/null
+++ b/gui-apps/nm-tray/nm-tray-0.4.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="A simple Qt-based NetworkManager front-end"
+HOMEPAGE="https://github.com/palinek/nm-tray"
+SRC_URI="https://github.com/palinek/nm-tray/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+BDEPEND=">=dev-util/cmake-3.10"
+DEPEND="
+	dev-qt/linguist:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	kde-frameworks/networkmanager-qt
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/nm-tray-0.4.3-missing-include-qmetaenum.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		-DNM_TRAY_XDG_AUTOSTART_DIR=/etc/xdg/autostart
+	)
+
+	cmake_src_configure
+}
diff --git a/gui-apps/swaybg/Manifest b/gui-apps/swaybg/Manifest
index 4c08bfdb966d..0ab41197cc69 100644
--- a/gui-apps/swaybg/Manifest
+++ b/gui-apps/swaybg/Manifest
@@ -1,4 +1,4 @@
 DIST swaybg-1.0.tar.gz 15851 BLAKE2B 820edbce4161f2d109bc8e842fb2bef101a5793d1da90f4258e5771fe85ab089e184c063a0a7073adbe218c59307946f86bd02c4d62b0585aeb3f9cd5c7963f8 SHA512 67d0e0109b906ece51800729182940374cc59fa07d0866b57cf876d12191fe12e796b84350a849dc85183fa58a3b2d196191e48dcc03dcc3708a980ed4a8cff0
-EBUILD swaybg-1.0.ebuild 803 BLAKE2B e321bf40913172eb0135b1a95b059d8e0b63a7ddaaf50ff13e4f3299d4e3e170f271eab777cc8a46410027e9ab48bf13f12738ced1beaf65409765c2e543d056 SHA512 c4bcaed1e6d6bbaea50ef9c4eaf70f3acb9bacbea9691279bba41e642c4763590e03243af44d690d474d52dd571bf92ff5fcca5cabbf71c8e8055fac56cfeee1
-EBUILD swaybg-9999.ebuild 806 BLAKE2B 12b1dca5a0e6ac37c752ff068f785f490fd467c698b052656a1ed80f4e5d22c14b97f264b07b2016e7e12a12d8595dad1fddf2c3d72c8571827116ee0fd56354 SHA512 a1dfe9bbb8bb4051c56ef2f3b6d3a0b5dd70ff73ff4ec7e90dae7f8d8640d47d03d5021874469bc585c1058acef783a27ee743c4b26cec57352cf291c86d3400
+EBUILD swaybg-1.0.ebuild 810 BLAKE2B cb309017732cb5e64b5137f6ebc2ad0425247be2fdb3144fb724a1c077b70efa82c77b6fa6351c79dff5811b58366c56e1069c027703317dcb384b04dedbd52f SHA512 d63bc6facc43dee7b5c4ae58c340512e1f17aa462f41eb88866b58cad196e32f50f60c365d08b412cd9e76564c843aeca2f04bd14b959b29962f1f988de4d802
+EBUILD swaybg-9999.ebuild 813 BLAKE2B 749ea546ac884d7684006708287a703527df983e0890478842a1775e4e57debe0fb1afb5187ac360fc17c3a0ca1e584a319f80cbab0b4f104c70dd703cc55a75 SHA512 9dc55b737dfb5ac36ec2630e9aaa38f5c0bdf560d5a81bfed0825b7f5401b22216bd2bdca07cb4133a3c86027b9fcb2f9292b9876c50aefca202ccc5cfc8e336
 MISC metadata.xml 943 BLAKE2B bee5990db9047cfa3f362a6d576f6d932e247e0235a04b83f427b5c9048e822a193585719e1d65747cc8f97d6b1f44f2435b9e956412b8fe707401fa492215bb SHA512 7d4b7910ef0d43041f899b608f351ef834870f8a7f1b9081c08e6ac197f65b9c7dc53e6785b7b9250ec7c3ee2200ee69b711a24c672c8bd3ceee381d5568756a
diff --git a/gui-apps/swaybg/swaybg-1.0.ebuild b/gui-apps/swaybg/swaybg-1.0.ebuild
index 605770a1f3d7..ba300c663030 100644
--- a/gui-apps/swaybg/swaybg-1.0.ebuild
+++ b/gui-apps/swaybg/swaybg-1.0.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"
diff --git a/gui-apps/swaybg/swaybg-9999.ebuild b/gui-apps/swaybg/swaybg-9999.ebuild
index af2fdfa04742..be7d136cfaa9 100644
--- a/gui-apps/swaybg/swaybg-9999.ebuild
+++ b/gui-apps/swaybg/swaybg-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"
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
diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index dae83eba5530..dfb293b0d790 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,6 +1,8 @@
 DIST swaylock-1.3.tar.gz 32848 BLAKE2B 81ed50839bcb0139e7fc2081bd37e738f3e6ef23e96a5108d1acf56cc3425285f7382576a54201f1bf188883b1da06492074c091877af13832c0140e4e6099fd SHA512 723d758d76f076f3f1539ea0d651f6ad2562659c72eef7e895d7827a0be21db663652fe4ce2609065aff45ff20230879599868cff327ab52b896330ca04d78c4
 DIST swaylock-1.4.tar.gz 34288 BLAKE2B 6b2c8764fd605b04843c254e776f7174caedf4f0dbc85cbd9b5cc10762eed5694ac2fdaa0393a630afc374980f0d6530104119505f034d65af37d738ab1a30fc SHA512 5068b5f97e3094c511deda553f363a71f655b16e6533ef8f82befcd3b9027a55de81f143eb95e60cf4dbe4cecdc49906285bd6a0e6d51eb3b2807d0101581809
+DIST swaylock-1.5.tar.gz 35350 BLAKE2B c68073d6154842c2cdb99836bda991560605f6ede66c6124986c3395575a4e2c22d59a837a09033d1632b61628e45b18b3ee5ca198bafe4fbd8f429cb0401eda SHA512 16dd9b912ca702849290cf18d91ffbd64a70118cc284982a84b567c4974fd4590b12707c0aae1fcda7ccd1caa7880f342c633b9345bd795c36702916696d1f67
 EBUILD swaylock-1.3.ebuild 1299 BLAKE2B ef276cf73b8296a58bfdbb559beb789b6b30f5de0352752313ab135af7d5d9e3f3ef22b67c8834923fe465eb86f45c85a1f999427cc5f964476a9d4de5e62307 SHA512 5c1d8b253ae607e332163cdc9fc8a7a53dcca202fdc512ef59b2d8c423818e3b7dabda42453c7fda36e8847075556472249d9433dd84be6fdee887ca965db972
 EBUILD swaylock-1.4.ebuild 1300 BLAKE2B 11f575506112c72b44efd6cf7ae62204fec25941de11fa1f9db135b4410f957d8c46a80ead447c7cd26efb8073661ea52be289e93776561bbb61f202efd11bc1 SHA512 442691e465e8c77305b5f7d745837e7a10fa18742ad7e8809bafbb919bfc086865132e72bd7beb9b33ca15149fab34190633cb65529d72d75b593d0f7ff1caa6
-EBUILD swaylock-9999.ebuild 1300 BLAKE2B 11f575506112c72b44efd6cf7ae62204fec25941de11fa1f9db135b4410f957d8c46a80ead447c7cd26efb8073661ea52be289e93776561bbb61f202efd11bc1 SHA512 442691e465e8c77305b5f7d745837e7a10fa18742ad7e8809bafbb919bfc086865132e72bd7beb9b33ca15149fab34190633cb65529d72d75b593d0f7ff1caa6
+EBUILD swaylock-1.5.ebuild 1268 BLAKE2B 539547ab69041bb8ece0d9a67a5af4b66a626924873ed73014a4b789135060b8b2fa0421bba7b4a9ebffee93978f9220d0f72007e90057e3e045a3d01b936dea SHA512 1d7623d91d82cee1640256c12c91b2375cdde53eeb22a8f5de7398795147459bd159011d0b5dfed1a7693b281c1dac579872550f693612b37410c29cd43539a5
+EBUILD swaylock-9999.ebuild 1268 BLAKE2B 539547ab69041bb8ece0d9a67a5af4b66a626924873ed73014a4b789135060b8b2fa0421bba7b4a9ebffee93978f9220d0f72007e90057e3e045a3d01b936dea SHA512 1d7623d91d82cee1640256c12c91b2375cdde53eeb22a8f5de7398795147459bd159011d0b5dfed1a7693b281c1dac579872550f693612b37410c29cd43539a5
 MISC metadata.xml 1290 BLAKE2B 70f739c94d39616e10c0d67d12a855d578748ac02241ba691c37388f2726ef60b33c93208d84f992981c651f0524b47f704b07a77d4b958aed9f2f6e0a67e238 SHA512 a9c40afdf3ecf0687cfd431bb8a5227e04c45020fec367f17b11a7b795a2d7aad792234ceb9bbf7a8f9f92b72745dc23dbf53d4fa94e57a813070a9c317b05de
diff --git a/gui-apps/swaylock/swaylock-1.5.ebuild b/gui-apps/swaylock/swaylock-1.5.ebuild
new file mode 100644
index 000000000000..1775122395b5
--- /dev/null
+++ b/gui-apps/swaylock/swaylock-1.5.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit fcaps meson
+
+DESCRIPTION="Screen locker for Wayland"
+HOMEPAGE="https://github.com/swaywm/swaylock"
+
+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="fish-completion +gdk-pixbuf +man +pam zsh-completion"
+
+DEPEND="
+	dev-libs/wayland
+	x11-libs/cairo
+	x11-libs/libxkbcommon
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
+	pam? ( sys-libs/pam )
+"
+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)
+		-Dpam=$(usex pam enabled disabled)
+		-Dgdk-pixbuf=$(usex gdk-pixbuf enabled disabled)
+		$(meson_use fish-completion fish-completions)
+		$(meson_use zsh-completion zsh-completions)
+		"-Dbash-completions=true"
+		"-Dwerror=false"
+	)
+	if [[ ${PV} != 9999 ]]; then
+		emesonargs+=("-Dswaylock-version=${PV}")
+	fi
+
+	meson_src_configure
+}
+
+pkg_postinst() {
+	if ! use pam; then
+		fcaps cap_sys_admin usr/bin/swaylock
+	fi
+}
diff --git a/gui-apps/swaylock/swaylock-9999.ebuild b/gui-apps/swaylock/swaylock-9999.ebuild
index 32d4bd3b58d8..1775122395b5 100644
--- a/gui-apps/swaylock/swaylock-9999.ebuild
+++ b/gui-apps/swaylock/swaylock-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"
@@ -27,10 +27,7 @@ DEPEND="
 	gdk-pixbuf? ( x11-libs/gdk-pixbuf:2 )
 	pam? ( sys-libs/pam )
 "
-RDEPEND="
-	${DEPEND}
-	!<=gui-wm/sway-1.0_beta2[swaylock]
-"
+RDEPEND="${DEPEND}"
 BDEPEND="
 	>=dev-libs/wayland-protocols-1.14
 	virtual/pkgconfig