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

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     502b4d8b39bf626c8ae0baecfa8a9a74a56e8430
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 20 10:43:28 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Apr 20 11:12:07 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=502b4d8b

sys-apps/kbd: Removed old.

Package-Manager: Portage-2.3.31, Repoman-2.3.9

 sys-apps/kbd/Manifest                    |  1 -
 sys-apps/kbd/files/kbd-2.0.0-tests.patch | 34 ------------------
 sys-apps/kbd/kbd-2.0.3.ebuild            | 62 --------------------------------
 3 files changed, 97 deletions(-)

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 50b5caac7ff..c23aeeba3b9 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,2 +1 @@
-DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f

diff --git a/sys-apps/kbd/files/kbd-2.0.0-tests.patch b/sys-apps/kbd/files/kbd-2.0.0-tests.patch
deleted file mode 100644
index 6a1c7ea851e..00000000000
--- a/sys-apps/kbd/files/kbd-2.0.0-tests.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-https://bugs.gentoo.org/485116
-http://lists.altlinux.org/pipermail/kbd/2015-July/000558.html
-
---- configure.ac
-+++ configure.ac
-@@ -11,7 +11,13 @@
- AC_CONFIG_SRCDIR([src/loadkeys.c])
- AC_CONFIG_HEADERS(config.h)
- 
--PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+AC_ARG_ENABLE(tests,
-+	AS_HELP_STRING(--enable-tests, [build tests]),
-+	[BUILD_TESTS=$enableval],[BUILD_TESTS=no])
-+AM_CONDITIONAL(BUILD_TESTS, test "$BUILD_TESTS" = "yes")
-+if test "$BUILD_TESTS" = "yes"; then
-+	PKG_CHECK_MODULES([CHECK], [check >= 0.9.4])
-+fi
- 
- m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
- AM_SILENT_RULES([yes])
---- Makefile.am
-+++ Makefile.am
-@@ -8,7 +8,10 @@
- 	CREDITS \
- 	contrib docs rc
- 
--SUBDIRS = src data po tests docs
-+SUBDIRS = src data po docs
-+if BUILD_TESTS
-+SUBDIRS += tests
-+endif
- 
- kbd-$(VERSION).tar.xz:
- 	make distcheck

diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild
deleted file mode 100644
index 3d02370de95..00000000000
--- a/sys-apps/kbd/kbd-2.0.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-SCM=""
-if [[ ${PV} == "9999" ]] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"
-	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"
-fi
-
-inherit autotools eutils ${SCM}
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam test"
-
-RDEPEND="pam? ( virtual/pam )
-	app-arch/gzip"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( dev-libs/check )"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-
-	# 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
-	mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch #485116
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable nls) \
-		$(use_enable pam vlock) \
-		$(use_enable test tests)
-}
-
-src_install() {
-	default
-	dohtml docs/doc/*.html
-}