gentoo resync : 18.12.2020

5 files changed, 25 insertions, 108 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 279dd869a3ac..184489dd9daa 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,12 +1,10 @@
-AUX kbd-2.0.4-vlock_configure_switch.patch 848 BLAKE2B 1e1cb785b75b0e9dbd9c4893081b7ccef7ce09d18835bc6644543f79b1e1bdca3619863c37f14adcabf07814680769caaac57ed24026440df50e14dc2f2fbba0 SHA512 46cba6402489db0ef5c7fb06ea8f2c91724699294e6ce7b2b67dbfa3ed696d8917355ee6999e897be092911570d206ce9127adc06e5159199a23f79ce79e6b81
 AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28443ba7e340ee6306dcc6a429c6e939684ed3058213681476342a428e06384739a8e51f08c549058b0c8b686 SHA512 14645a299e22afd38d2b118b9f1029280392880ce56c2b65a8e61bcfebd818d5e3b61f9a701d3b362b4f1d31bee4db2d23179b6e31e235e6e82b05b1e17d22b1
 AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed
-DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
 DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13
 DIST kbd-2.3.0.tar.xz 1099660 BLAKE2B 20044b942cc2568acc9c4616bc38cc0bacb6773ba397327e9e23c87f0473cfdb1a165b9905039fc60b69001d99f799c48491ca098b64961cf5821f7d4b954df7 SHA512 6d7ba496a963c29abf1f514831c47e6bc73797b04021115879cbdb203c879c5abfae9f8fcaeec52d8891cad848240d39f5293452d26c7f0a84fb58499ad6e927
-EBUILD kbd-2.0.4-r1.ebuild 1536 BLAKE2B 3bf3fb6e985557b4ac62a75fc64d9e9608716e5914ff151ab11af68bf16f499e06216bb26da494b39f93d032d57fc8b9a74680196659d76d48b8ff5460f26d7f SHA512 a0e5b222f7321d5094a3dc67737b09d6ac1e3881029bbc402feeb58a4e269d3dfb103cff0fddd5c962b0c0cbe8345e986ead373b1592b1a1a82c7e2520f34257
-EBUILD kbd-2.0.4.ebuild 1374 BLAKE2B 604d3d89c6a4a5f579607bdb03563edc51f3d29731dab80e1b202ceaa1658c70c48f84bcf09c8de958ce3acfcdae79224718897f21ef07803eadf07d900428be SHA512 f568ee8f7d27ee59b2c3e408c602a2d4daf8281964dc509ce251b7dd6b3fc35e6babae2c0f5023d6bd0453a1fe842c992366cf7cc633c21145ded70706d80384
+DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
 EBUILD kbd-2.2.0-r2.ebuild 1597 BLAKE2B e56136d4d7a0bbae100e8886731a09c30b908b7d075dcb8c935726cc8a6795ee91a45d994d42457ee5435eb6f143639c678e8458e1f2dcf48b81a9092bdc1a02 SHA512 0060f49d5a29b83264f4a975774cd28dec0b4b1869400d7e2a05de23912e81e53b2aa68353c47a951d6efa83e36c19669ef4e6ca965ce866d5855d0f20968679
 EBUILD kbd-2.3.0-r1.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a
-EBUILD kbd-9999.ebuild 1922 BLAKE2B 38bcdddab72b5783e128c56636c482a601582fbb5898e7908b3752c56f29aa4aebed8233a7854f5f8c3bb028c47365e7f801d83c0dc1b56f013ae7cf19f2f14f SHA512 fa572d7cbd83873e600b7c9632bb15d4601efd9380c35b976ddade9df9da765baa5b5fe4422cbc1ad2999570c928e085444114c2faedf0b0e72ba95b3abaa61a
+EBUILD kbd-2.4.0.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
+EBUILD kbd-9999.ebuild 1873 BLAKE2B 6c2dda365762f698add9ae8874be26679ab399f5373543c29710be91410138b8d7840b50d306e60dd4f76bc4ec4dab0c3022441633f0956b640cc340b225af6d SHA512 2c1614e0ad67eaeadbb7f0a46f45643f3946de100078d62f27d4aae8e5032bb4db99c14a0f013deaeae8e338894d02c269f14859b4f0a944afb799587471f56c
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch b/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch
deleted file mode 100644
index c3f5b660cbd4..000000000000
--- a/sys-apps/kbd/files/kbd-2.0.4-vlock_configure_switch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f7f357ef079b6d185f340e716d7c72a98d82bad0 Mon Sep 17 00:00:00 2001
-From: Garry Filakhtov <filakhtov@gmail.com>
-Date: Fri, 20 Jul 2018 15:58:56 +0200
-Subject: [PATCH] configure.ac: Fix logic of vlock configure switch
-
-Downstream bug report: https://bugs.gentoo.org/661650
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 87eb63c..07098cf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -119,7 +119,7 @@ AM_CONDITIONAL(BUILD_LIBKEYMAP, test "$BUILD_LIBKEYMAP" = "yes")
- 
- AC_ARG_ENABLE(vlock,
- 	AS_HELP_STRING(--disable-vlock, [do not build vlock]),
--	[VLOCK_PROG=no],[VLOCK_PROG=yes])
-+	[VLOCK_PROG=$enableval],[VLOCK_PROG=yes])
- AM_CONDITIONAL(VLOCK, test "$VLOCK_PROG" = "yes")
- 
- if test "$VLOCK_PROG" = "yes"; then
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
deleted file mode 100644
index 1be67fe78125..000000000000
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-SCM=""
-if [[ ${PV} == "9999" ]] ; then
-	SCM="autotools 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 ~riscv s390 sparc x86"
-fi
-
-inherit eutils ${SCM}
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="pam? ( sys-libs/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() {
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-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.4-r1.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild
index aeabdfc9bae0..ef571616a3ab 100644
--- a/sys-apps/kbd/kbd-2.0.4-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.4.0.ebuild
@@ -3,15 +3,21 @@
 
 EAPI=7
 
-inherit autotools pam
+inherit pam
 
 if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+	inherit autotools git-r3
+	#EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
+	EGIT_REPO_URI="https://github.com/legionus/kbd.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 ~riscv ~s390 ~sparc ~x86"
+	if [[ $(ver_cut 3) -lt 90 ]] ; then
+		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	else
+		inherit autotools
+		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	fi
 fi
 
 DESCRIPTION="Keyboard and console utilities"
@@ -20,7 +26,9 @@ HOMEPAGE="http://kbd-project.org/"
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="nls pam test"
-RESTRICT="!test? ( test )"
+#RESTRICT="!test? ( test )"
+# Upstream has strange assumptions how to run tests (see bug #732868)
+RESTRICT="test"
 
 RDEPEND="
 	app-arch/gzip
@@ -35,10 +43,6 @@ BDEPEND="
 	test? ( dev-libs/check )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-vlock_configure_switch.patch"
-)
-
 src_unpack() {
 	if [[ ${PV} == "9999" ]] ; then
 		git-r3_src_unpack
@@ -48,7 +52,6 @@ src_unpack() {
 
 	# 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
@@ -57,11 +60,15 @@ src_unpack() {
 
 src_prepare() {
 	default
-	eautoreconf
+	if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
+		eautoreconf
+	fi
 }
 
 src_configure() {
 	local myeconfargs=(
+		# USE="test" installs .a files
+		--disable-static
 		$(use_enable nls)
 		$(use_enable pam vlock)
 		$(use_enable test tests)
@@ -73,5 +80,7 @@ src_install() {
 	default
 	docinto html
 	dodoc docs/doc/*.html
-	use pam && pamd_mimic_system vlock auth account
+
+	# USE="test" installs .la files
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index 3cb9fb4edd0d..ef571616a3ab 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -80,7 +80,6 @@ src_install() {
 	default
 	docinto html
 	dodoc docs/doc/*.html
-	use pam && pamd_mimic_system vlock auth account
 
 	# USE="test" installs .la files
 	find "${ED}" -type f -name "*.la" -delete || die