summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2019-07-16 11:31:37 +0200
committerLars Wendler <polynomial-c@gentoo.org>2019-07-16 11:34:06 +0200
commit579046676a71d2e38c21c2b50b53f4904fd51052 (patch)
tree56e53b3f6571d69afa58d5c090b49e2075323e29 /sys-apps
parentsys-apps/kbd: Bump to version 2.1.0 (diff)
downloadgentoo-579046676a71d2e38c21c2b50b53f4904fd51052.tar.gz
gentoo-579046676a71d2e38c21c2b50b53f4904fd51052.tar.bz2
gentoo-579046676a71d2e38c21c2b50b53f4904fd51052.zip
sys-apps/kbd: Synced live ebuild
Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/kbd/kbd-9999.ebuild20
1 files changed, 13 insertions, 7 deletions
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index a05c81063a0c..12711a24eca6 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