From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A2DD3138335 for ; Tue, 16 Jul 2019 09:34:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9881EE0825; Tue, 16 Jul 2019 09:34:17 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7B394E0825 for ; Tue, 16 Jul 2019 09:34:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2135D347D0A for ; Tue, 16 Jul 2019 09:34:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F6426F2 for ; Tue, 16 Jul 2019 09:34:13 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1563269646.579046676a71d2e38c21c2b50b53f4904fd51052.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/kbd/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/kbd/kbd-9999.ebuild X-VCS-Directories: sys-apps/kbd/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 579046676a71d2e38c21c2b50b53f4904fd51052 X-VCS-Branch: master Date: Tue, 16 Jul 2019 09:34:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9f234c02-0fc4-4b0a-9b61-bd94524e2d65 X-Archives-Hash: 3fbd9193bbb210102b44156cc371f8d0 commit: 579046676a71d2e38c21c2b50b53f4904fd51052 Author: Lars Wendler gentoo org> AuthorDate: Tue Jul 16 09:31:37 2019 +0000 Commit: Lars Wendler gentoo 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 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