gentoo resync : 12.03.2021

6 files changed, 12 insertions, 74 deletions

diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index 05920540b25c..0ad708c92506 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/libzbd/Manifest b/sys-block/libzbd/Manifest
index f707771d1246..39ace6da2cc4 100644
--- a/sys-block/libzbd/Manifest
+++ b/sys-block/libzbd/Manifest
@@ -1,3 +1,3 @@
 DIST libzbd-1.2.0.tar.gz 56107 BLAKE2B 0b20ced5cb0abc6ac5d303a1b583b1a8c0b3c89936cf664dd227832d5a704f6665a82e0d1c7cf80c381400b4edcff6c9e0b192c10deaf00c89009b40edde8676 SHA512 d165640331c7a87c4660f3f707c0510fa7a21edd194e66e96abe6ad3698dc4652a6a673ac8ac1929b0f603df49c1621f398cfb81b7ab8f9dba6353fa9f05d94f
-EBUILD libzbd-1.2.0.ebuild 760 BLAKE2B 27091566ca5b375462b8f34f514846ec6d95ea721070cacba4cc70dcaa923a8833a92cbd76eaf52f6d8fa5721b75054d3cd73f075aba547e89e6bb43506cc726 SHA512 016af8ba77d2478aeb19a502a89c4637b56ec4714bb82e1139fc12bebeffb9841b9062e291a89b532ef2558ccee85c23f50660b419f57226375eb59915cd7c58
+EBUILD libzbd-1.2.0-r1.ebuild 966 BLAKE2B 8d5023c0af0e8ec151b41a648847c94800ef639cf46e7dd21cc5aa1692fc698a913a977773a02d26f5699c111cfa7c2fb66851545f40faec83e2900021b0ff22 SHA512 93c953a0507d5a38ea2479761e3c89b8875c6c529495acc2a6d977d50294bf2dd2c1a32aac19b59009a923b5dd1115ae7ebf0e526020fdae8b4bc80f14a7edaf
 MISC metadata.xml 360 BLAKE2B a4923a3ae6bd9db591be3a443a7acb0e3a7d1142f72c9f0e38fffa3aa01749058f68d540eb68df67e8368e2981e18b02ea1d3bb4e314afb152ef1c83dbe93cf2 SHA512 270e3d73adc2c49d2d96f4be69a90acc71087113958174acc4ca9b7dd5593765b0bfc593a3ead251a85e5dd25784f19822aa0c8d133c3429d3168b723a1ab7b2
diff --git a/sys-block/libzbd/libzbd-1.2.0.ebuild b/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
index 568e9787c1b0..ca893c6e8be5 100644
--- a/sys-block/libzbd/libzbd-1.2.0.ebuild
+++ b/sys-block/libzbd/libzbd-1.2.0-r1.ebuild
@@ -9,17 +9,20 @@ DESCRIPTION="Zoned block device manipulation library and tools"
 HOMEPAGE="https://github.com/westerndigitalcorporation/libzbd"
 SRC_URI="https://github.com/westerndigitalcorporation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
+# Examples/tools are GPL-3+, library is LGPL-3+
 LICENSE="GPL-3+ LGPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="gtk"
 
-DEPEND="virtual/pkgconfig
+# PKG_CHECK_MODULES is only for GTK right now
+# https://github.com/westerndigitalcorporation/libzbd/blob/master/configure.ac#L71
+BDEPEND="gtk? ( virtual/pkgconfig )"
+DEPEND="
 	>=sys-kernel/linux-headers-4.13
-	gtk? ( x11-libs/gtk+:3 )"
-
-PATCHES=(
-)
+	gtk? ( x11-libs/gtk+:3 )
+"
+RDEPEND="${DEPEND}"
 
 src_prepare() {
 	default
@@ -28,7 +31,7 @@ src_prepare() {
 
 src_configure() {
 	econf \
-		$(use_with gtk gtk3) \
+		$(use_enable gtk gui) \
 		--disable-static
 }
 
diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index b0feab0bfe89..6831336d7995 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,8 +1,6 @@
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
-DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4
 DIST parted-3.4.tar.xz 1860300 BLAKE2B c724d3d1490c62d440b9e5dc359fef7ff623bc77ae5f867d8905245cb279ec391fa07a1a774488ad3bf7a2c477007264d7bab2635a544be8f94dc706a654a711 SHA512 e69bd1b610778e980d4595d04892f2ea1faf4ae9bfc98cd62abfc70066423f08ddaa396f9461c7beb1330d023232274606b6b26091a0458aeedd0f3f57536690
 DIST parted-3.4.tar.xz.sig 508 BLAKE2B 112ad0158b1100bd9150a7c87e8f93e67d42870b82a17d4d0aa8bb5e46306f837f3f99feabaf301f8cd640c299174e5f5acf152dd1f20ea2b7ace73d57d31f14 SHA512 6b11812267e66470ba2908ee1cc78b232b0bc2519787f5a17b92cd5f8ba904b1a836833f19c5244b23d4c7810437eeb26fbbd68fac819391b342709682345472
-EBUILD parted-3.3-r2.ebuild 1346 BLAKE2B 9596370738eaa98e7521eec60895d91c21146c4dfa456546d09c329c33c7eda8bbc646a3f406047effc05a4ddee803ef091333039655b05dc3985576311b19b4 SHA512 cbb2689566d24a717b9fa27a67e0aff6b9f7aabd218a95bb78668f10ba7981a2b4ef1a6c85486e867e93e5dc5be747ed147468a828af99571c6666a7cf8cebd9
-EBUILD parted-3.4.ebuild 1467 BLAKE2B 009f6374180d45045a9d851a3fd857034aa586591678e6b406d92189d0c13b11b536f8c2fd8ab4d8598d93540b3ed64add20d9bc0a9db616f363b2589728b159 SHA512 369f4713087731077db9ee2eecf6a7959134aa8dc0339ceb3f2ff7b1f876f495f05dde35047f7b834f608eb441d31baa08aae70c31df0ffa1a1a1520c49ddaae
+EBUILD parted-3.4.ebuild 1460 BLAKE2B 35e26bf48c88c03dd256b7dd082c8ef44aab950be080f24caeba2d7b833027e52f4e1099d676a9e44cfa595a3e9a1f0c9a78921160c0de758faea385f159e224 SHA512 f2f70c5fe1f322d453a99ad8b0ac9eab53ae204c3fccae21fe611c2599394cfb432fe8a906ac4460ef13438d2d2916f4e4e138bef491f32ae7d6aa1b8fc04386
 MISC metadata.xml 886 BLAKE2B 7eab7ab0acb3ca62dbd119ebdccad3a0a5aa69754edbc7465182496bfd136cdd06a7f12c8515ff2c9420dd22b9a4c03ca7f126b357f146af3825bf8e76064149 SHA512 aad773c94d64b99d1f70f2e542e75c4795e1c58bfdc238eb50d0e0a7c10d1255af464b2c7ddea76bbee4b6af5f8d90e1c584f319cb290cbe85aa6c7c8e873e21
diff --git a/sys-block/parted/parted-3.3-r2.ebuild b/sys-block/parted/parted-3.3-r2.ebuild
deleted file mode 100644
index 92e75e2681b3..000000000000
--- a/sys-block/parted/parted-3.3-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="+debug device-mapper nls readline selinux"
-
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? (
-		>=sys-libs/ncurses-5.7-r7:0=
-		>=sys-libs/readline-5.2:0=
-	)
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-	"${FILESDIR}"/${PN}-3.3-atari.patch
-)
-
-src_prepare() {
-	default
-	touch doc/pt_BR/Makefile.in || die
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	local myconf=(
-		$(use_enable debug)
-		$(use_enable device-mapper)
-		$(use_enable nls)
-		$(use_enable selinux)
-		$(use_with readline)
-		--disable-rpath
-		--disable-static
-	)
-	econf "${myconf[@]}"
-}
-
-DOCS=(
-	AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
-)
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.4.ebuild b/sys-block/parted/parted-3.4.ebuild
index 24144f506ea7..c245ec7ab09b 100644
--- a/sys-block/parted/parted-3.4.ebuild
+++ b/sys-block/parted/parted-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="+debug device-mapper nls readline"
 
 RDEPEND="