[gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/

[Lars Wendler]

commit:     579046676a71d2e38c21c2b50b53f4904fd51052
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 16 09:31:37 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jul 16 09:34:06 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57904667

sys-apps/kbd: Synced live ebuild

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/kbd/kbd-9999.ebuild | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index a05c81063a0..12711a24eca 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 if [[ ${PV} == "9999" ]] ; then
        inherit autotools git-r3
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
        EGIT_BRANCH="master"
 else
        SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz";
-       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~s390 ~sh ~sparc ~x86"
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sh ~sparc ~x86"
 fi
 
 DESCRIPTION="Keyboard and console utilities"
@@ -19,11 +19,18 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
 
-RDEPEND="pam? ( virtual/pam )
-       app-arch/gzip"
-DEPEND="${RDEPEND}
+RDEPEND="
+       app-arch/gzip
+       pam? (
+               !app-misc/vlock
+               virtual/pam
+       )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
        virtual/pkgconfig
-       test? ( dev-libs/check )"
+       test? ( dev-libs/check )
+"
 
 src_unpack() {
        if [[ ${PV} == "9999" ]] ; then
@@ -34,7 +41,6 @@ src_unpack() {
 
        # Rename conflicting keymaps to have unique names, bug #293228
        cd "${S}"/data/keymaps/i386 || die
-       mv dvorak/no.map dvorak/no-dvorak.map || die
        mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
        mv olpc/es.map olpc/es-olpc.map || die
        mv olpc/pt.map olpc/pt-olpc.map || die