gentoo resync : 25.01.2018

6 files changed, 8 insertions, 150 deletions

diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 8f828aeae086..c1972053ed4e 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,10 +1,7 @@
-AUX kbd-1.15.5-loadkeys-parse.patch 2163 BLAKE2B dede07f128792190b91bdb3f1a6f6654b7cc2ed730a2227a0f9efde4e234a8d3f2a0b736868b7901b602ab3d1f506105f86ce64a7dcf4d14c64677f22dd283a2 SHA512 c338c5f5ee9054f3dfc62646f9e8a47a577fc55dbc4723a04f006afa6c966ac5b056b744c49d4bdfcd80d69e64af20b0f71cc9cfff23db9f017adb32bd6d9d7d
 AUX kbd-2.0.0-tests.patch 841 BLAKE2B 8162bc2521c6b6c470868ccabca87d9b5e2fa9417f8c4682bf9ff1cb67a0f4fefd403a1a9da99685403c8a280f9d0ed39c06768cd8cb436a88c42ec9ee813953 SHA512 b189b02c509f851bb871d75903dcbbef0177b39db923cf7b3bff4b3058868074975dd7c32bdafb54d50d3e4798ae8648a5b4e461078c86d025257e0502405f58
-DIST kbd-1.15.5.tar.gz 1730719 BLAKE2B 3a331237b235a0731abbfd6d2846bb1fd8e90ba6641559598d7c970fb6be12a0d57f293a7e1d79ac93d5bf4279513825e7ebbbad0c5d13afad5de349fa7b5100 SHA512 725853b0ecde6a38976e2bae5672b8de78bfc90d65a0762695964a6dab729c96be4af778fe7f0f195caae04d630b07a3d0d95c9c928d1a5609e223e47723e58c
 DIST kbd-2.0.3.tar.xz 1037036 BLAKE2B bbdc0ecd21e74c2d1074339f6d0e4caa69e0d3ee10a211c4ccd187906d7f513032df495c18e1c2667d1f2960a68db3d5aa995bdaafd3719fc35da5b769af7c11 SHA512 522718859c2a95abee06a50dd0a7cfe7bb9c8f4b3959d54fd9e56cef23acc85b9af85405aa4953f20cd029397412051d72c8b1b0d639ba3a26b4952f89ef6a3f
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
-EBUILD kbd-1.15.5-r1.ebuild 1040 BLAKE2B b0a2cd71950581a1a7bdcf75b4aa29787ef9b5e22cb5e482c885733be799b02b0d4433fd6a47a50a54efecfc0596d98a9cc30f42e67af9fd831414280f2a2039 SHA512 aea6c477a1527e5f38419c2356bf97e52bbfc9473919b182392d1a0bff96af9d0912b2cd132e4d015889a55e9b3a8613937b1d8e0d847b0d794596309ddc9ceb
-EBUILD kbd-2.0.3.ebuild 1360 BLAKE2B 3d285f5816f752701e123fc4441e9991dceb0d80eb9ee5f84f87f4cdb140306d23f7e7d40abca7df0ce372ec79ad55996e37b0fa6dc0bb67030fc5b8fde00cde SHA512 358c6679bea2e0270159fa07a4578f75c8356d1774e6d9f8def085f94225ac733a3e2e9a9e552485e15d763a0835256a9ea238893dd0280b4435f724cf23edba
-EBUILD kbd-2.0.4.ebuild 1351 BLAKE2B 8eac72198ebbb768d02a6a6e9ae50c6f2f37d1a2938f6f10c0cdea0d053431fabd5864ccc3383bb017aee0b0921e2d90fc4466d03e0ccdea2c3020266c61e05f SHA512 232570febfc48781aca0167cf1ef8294895cf6cf6b497b7a3cebe656685be9a921a4a3693f6f25c52ac714d99a18da2558aef3231de8f1161f3b0cd678359320
-EBUILD kbd-9999.ebuild 1412 BLAKE2B e0ed21760db01f1b81ed5b41225edb1fbc2b7638875fb663b7b4a70edc7a0f8dff5d02aaa289be61d2276035ec56589a4eebd2a3f9bdf2bdcf26a700b8a0020e SHA512 73150ecc4977e06aab03c867d97a9e78cfc749b1261fb099347072a4b07ff6a0fbdfa868c2262ed6d1c8ae2e994c137906aaf70e9a83919ba27025a600594fb7
+EBUILD kbd-2.0.3.ebuild 1362 BLAKE2B 2467e0d4c9d52258b9568b96df23f612bfc894b1861c16fff67d129b0d0345b2b7e6c3c0b9562678905cee44128758d8d6ca007b0f64cf64ce651aa918abeb01 SHA512 1d75087eaf1125646cd7650be96b45b9267751e0f4a278c635f760f30fd7c755f39ec49b7abb2c7fb5821a0357cbdd2ebf830042223f3e2d3da90e9a6fe7da65
+EBUILD kbd-2.0.4.ebuild 1351 BLAKE2B e7c4e92f4ba8c98107dabdf72b2bdc9bb09c3e34aca20e972f1268d75d2b3d48c6959a8b5757343013b8099f43756ef278bbe4135b64b3dc65d312275fcb46df SHA512 cf72dd4ec1e2a68793a4880136abcbde1e5a5e2683bb170c7ecd543b3a3714b5ebe2e069c380d6abf4f18b87e1a3bd1516550a741d445cc529c69e1e150f3e9d
+EBUILD kbd-9999.ebuild 1414 BLAKE2B 3b9e77383bdc18b4801eef6a7758f9eae122b3811dc924c06edad6c3826bf1d2ac68bc8231e7c159565a7fb00e64a026f6479502d9f1c7a791964eb144ecd0f0 SHA512 dbd5f7b4cedc8192b400aeca9f63dbed8d6f65cf075067dfe580ea8b77232e77ba0916e7b08d2cf71a12a78c9a52b697b55de485b1f7c8c8390d067da1a4585e
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
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 c78a22780840..000000000000
--- 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 <gladkov.alexey@gmail.com>
-Date: Tue, 11 Dec 2012 14:24:44 +0400
-Subject: [PATCH] Fix regression in 16117ce6ab
-
-Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>
----
- 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/kbd-1.15.5-r1.ebuild b/sys-apps/kbd/kbd-1.15.5-r1.ebuild
deleted file mode 100644
index 7c4451fcab11..000000000000
--- a/sys-apps/kbd/kbd-1.15.5-r1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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="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}"
-
-	# 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
-}
diff --git a/sys-apps/kbd/kbd-2.0.3.ebuild b/sys-apps/kbd/kbd-2.0.3.ebuild
index 084b72febeda..3d02370de950 100644
--- a/sys-apps/kbd/kbd-2.0.3.ebuild
+++ b/sys-apps/kbd/kbd-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index d1af17e39a9e..aa313ff81c3d 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -9,8 +9,8 @@ if [[ ${PV} == "9999" ]] ; then
 	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"
+	SRC_URI="https://www.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 eutils ${SCM}
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index df8a5adeb6c8..60f4d9718542 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.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"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 fi