gentoo resync : 18.08.2019

3 files changed, 35 insertions, 2 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index bd319aa576ef..8cb6d5479ed9 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,9 +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
 EBUILD kbd-2.0.4-r1.ebuild 1512 BLAKE2B ea78c2739f01dac41344870001a6dd34469f3311bfae0a2f7ad56b6e3c93ab5cd71fef852cd27753fb5677b671b009d4ac762027c5dd1664eb127702df7d88eb SHA512 21152c3daf9cc848f8c63aef17789da0371b55293e79b57243a119543334383c2541556efea6b864fcec60c0d96c022cd1f41e03648119a8504d165e88ccb448
 EBUILD kbd-2.0.4.ebuild 1346 BLAKE2B 954e13a347196bcc161977c95e10a090b95242167cb7d575ae434a3f4be4f1e92d3053402a49691252c8bc66db1e59659616f5823490c598b75ac4ddba9d4326 SHA512 7e533b92655479e4e56ad56cf029b8f983dc83fc525952d7990f8c9fc868f783e3340925ea78633a3dd2673ebba60eff784fe495da128f3ef9cdbf9257749fb6
-EBUILD kbd-2.2.0-r1.ebuild 1529 BLAKE2B 70a1c129e03344b3f6e5a2b87b1926715e3708468eb2568fe0f2d2f8392638f497e97b08f4fff24a24f327dabce4e967cc17824071a1aa1a801041169dfd5c20 SHA512 66c030906b545cfa0e4289b4eb411aea3f2e292ce73146248067ae93babee6f3b6c8613a062264809a700ea23fd0da7a6a7f1e141fe3ffffea0b21b9cf9a89e5
+EBUILD kbd-2.2.0-r2.ebuild 1581 BLAKE2B 22135bc429e2a4bdc48acc58d5fa33c03bd87f81d6d32f0a8e0e59c7e0dfa9eb92a919731cb696c4b4504058877ad791736698f6e7200d2b4db47df891112627 SHA512 b5234d1465a7580133381e82ac099832df42644416efde1c9c991ddf9efd1b827f5e6514e14a20898f6d5ab9c7ca05ba57395bfe41d8f11730d0ef4a38fbb0a8
 EBUILD kbd-9999.ebuild 1496 BLAKE2B 328079e258ec023c510049ebe14200fb5ff09be766ff05d4621d1adbd5af21af5c9f24e9eb1ef5ce8a8d2b8928fee0be0673de5e7ec9c65cfd85cd04e3050f9f SHA512 43cda0f03636fbedb4494564f231f39fd87188d74102697951803c193212c83eff24051cf1716a7e9f8ae11c0df85c661c7eba3183f48f6725bed3287c436995
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch
new file mode 100644
index 000000000000..4b545f5bc2a2
--- /dev/null
+++ b/sys-apps/kbd/files/kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch
@@ -0,0 +1,31 @@
+From acf93e44f6d036303f95555069031f6fb12ce9d1 Mon Sep 17 00:00:00 2001
+From: Alexey Gladkov <gladkov.alexey@gmail.com>
+Date: Tue, 6 Aug 2019 13:59:34 +0200
+Subject: [PATCH] libkbdfile: Do not stop on the first error
+
+The kbdfile_find() gets a list of directories in which the filename. If
+we could not find the filename in the first directory, you do not need
+to return an error.
+
+Link: https://github.com/legionus/kbd/issues/31
+
+Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
+---
+ src/libkbdfile/kbdfile.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/libkbdfile/kbdfile.c b/src/libkbdfile/kbdfile.c
+index 804f04a..fb8e035 100644
+--- a/src/libkbdfile/kbdfile.c
++++ b/src/libkbdfile/kbdfile.c
+@@ -433,8 +433,8 @@ kbdfile_find(char *fnam, char **dirpath, char **suffixes, struct kbdfile *fp)
+ 		rc = findfile_in_dir(fnam, dir, recdepth, suffixes, fp);
+ 		free(dir);
+ 
+-		if (rc <= 0)
+-			return rc;
++		if (!rc)
++			return 0;
+ 	}
+ 
+ 	return 1;
diff --git a/sys-apps/kbd/kbd-2.2.0-r1.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
index 895a4995c52c..3675430c7a9d 100644
--- a/sys-apps/kbd/kbd-2.2.0-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
@@ -36,7 +36,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}/${PN}-2.2.0-cflags.patch" #691142
+	"${FILESDIR}/${P}-cflags.patch" #691142
+	"${FILESDIR}/${P}-kbdfile-dont_stop_on_first_error.patch"
 )
 
 src_unpack() {