gentoo resync : 17.02.2020

6 files changed, 36 insertions, 22 deletions

diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 7e0bbb1febc7..bd6aa2d19cc5 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -5,9 +5,9 @@ DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
 DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
 DIST util-linux-2.35.tar.xz 5137796 BLAKE2B fbd3124284d50e1dc3fd158f77969057c628e111ee489a920896cfbd93186de4cf1ea97f41854171f824e4b3042968d860827557a8d46aeadcfe5ef976e71222 SHA512 c95d26b9037d6b877a247e6aeb58d17aa80f7e1bd6b523a4e0fde559fe07b3d924ece6d373300fefb65d1f206b3f990aeddb3a03605040e72ce6d6ee88591021
-EBUILD util-linux-2.33.2.ebuild 8562 BLAKE2B 68d0451a9bde127b4ee459168dc5c97292e50d932549025d765cd478dfacf2c72cab93deba0a83011121506973165950c7d84155476c78bff4b79c0f21012918 SHA512 f89856de7a65990bc7aa896da894b85148e1103305c12dd685ba058e181fc7f414dd73973b8654c00b7ac253c38903ff9b09ffe9782b52d5930b6ce85a91952a
-EBUILD util-linux-2.34-r3.ebuild 8582 BLAKE2B 4e5c1b1df64d8dedbbda93e8d2623e2c63c0f0a89ebcf64a1fe0ea7d540d9687de6f7a4b2b95a28bec035d5126f1fcbde9423d157f57980d3c34903048aa896f SHA512 8b9cd0afd11cf3edf5383cdf9c231f0b34d19b0d18987f054989a30a84a65473ba5367bad2e28e30784510d73f86ba5895338d83f4c5456612f8391313ae9212
-EBUILD util-linux-2.35.1.ebuild 8655 BLAKE2B 64727bb6c47e8fdf72148d8e006743d86c63750b32d0c334508334f1235e4a457735e50a9daa04d8dbf22b2b00874624db82cff91485b90d1d2fa2a970651915 SHA512 2cfa0b470d9d8e6bf5f7dca71b2915a4fe5c3e2649a05f9704dedb9ae06d4df8367646f39bc0880917566814dbc9fa39961a6edceab649034874734352fb0d68
-EBUILD util-linux-2.35.ebuild 8649 BLAKE2B b3f08910611e152867a441558062aec9a59362ebd819d83a0e2348ee559c086848975f60d66e1dbb2c0652d2bdc90d0cfd0340b56f7a8030bb71df7d87b1e7a2 SHA512 1db2abfcf93a0247ea255cf7766164c3f1f43a4b22f6f66ceae829293d8b9f832212685d00907595ef84ae06ec79a82405d1e8ae3946b18df5101c9dabc5bfc6
-EBUILD util-linux-9999.ebuild 8662 BLAKE2B 5850deb2b04b73cff388dd4ea25541aec83a6f9988cc7610ef9f6bf17e1e94cb29606ae859acab57c856fc2c6dcdf655f9a39116975219e60ce6f4ace924a87d SHA512 8f41e4f54a92d9751530b40c59cc533828046c7631f5f115f5f6de10c12d30108231d37c4eb924d1cfe9fa89e3876e05241f5d528fe812bb15f15530002aa4e2
+EBUILD util-linux-2.33.2.ebuild 8552 BLAKE2B 0a1101f73a337501c8862f0414ca908f01623a0dbe1f7398d611d42d53e35f0e15a55074f33cd1cbe576aba1d3b49d6663fa1c408468f1056b9454caba274501 SHA512 076b002b0baa8bc33a1795a92554c7e0f3bb312ad3b49a57dc8c66e03837ca9072db941276f42a9a2b1ce6ad69228280be5f73559c7f23101bc41296c2cae97c
+EBUILD util-linux-2.34-r3.ebuild 8588 BLAKE2B 75e9f7900d1d05c4c3f5b082c15206c3acf64e90c616e3271c0faf947ed8336ef0ccfb46b4393b531a9c8b271823eb4df8ec210b7c3acd03861ad7db2f5bbd87 SHA512 aedd7148e0a25d921829d6f108e5ce7d1927877b2dd3c01d0eab5020ce2a297173693f90017bd3503870ad55e98e098aa7f0f233831c80aff0bff24be4f2f71b
+EBUILD util-linux-2.35.1.ebuild 8681 BLAKE2B c20681d3125451fbb09de215afbb46187d9e2bee9b0ff601ba24d110e8116879bc0c718c838afabf9dfc2acbae88b34eecd5cdb73683d5d8c12ad831029cbdca SHA512 f5270f461889b89c03f31c442f32fd6de9d544387015c44523a8e3e83255466034adbe020960d4fb45769aafa44d7c72880b3d0453b049cf9c5c08f10cc83a28
+EBUILD util-linux-2.35.ebuild 8655 BLAKE2B 3bd3967e2bdabfc38bf154a5967c0f6101c78af0b7ec5bc5df977eaeb5b9c072a0825d3d68d428bd74a0304655bcdcfaca045f5e7f36594874129b77e964f99d SHA512 51bc9d69d70874f8ce68e30db2d38652bc26dc6af0fdefb585ab59796b2a3266307c402f579b6e9bca091b199d2b73b2eb9ca18e30ab25ccf0cb932bd9fd9d93
+EBUILD util-linux-9999.ebuild 8688 BLAKE2B 28cd40ac3b40daf69c3d93797dfd55029e3722e4a207746209f96831c1323b07ed87966720b1250071fc4bc55e946476e594e8998ce9312514db76edd6406282 SHA512 3ba05891ede3c2bf56a137988b1a82b0d2ccfe4ebdc55d095a4b21c2a062cd3463d8bbf3950b7dc7739c784d6a9e5e4814921867314a7a0c63566ba29b0eb02c
 MISC metadata.xml 1260 BLAKE2B c68fc8a1ab1ed6a5e8e8e09571adab4f0e6c539c7ce45434730d0bf7c039cb886b1a5273f0b41d5c00cd7188143aeedba9be70cd4eaa024f4e71503dc7f88e6e SHA512 701f00691c6fde1fcd3be15e9daa2c067f3b676b80a05d5131bf39ef111d652ede31bf2c45db1dffdfd81e523983a85ea96ed9b6ae0fd645b2203ac5c3afb508
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index 47b276f2d73f..479dd486b007 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
index 18ce20510634..60611bb1505d 100644
--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -29,8 +29,7 @@ IUSE="build caps +cramfs fdformat hardlink kill +logger ncurses nls pam python +
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
-DEPEND="
-	virtual/os-headers
+RDEPEND="
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
@@ -47,7 +46,11 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
 "
-RDEPEND="${DEPEND}
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
 	hardlink? ( !app-arch/hardlink )
 	logger? ( !>=app-admin/sysklogd-2.0[logger] )
 	kill? (
diff --git a/sys-apps/util-linux/util-linux-2.35.1.ebuild b/sys-apps/util-linux/util-linux-2.35.1.ebuild
index 9d43c8d24652..c3759ac85c74 100644
--- a/sys-apps/util-linux/util-linux-2.35.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -29,8 +29,8 @@ IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls p
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
-DEPEND="
-	virtual/os-headers
+RDEPEND="
+	virtual/libcrypt:=
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
@@ -48,7 +48,11 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
 "
-RDEPEND="${DEPEND}
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
 	hardlink? ( !app-arch/hardlink )
 	logger? ( !>=app-admin/sysklogd-2.0[logger] )
 	kill? (
diff --git a/sys-apps/util-linux/util-linux-2.35.ebuild b/sys-apps/util-linux/util-linux-2.35.ebuild
index 73c75936b3b6..07268ccec448 100644
--- a/sys-apps/util-linux/util-linux-2.35.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -29,8 +29,7 @@ IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls p
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
-DEPEND="
-	virtual/os-headers
+RDEPEND="
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
@@ -48,7 +47,11 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
 "
-RDEPEND="${DEPEND}
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
 	hardlink? ( !app-arch/hardlink )
 	logger? ( !>=app-admin/sysklogd-2.0[logger] )
 	kill? (
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 903792320fe4..66feb7a972f4 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 usr-ldscript \
 	pam python-r1 multilib-minimal multiprocessing systemd
@@ -29,8 +29,8 @@ IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls p
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
-DEPEND="
-	virtual/os-headers
+RDEPEND="
+	virtual/libcrypt:=
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
@@ -48,7 +48,11 @@ BDEPEND="
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
 "
-RDEPEND="${DEPEND}
+DEPEND="
+	${RDEPEND}
+	virtual/os-headers
+"
+RDEPEND+="
 	hardlink? ( !app-arch/hardlink )
 	logger? ( !>=app-admin/sysklogd-2.0[logger] )
 	kill? (