12 files changed, 6 insertions, 401 deletions
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index eb591982269d..6eb9a905c49c 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 357ff2ca26fa..df75d6763889 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -20,7 +20,7 @@ DIST db-6.2.38.tar.gz 41298311 BLAKE2B a04a3344058b1d9982f39628c1114aded8f8c8607
 EBUILD db-18.1.32-r1.ebuild 5960 BLAKE2B 0c5376bf33a91c69c3f0bfe3baf9b4f99770082ebbbf202ac436a9a1b9d8f9ce8e59f8e2670c0a524848717e98991cbb0e628098d060af99cead9fa5ef82a632 SHA512 3f5dca955df5d78f95baaeb2f64ae30e67f7ee30656e962ccd119f8a88d45905fecbdf5d29a2e72b5e63c41ef849db6961b22b86cc03aa132a0114fc00310d61
 EBUILD db-18.1.40-r1.ebuild 5877 BLAKE2B 225c7e6250140cc1c8c81f0b99a326e5b3ea0007b5b8804155b45e4b3c82fe09bb704590379098789ea43a657d0e72e79b1bd2e0c0dfd69c4615685010939d51 SHA512 6d9052607d2bf864d3ded422054b55a387c7cbc17f2575c879b7333be22b57507f186598f4107167a914dee7594c0a98d5e1628aba40a2c3269dc95ef0b73905
 EBUILD db-4.8.30-r6.ebuild 4304 BLAKE2B c9021ae73d814d5f78e0fa9066a27813729d7353fb62b5735dadf7394dbc586b67e4f4703132396f9b80906c70353cde6ae1113cab8ed5778894d6242024e648 SHA512 6509604b1624b47f5e3a51e2b37e5de002836d23a4ea4633b994a4f168c44804dd2283904783473391e160cae5462ed6c087da893d2e4e06440f7db6456246e9
-EBUILD db-4.8.30-r7.ebuild 4337 BLAKE2B 156f886f3d5ddd5467a0502739f6e757aab3cbd6230b66fa98fa647108fd9b7948c647de35009845214cd6b0710eb01ca188f117725afe75d17d78160e0af356 SHA512 9d57ae9fcb70f3d2d62fc93e03f2062895f99c51789c23cb3c70c26242496988631ee5f1eff3e948a58c48772779dafc05cffc3d7ca6402e52028f2ac5666e5a
+EBUILD db-4.8.30-r7.ebuild 4336 BLAKE2B d7bdc5542935f257e3881ca0fd5c4c60e802f85c0af595159bf39801aacc1cb5603d20c3f0c2c1c29fdd175d6affdc0851ecb707e51ce84bfacc81360748e722 SHA512 5ffba114b4f5abdec25665baa9f253b8673f3a7c0d3f883846b93871708b1f0890da413ab3efde219aa896108a44a4727d1f63c2564f771f9feb58bb7ea212b7
 EBUILD db-5.3.28-r8.ebuild 6332 BLAKE2B 20716e56c762093c140f9e33306ea7a131fa9aa4de97b873f1ef3e1998b698502926948c7e3ee6483645cae3a82682a54b7655db72bbb368dd762a7fe5a9eb91 SHA512 95d286e2ca2196703db123afb2c9f4bd2d9fe1f8170b3005ab23e086d8af2651a241ad15dab13e13f4ebb00a232d251210624c9156a7c699d687beea1b6455c8
 EBUILD db-6.0.35-r4.ebuild 6228 BLAKE2B 6c533595bbe2d1888c296eabaae5eb40f1335c81a76d1d95a3b4bbd2123abc673dee0e08e90c323ab7a59c95ab8890da483aa53cec93c92079000021e4d943b9 SHA512 18497321dd41cd1025c2e9ebffae12a0e0acb70843dd73c7db668bca86d31246cd3e60ceebfb1d06367061a47e8cbde3fa51053c67917000d567d1c4d663541f
 EBUILD db-6.1.38-r1.ebuild 5972 BLAKE2B 38eae142baf4c6ec125a47122152c91784d4966f76cdbccc47bd1b45589427f81fdee9885c5cd7cc22314bd7568c49cb418f92c20ad30fdee467b20de094ab04 SHA512 87f8b07c235de5e19b39abd2c274f9d84084c0c7d73bb3db545b41ba4b19d93c0de9a0be5d601f087d3f8d6429bceed36567fbc6f4ec989be07fcf084cd829e9
diff --git a/sys-libs/db/db-4.8.30-r7.ebuild b/sys-libs/db/db-4.8.30-r7.ebuild
index 9f5fc2272724..13a1aac18559 100644
--- a/sys-libs/db/db-4.8.30-r7.ebuild
+++ b/sys-libs/db/db-4.8.30-r7.ebuild
@@ -27,7 +27,7 @@ done
 
 LICENSE="Sleepycat"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc ~x86"
 IUSE="doc cxx tcl test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tcl )"
diff --git a/sys-libs/libstatgrab/Manifest b/sys-libs/libstatgrab/Manifest
index eb9594a676a0..05377457b848 100644
--- a/sys-libs/libstatgrab/Manifest
+++ b/sys-libs/libstatgrab/Manifest
@@ -1,3 +1,3 @@
 DIST libstatgrab-0.92.tar.gz 815262 BLAKE2B d8ca538f01d9e0b1d5c459c9c0da6df5b6806e02649d726c3ee8a2f69233a7183df6dda95980a8e6f8b438478ec28f4baa9d623d5372e5e3e28ea4909e905872 SHA512 a99c6be56d930779d0d8f6f81e64e2f31e19423009c39e925b39116a42aa2c6037651992ac2168c43a5c6ecadf3e4a58486ab6148cf96118c429b04fdcf65192
-EBUILD libstatgrab-0.92.ebuild 906 BLAKE2B 32266f81de6226b2fef222c7bba5e0263d342d4ba92ba3f1ca5cfbf554d1c61c0d5cb33ef54445dcc121b4205f98dfe1076b7d9cb5fcb16fba725a8658d7a6f8 SHA512 1b7b9aaa76338383265b7c3790d1b8d7b08d5f46a8dd6c86878c898d53f8be0ad18a269b8a62605fe4deaa7451250f3fc7f61be60877b508623da40eb4ab2318
+EBUILD libstatgrab-0.92.ebuild 913 BLAKE2B c100c399080d58ddd5d46439c07364563cb1f6909b14451a0636bb2eb0e5f723b82967a38292e2be79142ab2704dc7e53e102fc6bb964b2f19bfd1aa5640811f SHA512 83997940ac2f2c546e2b45bc0398970f6b124c538be114392b9a1848870c8841c39bc43140f5eff82afc0b72d01fb9582de29083fc118bccc01a01c6045766ae
 MISC metadata.xml 256 BLAKE2B 2cc24f32d3929f21719f6dbfed59d471a6c5b3c8bc63534f0686f456805ded41b6d8e2dd7621443b1f57a3b09f43801b8a0649162d5afa995a8378fd76e1109b SHA512 b1a2dce972e99ca197dcb2f9c7830dd8f3702cb5c6cdbdbe6ec2de64df8a7d2fa6b680d194ebc3e8c53c1b8d05c1723673b1e56e7684ba2a4567adaa358335b6
diff --git a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
index b2d0f65011fe..4e723145cf74 100644
--- a/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
+++ b/sys-libs/libstatgrab/libstatgrab-0.92.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.mirrorservice.org/sites/ftp.i-scream.org/pub/i-scream/libst
 
 LICENSE="|| ( GPL-2 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ia64 ppc ~riscv x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ~riscv x86"
 IUSE="examples"
 
 RDEPEND="sys-libs/ncurses"
diff --git a/sys-libs/libvpd/Manifest b/sys-libs/libvpd/Manifest
index 5a670719c1d1..e1f00af800f9 100644
--- a/sys-libs/libvpd/Manifest
+++ b/sys-libs/libvpd/Manifest
@@ -1,7 +1,3 @@
-AUX 2.2.8-gcc11.patch 3279 BLAKE2B 50816aa628d6c9b3f9c9d27b1a4550a10c83fafc9a95dd5a9f499a68534fa96b4ce6fd73d7b28777e09dfe45580b7928a7370e51f1784f59c6ee7e78dd45d2a2 SHA512 817d00ffb794b685f5c20625dba50950ea67baae8cd7d4120e907d789bd93d5ea306681dd384296782d6037560b72aefd5db9c004a8a711a4e3df0aa639746e2
-AUX 2.2.8-warnings.patch 2326 BLAKE2B 71a480bedc290a447ae988ed96d4ec3b8f68fc74773c39c0b813b0083c69f5bb659fbbee078b741c496c46f1906e6e6c47bf5acbb29c2b8064b8eefa79851828 SHA512 b095be3e4d9cfe03d8b01d0d1861df2934a7695cc1585af556702dee9c6692fbbe68ea1266181250f72ff74d97694516329de0fde00cd574d60eff004d7083e1
-DIST libvpd-2.2.8.tar.gz 52725 BLAKE2B 76bdc6ddf80236a6848185273c2cac181d44214f0c609d7c5af6fa4d09a7cd816324af35745617ce3daa7268311e2ed754335600df1d4970a324eb327015d051 SHA512 d0b7d1760c6ae54717c538405c651317b7318dec5780961f5386c09b7d245e35a84c2fc47d89c47c3cd2168d73d7186f5819981d52c3ba962514639833dc62aa
 DIST libvpd-2.2.9.tar.gz 53747 BLAKE2B c8898e2f604431b74bf5e10fc99e7a9b5540b825f2a996776109a2b2b636f732ff8d9f7956ffea1231e5b023e285eee641a873a68fcd8a2d6a6d9e64c5ab3b18 SHA512 e32a80e0f3aaedbaaac64dbdedfee7eeb2e7a7b6d2d737bca4678d26caadab77032a7c26211a5fc3caed3724488bc8fa99620ceac05f8d156ca90f4452cfaf0a
-EBUILD libvpd-2.2.8-r1.ebuild 991 BLAKE2B 8e3145531b1e1dbae7eeba2e0df7c7810d6045f93c97c83567bdd786c33b2913662f54be950e9677e2ff6b34dd8a904a738ad2ed4863e1497de5418a6114e4e3 SHA512 716bb2e1d385ec53f99281f7f1bc8c466c266461570f65b8e700263bf8ab9a484c3efeb1ec81f0816efd77a765038f7e41a23df533f1ced7dcd5571853564003
-EBUILD libvpd-2.2.9.ebuild 912 BLAKE2B c2e2e9f6dc3423896d75f13ef5b2be7c47fe3ea0afc11c368fcee9b59d969bab531e6b9761da12bbc3c2c811c41b0794744220e1e2115c7229f76fdd9144b2e3 SHA512 5de6d7ac16274ed5f289004d12353627491a4772b375f7a6c652191f83132713e926372382c68f3bb456e26950fbae97f01ed90f1874dccfb55022e17e3b90e2
+EBUILD libvpd-2.2.9.ebuild 911 BLAKE2B a0c5d8e7742ae4316ca50e9b6a17c093aa001f54510ca8ee591a296ff09e3b44a627f39c8438eccd6cfe03198548d0de0b951a648378827cedac16a9d0535a19 SHA512 cd4f2000a6b28f02da1d99f2a1913f5ec52a9181223498f30353ce778b4c70fe291483a885ea21a9c911f6008f990aa97c8735a695c20f2567471ed907c0ac48
 MISC metadata.xml 421 BLAKE2B c57e915b83891c6778ae1700b183bf7a45612bf8b5af05f02dd877308867827f51db4d9065c02f28a1df547141fc3b29928e0fbbac3be6747bb6a893927da05e SHA512 0740622c3abeac4e6bbe3334b7aed72647496c8a843971be6ba891b91cd0e96395ba6801f45b617aa6e3be28e6c54e62d5033a8faf8d1340656f4b81039b9360
diff --git a/sys-libs/libvpd/files/2.2.8-gcc11.patch b/sys-libs/libvpd/files/2.2.8-gcc11.patch
deleted file mode 100644
index 7e09f8329bba..000000000000
--- a/sys-libs/libvpd/files/2.2.8-gcc11.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 83ccb994e30364c0703d7b8c15817d56b42da2e6 Mon Sep 17 00:00:00 2001
-From: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
-Date: Wed, 7 Apr 2021 14:11:41 +0530
-Subject: [PATCH] Remove dynamic exception specification
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Tomasz Kłoczko reported that the build fails, while compiling
-with GCC 11:
-
-In file included from src/vpdretriever.cpp:25:
-./src/libvpd-2/vpdretriever.hpp:62:33: error: ISO C++17 does not allow dynamic exception specifications
-   62 |                                 throw( VpdException& );
-      |                                 ^~~~~
-./src/libvpd-2/vpdretriever.hpp:74:33: error: ISO C++17 does not allow dynamic exception specifications
-   74 |                                 throw( VpdException& );
-      |                                 ^~~~~
-src/vpdretriever.cpp:50:37: error: ISO C++17 does not allow dynamic exception specifications
-   50 |                 string dbFileName ) throw( VpdException& )
-      |                                     ^~~~~
-src/vpdretriever.cpp:62:39: error: ISO C++17 does not allow dynamic exception specifications
-   62 |         VpdRetriever::VpdRetriever( ) throw( VpdException& )
-      |                                       ^~~~~
-make: *** [Makefile:660: src/vpdretriever.lo] Error 1
-
-As part of
-http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2016/p0003r5.html,
-the dynamic exception specification have been removed. Remove the
-throw specifier, to specify that the function might throw an exception.
-
-Signed-off-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- src/libvpd-2/vpdretriever.hpp | 6 ++----
- src/vpdretriever.cpp          | 4 ++--
- 2 files changed, 4 insertions(+), 6 deletions(-)
-
-diff --git a/src/libvpd-2/vpdretriever.hpp b/src/libvpd-2/vpdretriever.hpp
-index 0d91ac4..1be2664 100644
---- a/src/libvpd-2/vpdretriever.hpp
-+++ b/src/libvpd-2/vpdretriever.hpp
-@@ -58,8 +58,7 @@ namespace lsvpd
- 			 * @param dbFileName
- 			 *   The file name for the VPD database.
- 			 */
--			VpdRetriever( string envDir, string dbFileName )
--				throw( VpdException& );
-+			VpdRetriever( string envDir, string dbFileName );
- 			
- 			/**
- 			 * Builds A VpdRetriever object that can be used for reading the
-@@ -70,8 +69,7 @@ namespace lsvpd
- 			 * this constructor, there were serious underlying issues that
- 			 * are not recoverable.  Uses the default dir and filename
- 			 */
--			VpdRetriever( )
--				throw( VpdException& );
-+			VpdRetriever( );
- 			~VpdRetriever( );
- 
- 			/**
-diff --git a/src/vpdretriever.cpp b/src/vpdretriever.cpp
-index 9f7e7a0..470047e 100644
---- a/src/vpdretriever.cpp
-+++ b/src/vpdretriever.cpp
-@@ -47,7 +47,7 @@ namespace lsvpd
- 	const string VpdRetriever::UDEV_NOTIFY_FILE ( "/run/run.vpdupdate" );
- 
- 	VpdRetriever::VpdRetriever( string envDir,
--		string dbFileName ) throw( VpdException& )
-+		string dbFileName )
- 	{
- 		try {
- 			db = new VpdDbEnv( envDir, dbFileName, true );
-@@ -59,7 +59,7 @@ namespace lsvpd
- 		}
- 	}
- 	
--	VpdRetriever::VpdRetriever( ) throw( VpdException& )
-+	VpdRetriever::VpdRetriever( )
- 	{
- 		struct stat vpd_stat,udev_stat;
- 		const string vpddb = VpdRetriever::DEFAULT_DIR + VpdRetriever::DEFAULT_FILE;
diff --git a/sys-libs/libvpd/files/2.2.8-warnings.patch b/sys-libs/libvpd/files/2.2.8-warnings.patch
deleted file mode 100644
index 1419de3dda49..000000000000
--- a/sys-libs/libvpd/files/2.2.8-warnings.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 72b75e1976b50372f07271a5235ee8e9c75bdac4 Mon Sep 17 00:00:00 2001
-From: Kamalesh Babulal <kamalesh@linux.ibm.com>
-Date: Mon, 21 Jun 2021 11:42:02 +0530
-Subject: [PATCH] vpddbenv_c: fix compile warnings
-
-src/vpddbenv_c.c: In function 'new_vpddbenv':
-src/vpddbenv_c.c:56:17: warning: 'strncat' specified bound 1 equals source length [-Wstringop-overflow=]
-   56 |                 strncat( ret->fullPath, "/" , 1 );
-      |                 ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-src/vpddbenv_c.c:58:17: warning: 'strncat' accessing between 258 and 9223372036854775804 bytes at offsets 514 and 257 may overlap 1 byte at offset 514 [-Wrestrict]
-   58 |                 strncat( ret->fullPath, ret->dbFileName, strlen(ret->dbFileName) );
-      |
-                        ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-While compiling the code with GCC-11 (Fedora 34), the GCC complains
-about src string length and N bytes mentioned in the strncat() are of
-same length. It gets suspicious, when strncat() mimics strcat(), the
-strcat() was replaced using strncat() by the commit 38de4e65205
-("libvpd: Convert strcat to strncat") as part of secure coding.
-
-refactor the code using snprintf(), making the code lean and keep the
-GCC happy as well.
-
-Signed-off-by: Kamalesh Babulal <kamalesh@linux.ibm.com>
-Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
----
- src/vpddbenv_c.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/src/vpddbenv_c.c b/src/vpddbenv_c.c
-index 96aecd3..bae36e9 100644
---- a/src/vpddbenv_c.c
-+++ b/src/vpddbenv_c.c
-@@ -50,14 +50,10 @@ struct vpddbenv * new_vpddbenv( const char *dir, const char *file )
- 		ret->dbFileName[MAX_NAME_LENGTH] = '\0';
- 	}
- 
--	strncpy( ret->fullPath, ret->envDir , FULL_PATH_SIZE - 1);
--
--	if (strlen(ret->fullPath) + 1 < FULL_PATH_SIZE)
--		strncat( ret->fullPath, "/" , 1 );
--	if (strlen(ret->fullPath) + strlen(ret->dbFileName) < FULL_PATH_SIZE)
--		strncat( ret->fullPath, ret->dbFileName, strlen (ret->dbFileName) );
--
--	ret->fullPath[FULL_PATH_SIZE - 1] = '\0';
-+	if ( ( strlen( ret->envDir ) + strlen( ret->dbFileName ) + 1 ) <
-+			FULL_PATH_SIZE )
-+		snprintf( ret->fullPath, FULL_PATH_SIZE,
-+				"%s/%s", ret->envDir, ret->dbFileName );
- 	
- 	rc = sqlite3_open( ret->fullPath, &(ret->db) );
- 	if( rc != SQLITE_OK )
diff --git a/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild b/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild
deleted file mode 100644
index 3b69e327edd6..000000000000
--- a/sys-libs/libvpd/libvpd-2.2.8-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools udev
-
-DESCRIPTION="Library implementation for listing Vital Product Data"
-HOMEPAGE="https://github.com/power-ras/libvpd"
-SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="ppc ppc64"
-
-DEPEND="
-	dev-db/sqlite:3
-	sys-libs/zlib:=
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/2.2.8-gcc11.patch"
-	"${FILESDIR}/2.2.8-warnings.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# sysconfdir is used only to establish where the udev rules file should go
-	# unfortunately it also adds the subdirs on its own so we strip it down to
-	# dirname
-	local myconf=(
-		--disable-static
-		--localstatedir="${EPREFIX}/var"
-		--sysconfdir="$( dirname $(get_udevdir) )"
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	keepdir /var/lib/lsvpd
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-libs/libvpd/libvpd-2.2.9.ebuild b/sys-libs/libvpd/libvpd-2.2.9.ebuild
index 1fb2f63eef03..8d0128e92307 100644
--- a/sys-libs/libvpd/libvpd-2.2.9.ebuild
+++ b/sys-libs/libvpd/libvpd-2.2.9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/power-ras/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="0/3"
-KEYWORDS="~ppc ppc64"
+KEYWORDS="ppc ppc64"
 
 DEPEND="
 	dev-db/sqlite:3
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index 8122116d4ec9..7ad5d356dde2 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -15,7 +15,6 @@ DIST readline81-002.sig 95 BLAKE2B f85d8a65a7326d6e18b32a603c8082952e4b81c53b6a1
 DIST readline82-001 1198 BLAKE2B 2e8f3d2aa14c4c4c4f9621f80f4ffae9bbd6f46c3561e87aaf684c759ffd82e3c46843cf4c4224533b28a847d83f7b8b254813f8a306d438e9f7cb457516c4e0 SHA512 ea3800a62e992b3e594d78e77b6c4b662fb8c501b81010277e478656bb3b56db7747ba40c6c3d68c3ec5ab8e9e41be104788ec52268135d7e642ff40dea421a8
 DIST readline82-001.sig 94 BLAKE2B 542ac331a7da3702b47f4828b3264bc7bf996f473807d675044beeb9688c4ca3645bcba0898d3ea9447c1cde540eb8a6b1934008b0a11baef33235e43f44c6c7 SHA512 01ad9769fee42dc601b511c87bd39e15c74226e1747c4ae8914e303213706005780135add180dbfe538fe847533dc56cfe8f51a3ad9ec55d1fde2cb2e096bfb5
 EBUILD readline-8.1_p2-r1.ebuild 6485 BLAKE2B caa2a68b55108bacd6279720ff134b44adb16d8ce825d9c9fc876596538b002c0aa8069a5a8c9f91f6aa2c65fac6ce21decba4fe1ec3933ca58e17bbb54570b5 SHA512 ea2ab2b573fb31893e161a2f88bf574a8eea6b8a13471e6bebee39fbe30ff0d67df71b960cc011e1b530a396152e64e3f464d65bc9e70abb9d97d17bd1b0a89f
-EBUILD readline-8.1_p2.ebuild 6266 BLAKE2B df1a758c63118e9f8b23bbc6831cc2d3fb975e332fd4212d5b94cb6b43885d4d3713a664d4b11729d6a447b5c57808b07d40a426d1738b85874da7c7d7880006 SHA512 e8a21619d26dd11d4fa0b2d8accb9ba89405a9ae66f6ef7c73a3122bb25b769f013691ff1688583a560911da303c15bd85f2a7863b41ec802607ec5f7df444ae
 EBUILD readline-8.2_p1.ebuild 7140 BLAKE2B e7261c466ab1c6d5e3b065fd975fc43f7cfb6a23705f04495cb0f5c5703c46f88adb4da54c5a1914203759c8ef8511f9fb414e756a8ad00178775af825c0259d SHA512 f26d4f79a78cb5f674b2cd98aac61cc58c64a2789ebd3514e57dc1f976c422d1d1e95e4e0a3e8909ee38bb1990e2516084ccc780086393f85b0f24d78d3e89cd
 EBUILD readline-9999.ebuild 7140 BLAKE2B e7261c466ab1c6d5e3b065fd975fc43f7cfb6a23705f04495cb0f5c5703c46f88adb4da54c5a1914203759c8ef8511f9fb414e756a8ad00178775af825c0259d SHA512 f26d4f79a78cb5f674b2cd98aac61cc58c64a2789ebd3514e57dc1f976c422d1d1e95e4e0a3e8909ee38bb1990e2516084ccc780086393f85b0f24d78d3e89cd
 MISC metadata.xml 533 BLAKE2B 2324b38d79697509a98d761cb8f91e08934b419f71bfd65cf09149773e3f44e8ff153d173cb1af80ccc4c10c7c65103bba5ca797f3b18b96c13132ffd777049e SHA512 5d66a8a464db16ea8afebeca7102632629486ccd4d348821ef693abde571c8a70a6aa38e9b563ddcfe93950afc38f63d2cb4239c645d97e92138a0c1e5c67f00
diff --git a/sys-libs/readline/readline-8.1_p2.ebuild b/sys-libs/readline/readline-8.1_p2.ebuild
deleted file mode 100644
index 72ba36ee3ea8..000000000000
--- a/sys-libs/readline/readline-8.1_p2.ebuild
+++ /dev/null
@@ -1,206 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in mirror://gnu/${PN} ftp://ftp.cwru.edu/pub/bash ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-			printf "${u}/${PN}-${MY_PV}-patches/%s.sig " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-		SRC_URI+=" verify-sig? ( ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-		SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig )"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-	"${FILESDIR}"/${PN}-8.1-windows-signals.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	verify-sig_src_unpack
-
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
-		# If we're bootstrapping, make a guess. We don't have pkg-config
-		# around yet. bug #818103.
-		# Incorrectly populating this leads to underlinked libreadline.
-		local ncurses_libs
-		local ncurses_libs_suffix=$(usex unicode w '')
-
-		ncurses_libs="-lncurses${ncurses_libs_suffix}"
-
-		if has_version "sys-libs/ncurses[tinfo(+)]" ; then
-			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
-		fi
-	else
-		# Force ncurses linking. #71420
-		# Use pkg-config to get the right values. #457558
-		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
-	fi
-
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}