gentoo resync : 02.06.2019

2 files changed, 16 insertions, 13 deletions

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0b63fbb56990..ccadd43aa2e6 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -9,10 +9,10 @@ AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
 DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
-DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014
 DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779
+DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
 EBUILD e2fsprogs-1.44.5.ebuild 3915 BLAKE2B 910133a809c3d28f21623a38b1aa4a5ec162298e32360db7cfa8e7a345bb440c0208e47fecc9a57a56eccaf59d2ff0699cf793167cdbb4c59b92acae00199d3f SHA512 bb486fadb929ffe64df5066d3bb5c1a96e604ad17f164ddd06956ca35cfcb2f0283a4e1161ebe4ae5a5aecea5db927a3a48d6215aa24373d91508d05b517f15a
 EBUILD e2fsprogs-1.44.6.ebuild 3863 BLAKE2B 57d1ab60969ce206b11aae22c1c5f214bcdac17a9e741829cc5b3ac105919e68a736f9f2f5263d037965e63a692263b58e5615ce6c14a0c3dd16710d2299bd80 SHA512 ef1981716a3f7495ea68ff8ff2800549f51390eb3f1d9ef037f141fa1e2fbc2bdcc945277456d453dae40e5fea6b092100526cfc8cd750128ebf45920075c149
-EBUILD e2fsprogs-1.45.0-r1.ebuild 4037 BLAKE2B 9003905aa14158acfa765ec97c0865f11248d46c138eda355bde393e1540afad7104dc04d57ea68d70a245bf34a7579871bd204661ef8ef5bbf05ba8f002ae12 SHA512 2d076c6de2451d604629a6bf9b70bb98de5d4ce64116cf2a726f673c0e9c42aa62ea4032c7871caedafc71ae9ebc877826ab7a7d590928aaa90ee81cca25e2dc
 EBUILD e2fsprogs-1.45.1-r1.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
+EBUILD e2fsprogs-1.45.2.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
 MISC metadata.xml 578 BLAKE2B 08094a62570e432f1ed7370d2eb402523f17e7cea8ca1370302b602de949e812e6d277a280be23d0a0f515b6b39ee18d974b1ef0d008d2267fcc4e7bb41ff3d9 SHA512 094625d323bca75af0884ee4d2c1503437a50aa1a323c52e054b49edf890afc0b20f936b2833c82e944b58615996b76e7fc2a502aa87b3c66a385e7698d2d6cf
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
index c87cb951ed5a..c0ce32929e1b 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic systemd toolchain-funcs udev
 
@@ -14,16 +14,19 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="fuse nls static-libs elibc_FreeBSD"
+IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
 	>=sys-apps/util-linux-2.16
+	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
 	fuse? ( sys-fs/fuse:0 )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
-	sys-apps/texinfo"
+	sys-apps/texinfo
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
@@ -69,10 +72,10 @@ src_configure() {
 	append-cppflags -D_GNU_SOURCE
 
 	local myeconfargs=(
-		--with-root-prefix="${EPREFIX%/}/"
-		--with-crond-dir="${EPREFIX%/}/etc/cron.d"
+		--with-root-prefix="${EPREFIX}"
+		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX%/}$(get_udevdir)/rules.d"
+		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
 		--enable-symlink-install
 		--enable-elf-shlibs
 		$(tc-has-tls || echo --disable-tls)
@@ -109,8 +112,8 @@ src_install() {
 	# econf above (i.e. multilib) will screw up the default #276465
 	emake \
 		STRIP=: \
-		root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
-		DESTDIR="${D%/}" \
+		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
 		install install-libs
 
 	einstalldocs
@@ -135,7 +138,7 @@ src_install() {
 
 		# filefrag is linux only
 		rm \
-			"${ED%/}"/usr/sbin/filefrag \
-			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
+			"${ED}"/usr/sbin/filefrag \
+			"${ED}"/usr/share/man/man8/filefrag.8 || die
 	fi
 }