gentoo resync : 02.06.2019

3 files changed, 10 insertions, 41 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 7b37acee0c51..9cdbc4be8830 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -3,14 +3,13 @@ AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254
 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
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
-AUX util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch 971 BLAKE2B f035bbcc83fd342e202ced33d0e50d11d6d89e34f59826ab4a95231afcc0696ab6e34d504eed599681e44d369fdca8578b46875f264a6f3f70f562abe9748226 SHA512 b6d5fdb7cd49df072fb00410d1ead9990c53c5105ce7dd2e48ed3c88e91f45271c0a62a87a5cd9c703d96004cb7a81a48c5fff504269c4c1b8edb2d9a4471eab
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
-DIST util-linux-2.34-rc1.tar.xz 4930092 BLAKE2B 742322c85c2b92ff16cc95e98da40522350d84c9e72b929d763da882f54ff88e4ff38d1622a2642b88fcb124e9221ff32e26403e5d76cc06bcfeb6c92e450d91 SHA512 4f968f04394f6beaafd60a84daf1db808ec486dbfa82d2f58b0678f93adc37477395a1b22c0c2af33f9652c5fa82f8bb3c1ce8b62146c983bce270fe45c1419b
+DIST util-linux-2.34-rc2.tar.xz 4990080 BLAKE2B 63c7bc91d04e8cde2f67e2fad5a6a4b6ffe7b392d284c29b01b5a89eea26b42436656f8c4544555545b3718a739674c795c13a41e3a1e1cb2a98e952d02f9283 SHA512 54ae5ab146a2f8185dd1e46b363d3f83fd6791eb95f83522307ea59dcf23be93a9496fd1ca10bb09788ebd429c62db8fcde8747ed793c7826340289efb4e77d0
 EBUILD util-linux-2.33-r1.ebuild 8369 BLAKE2B c8991a1f9a36cc09ad888b439b1baba241740707112abda423a85fdaf13db09c10be9a29ff2c018166cb14f64f425b6f8ffd6c2680c3fce1e25369f4ee8d3209 SHA512 13e47582fe9ae0bced2ad9c2c47e8d4b062ad4ed1cc65973debb2b6fa54d5aa232936f91fc88b6183cd53c2ec2754f00d7a79e274e7cc41f2dd6a8949004311c
 EBUILD util-linux-2.33.1.ebuild 8638 BLAKE2B 9ed38cd12026e04327b38f33a2c0f5285cbe148f9e604e03fd2ba179cdc10351b12ef3768bd97da7f7ba5e65972c42b04c1cef50a2f7ab6854953a990eba8b10 SHA512 aca35d647f0d3d3e260acc67e95a2e32a6d5b4898c78a187306a9c2d228e4304503eeaaed8fe92a6b2c6f7e0a6110ae087d3f486d37ad1c429d04f30b49b8832
 EBUILD util-linux-2.33.2.ebuild 8646 BLAKE2B 14ff1524097b52badbf1d9387be0227f965726c0de918759bd97af2d60eb1e7f3b8e5c06b04874eeb6031d31b9b5f776b794cc8cca17cfbb296598a985c668e9 SHA512 fe5dc9c0c5e40aafa89ced9058048d2f1df5c17e7eb19cf178c7b416c4f9a72af520f921ea4952ec9f28d24151bc902b89f1d6e83ee6c2edb6c5a84c2edf4645
-EBUILD util-linux-2.34_rc1.ebuild 8319 BLAKE2B 4be344e257e15a2505d06071c912e0555923c13333f147b1388d2107ba6950437fae0e13875d79efa6aa14964890d76a6aba180c0748bd00b5da8b437d35f717 SHA512 ea35a87124c3d9a0fe75ba78e974f8fb38639b350a2031e7c1a04fe8043e49c73d77e40084f8e3aebcedf8e093841fc0bcb549438cf67500b1a507b0e6e07766
+EBUILD util-linux-2.34_rc2.ebuild 8244 BLAKE2B e23a21643c084b26a0c5644eaa7ed6ec8075dc52abe8d9bfde40fa6c69e6dce99e92ee1d0a05e0750b53fa48c123ac143447a96fab1480297017e3edfbf342cc SHA512 0a9cd16c055aa50d936b7f5d45198e74619154537ca8af859e14a343923efcfa70948a1dac423aa72ffeca5891f6af516ee480466296fc55f64f34e7b0fbc960
 EBUILD util-linux-9999.ebuild 8238 BLAKE2B 8fd5c1b2fc9bde4b6e9331da10d8f013d3c29a2f74b69ffb63c8f34ddad81d67f638be661bf258d41c31b973a9b00dd01f06ae6dcf2e0f1e4b259e9c22bf2ea8 SHA512 cc6bf3d785dc23b101ab4f147dea9c0ab258fbebf6c4de44f6e4600c46e986a555f2b54264142d7168bbbbe5ce280fcc995c879dbb3afb8b50940128e89008b4
 MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
diff --git a/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch b/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch
deleted file mode 100644
index b1314e0e44c7..000000000000
--- a/sys-apps/util-linux/files/util-linux-2.34_rc1-lscpu_floating_point_exception_fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 836455917879333e94d4a535aa22f1235b5d4885 Mon Sep 17 00:00:00 2001
-From: Sami Kerola <kerolasa@iki.fi>
-Date: Sat, 18 May 2019 10:19:35 +0100
-Subject: [PATCH] lscpu: fix floating point exception
-
-FIXME: this commit should include vmware_fpe regression test inclusion.
-
-Caused-by: e5f721132ec8b8c933a396d8dcb3efcb67854f13
-Addresses: https://github.com/karelzak/util-linux/issues/788
-Reported-by: Lars Wendler <polynomial-c@gentoo.org>
-Signed-off-by: Sami Kerola <kerolasa@iki.fi>
----
- sys-utils/lscpu.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c
-index ca7f6a037..7f6277f00 100644
---- a/sys-utils/lscpu.c
-+++ b/sys-utils/lscpu.c
-@@ -1925,6 +1925,8 @@ static int get_cache_full_size(struct lscpu_desc *desc,
- 	/* Correction for CPU threads */
- 	if (desc->nthreads > desc->ncores)
- 		nshares /= (desc->nthreads / desc->ncores);
-+	if (nshares < 1)
-+		nshares = 1;
- 
- 	*res = (desc->ncores / nshares) * ca->size;
- 	return 0;
diff --git a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
index b222e422b0fa..9aefa2207941 100644
--- a/sys-apps/util-linux/util-linux-2.34_rc1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
@@ -2,7 +2,7 @@
 # Copyright 2018 Sony Interactive Entertainment Inc.
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
@@ -30,7 +30,9 @@ IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
+DEPEND="
+	virtual/os-headers
+	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
@@ -41,12 +43,12 @@ RDEPEND="caps? ( sys-libs/libcap-ng )
 	slang? ( sys-libs/slang )
 	!build? ( systemd? ( sys-apps/systemd ) )
 	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
+"
+RDEPEND="${DEPEND}
 	kill? (
 		!sys-apps/coreutils[kill]
 		!sys-process/procps[kill]
@@ -63,10 +65,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-lscpu_floating_point_exception_fix.patch
-)
-
 src_prepare() {
 	default
 
@@ -263,7 +261,7 @@ multilib_src_install_all() {
 	if ! use userland_GNU; then
 		# manpage collisions
 		# TODO: figure out a good way to keep them
-		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+		rm "${ED}"/usr/share/man/man3/uuid* || die
 	fi
 
 	if use pam; then