commit: 3dbd6d8a84a1d7d7dc2809735e660f247bcc09fd Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Mon Jan 9 18:32:56 2017 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Mon Jan 9 18:33:17 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dbd6d8a
sys-apps/kbd: Removed old. Package-Manager: Portage-2.3.3, Repoman-2.3.1 sys-apps/kbd/Manifest | 2 - sys-apps/kbd/files/kbd-2.0.1-big_endian.patch | 27 ----------- sys-apps/kbd/files/kbd-2.0.1-stdarg.patch | 43 ------------------ sys-apps/kbd/kbd-2.0.1-r1.ebuild | 64 --------------------------- sys-apps/kbd/kbd-2.0.1.ebuild | 55 ----------------------- sys-apps/kbd/kbd-2.0.2.ebuild | 62 -------------------------- 6 files changed, 253 deletions(-) diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest index 725e095..87bcad6 100644 --- a/sys-apps/kbd/Manifest +++ b/sys-apps/kbd/Manifest @@ -1,5 +1,3 @@ DIST kbd-1.15.5.tar.gz 1730719 SHA256 e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c WHIRLPOOL 431873623d4125b73622894c511711a2153fae498a17dc59851219405c69a641c24bb591fa66001eb4cc7491fc4f90e532661c2bf56f69e2a17dd435d1e14ace -DIST kbd-2.0.1.tar.xz 951132 SHA256 55407b79e90ee65cdbaff7d3dafd2b53c4fee3a645788ffb582091074a2254af SHA512 8d6f663611a99426a7259909d1276732635edc90e61a4affc4cebbdd8bcb180c91a19c8f90bc1b6511c57abee66d5fa513f13bc05cfb3903ee51b5048577d836 WHIRLPOOL 3be2d1fb0cae1443dbd813a45cd815664e4bab94fa1bc37b0c3054f86846fa3d69c8c1a5e620413da34d65f58a90768eac22cd24972366f2d8d24fafcd094703 -DIST kbd-2.0.2.tar.xz 1023980 SHA256 9dfddabf96012e329c4bebb96a21aeef7c3872f624e96e8156ba542b82aeb912 SHA512 8159383f94242f06c701dfd5400e35bd3a76494a643f738d98c6713bcb20034065b49f31f66e8bf19e6829a30be97fbeee43ed8ad276febb98e28b3bf82972fa WHIRLPOOL e6a5be104b11266f8be9ba653e9e0de701cdf4c56b249af9bc52ea5eea374d1de82e3f4a02214552750adebb8ae21c8c964a4161d661e460f765306920e23849 DIST kbd-2.0.3.tar.xz 1037036 SHA256 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f WHIRLPOOL 7534370cd0410119775c564269ada152248c75711332e2d6884d1503cef4f573617d7d7d4bb29c581ee993be2f8e96f6c290feb07bfabbb8c14a12ca6d33841e DIST kbd-2.0.4.tar.xz 1031864 SHA256 5fd90af6beb225a9bb9b9fb414c090fba53c9a55793e172f508cd43652e59a88 SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f WHIRLPOOL bde3f8ac3900cc7a39e8d8fd4bc0e87e777e21cb559c1efc9ca1dd0192fba6e8983e40011b702e1be14bb92d238ef89bde23ed40269dbeb8719c622c4d7cb8d9 diff --git a/sys-apps/kbd/files/kbd-2.0.1-big_endian.patch b/sys-apps/kbd/files/kbd-2.0.1-big_endian.patch deleted file mode 100644 index f69b7f9..00000000 --- a/sys-apps/kbd/files/kbd-2.0.1-big_endian.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 363185b72ccb5279fa950a378ebd93c082078d39 Mon Sep 17 00:00:00 2001 -From: Aaro Koskinen <[email protected]> -Date: Sat, 15 Mar 2014 01:32:56 +0200 -Subject: libkeymap: fix kmap on big-endian machines - -Currently "loadkeys" does not work properly (no keys are ever changed) -on big-endian machines (e.g. SPARC and other classic hardware) -due to incorrect typing. The patch fixes this. - -Signed-off-by: Aaro Koskinen <[email protected]> - -diff --git a/src/libkeymap/kmap.c b/src/libkeymap/kmap.c -index e529136..85a3bb3 100644 ---- a/src/libkeymap/kmap.c -+++ b/src/libkeymap/kmap.c -@@ -37,7 +37,7 @@ int - lk_key_exists(struct lk_ctx *ctx, unsigned int k_table, unsigned int k_index) - { - struct lk_array *map; -- u_short *key; -+ unsigned int *key; - - map = lk_array_get_ptr(ctx->keymap, k_table); - if (!map) { --- -cgit v0.10.1 - diff --git a/sys-apps/kbd/files/kbd-2.0.1-stdarg.patch b/sys-apps/kbd/files/kbd-2.0.1-stdarg.patch deleted file mode 100644 index b325af4..00000000 --- a/sys-apps/kbd/files/kbd-2.0.1-stdarg.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7955ccd650dc3235df3bf6333222c2811dd43141 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger <[email protected]> -Date: Mon, 6 Jan 2014 10:27:23 -0500 -Subject: [PATCH] libkeymap: include stdarg.h where used - -Some of these headers use va_list but don't include stdarg.h for it. - -Reported-by: Anthony Basile <[email protected]> -Signed-off-by: Mike Frysinger <[email protected]> ---- - src/libkeymap/contextP.h | 2 ++ - src/libkeymap/keymap/common.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/libkeymap/contextP.h b/src/libkeymap/contextP.h -index e3798e3..8ee3fab 100644 ---- a/src/libkeymap/contextP.h -+++ b/src/libkeymap/contextP.h -@@ -1,6 +1,8 @@ - #ifndef LK_CONTEXTP_H - #define LK_CONTEXTP_H - -+#include <stdarg.h> -+ - #include "keymap.h" - - /** -diff --git a/src/libkeymap/keymap/common.h b/src/libkeymap/keymap/common.h -index 6b9cead..987b564 100644 ---- a/src/libkeymap/keymap/common.h -+++ b/src/libkeymap/keymap/common.h -@@ -6,6 +6,8 @@ - #ifndef LK_COMMON_H - #define LK_COMMON_H - -+#include <stdarg.h> -+ - #include <keymap/context.h> - - /** Initializes the structures necessary to read and/or parse keymap. --- -1.8.4.3 - diff --git a/sys-apps/kbd/kbd-2.0.1-r1.ebuild b/sys-apps/kbd/kbd-2.0.1-r1.ebuild deleted file mode 100644 index 00353b9..00000000 --- a/sys-apps/kbd/kbd-2.0.1-r1.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2015 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="https://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="~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 )" -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 - epatch "${FILESDIR}"/${P}-stdarg.patch #497200 - epatch "${FILESDIR}"/${P}-big_endian.patch #508436 - 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/kbd-2.0.1.ebuild b/sys-apps/kbd/kbd-2.0.1.ebuild deleted file mode 100644 index 5f39fcd..00000000 --- a/sys-apps/kbd/kbd-2.0.1.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit autotools eutils - -DESCRIPTION="Keyboard and console utilities" -HOMEPAGE="http://kbd-project.org/"; -SRC_URI="ftp://ftp.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 test" - -RDEPEND="pam? ( virtual/pam )" -DEPEND="${RDEPEND} - virtual/pkgconfig - test? ( dev-libs/check )" - -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}"/${PN}-2.0.0-tests.patch #485116 - epatch "${FILESDIR}"/${P}-stdarg.patch #497200 - 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/kbd-2.0.2.ebuild b/sys-apps/kbd/kbd-2.0.2.ebuild deleted file mode 100644 index ec36a52..00000000 --- a/sys-apps/kbd/kbd-2.0.2.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 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="https://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="~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 )" -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 -}
