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 2EC1B138206 for ; Fri, 19 Jan 2018 12:49:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4A801E077A; Fri, 19 Jan 2018 12:49:35 +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 29567E077A for ; Fri, 19 Jan 2018 12:49:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 A8FF1335C43 for ; Fri, 19 Jan 2018 12:49:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E744D15D for ; Fri, 19 Jan 2018 12:49:31 +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: <1516366168.b6501f9a8465e71b3159af088f7d1e2eb28b4941.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: b6501f9a8465e71b3159af088f7d1e2eb28b4941 X-VCS-Branch: master Date: Fri, 19 Jan 2018 12:49:31 +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-Archives-Salt: a113a4b1-6969-4c1f-8339-f91f3f7a9aac X-Archives-Hash: 86ce957e966dca89a7fce8aa9008c17b commit: b6501f9a8465e71b3159af088f7d1e2eb28b4941 Author: Lars Wendler gentoo org> AuthorDate: Fri Jan 19 12:49:14 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Fri Jan 19 12:49:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6501f9a sys-apps/kbd: Ported live ebuild to EAPI-6 Package-Manager: Portage-2.3.19, Repoman-2.3.6 sys-apps/kbd/kbd-9999.ebuild | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild index 139d12639fd..df8a5adeb6c 100644 --- a/sys-apps/kbd/kbd-9999.ebuild +++ b/sys-apps/kbd/kbd-9999.ebuild @@ -1,19 +1,19 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=6 SCM="" if [[ ${PV} == "9999" ]] ; then - SCM="git-r3" - EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/kbd.git" + SCM="autotools git-r3" + EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git" EGIT_BRANCH="master" else SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" fi -inherit autotools eutils ${SCM} +inherit eutils ${SCM} DESCRIPTION="Keyboard and console utilities" HOMEPAGE="http://kbd-project.org/" @@ -22,7 +22,8 @@ LICENSE="GPL-2" SLOT="0" IUSE="nls pam test" -RDEPEND="pam? ( virtual/pam )" +RDEPEND="pam? ( virtual/pam ) + app-arch/gzip" DEPEND="${RDEPEND} virtual/pkgconfig test? ( dev-libs/check )" @@ -44,18 +45,23 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch - eautoreconf + default + if [[ ${PV} == "9999" ]] ; then + eautoreconf + fi } src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam vlock) \ + local myeconfargs=( + $(use_enable nls) + $(use_enable pam vlock) $(use_enable test tests) + ) + econf "${myeconfargs[@]}" } src_install() { default - dohtml docs/doc/*.html + docinto html + dodoc docs/doc/*.html }