gentoo resync : 25.11.2020

10 files changed, 39 insertions, 450 deletions

diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index 60046065dd2c..d286b65dfa4a 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -1,15 +1,5 @@
-AUX parted-3.2-devmapper.patch 1972 BLAKE2B 10ceeec3f6af744dad642a9b1b8e8d30a85793415bac68c87463d459e4b1fb321c1d0e9017aa895334f2a2849c436f617581c5b4f3d1d0dbe5d1a97b9f3a278b SHA512 3baf2090ba86242df1633bb4b50deeb6e0226b0a56ad82466ddd76f028a859e29bd021f1f251047cd2a2a5ea1c77ed0129eca8be2e97ee48c21c1d186c07b8da
-AUX parted-3.2-fix-resizing-FAT16.patch 2383 BLAKE2B d680374c1949a1f4f118e67ad5f2b90cbde13475b0749cf580d25dc78b424ecc003a97c4607733b7bde833022c0ba76bdcae0853c8f205fb1fb4c873639ee928 SHA512 31a79f24de58fdbc77b50790372019083375acace66f9a9d3fc93c6ec22988b7198fda13c3790e00518f7a2878de1efb914658f517d275c6ecfd3e507bc4cd15
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
-AUX parted-3.2-sysmacros.patch 804 BLAKE2B 294094fd79a799d577c2db00569f4be218713b71659654603a299f039939a7b3901ab80aab6cf969fd503712da8a7039e8fd7dac007b164a1f3b7ead4c5596ed SHA512 97c141d623bc52387b3726a164c5191c094cef1b2aa000dbd8e505aab418210d27ad07a59e0433faf001bf12ee1e3729838186fc2bae69ed7a66941364e3b468
 AUX parted-3.3-atari.patch 421 BLAKE2B 9048176f882e66cf89cc2d79aa0ea7a550f9c649d8f54f4df102eb361c6e0be473a2e07e1ab8f63dc446422a92ced10cfb4858a27b7988c1b5a960e6e8e1d518 SHA512 59738de6f89dd6d407eef139ffe4d0925d418f4d33a30a1ead1e1f05ab7ad93e13294412d5061dd40302b9592a33b97f137089f477dc6a2febd3fe60eae77ca0
-DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
 DIST parted-3.3.tar.xz 1757432 BLAKE2B d1e248cd8fdce22d4957055d65f9f93333505229f92174f343897422a31a43f3d35ea06f8f1bdafd254e4629c5890ec38d6b75d3b499c39a9ada4a8d5f9d9d8f SHA512 d1384694a491aa53bab6206fdeccd1d192de2ed379fe25aa865dd6aa06ed945a728e85b2ccc2fb23f5aa9dfee4a8bd8f0f2be1dd386cb8e8861b73382c6a07e4
-DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
-DIST parted_3.2-25.debian.tar.xz 88524 BLAKE2B e994ca8a68f700773e0a67657d59793ea130a5c7e9eca31688fa48e7133a0c350446b8c0a175ac2f59aca8c2fe1ef419a94f3f6f0547b0b25cca329c6f569571 SHA512 2d4e52513b016ef67b203db577641cd56b4d2d013e1bc186b665ab47d0f6c673321b108f81d36caaa0fd14c555d8336a2556a60cccbeccb9d2cf98a85872d949
-EBUILD parted-3.2-r1.ebuild 1479 BLAKE2B 72706d8d8cfbc63af64546de63d6e8b9baeea99e6ac032f8565a09a2ecb21cba9c2cb946a87b322df7274acc0a021609e4ac0260694c1313c3ca0a85a7f37b2d SHA512 39ad4d18564b6bd06978e33087d756654962eec60ca945e99690762f2c44e80ae580ee33c74a3bee3c0ecd4a362ae6b5083422cbe9c8eae431792620b7e38456
-EBUILD parted-3.2_p23.ebuild 1677 BLAKE2B a5d9dc1c9873434259b6e4625dd5399f7cb190d2adaa66fccc8e1088523769b7fac5d6d41e74ec8e1921a3d41202007811335d5df206d287f13df52b8ccb76b4 SHA512 69f4d97ba8583b658261cb47af1db6993a065c17c54d444acdbab67020efd3fff85ca301d0aa49fb36a3f43352068306f2dd5532eb569f247548897c24585160
-EBUILD parted-3.2_p25.ebuild 1678 BLAKE2B 01aec7444da95f070d776ba0fdccb825391abdbcf2ea488cf72836e8b6c057d325c31b45657a5de166bc47b12bc46b008ee2bed623748f6d6663f303b5d6c0e7 SHA512 e9489c3cb304975a4bf2eb83d005b5c6230252278e48a24fcbb1c97d95252c73b92e288613c1b353c94ae02496e65f68030241f2980ce3f1d5426e45334609ec
-EBUILD parted-3.3-r1.ebuild 1392 BLAKE2B 7fd4582f48518e8cc48d82e3d7b21c626d18aacd6fe469cd201d827e90af5e517a81881ec13db20dd5afbff55b1e69c01c5c7e5fb45d3bdb93b1677041bb1e23 SHA512 e8b197e02351925ebe775cecc268303324ce2a28a11507ac42e47104987de8083ee6bf4122d01391629cdff5e4ba3b28c3babe225245bb0d8a1eee338268bdbb
-EBUILD parted-99999.ebuild 1407 BLAKE2B ac953dbc8d771ffab9d7e39990020a2ab01e621ded61b2b42a9bac6778eae29015dd4be1d2e02201adf15435cd7016bfd054bf42a21b756850f686ea41c5e061 SHA512 02c10b91a43ecbe806d7ec7bd546e212c98a8ba5ed93d5ad68dc0013886b3cdab34e13033776f88d71c813b7fa9710e20fa4568056651bd95df1267d56d61935
-MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
+EBUILD parted-3.3-r2.ebuild 1327 BLAKE2B f658999b44e2756e802acd05a8db7ddc53ad34ab4543080ddc9cad31a5d66d18ee3d3fd645e97846e851067426e1f8d3dd3fbb58c2a54acde0ebbeaaa8461eff SHA512 57499a912376b92d63eb3406ac92dc9aab0c13f2d5eae24fd1ee212a4d36a33c847b5c41126eb914d6e7b14261ab2cd7b53e7ce49f7f75dc3bb7c4c6719b4a29
+MISC metadata.xml 886 BLAKE2B 7eab7ab0acb3ca62dbd119ebdccad3a0a5aa69754edbc7465182496bfd136cdd06a7f12c8515ff2c9420dd22b9a4c03ca7f126b357f146af3825bf8e76064149 SHA512 aad773c94d64b99d1f70f2e542e75c4795e1c58bfdc238eb50d0e0a7c10d1255af464b2c7ddea76bbee4b6af5f8d90e1c584f319cb290cbe85aa6c7c8e873e21
diff --git a/sys-block/parted/files/parted-3.2-devmapper.patch b/sys-block/parted/files/parted-3.2-devmapper.patch
deleted file mode 100644
index 0cd3e0e3307f..000000000000
--- a/sys-block/parted/files/parted-3.2-devmapper.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -2304,6 +2304,7 @@
-   return r < 0 ? NULL : resultp;
- }
- 
-+#ifdef ENABLE_DEVICE_MAPPER
- static char *
- dm_canonical_path (PedDevice const *dev)
- {
-@@ -2326,12 +2327,22 @@
- err:
-         return NULL;
- }
-+#endif /* ENABLE_DEVICE_MAPPER */
- 
- static char*
- _device_get_part_path (PedDevice const *dev, int num)
- {
--        char *devpath = (dev->type == PED_DEVICE_DM
--                         ? dm_canonical_path (dev) : dev->path);
-+        char *devpath =
-+#ifdef ENABLE_DEVICE_MAPPER
-+                        (
-+                         dev->type == PED_DEVICE_DM
-+                         ? dm_canonical_path (dev) :
-+#endif /* ENABLE_DEVICE_MAPPER */
-+						 dev->path
-+#ifdef ENABLE_DEVICE_MAPPER
-+                        )
-+#endif /* ENABLE_DEVICE_MAPPER */
-+                        ;
-         size_t path_len = strlen (devpath);
-         char *result;
-         /* Check for devfs-style /disc => /partN transformation
-@@ -2945,12 +2956,14 @@
-                                                unsigned long long *length);
- 
- 
-+#ifdef ENABLE_DEVICE_MAPPER
-         if (disk->dev->type == PED_DEVICE_DM) {
-                 add_partition = _dm_add_partition;
-                 remove_partition = _dm_remove_partition;
-                 resize_partition = _dm_resize_partition;
-                 get_partition_start_and_length = _dm_get_partition_start_and_length;
-         } else {
-+#endif /* ENABLE_DEVICE_MAPPER */
-                 add_partition = _blkpg_add_partition;
-                 remove_partition = _blkpg_remove_partition;
- #ifdef BLKPG_RESIZE_PARTITION
-@@ -2959,7 +2972,9 @@
-                 resize_partition = NULL;
- #endif
-                 get_partition_start_and_length = _kernel_get_partition_start_and_length;
-+#ifdef ENABLE_DEVICE_MAPPER
-         }
-+#endif /* ENABLE_DEVICE_MAPPER */
- 
-         /* lpn = largest partition number.
-          * for remove pass, use greater of device or label limit */
diff --git a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch b/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
deleted file mode 100644
index 2a5a2311f1dd..000000000000
--- a/sys-block/parted/files/parted-3.2-fix-resizing-FAT16.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1e9e770f4bc7f3d80e09ecd1df58575fad064163 Mon Sep 17 00:00:00 2001
-From: Mike Fleetwood <mike.fleetwood@googlemail.com>
-Date: Sun, 28 Sep 2014 15:15:48 +0000
-Subject: lib-fs-resize: Prevent crash resizing FAT16 file systems
-
-Resizing FAT16 file system crashes in libparted/fs/r/fat/resize.c
-create_resize_context() because it was dereferencing NULL pointer
-fs_info->info_sector to copy the info_sector.
-
-Only FAT32 file systems have info_sector populated by fat_open() ->
-fat_info_sector_read().  FAT12 and FAT16 file systems don't have an
-info_sector so pointer fs_info->info_sector remains assigned NULL from
-fat_alloc().  When resizing a FAT file system create_resize_context()
-was always dereferencing fs_info->info_sector to memory copy the
-info_sector, hence it crashed for FAT12 and FAT16.
-
-Make create_resize_context() only copy the info_sector for FAT32 file
-systems.
-
-Reported by Christian Hesse in
-https://bugzilla.gnome.org/show_bug.cgi?id=735669
----
-diff --git a/NEWS b/NEWS
-index 297b0a5..da7db50 100644
---- a/NEWS
-+++ b/NEWS
-@@ -2,6 +2,10 @@ GNU parted NEWS                                    -*- outline -*-
- 
- * Noteworthy changes in release ?.? (????-??-??) [?]
- 
-+** Bug Fixes
-+
-+  libparted-fs-resize: Prevent crash resizing FAT16 file systems.
-+
- 
- * Noteworthy changes in release 3.2 (2014-07-28) [stable]
- 
-diff --git a/libparted/fs/r/fat/resize.c b/libparted/fs/r/fat/resize.c
-index 919acf0..bfe60a0 100644
---- a/libparted/fs/r/fat/resize.c
-+++ b/libparted/fs/r/fat/resize.c
-@@ -668,11 +668,17 @@ create_resize_context (PedFileSystem* fs, const PedGeometry* new_geom)
- 
- /* preserve boot code, etc. */
- 	new_fs_info->boot_sector = ped_malloc (new_geom->dev->sector_size);
--	new_fs_info->info_sector = ped_malloc (new_geom->dev->sector_size);
- 	memcpy (new_fs_info->boot_sector, fs_info->boot_sector,
- 		new_geom->dev->sector_size);
--	memcpy (new_fs_info->info_sector, fs_info->info_sector,
--		new_geom->dev->sector_size);
-+	new_fs_info->info_sector = NULL;
-+	if (fs_info->fat_type == FAT_TYPE_FAT32)
-+	{
-+		PED_ASSERT (fs_info->info_sector != NULL);
-+		new_fs_info->info_sector =
-+			ped_malloc (new_geom->dev->sector_size);
-+		memcpy (new_fs_info->info_sector, fs_info->info_sector,
-+			new_geom->dev->sector_size);
-+	}
- 
- 	new_fs_info->logical_sector_size = fs_info->logical_sector_size;
- 	new_fs_info->sector_count = new_geom->length;
---
-cgit v0.9.0.2
diff --git a/sys-block/parted/files/parted-3.2-sysmacros.patch b/sys-block/parted/files/parted-3.2-sysmacros.patch
deleted file mode 100644
index a29e7619b148..000000000000
--- a/sys-block/parted/files/parted-3.2-sysmacros.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/580022
-
-From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 15:01:08 -0400
-Subject: [PATCH] include sysmacros.h for major/minor/makedev
-
-Linux C libs are moving away from including this header implicitly via
-sys/types.h, so include it explicitly.
----
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 326b95619d31..e5c168be3c68 100644
---- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -37,6 +37,7 @@
- #include <dirent.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <sys/utsname.h>        /* for uname() */
- #include <scsi/scsi.h>
--- 
-2.8.2
-
diff --git a/sys-block/parted/metadata.xml b/sys-block/parted/metadata.xml
index 2011c0117f13..97203c5d7a4f 100644
--- a/sys-block/parted/metadata.xml
+++ b/sys-block/parted/metadata.xml
@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
 	<maintainer type="project">
-		<email>livecd@gentoo.org</email>
-		<name>Gentoo LiveCD Project</name>
+		<email>base-system@gentoo.org</email>
+		<name>Base System Project</name>
 	</maintainer>
 	<use>
 		<flag name="device-mapper">
-	Enable device-mapper support from <pkg>sys-fs/lvm2</pkg> in parted
-	</flag>
+			Enable device-mapper support from <pkg>sys-fs/lvm2</pkg>
+			in parted
+		</flag>
 		<flag name="debug">
-	Enable debugging as encouraged by upstream: [The default configuration]
-	includes --enable-debug (by default), which contains many assertions.
-	Obviously, these "waste" space, but in the past, they have caught
-	potentially dangerous bugs before they would have done damage, so we think
-	it's worth it.  Also, it means we get more bug reports ;)
-	</flag>
+			Enable debugging as encouraged by upstream: [The default
+			configuration] includes --enable-debug (by default), which
+			contains many assertions.  Obviously, these "waste" space,
+			but in the past, they have caught potentially dangerous bugs
+			before they would have done damage, so we think it's worth
+			it.  Also, it means we get more bug reports ;)
+		</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-block/parted/parted-3.2-r1.ebuild b/sys-block/parted/parted-3.2-r1.ebuild
deleted file mode 100644
index 5c7263071d8e..000000000000
--- a/sys-block/parted/parted-3.2-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools eutils flag-o-matic ltprune
-
-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 static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-3.2-devmapper.patch \
-		"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch \
-		"${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch \
-		"${FILESDIR}"/${PN}-3.2-sysmacros.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sys-block/parted/parted-3.2_p23.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
deleted file mode 100644
index c02bd5426f6d..000000000000
--- a/sys-block/parted/parted-3.2_p23.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools 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/_p*/}.tar.xz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.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 static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}/debian/patches/$patch"
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.2_p25.ebuild b/sys-block/parted/parted-3.2_p25.ebuild
deleted file mode 100644
index fceabd18435f..000000000000
--- a/sys-block/parted/parted-3.2_p25.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools 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/_p*/}.tar.xz
-	mirror://debian/pool/main/p/${PN}/${PN}_${PV/_p/-}.debian.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 static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-	sed -i -e '/atari\.patch/d' "${WORKDIR}"/debian/patches/series || die
-	for patch in $(< "${WORKDIR}"/debian/patches/series); do
-		eapply "${WORKDIR}/debian/patches/$patch"
-	done
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/sys-block/parted/parted-3.3-r1.ebuild b/sys-block/parted/parted-3.3-r2.ebuild
index 20e7c295951b..5cc32e79496f 100644
--- a/sys-block/parted/parted-3.3-r1.ebuild
+++ b/sys-block/parted/parted-3.3-r2.ebuild
@@ -3,24 +3,24 @@
 
 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
-"
+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 static-libs"
-RESTRICT="test"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+IUSE="+debug device-mapper nls readline selinux"
 
-# specific version for gettext needed
-# to fix bug 85999
 RDEPEND="
 	>=sys-fs/e2fsprogs-1.27
 	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
+	readline? (
+		>=sys-libs/ncurses-5.7-r7:0=
+		>=sys-libs/readline-5.2:0=
+	)
 	selinux? ( sys-libs/libselinux )
 	elibc_uclibc? ( dev-libs/libiconv )
 "
@@ -41,20 +41,23 @@ src_prepare() {
 
 src_configure() {
 	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
+	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} )
+DOCS=(
+	AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp}
+)
 
 src_install() {
 	default
-
 	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sys-block/parted/parted-99999.ebuild b/sys-block/parted/parted-99999.ebuild
deleted file mode 100644
index f107e4023828..000000000000
--- a/sys-block/parted/parted-99999.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 autotools git-r3
-
-DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
-HOMEPAGE="https://www.gnu.org/software/parted"
-EGIT_REPO_URI="https://git.savannah.gnu.org/git/parted.git"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS=""
-IUSE="+debug device-mapper nls readline selinux static-libs"
-RESTRICT="test"
-
-# specific version for gettext needed
-# to fix bug 85999
-RDEPEND="
-	>=sys-fs/e2fsprogs-1.27
-	device-mapper? ( >=sys-fs/lvm2-2.02.45 )
-	readline? ( >=sys-libs/readline-5.2:0= >=sys-libs/ncurses-5.7-r7:0= )
-	selinux? ( sys-libs/libselinux )
-	elibc_uclibc? ( dev-libs/libiconv )
-"
-DEPEND="
-	${RDEPEND}
-	nls? ( >=sys-devel/gettext-0.12.1-r2 )
-	virtual/pkgconfig
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-)
-S=${WORKDIR}/${P/_p*/}
-
-src_prepare() {
-	default
-
-	sh ./bootstrap --gnulib-srcdir=gnulib --no-git || die
-
-	eautoreconf
-}
-
-src_configure() {
-	use elibc_uclibc && append-libs -liconv
-	econf \
-		$(use_enable debug) \
-		$(use_enable device-mapper) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable static-libs static) \
-		$(use_with readline) \
-		--disable-gcc-warnings \
-		--disable-rpath
-}
-
-DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
-
-src_install() {
-	default
-
-	find "${D}" -name '*.la' -delete || die
-}