gentoo resync : 18.11.2018

5 files changed, 57 insertions, 6 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 63f7ba9374f4..9064f9d1a903 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -2,12 +2,13 @@ AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f31680
 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
 DIST util-linux-2.32.1.tar.xz 4561088 BLAKE2B 9e89b7fa2eacd51ad8c5cf90cc78df73de5d414c1039bb38784a376841806c1e0d38b702d29c6a8e91a2c3464fec1edcf68caaaa655400db2e5be483eb5efbcf SHA512 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698
 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
-DIST util-linux-2.33-rc2.tar.xz 4613036 BLAKE2B ac17fc3efea4f5d637e00cf367f087dfc25cea9f024aa2d6510262b3db236fb0e0b280db35d32848e9569603a494fd59a516ae02a178f8d7ac1f9f3936493563 SHA512 7a38a7408a42a47f4e67ead068b5418490c8871ed452613cd2459bd7af64b1a218dc4e826197730b2de60d5d757c02ef79dc7e0f8aeb3f24be9cf8934e40a5ad
+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.32.1-r1.ebuild 8501 BLAKE2B 1516985e647b7c2df8b15c86fbd2b00db3e620ad530a7c28cb61a63254f062fb70abe56eae8cb447178c5b27b6f5bd8382f5c3e129f1b9971c3ad51cd720b3e9 SHA512 3eb54f75017cf4a04c1bd348b8d1d32280c7d1806aff8713dfc411dd780cbdb6f2a245f1585d95b291a241b60fdd60acf5992cae4c7fd6dce7ea88f7ab3c2442
+EBUILD util-linux-2.32.1-r1.ebuild 8585 BLAKE2B d68bc92dbb11e037fdef417440f1d457278df07599de754346891d46b682a41a6f19c3258c594c782bf5a486543d93e414079efe652c960c3e5de00acf00cf71 SHA512 d3821efb841a3a301d3d88468f380e8d51c72af7604c6b5444a3b43b04bcf7f93acadded2acc16328e116c49c864ad1d15ae6ee93c8fd65baaf19aa2d4c334ca
 EBUILD util-linux-2.32.1.ebuild 7370 BLAKE2B f613cace23c64e8d7e69dfe785cc1cc4a2e7c77897867d2e84943559e7030841ec929fa8b178d75096ce1ec0adf2af861fcfc99bc7d446760727432637212c2f SHA512 ea7131a22979df1efcbd041ce5539ef3b3ca5df31713ea46952af3fbee143a5b609b114fdc1be6e0d981f23e82d1bfce2fa489f2e5aeae0d19a01ff04530b5ca
-EBUILD util-linux-2.33_rc2-r1.ebuild 8240 BLAKE2B ca8992075b02fb86f2c5e74438228058a948cb0ef9ce84c6aaf20399a1e513ee66b520f5d44c3df6b4e8ea03cca35a8c0a200b843b87bf7cac40ea601d29d3b6 SHA512 3a8729e25f36bb00b9cf2d5fbf8059fcf94ddd9ce9bfa297471e6ceae4307696b76aa18a2aadd7c2a14b16b3be1d201bf8da184f3cbdd5d903b5459c0336f7e9
-EBUILD util-linux-9999.ebuild 8240 BLAKE2B ca8992075b02fb86f2c5e74438228058a948cb0ef9ce84c6aaf20399a1e513ee66b520f5d44c3df6b4e8ea03cca35a8c0a200b843b87bf7cac40ea601d29d3b6 SHA512 3a8729e25f36bb00b9cf2d5fbf8059fcf94ddd9ce9bfa297471e6ceae4307696b76aa18a2aadd7c2a14b16b3be1d201bf8da184f3cbdd5d903b5459c0336f7e9
+EBUILD util-linux-2.33.ebuild 8340 BLAKE2B e84cd78344a248cd1dbbfa8a45d32fcbaa031f7f8e3f5f5ae5ac47a5a5dbc1c304814a82da74ba3e7a341cb08ae7f4edad317a3e0f631e526362f7fd623caf67 SHA512 540bed78dfe944c11512c7732ee7da3aa4b4ebbc0b34b4dc7be884274fa83ef7cb77ee2063f60c6fe612fd5c13398db2d8f0a15c7bb57368c30c39c24c997e57
+EBUILD util-linux-9999.ebuild 8337 BLAKE2B 1e51724049b9d1dab358d98ce143d1bbf6fba029aa7300cc1e0315036482a66e710f5555ab2e1e80a8b74e6b40fcebc9c99dcb5df115da74efd1bdb4fea64911 SHA512 e5d72470a51be9f22e6c0988323be4f56e396607cddf911c2526d1baa26b901a44e9ae096ff2aa99edee552c51ff8eaa834d86388272489df358bb22bb31ef41
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch b/sys-apps/util-linux/files/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch
new file mode 100644
index 000000000000..743dc89e2425
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch
@@ -0,0 +1,41 @@
+From 8f93c8c71d264e90bdcecf98c9ac372bbcdc53aa Mon Sep 17 00:00:00 2001
+From: Thomas Deutschmann <whissi@gentoo.org>
+Date: Sun, 11 Nov 2018 02:17:55 +0100
+Subject: [PATCH] tests: run oids test only when uuidgen tool was built
+
+oids test did not check if uuidgen was available.
+
+oids test was also calling uuidgen from PATH which could result
+in wrong results if uuidgen from a previous util-linux installation
+was used.
+
+With this commit we will check if uuidgen was built and make sure
+that we only call the uuidgen binary we just built. If uuidgen is
+not available we will skip this test.
+---
+ tests/ts/uuid/oids | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/tests/ts/uuid/oids b/tests/ts/uuid/oids
+index 3b005c5b2..77e010c1d 100755
+--- a/tests/ts/uuid/oids
++++ b/tests/ts/uuid/oids
+@@ -20,12 +20,14 @@ ts_init "$*"
+ 
+ : . > $TS_OUTPUT
+ 
+-uuidgen --md5 --namespace @dns --name "www.widgets.com" >> $TS_OUTPUT
++ts_check_test_command "$TS_CMD_UUIDGEN"
+ 
+-uuidgen --md5 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
++$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.widgets.com" >> $TS_OUTPUT
+ 
+-uuidgen --sha1 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
++$TS_CMD_UUIDGEN --md5 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
+ 
+-uuidgen --sha1 --namespace @oid --hex --name "525400fc0f5e" >> $TS_OUTPUT
++$TS_CMD_UUIDGEN --sha1 --namespace @dns --name "www.example.com" >> $TS_OUTPUT
++
++$TS_CMD_UUIDGEN --sha1 --namespace @oid --hex --name "525400fc0f5e" >> $TS_OUTPUT
+ 
+ ts_finalize
diff --git a/sys-apps/util-linux/util-linux-2.32.1-r1.ebuild b/sys-apps/util-linux/util-linux-2.32.1-r1.ebuild
index 8334aa825c11..954f4398edfa 100644
--- a/sys-apps/util-linux/util-linux-2.32.1-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32.1-r1.ebuild
@@ -65,6 +65,7 @@ S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/util-linux-2.32-python3-tests.patch"
+	"${FILESDIR}/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch"
 )
 
 src_prepare() {
diff --git a/sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild b/sys-apps/util-linux/util-linux-2.33.ebuild
index cdfc75a44ba2..c95e045cc204 100644
--- a/sys-apps/util-linux/util-linux-2.33_rc2-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation and others
 # Copyright 2018 Sony Interactive Entertainment Inc.
 # Distributed under the terms of the GNU General Public License v2
 
@@ -63,6 +63,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch"
+)
+
 src_prepare() {
 	default
 
@@ -151,7 +155,7 @@ multilib_src_configure() {
 		$(use_enable unicode widechar)
 		$(use_enable static-libs static)
 		$(use_with selinux)
-		$(usex ncurses '' '--without-tinfo')
+		$(use_with ncurses tinfo)
 	)
 	# build programs only on GNU, on *BSD we want libraries only
 	if multilib_is_native_abi && use userland_GNU; then
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index cdfc75a44ba2..78f587fe30c9 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -63,6 +63,10 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}/util-linux-2.32.1-skip-oids-test-when-uuidgen-is-not-available.patch"
+)
+
 src_prepare() {
 	default