gentoo resync : 22.01.2019

3 files changed, 2 insertions, 108 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index d8766a4260da..e84e8098e2ab 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,14 +1,13 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
 AUX util-linux-2.32-add-missing-lintl.patch 1279 BLAKE2B d76fac864c34f38f51fdf422042f3199ddd8eecf7b2eab1b222c6be65605df365477be7e605bd45937ca3be716008227e7157d3da130fc0bf32eeffbefdbd9c1 SHA512 e705a5ec1a686d46226d9fa1e9369cc266c69c314a2a2f2f456cf92235d87b974c1dac72c928892657ea12f71bdaea83afaf95ed2eefd89b36007b371e047eb1
-AUX util-linux-2.32-python3-tests.patch 4512 BLAKE2B ae8f93748f4ef71e0bb7952272b7d3e7c4a3e63adecfe341e60fc65cf784a2df021cc7b567b0283902f22e1653a54644f508c4ae16d8056c21c3b279649af04a SHA512 9c065bc91e22f38eb8ad8156db8e66671749d2544cb8452da787f0d9e07f34107e9db49beb0d80962020e0b5c134fd8b090d7484d1dbf87eac933e65c81989dc
 AUX util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch 1546 BLAKE2B 11a714486f7c6e4ca3d38adbf59231378ac94a5cd934816d93e46c73e8a9ff3f23909d88c39381b15d0beb4da8dd5c97af72166eec5822dc6a49b67a60eacf5f SHA512 5dfa5bb88e9e454a99c8ff5e8f76b9323729962aa9eba682a4a6ccfadc3af6068714ea3bf0e19abf5cc402dcafeb92057eaf4d25d5c292937d0cb94bbc8d99c2
 AUX util-linux-2.33-sparc-setarch.patch 2353 BLAKE2B 16f3c627096644da973152db4b29d09f6e76d5576d1e9513ae29ed76e1112d71327ceef31b915e58652f8ead0b506819a2c5a996bda0c3670035f13d1f9595eb SHA512 d9e2bbe4a5c0d41dc199406a27187107121294b9bd13794b7f48b558c2dfe3f16b0dfa11e7ef70b6072fd6464d2220f35a0ab032bf6b99e11740056751ec7aed
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
 EBUILD util-linux-2.32-r4.ebuild 7269 BLAKE2B 415ff80ef80ad95e10e4fc79c830e0ed5bfeaad4671a049eeb081ac7ee2fa7ff67ec47f9368af0fea2b19896b2b00bbac8cd00e331c8a56241fe116670b26665 SHA512 89746556f3753e5cbbb10bb1e56c275f5dd434b61a6e6d3bc7366cc02dcf7a596f1343eb674caf427909706e8ee00ad0aa6b03a84526028f719e977de2390db3
-EBUILD util-linux-2.33-r1.ebuild 8371 BLAKE2B f2c5a6efd1930bd4e0290e84e6390751a6c427f2bfe963fc1b41ae98a54c6f303f136e730f533804ce7b9deda77a3dd01ef25d054b7f78c5b86fb2629a6fc263 SHA512 a2602b02471ae9cbad0e545e4df17d4911e0a8a89314d405be7a6d376f2c58f3dbac5373e5558657f3979f5c302e23569f2878d8fb2113f44b151214c5d38529
+EBUILD util-linux-2.33-r1.ebuild 8369 BLAKE2B ece7c99d71b080bc7caff76f9c292c42fb600e4bda85e508aa138848a0553b1655f215b48a7dcd59b047aee2e696267c94d0b388413b5b7607262bc9e6bb4a07 SHA512 2ffb2c73200e40a2c6fbd3ad0581d07d8c72b37351f49351a1afccb6a515a82fcb605e67f425acdb4517a5658035d044fee6a5fd7906690094d21bb5c6e55491
 EBUILD util-linux-2.33.1.ebuild 8240 BLAKE2B 5809b713cac06b5b13c9269851327dfef2122789f26059e2ee6980c7cfb9153a2647107264d804a7959fc0b5b10bdab5711e97027a821bf2c7939103d734ac4b SHA512 d17d2959f137216ee08b55e8aab293b4c97be8cd228732b0fb8b70ed0fe9fe11b72594e5f5c9232a22889c950cabe36a562605921426ac96905c9918fe67bfa5
 EBUILD util-linux-9999.ebuild 8337 BLAKE2B 253fdd3aeb1b8fc7c883bbaac72d6158cadab391b304bc7eec720e9186283ceab719c8288003cb0b396923194460b978cafd2d1b63d312418636c20b85fed6c5 SHA512 f472e0c9a0e6b445bc8bbb22f1d8a8138d46fecec9d072ebdddcc73b88c9d7aebb3c15fcf6d61247ea297c9bf7240dc564aafd4f3f0395894394f374b92b348f
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch b/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
deleted file mode 100644
index 7b8867ba0347..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.32-python3-tests.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 8a12ab57755afc36546834f175ef0b9e9376ba59 Mon Sep 17 00:00:00 2001
-From: Frank Schaefer <kelledin@gmail.com>
-Date: Tue, 10 Jul 2018 20:21:02 -0500
-Subject: [PATCH] * break up large strings for PySys_WriteStdout()
-
----
- libmount/python/fs.c | 56 ++++++++++++++++++++++++++++++++++++++++------------
- 1 file changed, 43 insertions(+), 13 deletions(-)
-
-diff --git a/libmount/python/fs.c b/libmount/python/fs.c
-index d6490d248..634a914ef 100644
---- a/libmount/python/fs.c
-+++ b/libmount/python/fs.c
-@@ -63,32 +63,62 @@ static PyObject *Fs_get_devno(FsObject *self)
- 	return PyObjectResultInt(mnt_fs_get_devno(self->fs));
- }
- 
-+static void _dump_debug_string(const char *lead, const char *s, char quote)
-+{
-+	/* PySys_WriteStdout() will automatically truncate any '%s' token
-+	 * longer than a certain length (documented as 1000 bytes, but we
-+	 * give ourselves some margin here just in case).  The only way I
-+	 * know to get around this is to print such strings in bite-sized
-+	 * chunks.
-+	 */
-+	static const unsigned int _PY_MAX_LEN = 900;
-+	static const char *_PY_MAX_LEN_FMT = "%.900s";
-+	unsigned int len;
-+
-+	if (lead != NULL)
-+		PySys_WriteStdout("%s", lead);
-+
-+	if (quote != 0)
-+		PySys_WriteStdout("%c", quote);
-+
-+	for (len = strlen(s); len > _PY_MAX_LEN; len -= _PY_MAX_LEN, s += _PY_MAX_LEN) 
-+		PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
-+
-+	if (len > 0)
-+		PySys_WriteStdout(_PY_MAX_LEN_FMT, s);
-+
-+	if (quote != 0)
-+		PySys_WriteStdout("%c\n", quote);
-+	else
-+		PySys_WriteStdout("\n");
-+}
-+
- #define Fs_print_debug_HELP "print_debug()\n\n"
- static PyObject *Fs_print_debug(FsObject *self)
- {
- 	PySys_WriteStdout("------ fs: %p\n", self->fs);
--	PySys_WriteStdout("source: %s\n", mnt_fs_get_source(self->fs));
--	PySys_WriteStdout("target: %s\n", mnt_fs_get_target(self->fs));
--	PySys_WriteStdout("fstype: %s\n", mnt_fs_get_fstype(self->fs));
-+	_dump_debug_string("source: ", mnt_fs_get_source(self->fs), 0);
-+	_dump_debug_string("target: ", mnt_fs_get_target(self->fs), 0);
-+	_dump_debug_string("fstype: ", mnt_fs_get_fstype(self->fs), 0);
- 
- 	if (mnt_fs_get_options(self->fs))
--		PySys_WriteStdout("optstr: %s\n", mnt_fs_get_options(self->fs));
-+		_dump_debug_string("optstr: ", mnt_fs_get_options(self->fs), 0);
- 	if (mnt_fs_get_vfs_options(self->fs))
--		PySys_WriteStdout("VFS-optstr: %s\n", mnt_fs_get_vfs_options(self->fs));
-+		_dump_debug_string("VFS-optstr: ", mnt_fs_get_vfs_options(self->fs), 0);
- 	if (mnt_fs_get_fs_options(self->fs))
--		PySys_WriteStdout("FS-opstr: %s\n", mnt_fs_get_fs_options(self->fs));
-+		_dump_debug_string("FS-opstr: ", mnt_fs_get_fs_options(self->fs), 0);
- 	if (mnt_fs_get_user_options(self->fs))
--		PySys_WriteStdout("user-optstr: %s\n", mnt_fs_get_user_options(self->fs));
-+		_dump_debug_string("user-optstr: ", mnt_fs_get_user_options(self->fs), 0);
- 	if (mnt_fs_get_optional_fields(self->fs))
--		PySys_WriteStdout("optional-fields: '%s'\n", mnt_fs_get_optional_fields(self->fs));
-+		_dump_debug_string("optional-fields: ", mnt_fs_get_optional_fields(self->fs), '\'');
- 	if (mnt_fs_get_attributes(self->fs))
--		PySys_WriteStdout("attributes: %s\n", mnt_fs_get_attributes(self->fs));
-+		_dump_debug_string("attributes: ", mnt_fs_get_attributes(self->fs), 0);
- 
- 	if (mnt_fs_get_root(self->fs))
--		PySys_WriteStdout("root:   %s\n", mnt_fs_get_root(self->fs));
-+		_dump_debug_string("root:   ", mnt_fs_get_root(self->fs), 0);
- 
- 	if (mnt_fs_get_swaptype(self->fs))
--		PySys_WriteStdout("swaptype: %s\n", mnt_fs_get_swaptype(self->fs));
-+		_dump_debug_string("swaptype: ", mnt_fs_get_swaptype(self->fs), 0);
- 	if (mnt_fs_get_size(self->fs))
- 		PySys_WriteStdout("size: %jd\n", mnt_fs_get_size(self->fs));
- 	if (mnt_fs_get_usedsize(self->fs))
-@@ -97,7 +127,7 @@ static PyObject *Fs_print_debug(FsObject *self)
- 		PySys_WriteStdout("priority: %d\n", mnt_fs_get_priority(self->fs));
- 
- 	if (mnt_fs_get_bindsrc(self->fs))
--		PySys_WriteStdout("bindsrc: %s\n", mnt_fs_get_bindsrc(self->fs));
-+		_dump_debug_string("bindsrc: ", mnt_fs_get_bindsrc(self->fs), 0);
- 	if (mnt_fs_get_freq(self->fs))
- 		PySys_WriteStdout("freq:   %d\n", mnt_fs_get_freq(self->fs));
- 	if (mnt_fs_get_passno(self->fs))
-@@ -112,7 +142,7 @@ static PyObject *Fs_print_debug(FsObject *self)
- 	if (mnt_fs_get_tid(self->fs))
- 		PySys_WriteStdout("tid:    %d\n", mnt_fs_get_tid(self->fs));
- 	if (mnt_fs_get_comment(self->fs))
--		PySys_WriteStdout("comment: '%s'\n", mnt_fs_get_comment(self->fs));
-+		_dump_debug_string("comment: ", mnt_fs_get_comment(self->fs), '\'');
- 	return UL_IncRef(self);
- }
- /*
diff --git a/sys-apps/util-linux/util-linux-2.33-r1.ebuild b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
index 930f1b8dc20f..ffb43ba02da1 100644
--- a/sys-apps/util-linux/util-linux-2.33-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33-r1.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi