gentoo resync : 24.12.2018

3 files changed, 6 insertions, 71 deletions

diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index f6b18b8406fa..585a3cacce13 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,10 +3,9 @@ AUX parted-3.2-fix-resizing-FAT16.patch 2383 BLAKE2B d680374c1949a1f4f118e67ad5f
 AUX parted-3.2-po4a-mandir.patch 275 BLAKE2B 5342cc776f557c9ef95604eb2c15ad484c4dbf102d4093dcb1d4005f2f6d4f90db2ff0fc3ceae59fd22c3442604b2abbdac48594f860ba810dc4d8dce89d6fc0 SHA512 5ef686f56d8c3939da3f24fdb6196d8858c2f980805f1cb06020d6f6996158f62b8372a233ec3ec98aae30b41034046d615e415b3abf2648db7be88e3b45a872
 AUX parted-3.2-sysmacros.patch 804 BLAKE2B 294094fd79a799d577c2db00569f4be218713b71659654603a299f039939a7b3901ab80aab6cf969fd503712da8a7039e8fd7dac007b164a1f3b7ead4c5596ed SHA512 97c141d623bc52387b3726a164c5191c094cef1b2aa000dbd8e505aab418210d27ad07a59e0433faf001bf12ee1e3729838186fc2bae69ed7a66941364e3b468
 DIST parted-3.2.tar.xz 1655244 BLAKE2B 56608590b26a9b5266dacf3698d990b730bdb35d9374d1da57103fbef3ef5037e40dd2fe0f523ca8e0e75401a3b25cf543e5ca5c94cf410bbaa62ea15d6f0ba3 SHA512 4e37dbdd6f5032c9ebfec43704f6882379597d038167b9c4d04053efa083c68a705196713864451fa9e11d32777e16c68982877945c5efd9ea5f8252cb20e1c4
-DIST parted_3.2-19.debian.tar.xz 87288 BLAKE2B f0cef2978ead9edca3e952849deb36526eea0a050d45ab480b2aa62d02ba0a1750c28e93c28a714df6629f02ccf5a1e4fbb33a6e42b82bf6685c05aeaad1756c SHA512 de3e55545d7d94668eb608c8c31440f550baaf7b664836d199f73f7a8c75bba4ff59b4c06a23459c7d522250d7c03d29fa7f727f7d1a2b1e5a0366e83a2d871a
 DIST parted_3.2-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22
+DIST parted_3.2-23.debian.tar.xz 88152 BLAKE2B 5e69a5799cc909bf54d1dcd1c7a8f7fe5dd7ce46b03957406f4a6118480d5acca3a165cc16b720fd03a89339fcfb46844d470079c4e10a4683e270c9e804c245 SHA512 7f449a24d1ea75a185b5fd589fea73a2f0944f1276288ece2790c5889de6adf8354f94388046a25b2dbf5735759f6010397f140607320a4de348cf77f8c75b09
 EBUILD parted-3.2-r1.ebuild 1503 BLAKE2B c2f7caec38f0d237e93a137a66ad433cb92dd23eeddb398625de2c5c114340136da270229d9e1ac6d9d58e64989481aa14caace6167cafea593c00d9d9801503 SHA512 32f77e24f7b4b986aac5508780121cf32525d2412fb84202a1385a14b453e72661b26cf8700be4d32555d143d9a23284daf3bac0dbba7038047f290d11a68a81
-EBUILD parted-3.2-r2.ebuild 1514 BLAKE2B d7144fc4a68de8e12059a1dc3a771bb633af41c46dee8cb99b38b480fe90d144dd33f090d383b70b8956abf09b4de8fc5853d44ff74f17e8a883a4f22050152f SHA512 cf2898a4c373c4597cbb99cc511527af7382f548a0b7c8b8f3bc3cd6afea6ab3344cf58c37312d5d5eeacdcb937430f27bf20627aeb9e441950c055f0266eabd
-EBUILD parted-3.2_p19-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
 EBUILD parted-3.2_p20-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
+EBUILD parted-3.2_p23.ebuild 1709 BLAKE2B 3fd7151f26bfaaa97cfab4227fef7990a84e73bda333fe974ea5dafd75105062eb78565d0b6bc198dc612c6b68d9bb5a930b38e385ce095b903273c455a152a5 SHA512 63e845feb6c9095b10d4bca9b9e61e530b6cb365420d7c9debe85de28d0d58fd1cace23f79f27724c89e60d17479e76f623d943551ea4d97a593f536b9f9aff7
 MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
diff --git a/sys-block/parted/parted-3.2-r2.ebuild b/sys-block/parted/parted-3.2-r2.ebuild
deleted file mode 100644
index b4561cfee286..000000000000
--- a/sys-block/parted/parted-3.2-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools eutils 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 ~sh ~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
-	"${FILESDIR}"/${PN}-3.2-fix-resizing-FAT16.patch
-	"${FILESDIR}"/${PN}-3.2-sysmacros.patch
-)
-
-src_prepare() {
-	default
-
-	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 \
-		--disable-silent-rules
-}
-
-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_p19-r1.ebuild b/sys-block/parted/parted-3.2_p23.ebuild
index 8547e2cb78ea..b4a1e19a9f36 100644
--- a/sys-block/parted/parted-3.2_p19-r1.ebuild
+++ b/sys-block/parted/parted-3.2_p23.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
+inherit autotools flag-o-matic
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="https://www.gnu.org/software/parted"
@@ -34,7 +34,6 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.2-devmapper.patch
 	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-	"${FILESDIR}"/${PN}-3.2-sysmacros.patch
 )
 S=${WORKDIR}/${P/_p*/}
 
@@ -66,5 +65,5 @@ DOCS=( AUTHORS BUGS ChangeLog NEWS README THANKS TODO doc/{API,FAT,USER.jp} )
 src_install() {
 	default
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 }