sys-apps/kbd: Drop old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index d6c4a8c16e7a850613102784cf320cec138b7224..50b5caac7ff300c8507093181bbbf1ed5eae069b 100644 (file)
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,3 +1,2 @@
-DIST kbd-1.15.5.tar.xz 790680 BLAKE2B f34883fea204a292c91bd0b06924e5a93f0157ef2b1a4f7e8b424770103222685c0e11ae9897c9f5da3ee5e2a87dbea808ca1405fb92a55bfef3dc3e75b21ec4 SHA512 fed954bfe231a46debc2a0d6e919335b42d8cfc879821137424440289de248f6a1705e48745cf19e5bd16d7f66c2a8ff2793341f9906d2d4b2b88ac7774d8c7f
 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-1.15.5-loadkeys-parse.patch b/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
deleted file mode 100644 (file)
index c78a227..0000000
--- a/sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/447440
-
-From 7e06e56157e8431d02e1377cdc44230944203d88 Mon Sep 17 00:00:00 2001
-From: Alexey Gladkov <gladkov.alexey@gmail.com>
-Date: Tue, 11 Dec 2012 14:24:44 +0400
-Subject: [PATCH] Fix regression in 16117ce6ab
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- src/loadkeys.analyze.l | 14 +++++++++-----
- 1 file changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/src/loadkeys.analyze.l b/src/loadkeys.analyze.l
-index c18dcea..f817c78 100644
---- a/src/loadkeys.analyze.l
-+++ b/src/loadkeys.analyze.l
-@@ -307,8 +307,10 @@ To                      to|To|TO
-                               char *s = xstrndup(yytext+1, strlen(yytext)-2);
-                               /* use static pathname to store *s ? */
-                               open_include(s);
--                              yy_pop_state();
--                              state_ptr--;
-+                              while (state_ptr > 0) {
-+                                      yy_pop_state();
-+                                      state_ptr--;
-+                              }
-                       }
- <INCLSTR>[^"]|\"\"|\"[^"\n]*{Eol}     {
-                               yyerror(_("expected filename between quotes"));
-@@ -323,7 +325,7 @@ To                      to|To|TO
-                       }
- {Eol}                 {
-                               line_nr++;
--                              if (state_ptr > 0) {
-+                              while (state_ptr > 0) {
-                                       yy_pop_state();
-                                       state_ptr--;
-                               }
-@@ -428,8 +430,10 @@ To                      to|To|TO
-                       }
- <STR>\"                       {
-                               *p = '\0';
--                              yy_pop_state();
--                              state_ptr--;
-+                              while (state_ptr > 0) {
-+                                      yy_pop_state();
-+                                      state_ptr--;
-+                              }
-                               return(STRLITERAL);
-                       }
- .                     {
---- a/src/loadkeys.analyze.c
-+++ b/src/loadkeys.analyze.c
-@@ -1359,8 +1359,10 @@ YY_RULE_SETUP
-                               char *s = xstrndup(yytext+1, strlen(yytext)-2);
-                               /* use static pathname to store *s ? */
-                               open_include(s);
--                              yy_pop_state();
--                              state_ptr--;
-+                              while (state_ptr > 0) {
-+                                      yy_pop_state();
-+                                      state_ptr--;
-+                              }
-                       }
-       YY_BREAK
- case 3:
-@@ -1393,7 +1395,7 @@ YY_RULE_SETUP
- #line 324 "loadkeys.analyze.l"
- {
-                               line_nr++;
--                              if (state_ptr > 0) {
-+                              while (state_ptr > 0) {
-                                       yy_pop_state();
-                                       state_ptr--;
-                               }
-@@ -1670,8 +1670,10 @@ YY_RULE_SETUP
- #line 429 "loadkeys.analyze.l"
- {
-                               *p = '\0';
--                              yy_pop_state();
--                              state_ptr--;
-+                              while (state_ptr > 0) {
-+                                      yy_pop_state();
-+                                      state_ptr--;
-+                              }
-                               return(STRLITERAL);
-                       }
-       YY_BREAK
--- 
-1.8.0.2

diff --git a/sys-apps/kbd/kbd-1.15.5-r1.ebuild b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
deleted file mode 100644 (file)
index aeb194b..0000000
--- a/sys-apps/kbd/kbd-1.15.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://freshmeat.net/projects/kbd/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls pam"
-
-RDEPEND="pam? ( virtual/pam )"
-DEPEND="${RDEPEND}"
-
-src_unpack() {
-       default
-       cd "${S}"
-
-       # broken file ... upstream git punted it
-       rm po/es.po
-
-       # Rename conflicting keymaps to have unique names, bug #293228
-       cd "${S}"/data/keymaps/i386
-       mv dvorak/no.map dvorak/no-dvorak.map
-       mv fgGIod/trf.map fgGIod/trf-fgGIod.map
-       mv olpc/es.map olpc/es-olpc.map
-       mv olpc/pt.map olpc/pt-olpc.map
-       mv qwerty/cz.map qwerty/cz-qwerty.map
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-loadkeys-parse.patch #447440
-}
-
-src_configure() {
-       econf \
-               $(use_enable nls) \
-               $(use_enable pam vlock)
-}
-
-src_install() {
-       default
-       dohtml doc/*.html
-}