commit:     9ca2dad2a63a63b0ddefb48585582d0676963003
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 25 21:03:25 2020 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sat Jul 25 21:04:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ca2dad2

gui-apps/swaylock: 1.5 stable amd64 arm64 x86

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 gui-apps/swaylock/Manifest            |  1 -
 gui-apps/swaylock/swaylock-1.4.ebuild | 61 -----------------------------------
 gui-apps/swaylock/swaylock-1.5.ebuild |  2 +-
 3 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/gui-apps/swaylock/Manifest b/gui-apps/swaylock/Manifest
index c79d922f5af..ae3b36d8cbf 100644
--- a/gui-apps/swaylock/Manifest
+++ b/gui-apps/swaylock/Manifest
@@ -1,3 +1,2 @@
 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

diff --git a/gui-apps/swaylock/swaylock-1.4.ebuild 
b/gui-apps/swaylock/swaylock-1.4.ebuild
deleted file mode 100644
index 32d4bd3b58d..00000000000
--- 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 1775122395b..846a5eb4b23 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"

Reply via email to