gentoo resync : 25.08.2020

3 files changed, 2 insertions, 65 deletions

diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index dfb293b0d790..39c8dd29d9f9 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,8 +1,6 @@
 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-1.5.ebuild 1268 BLAKE2B 539547ab69041bb8ece0d9a67a5af4b66a626924873ed73014a4b789135060b8b2fa0421bba7b4a9ebffee93978f9220d0f72007e90057e3e045a3d01b936dea SHA512 1d7623d91d82cee1640256c12c91b2375cdde53eeb22a8f5de7398795147459bd159011d0b5dfed1a7693b281c1dac579872550f693612b37410c29cd43539a5
+EBUILD swaylock-1.5.ebuild 1265 BLAKE2B 91273004b19254fec334126cc2327ff7954169e9a153d321fd90a539efaf7048fdb4fed6a6f0e72dabae6f0e398f37866baffb3437e10c45580e4fcb247a9290 SHA512 e6d6bbcdbc090995a2ee270317095112641688f012f9a753d950daeccee636e972258a725d904acbe0d01e2ee98aeb058835ecf37284a82ffb41904d88b386f9
 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.4.ebuild b/gui-apps/swaylock/swaylock-1.4.ebuild
deleted file mode 100644
index 32d4bd3b58d8..000000000000
--- a/gui-apps/swaylock/swaylock-1.4.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 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 ~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}
-	!<=gui-wm/sway-1.0_beta2[swaylock]
-"
-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-1.5.ebuild b/gui-apps/swaylock/swaylock-1.5.ebuild
index 1775122395b5..846a5eb4b23e 100644
--- a/gui-apps/swaylock/swaylock-1.5.ebuild
+++ b/gui-apps/swaylock/swaylock-1.5.ebuild
@@ -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 ~ppc64 ~x86"
+	KEYWORDS="amd64 arm64 ~ppc64 x86"
 fi
 
 LICENSE="MIT"