Добавление дополнительных терминальных раскалдок для kbd-2.0.4

sys-apps/kbd/Manifest

@@ -1,4 +1,2 @@
-DIST kbd-1.15.5.tar.gz 1730719 SHA256 e35fa29f690dbbfb721706b2c8edc760c697640904fec65e81194ae8840c5c62 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c WHIRLPOOL 431873623d4125b73622894c511711a2153fae498a17dc59851219405c69a641c24bb591fa66001eb4cc7491fc4f90e532661c2bf56f69e2a17dd435d1e14ace
-DIST kbd-2.0.3.tar.xz 1037036 SHA256 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f WHIRLPOOL 7534370cd0410119775c564269ada152248c75711332e2d6884d1503cef4f573617d7d7d4bb29c581ee993be2f8e96f6c290feb07bfabbb8c14a12ca6d33841e
-DIST keymaps-addon-0.0.1.tar.bz2 10659 SHA256 a6e57924977a513c048ac38f310e41316532ba9f381acdcef31d180c698c012c SHA512 c3ac58cfef097e0eca58f439c9fbee892551ace5120709236556e97977e8df571e177b1f1138f801da31bc6614c0fee2ec9c3c4b98895f475ae991afe14d1edd WHIRLPOOL 1a488bf833b2c6f0e70cdeb46c7e0afd64a7f51312ed42b729f8807a7291ec432204147d770f917b98b69de5d9feaa2048102f969b9c46d1b8244e310af51dd8
-DIST keymaps-addon-0.0.2.tar.bz2 8751 SHA256 cda471b7a4220d12ef3503bc3ca4e1b51121ce767cd8587e796cd1c356fa8378 SHA512 0f1fca0e795680bcca1d9cd75e52d8206ea5f3c1c6da8e39a309bf471ea795870de3c133012b4cea5abb84657b6cf51af8a9e44ae2b1d6d111f31e64d2c528cf WHIRLPOOL 662a6b2bf0c61a7673bffe03e1ce5ac3f2f16bac56ce7576870eb4dc70b029f5f871a731fb3db614d15ac6c91e58cc0d6a7c76d55e9282c8db7a0ce143c8c510
+DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
+DIST keymaps-addon-0.0.2.tar.bz2 8751 BLAKE2B 90a5c261e8e1a63ab372198e0fc53a78d60c39ae0c86a3c1be9b5a77b9daf5f27559148ba5ff5c8f6705de95932060480747579d73ff8a9ca39b854229387d07 SHA512 0f1fca0e795680bcca1d9cd75e52d8206ea5f3c1c6da8e39a309bf471ea795870de3c133012b4cea5abb84657b6cf51af8a9e44ae2b1d6d111f31e64d2c528cf

sys-apps/kbd/kbd-1.15.5-r9.ebuild

@@ -1,55 +0,0 @@
-# Copyright 1999-2014 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
-	ftp://ftp.calculate-linux.ru/pub/calculate/keymaps-addon/keymaps-addon-0.0.1.tar.bz2
-	http://mirror.yandex.ru/calculate/keymaps-addon/keymaps-addon-0.0.1.tar.bz2
-	ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/keymaps-addon/keymaps-addon-0.0.1.tar.bz2"
-
-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}"
-	pwd
-	cp -r ../keymaps data/
-
-	# 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
-}

sys-apps/kbd/kbd-2.0.4-r9.ebuild

@@ -1,23 +1,23 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
 SCM=""
 if [[ ${PV} == "9999" ]] ; then
-	SCM="git-r3"
+	SCM="autotools 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
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz
 		ftp://ftp.calculate-linux.ru/calculate/source/keymaps-addon/keymaps-addon-0.0.2.tar.bz2
 		http://mirror.yandex.ru/calculate/source/keymaps-addon/keymaps-addon-0.0.2.tar.bz2
 		ftp://ftp.linux.kiev.ua/pub/Linux/Calculate/source/keymaps-addon/keymaps-addon-0.0.2.tar.bz2"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86"
+
+	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/"
@@ -26,7 +26,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 )"
@@ -40,7 +41,6 @@ src_unpack() {
 	cd "${S}"
 	cp -r ../keymaps data/
 
-
 	# Rename conflicting keymaps to have unique names, bug #293228
 	cd "${S}"/data/keymaps/i386 || die
 	mv dvorak/no.map dvorak/no-dvorak.map || die
@@ -51,8 +51,9 @@ src_unpack() {
 }
 
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.0.0-tests.patch #485116
-	eautoreconf
+	if [[ ${PV} == "9999" ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {