gentoo resync : 13.10.2019

3 files changed, 8 insertions, 23 deletions

diff --git a/sys-block/parted/Manifest b/sys-block/parted/Manifest
index c41ee9fd1346..567e439d9400 100644
--- a/sys-block/parted/Manifest
+++ b/sys-block/parted/Manifest
@@ -3,12 +3,12 @@ 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-20.debian.tar.xz 87496 BLAKE2B 4409826b35b42093f16f80b1ab2f41b4caf2264c9dcfe9572fa1ddf5f51eeffa2208fc187bd7a98290ee2df92604928eae84fd2fdee78d688ec19e81f8b9efac SHA512 83f14befdd7d048976572b3e2eebfaa42649458cbcfd659db704737dce991980ddb2bc65013c5b31b04a17fc17fb756da0dda76edbcba93708afca34c56e0d22
+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 1503 BLAKE2B c2f7caec38f0d237e93a137a66ad433cb92dd23eeddb398625de2c5c114340136da270229d9e1ac6d9d58e64989481aa14caace6167cafea593c00d9d9801503 SHA512 32f77e24f7b4b986aac5508780121cf32525d2412fb84202a1385a14b453e72661b26cf8700be4d32555d143d9a23284daf3bac0dbba7038047f290d11a68a81
-EBUILD parted-3.2_p20-r1.ebuild 1740 BLAKE2B fb283538a1fb4bff9efc65fc1fdbad622288dbec7f18c0b5c81ec05a96c7c321fed34d1f6fc3aa3d306638c55cb6167e590875e68c74b0c63b3866d02722f3f5 SHA512 90378164b7d0d4d4b7f0cb71c589860d592fcbc7cc4199914287c00d0ebd36b9bdc7d3a8e1e0782ec29962df4f9993c050347b4a3c3dd8aa7ba21a48d4c13b2e
 EBUILD parted-3.2_p23.ebuild 1708 BLAKE2B 0e7fe667d2a5abf26d22c5565eab5d844ba5ee88c33fb3a114e1b53374b070c917c02f3a3559eca3fac48455075cec394a4cdb9ba3c856c3a038be1a1a81fb64 SHA512 8359721e7f4fc1df27168f596d3101910fbad078d43a4c8139d318d5630f451a8a96c229241f312b7465385b5bf34e46f16ef0626d6122f8678ab347c08f831f
 EBUILD parted-3.2_p25.ebuild 1709 BLAKE2B 99b89316a52c01528ddc7e51b9cd3415945c1e4a79bd6669b5c3abb161d7edb3607db4d6814d8f1d81894eef364ce6d71105c009dc6c1231c49ddf1a3ec5b0c2 SHA512 afd60957fe6cf5d5cd9900128fcded9c7910b2288beb14129d0a4987950ce926b5506ecdec8502d8c906b2e66539d1563aa551a7b3e4c0da86f771c258b48972
-EBUILD parted-99999.ebuild 1447 BLAKE2B ec61ea53abdf1d4a7d6575269b02e832fe21e5721677a79cfae9157395ef98a43a8f29328a17bc3f165c1fbfdef1316569afe4091934b1c5b83d02ea67ff8250 SHA512 622b3d39d9f7c88de9c29f7216d2149c45b881c669e2cdfd4c6910c4f2940c8dc8fffbb5c51b6c77007551c562a4b0df2a6c981c9649b7e53985cad153c0f677
+EBUILD parted-3.3.ebuild 1322 BLAKE2B 9956c9f5a1b368c6b747ec7b7b818ececc4be5a6b0f41a859e6f8d1093ce3b29876d1ddab30128872a5b885c1142aad53e378800f9d4c25448a5e5de053d82e0 SHA512 a43ca5c881ce2e89f51463ad3b906265292b853d1120e76698a774ecfa59938dc0a37021340a2552adb704d72c6611af2714a4128802e45391c6f503b99cb826
+EBUILD parted-99999.ebuild 1434 BLAKE2B 9f3244f06da51245e21f7931888c9358f564fede3b3332c8c47f5aec5ddaff97419a6197d11baa0ebc79671f6604707d7e47f11046c658c95523dee79e09c2eb SHA512 4c4415068e0a4dd5ff10f583e6314b542efef47437460c9dd7fee3ef19c0b29a4048d4d8f655964e90e953dcade09be240e289558992ff8594206d493c67bd75
 MISC metadata.xml 754 BLAKE2B 6bf44d26295c82c00691f9ba11e114f43c2674e98b1a0f332280e2753c08aeeb5b5a402c2288e9f0c654d4d91be1ed20810eb4b19cf277b76d326423ee6b19a8 SHA512 b5ced0310e8a606de46a5a2a690d7a549c5528eb843616621486db93a9fc45266eafbcbacc90d38d8005cd0366fee671705fc98c54c79bf0b3519d182d15c184
diff --git a/sys-block/parted/parted-3.2_p20-r1.ebuild b/sys-block/parted/parted-3.3.ebuild
index 8547e2cb78ea..aa855d377c10 100644
--- a/sys-block/parted/parted-3.2_p20-r1.ebuild
+++ b/sys-block/parted/parted-3.3.ebuild
@@ -1,14 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools eutils flag-o-matic
+EAPI=7
 
 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
+	mirror://gnu/${PN}/${P}.tar.xz
 "
 
 LICENSE="GPL-3"
@@ -32,21 +30,8 @@ DEPEND="
 	virtual/pkgconfig
 "
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2-devmapper.patch
 	"${FILESDIR}"/${PN}-3.2-po4a-mandir.patch
-	"${FILESDIR}"/${PN}-3.2-sysmacros.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
@@ -66,5 +51,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
 }
diff --git a/sys-block/parted/parted-99999.ebuild b/sys-block/parted/parted-99999.ebuild
index a3d6fcc40698..a4bb63aa3d01 100644
--- a/sys-block/parted/parted-99999.ebuild
+++ b/sys-block/parted/parted-99999.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools flag-o-matic git-r3
+inherit autotools git-r3
 
 DESCRIPTION="Create, destroy, resize, check, copy partitions and file systems"
 HOMEPAGE="https://www.gnu.org/software/parted"