gentoo resync : 16.04.2022

4 files changed, 7 insertions, 83 deletions

diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 75427e18942c..4b5b168b5999 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,9 +1,8 @@
-AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfbb8f5857afa19be417ac9f93cf3feb0c5800a813690e453266d560a934c7066ad2aae0a83b08554cfe59eeecfb60a6f64a5c8fed800311c SHA512 11d7d990d8068f1310ceefc3d59069d9e563125b02011b6b6d6833c2bbcb101c45163c9371d698ab8d489bac0621f5454030f27c70773d7f30daad7aabace682
 AUX gptfdisk-1.0.7-remove_byteswap.patch 1836 BLAKE2B 2c16a9eb14c4aef96db2b3b4e5a9b4493032845234cf01b326ad17a12e2ffd2a5e27b5a32b13416dbf11c8224cee1b4a10cf0b0dfd2f95adca7faa88f2d712e8 SHA512 d91ce5ec39ed42cb87ac8a986c12ae79c1fe46340965508edb586a8aaad8e72a4227d88ce8e53d73e17d796ecc547d1c41e626bc6f897ee70badb5d74223a940
-DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 DIST gptfdisk-1.0.7.tar.gz 207723 BLAKE2B cebb0375294b4ff8f8eb522a4ae23259714d07d670a7bfbf8664586c948c1c8bee2674649a181a7c5d22f9dfe177feb7a9648ca9936c388b419faf7b52e789d8 SHA512 8a2067523479e34c76392571692b36e6c9eadcd0aca979f1ba09904930ed92a709bfdcdfa3369230a5ab2b5a751682dc7fb4645fb5f7f1c361ee8d28e104214c
 DIST gptfdisk-1.0.8.tar.gz 208958 BLAKE2B 03c74c43fead13e90ff6cd42405e15db726f527801a9e3f1d5f6a83d3fa58f0f8e58b35edc1b12b0b2e6c7849b657ce4493ac67204d25309e6f63fe7f57f766b SHA512 0818a238e57cf6de893da7c161e8aaf2d30ad917a47750de09967ce1d83d1ab6666fa043465abaffdc293d058acc3fa87f8bc93a4b03c7c5d9a9ceb8f5b07331
-EBUILD gptfdisk-1.0.6-r2.ebuild 1290 BLAKE2B d6fde27a06ffcedf0b68b708c7bccff19f8f22f25bc107ac3c1714665040e4f4315b3dfcb9291567ba6232f5e07a7864af3d702ae880441b407a2ac480255fd5 SHA512 ed80ab87a3edbab7a88c5ad9a9dcf3095e0b0af584bef5a437015476805781df6ca62e9e74fb8fd99021c1b9dda45e5627b865e77f04b96b9fe73c8127ae65da
+DIST gptfdisk-1.0.9.tar.gz 215065 BLAKE2B 1939ffd75972a4d7f92af2bfab90c7b0223825b5478b6b808dd35af943c687d38ba81663cd7ba5e0f9400656db4dac019c13a9f75d90b7bd716568c676c24dd2 SHA512 c2489ac7e196cb53b9fdb18d0e421571eca43c366de8922c5c7f550aadf192558e7af69b181c30747d6cf607c1670126223465eaa5e231cc589402d94a4e97a2
 EBUILD gptfdisk-1.0.7-r2.ebuild 1290 BLAKE2B 789fed2d6991ebbb1bc8707dd17ed86449e6c2d22db73d8ec7451fa0f9c8d13dac65752295109010ce3332c63f0aab16bbd55cd757c959a8ef57f89543645569 SHA512 0d9b32e690c1e6d477b4009cbf55dc2361f00c6c99b289b8e927b516787770351f751f6226bd6cbd68dda4edd6450d0c55e5db6b9834356830d6e4bb464c4fa3
-EBUILD gptfdisk-1.0.8-r1.ebuild 1232 BLAKE2B c276a6d7f23bf6075a3dc4493008bbb43d2dfefdb128273646e6adb732441687d9e811487e8c77c54e609c9517c90855a0a3eba4550fd9c4aaa34efd81a5dcbd SHA512 51341a4dcfc4fe7738022f821da0c29c25031c6fa39328afeba7313e0e493a934bb9656e46ae64d51a9a5872725b5baf2124517d572f87b24f0ac3275b213841
+EBUILD gptfdisk-1.0.8-r1.ebuild 1226 BLAKE2B a2cf4124d04580e997b3b07bcf0a05386fc5ffdd28a1cf23bcadaf298c2baa85a623fc86f3b7fd1e20b385f136025ec3db4b95ca204d2a103d40ec0856b291e2 SHA512 2d5925cbd3b1c951752526bfae8ab5c2b32f67ca50684255e490b46687ee1e5d301f38bd135c6798a5b50193b512c0a61951e3d59a0bc363cdd7c3402b46f399
+EBUILD gptfdisk-1.0.9.ebuild 1232 BLAKE2B f5e5b583fb8449d46e87be7918e4112fa7d419160140bf4203219b84ef9c92d6fc52d48fe54a3b83dbd3763ae0fb7332a4267b60f13e19c3bba7e6031f462988 SHA512 b6d08bd889289a2a16f2bbe1d01430647c0a9ad246bce6217db91b5fe63d86b171114bc53587ab49017d134481d0633b0999b2489e935c5d1bc0a4d6cd7b7b5d
 MISC metadata.xml 340 BLAKE2B 1934da4cf8289a324846642f69ba53d6e0988eb37c4a56019bae8094935efc1ff485f7f6746d58a72efcf81b1a017baca1f48e3a47d321fd8c87fb756b2e5419 SHA512 6074f7a7c0ada7deacf252c2bd7be3b5aacc3402e88b13bfbbf085b7760956a1ec35e52c22d49663d358dd837319815e4b1d5071ea0119f9890d31eca9ef84ed
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch
deleted file mode 100644
index e60aa9feeffb..000000000000
--- a/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From f063fe08e424c99f133df18bf9dce49c851bcb0a Mon Sep 17 00:00:00 2001
-From: Rod Smith <rodsmith@rodsbooks.com>
-Date: Mon, 1 Feb 2021 10:19:50 -0500
-Subject: [PATCH] Fix spurious warnings of problems on MBR disks
-
----
- NEWS      |  7 +++++++
- gpt.cc    | 18 +++++++++++++-----
- support.h |  2 +-
- 3 files changed, 21 insertions(+), 6 deletions(-)
-
-diff --git a/NEWS b/NEWS
-index f74bad0..a7131aa 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,3 +1,10 @@
-+1.0.7 (?/??/2021):
-+------------------
-+
-+- Fixed bug that caused spurious warnings about the partition table
-+  header claiming an invalid size of partition entries when reading
-+  some MBR disks.
-+
- 1.0.6 (1/13/2021):
- ------------------
- 
-diff --git a/gpt.cc b/gpt.cc
-index 1b4e10f..842dfb1 100644
---- a/gpt.cc
-+++ b/gpt.cc
-@@ -1042,11 +1042,19 @@ int GPTData::LoadHeader(struct GPTHeader *header, DiskIO & disk, uint64_t sector
-    *crcOk = CheckHeaderCRC(&tempHeader);
- 
-    if (tempHeader.sizeOfPartitionEntries != sizeof(GPTPart)) {
--       cerr << "Warning: Partition table header claims that the size of partition table\n";
--       cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program ";
--       cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n";
--       cerr << "Adjusting accordingly, but partition table may be garbage.\n";
--       tempHeader.sizeOfPartitionEntries = sizeof(GPTPart);
-+      // Print the below warning only if the CRC is OK -- but correct the
-+      // problem either way. The warning is printed only on a valid CRC
-+      // because otherwise this warning will display inappropriately when
-+      // reading MBR disks. If the CRC is invalid, then a warning about
-+      // that will be shown later, so the user will still know that
-+      // something is wrong.
-+      if (*crcOk) {
-+         cerr << "Warning: Partition table header claims that the size of partition table\n";
-+         cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program ";
-+         cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n";
-+         cerr << "Adjusting accordingly, but partition table may be garbage.\n";
-+      }
-+      tempHeader.sizeOfPartitionEntries = sizeof(GPTPart);
-    }
- 
-    if (allOK && (numParts != tempHeader.numParts) && *crcOk) {
-diff --git a/support.h b/support.h
-index d87fe9a..e3e1e12 100644
---- a/support.h
-+++ b/support.h
-@@ -8,7 +8,7 @@
- #include <stdlib.h>
- #include <string>
- 
--#define GPTFDISK_VERSION "1.0.6"
-+#define GPTFDISK_VERSION "1.0.6.1"
- 
- #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
- // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
--- 
-2.30.1
-
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
index 150948967cf2..245535567ce5 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild
index 2861972f8552..62367d7e3bbc 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.6-r2.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="ncurses static"
 
 # libuuid from util-linux is required.
@@ -27,12 +27,8 @@ DEPEND="
 		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
 		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
 	)
+	virtual/pkgconfig
 "
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${P}.1-spurious_mbr_warnings.patch"
-)
 
 src_prepare() {
 	default