commit: eb56230933b2ce68f9532e08c9ea678ea4a37eb5 Author: Felix Janda <felix.janda <AT> posteo <DOT> de> AuthorDate: Sun Jul 10 19:39:42 2016 +0000 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> CommitDate: Fri Jul 15 05:38:05 2016 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=eb562309
sys-apps/kbd: In tree version works Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=563350 sys-apps/kbd/Manifest | 10 -- .../kbd-1.15.5-fix-struct_winsize-collision.patch | 11 -- sys-apps/kbd/files/kbd-1.15.5-loadkeys-parse.patch | 90 ------------- .../kbd/files/kbd-1.15.5-musl-headers-error.patch | 115 ---------------- sys-apps/kbd/files/kbd-2.0.0-tests.patch | 31 ----- .../kbd/files/kbd-2.0.2-musl-headers-error.patch | 147 --------------------- sys-apps/kbd/kbd-1.15.5-r99.ebuild | 52 -------- sys-apps/kbd/kbd-2.0.2-r99.ebuild | 64 --------- sys-apps/kbd/metadata.xml | 11 -- 9 files changed, 531 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest deleted file mode 100644 index f638e03..0000000 --- a/sys-apps/kbd/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -AUX kbd-1.15.5-fix-struct_winsize-collision.patch 366 SHA256 510856ce92915a2f2c2547b99761a5c62c5ca452a6a57a43c2ec3392509fa3b6 SHA512 19f0623b594796e7bf3f82421d46fefcf9acc210683b4915d5ae6a0ddf026ccd373abb9f0cfb7d8ad99cc19443b5e585150f480653e360efb76dfdd722c801d2 WHIRLPOOL 8c7fd883c3b2b032ff0790514d519083a9a8dad09cfa3ad931ad9423d6ec511c2ab15938ba30c98fb986875dec44d0c5d3382cc223542f91d36ffb880e368e16 -AUX kbd-1.15.5-loadkeys-parse.patch 2163 SHA256 8fa928854ee1e3298df99e600cfdb08ccf8b44b7a7fc42423569fecc9365aa22 SHA512 c338c5f5ee9054f3dfc62646f9e8a47a577fc55dbc4723a04f006afa6c966ac5b056b744c49d4bdfcd80d69e64af20b0f71cc9cfff23db9f017adb32bd6d9d7d WHIRLPOOL 26b1adadc347b534675c7426eb9aca535556b81cffdd1ccd7ef50c603e127c1f9f6774af1b8050c67fc81daefe0c33da4593f74d3b77c47a089d6772363153e8 -AUX kbd-1.15.5-musl-headers-error.patch 3456 SHA256 5ada44aa9dc55385cb55d5b22a3d657e932652b8a0b0f261de91c635450e734c SHA512 56dd0fca91284ef76a5265cc92c08ac404b3ed2fde9d02a7d631d27ae380dde75343a889bdd7d320daa09212db1ae70a2f8b91ddc42513133fefa78da59e9b36 WHIRLPOOL 4908b996e41abead43259680630885ac65fc45cb0d75677302a32324c082b1c56927e73cdda16c37250d00d8e9820e56b624e7e21d12247e8a5489cdfaf540eb -AUX kbd-2.0.0-tests.patch 747 SHA256 b1bd608043ecd19a9f0a9431afd4f3202e4d953b7f5c361d3e5949de65eda852 SHA512 408df2b4a9409c10c350d4c879a273cf7126ba58b49546a910cc93e0fd3119014a32b3e8b9c19eddecc9f601aa9d2a1b2b25c563f9529691c2d44f8db4cd0974 WHIRLPOOL 27e78a5dfb6d4ee3e117cbbfdd3025ee99980201e590c4631fab399a89a408a5275d17beac60da2364d2dfaf7f9e1cfda5c8cc8e74713d4160241bffd41c9b6a -AUX kbd-2.0.2-musl-headers-error.patch 3327 SHA256 93add08a331bf538a3894a302fd9f5dc8631043feba7d1441773800f4d47e07c SHA512 4411480ed84e992cf8ede1f54983ef804cc2ce4ce3a952127454188a6a341293cb2ddfc26d61a04d678c8a58b311d6df78f4c406b475dbe18c379e36ee5406dd WHIRLPOOL 8512ed0f2738a9b4a69e6028c0c10b1adfde4537ad66a0b4393842df49475c7be94abe709556834a96d2781142a09acde7fc2fb9fdb9b3853c7b7440ac9432d9 -DIST kbd-1.15.5.tar.gz 1730719 SHA256 e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c WHIRLPOOL 431873623d4125b73622894c511711a2153fae498a17dc59851219405c69a641c24bb591fa66001eb4cc7491fc4f90e532661c2bf56f69e2a17dd435d1e14ace -DIST kbd-2.0.2.tar.xz 1023980 SHA256 9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912 SHA512 8159383f94242f06c701dfd5400e35bd3a76494a643f738d98c6713bcb20034065b49f31f66e8bf19e6829a30be97fbeee43ed8ad276febb98e28b3bf82972fa WHIRLPOOL e6a5be104b11266f8be9ba653e9e0de701cdf4c56b249af9bc52ea5eea374d1de82e3f4a02214552750adebb8ae21c8c964a4161d661e460f765306920e23849 -EBUILD kbd-1.15.5-r99.ebuild 1114 SHA256 749cd71813a800b98f5a8d2f5bc99514095cce7e9705632369f32213002fcc5a SHA512 4e4a3c46b2385f43934ac3b4cdc9fed46005ec8a8e5cf7171db236804ceff310335cb59a750ce13269ce0a62d16afc612b7021360f3415d798b152ee67e9bda6 WHIRLPOOL 4580d9dec1b5ba25e3764ec1ada21d766c7175bbb3156ff776a974903f718172c8184a9db177eebb06dd95463af11e9da7745da32277f922f5c73cfe766d16d8 -EBUILD kbd-2.0.2-r99.ebuild 1423 SHA256 b92d09286be1d017985d6bdd7af835023a4f50e6b4113e29da69e34c13af534e SHA512 90fd8bd4022c84eae0c4e486a9e1771c2213113d5b084790522d48cbdd923e9b523b835d07564974b0fa6e7edc229a9f8129df1eb07332bac37754af7ead32ff WHIRLPOOL f7814b63266dd0bd68e42f8c2aa002d92c2fb749ca4c51df7d814707f40ce3a536a1398694add80c3614b4ad20243208549c293bf777e6276edcd2f6a005bb5b -MISC metadata.xml 321 SHA256 1462f761b68587fc7326d39bcc0cd09d6ec204d7a4b3fa56183c018091599122 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641 WHIRLPOOL f83457f54b220ab31efe8775b16a54a78710f652c8dc5d9d4421a9f9e13f4d663a16b1023efecfff28126ada8af20990e6690fec99b2651130daf1de3cad3347 diff --git a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch b/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch deleted file mode 100644 index 2936090..0000000 --- a/sys-apps/kbd/files/kbd-1.15.5-fix-struct_winsize-collision.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Naur kbd-1.15.5.orig/src/resizecons.c kbd-1.15.5/src/resizecons.c ---- kbd-1.15.5.orig/src/resizecons.c 2012-12-01 21:41:38.000000000 +0000 -+++ kbd-1.15.5/src/resizecons.c 2014-01-16 13:48:25.793935059 +0000 -@@ -82,7 +82,6 @@ - #include <sys/perm.h> - #else - #include <linux/types.h> --#include <linux/termios.h> - #endif - #include <linux/vt.h> - #include "paths.h" 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 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 <[email protected]> -Date: Tue, 11 Dec 2012 14:24:44 +0400 -Subject: [PATCH] Fix regression in 16117ce6ab - -Signed-off-by: Alexey Gladkov <[email protected]> ---- - 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/files/kbd-1.15.5-musl-headers-error.patch b/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch deleted file mode 100644 index ad52a63..0000000 --- a/sys-apps/kbd/files/kbd-1.15.5-musl-headers-error.patch +++ /dev/null @@ -1,115 +0,0 @@ -diff -Naur kbd-1.15.3.orig/src/dumpkeys.c kbd-1.15.3/src/dumpkeys.c ---- kbd-1.15.3.orig/src/dumpkeys.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/dumpkeys.c 2013-07-06 02:20:41.660131968 +0000 -@@ -12,6 +12,7 @@ - #include <linux/kd.h> - #include <linux/keyboard.h> - #include <sys/ioctl.h> -+#include <sys/types.h> - #include <string.h> - #include <errno.h> - #include "ksyms.h" -diff -Naur kbd-1.15.3.orig/src/kbdinfo.c kbd-1.15.3/src/kbdinfo.c ---- kbd-1.15.3.orig/src/kbdinfo.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/kbdinfo.c 2013-07-06 02:29:12.057160508 +0000 -@@ -1,6 +1,5 @@ - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <unistd.h> - #include <sys/ioctl.h> - #include <linux/kd.h> -@@ -9,6 +8,10 @@ - #include "nls.h" - #include "version.h" - -+#define error(e, n, s) \ -+ perror(s); \ -+ exit(e); \ -+ - static const char *action = NULL; - static const char *value = NULL; - -diff -Naur kbd-1.15.3.orig/src/kbdrate.c kbd-1.15.3/src/kbdrate.c ---- kbd-1.15.3.orig/src/kbdrate.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/kbdrate.c 2013-07-06 02:21:53.121135964 +0000 -@@ -74,6 +74,7 @@ - #include <errno.h> - #include <sys/file.h> - #include <sys/ioctl.h> -+#include <fcntl.h> - - #ifdef __sparc__ - #include <asm/param.h> -diff -Naur kbd-1.15.3.orig/src/loadkeys.c kbd-1.15.3/src/loadkeys.c ---- kbd-1.15.3.orig/src/loadkeys.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/loadkeys.c 2013-07-06 02:21:02.148133114 +0000 -@@ -79,6 +79,7 @@ - #include <ctype.h> - #include <sys/param.h> - #include <sys/ioctl.h> -+#include <sys/types.h> - #include <linux/kd.h> - #include <linux/keyboard.h> - #include <unistd.h> -diff -Naur kbd-1.15.3.orig/src/openvt.c kbd-1.15.3/src/openvt.c ---- kbd-1.15.3.orig/src/openvt.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/openvt.c 2013-07-06 02:22:11.080136968 +0000 -@@ -10,6 +10,7 @@ - #include <sys/vt.h> - #include <sys/wait.h> - #include <sys/file.h> -+#include <fcntl.h> - - #include "version.h" - #include "xmalloc.h" -diff -Naur kbd-1.15.3.orig/src/setvtrgb.c kbd-1.15.3/src/setvtrgb.c ---- kbd-1.15.3.orig/src/setvtrgb.c 2011-05-07 20:33:42.000000000 +0000 -+++ kbd-1.15.3/src/setvtrgb.c 2013-07-06 02:34:26.390178084 +0000 -@@ -5,12 +5,15 @@ - #include <sys/ioctl.h> - #include <linux/kd.h> - #include <errno.h> --#include <error.h> - #include "kbd.h" - #include "getfd.h" - #include "nls.h" - #include "version.h" - -+#define error(e, n, s) \ -+ perror(s); \ -+ exit(e); \ -+ - static unsigned char *cmap; - - /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's -@@ -82,25 +85,21 @@ - if (c == EOF) - error(EXIT_FAILURE, errno, "fscanf"); - -- error(EXIT_FAILURE, 0, _("Error: %s: Invalid value in field %u in line %u."), -- filename, rows + 1, cols + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - } - - cmap[rows + cols * 3] = (unsigned char) val; - - if (cols < 15 && fgetc(fd) != ',') -- error(EXIT_FAILURE, 0, _("Error: %s: Insufficient number of fields in line %u."), -- filename, rows + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - cols++; - } - - if ((c = fgetc(fd)) == EOF) -- error(EXIT_FAILURE, 0, _("Error: %s: Line %u has ended unexpectedly.\n"), -- filename, rows + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - - if (c != '\n') -- error(EXIT_FAILURE, 0, _("Error: %s: Line %u is too long.\n"), -- filename, rows + 1); -+ error(EXIT_FAILURE, 0, "setvtrgb"); - } - } - 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 7a4e186..0000000 --- a/sys-apps/kbd/files/kbd-2.0.0-tests.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- 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/files/kbd-2.0.2-musl-headers-error.patch b/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch deleted file mode 100644 index 69ac7d0..0000000 --- a/sys-apps/kbd/files/kbd-2.0.2-musl-headers-error.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/src/kbdinfo.c b/src/kbdinfo.c -index e5f122d..dcdcac0 100644 ---- a/src/kbdinfo.c -+++ b/src/kbdinfo.c -@@ -1,6 +1,5 @@ - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <unistd.h> - #include <sys/ioctl.h> - #include <linux/kd.h> -@@ -9,6 +8,10 @@ - #include "nls.h" - #include "version.h" - -+#define error(e, n, ...) \ -+ fprintf(stderr, ##__VA_ARGS__); \ -+ exit(e); -+ - static const char *action = NULL; - static const char *value = NULL; - -diff --git a/src/kbdrate.c b/src/kbdrate.c -index 2ab8388..5faff00 100644 ---- a/src/kbdrate.c -+++ b/src/kbdrate.c -@@ -74,6 +74,7 @@ beats rebuilding the kernel! - #include <errno.h> - #include <sys/file.h> - #include <sys/ioctl.h> -+#include <fcntl.h> - #include <linux/kd.h> - - #ifdef __sparc__ -diff --git a/src/libkeymap/dump.c b/src/libkeymap/dump.c -index 0262e24..606931e 100644 ---- a/src/libkeymap/dump.c -+++ b/src/libkeymap/dump.c -@@ -13,6 +13,7 @@ - #include <string.h> - #include <ctype.h> - #include <unistd.h> -+#include <sys/types.h> - - #include "keymap.h" - -diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c -index 67be81e..e13498b 100644 ---- a/src/libkeymap/kmap.c -+++ b/src/libkeymap/kmap.c -@@ -1,5 +1,6 @@ - #include <stdlib.h> - #include <string.h> -+#include <sys/types.h> - - #include "nls.h" - #include "kbd.h" -diff --git a/src/libkeymap/summary.c b/src/libkeymap/summary.c -index 46df90d..0912ae8 100644 ---- a/src/libkeymap/summary.c -+++ b/src/libkeymap/summary.c -@@ -9,6 +9,7 @@ - #include <string.h> - #include <errno.h> - #include <sys/ioctl.h> -+#include <sys/types.h> - - #include "keymap.h" - -diff --git a/src/openvt.c b/src/openvt.c -index 075136f..49720d7 100644 ---- a/src/openvt.c -+++ b/src/openvt.c -@@ -10,6 +10,7 @@ - #include <sys/vt.h> - #include <sys/wait.h> - #include <sys/file.h> -+#include <fcntl.h> - - #include "version.h" - #include "xmalloc.h" -@@ -19,6 +20,8 @@ - #include "compat/linux-limits.h" - #endif - -+#define NAME_MAX 255 -+ - // There must be a universal way to find these! - #define TRUE (1) - #define FALSE (0) -diff --git a/src/setvtrgb.c b/src/setvtrgb.c -index f99badc..f1a631c 100644 ---- a/src/setvtrgb.c -+++ b/src/setvtrgb.c -@@ -5,12 +5,15 @@ - #include <sys/ioctl.h> - #include <linux/kd.h> - #include <errno.h> --#include <error.h> - #include "kbd.h" - #include "getfd.h" - #include "nls.h" - #include "version.h" - -+#define error(e, n, ...) \ -+ fprintf(stderr, ##__VA_ARGS__); \ -+ exit(e); -+ - static unsigned char *cmap; - - /* Standard VGA terminal colors, matching those hardcoded in the Linux kernel's -diff --git a/src/vlock/auth.c b/src/vlock/auth.c -index da135ce..a3f365b 100644 ---- a/src/vlock/auth.c -+++ b/src/vlock/auth.c -@@ -22,7 +22,6 @@ - */ - - #include <errno.h> --#include <error.h> - #include <stdio.h> - #include <string.h> - #include <stdlib.h> -diff --git a/src/vlock/vlock.c b/src/vlock/vlock.c -index c2c4158..fa2f386 100644 ---- a/src/vlock/vlock.c -+++ b/src/vlock/vlock.c -@@ -23,7 +23,6 @@ - - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <string.h> - #include <stdlib.h> - #include <unistd.h> -diff --git a/src/vlock/vt.c b/src/vlock/vt.c -index 4e5282b..f3ba85d 100644 ---- a/src/vlock/vt.c -+++ b/src/vlock/vt.c -@@ -23,7 +23,6 @@ - - #include <stdio.h> - #include <errno.h> --#include <error.h> - #include <string.h> - #include <stdlib.h> - #include <unistd.h> diff --git a/sys-apps/kbd/kbd-1.15.5-r99.ebuild b/sys-apps/kbd/kbd-1.15.5-r99.ebuild deleted file mode 100644 index 284cc09..0000000 --- a/sys-apps/kbd/kbd-1.15.5-r99.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit eutils - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://freshmeat.net/projects/kbd/"; -SRC_URI="ftp://ftp.altlinux.org/pub/people/legion/kbd/${P}.tar.gz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc 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 - epatch "${FILESDIR}"/${P}-musl-headers-error.patch - epatch "${FILESDIR}"/${P}-fix-struct_winsize-collision.patch -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam vlock) -} - -src_install() { - default - dohtml doc/*.html -} diff --git a/sys-apps/kbd/kbd-2.0.2-r99.ebuild b/sys-apps/kbd/kbd-2.0.2-r99.ebuild deleted file mode 100644 index a984d0d..0000000 --- a/sys-apps/kbd/kbd-2.0.2-r99.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -SCM="" -if [[ ${PV} == "9999" ]] ; then - SCM="git-r3" - EGIT_REPO_URI="http://git.kernel.org/cgit/linux/kernel/git/legion/${PN}.git"; - EGIT_BRANCH="master" -else - SRC_URI="ftp://ftp.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"; - KEYWORDS="~amd64 ~arm ~mips ~ppc ~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 )" -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 - epatch "${FILESDIR}"/${PN}-1.15.5-fix-struct_winsize-collision.patch - epatch "${FILESDIR}"/${PN}-2.0.2-musl-headers-error.patch - eautoreconf -} - -src_configure() { - econf \ - $(use_enable nls) \ - $(use_enable pam vlock) \ - $(use_enable test tests) -} - -src_install() { - default - dohtml docs/doc/*.html -} diff --git a/sys-apps/kbd/metadata.xml b/sys-apps/kbd/metadata.xml deleted file mode 100644 index 994903f..0000000 --- a/sys-apps/kbd/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo Base System</name> -</maintainer> -<upstream> - <remote-id type="freshmeat">kbd</remote-id> -</upstream> -</pkgmetadata>
