gentoo resync : 19.03.2019

5 files changed, 47 insertions, 30 deletions

diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index a825d85c19b9..8453edc151b9 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -3,15 +3,16 @@ AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa1
 AUX e2fsprogs-1.41.8-makefile.patch 317 BLAKE2B 89f393fd0b09e853158707aa6ec7f803c8938138666459df6a2bbc1cc5e86ac107db67b40ffbd7b12694de8eb22863b6c910b6e192f42e07939c0206b248e627 SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
 AUX e2fsprogs-1.44.4-fix_make_install_for_subset.patch 2168 BLAKE2B 041a3ce097186d8cbad480157c2bcf686d83218cf90bf7dc419e6f709e1557955b26dfc18a30586644497364289f3266626efcb2e7765d8d53fd639ff0a9785a SHA512 f6fa19fbe5dc1ed9adae421bd371d4cad7f52b250eedad1c47883a00ac6aa7061530df3d5928d0f4cfbcd2af0d9c457c4ab1fa460c9e43df323d1db052934724
+AUX e2fsprogs-1.44.6-parallel_install.patch 317 BLAKE2B a57666bebbbfdd9933112b027eb48aef6702514c835b0e5ce493957c6db7d6dd5570734a28415f27a874e54429e169e79b6895d4cfb69de1fb91fb2000f0245d SHA512 4b6b51d93cd2c84facd88174312522443822232f8f2259492dcb0e9d52b27d6a5bb6c2b874f50de53b0c127dd3df3cb86610e7f3615986851d8f743922e8dce0
 AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0
 AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
-DIST e2fsprogs-1.43.6.tar.gz 7466907 BLAKE2B 6c19c686432b7990900b239c4a1b3b6675b085ca7adfdb4323d1253ee8c83f22f87f67b0b4a843e48cb71322b1a7454b3ceab669f875b71b967e96054a55f1ac SHA512 95e3e7def177de921d3204aeace4cb8243d79872468d3289cace0547798c84e92af253022deb803cd8c045411283b01431728a86b14b9e8b45cdd5dca739db66
 DIST e2fsprogs-1.43.9.tar.gz 7470878 BLAKE2B dcc1a6fda87884a0b3b1d49f4116be060bf39c4820246ba6aa7ce61c6735415542f852b36d3c809b2b52782de2ca9ea9a87086a0d4ff71ee217845939aae00f1 SHA512 7bdc5da165b14e6779aedd9243175018ca8cb2bb0f5aad9c3d04f7e0619da2107f37929e6d8027b682145801106f97d1376345c4c30ce64f2b02b716b0c4ba3b
-DIST e2fsprogs-1.44.4.tar.xz 5363496 BLAKE2B 8c7216bd63dbba0660c7383d6ed068be0a7016b50235d22f855283bb57d3355a3ea5bfa47294b71b67fcc5d4af28219abeb9cf4a6429595a43680d3d787bdf1a SHA512 52e39565dee30997b9c245b5d8791844067a903a570082f3a5ff9d9ef96624535322617bb21029056c88259fef46416eb1181bd7aec419e64fc021830887ec8f
 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
-EBUILD e2fsprogs-1.43.6.ebuild 3781 BLAKE2B b68206959b716f2f7018da95f2e7872bdab4dd1ba554d83fc089ad5dead7e2e51b5c7a3d67669083bbe7f8d67c5b45919439a2560d95a4de3dcc217dd4bdbe1a SHA512 71ce74750ec162caac3d07602cc011ac0ed429723f8aca43d4f4918184cb3ea9a4ae770e834ab46ba2dacf351cf5288463b05b36c66f90d127cbe50452c7a727
+DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
+DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014
 EBUILD e2fsprogs-1.43.9.ebuild 3804 BLAKE2B a110adfe131292172510d7133d8c4266742c54cc3a3aad3959375d966672d462d2761561b79a2f952c6f4ed2b3004bc7abbc0ef90a6d44e8b89203a0df96cd09 SHA512 143bdfe5f8dd353782e84e3c0b9955127eab10aa7fa07e6c024656282225ec5ba30880d1fab61e249010d5192b2d546278694f0b951138500fb1a6ac3ee70a6d
-EBUILD e2fsprogs-1.44.4.ebuild 3857 BLAKE2B 3e9e55635efdb8a463a760bb0eac8c602b3d474e936d8b8aee6c56a950d33a14d30bb3f47b1ef1ef9762ff1db019a9495e7d970f72ccde2dda89c9429ad9f3af SHA512 a7f0441b1cd0fbb2f3c0a06b9b4ea831c97eaa36516bf5b205d65e7212d6e1b0312c64b89d2f72076bc580a5cfe9775bb0b237e6b76bc6de5d54de03ecae8fe1
-EBUILD e2fsprogs-1.44.5.ebuild 3917 BLAKE2B 249b8d037c3cb4c841333bde3ad135aef7cc1c6c527d2c3dbdd7d43a74c3b5ca5935ad4763520e32e9d066b27a0492d461eef6756af7d6276f7a60c24f173ee2 SHA512 59a8782f172933fa21c0edf85d84cf52e39e2c624c384774d8739fc843023bb642063d3b1c10b8188b2d0385815104f48a22417bfd4fbc053916eb3697b70d49
+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 4030 BLAKE2B c151ea7ca9e33336aaf833a51797eec5d39c884ebc372a36b25b2a24cbeacd8e068c73f19c88f471df3d8965862751b348ee4ac805234544359b9b85bfddd13f SHA512 daf0be5cfcc48babfd113ae0bb41f8d4c0b3ce2f9808820f7e74f88a4cb56d18b91c5a35b4945ffbf76aff5ebb0c91b9b74401e9a4275f95a4f545d2fa256dfd
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
index 354b504f090a..78f00a2c0a26 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
@@ -13,7 +13,7 @@ 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 s390 ~sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.6.ebuild
index 256963ab46d1..8dc1b6efbfd7 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	sys-apps/texinfo"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	"${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
 	"${FILESDIR}"/${PN}-1.40-fbsd.patch
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
@@ -121,7 +121,7 @@ src_install() {
 
 	# configure doesn't have an option to disable static libs :/
 	if ! use static-libs ; then
-		find "${D}" -name '*.a' -delete || die
+		find "${ED}" -name '*.a' -delete || die
 	fi
 
 	if use elibc_FreeBSD ; then
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
index 92b21222d8c5..4b80e4691fa6 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.43.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
@@ -1,24 +1,19 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="6"
 
-case ${PV} in
-*_pre*) UP_PV="${PV%_pre*}-WIP-${PV#*_pre}" ;;
-*)      UP_PV=${PV} ;;
-esac
-
-inherit eutils flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic systemd toolchain-funcs udev
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${PN}-${UP_PV}.tar.gz
-	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${UP_PV}/${PN}-${UP_PV}.tar.gz
+SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
 	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
@@ -30,10 +25,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 	sys-apps/texinfo"
 
-S="${WORKDIR}/${P%_pre*}"
-
 PATCHES=(
-	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	"${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
 	"${FILESDIR}"/${PN}-1.40-fbsd.patch
 	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
 
@@ -47,8 +40,13 @@ src_prepare() {
 
 	default
 
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+
+	# Get rid of doc -- we don't use them. This also prevents a sandbox
+	# violation due to mktexfmt invocation
+	rm -r doc || die "Failed to remove doc dir"
+
 	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	rm -rf doc
 	sed -i -r \
 		-e 's:@LIBINTL@:@LTLIBINTL@:' \
 		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
@@ -71,9 +69,12 @@ src_configure() {
 	append-cppflags -D_GNU_SOURCE
 
 	local myeconfargs=(
-		--with-root-prefix="${EPREFIX}/"
+		--with-root-prefix="${EPREFIX%/}/"
+		--with-crond-dir="${EPREFIX%/}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		--with-udev-rules-dir="${EPREFIX%/}$(get_udevdir)/rules.d"
 		--enable-symlink-install
-		$(tc-is-static-only || echo --enable-elf-shlibs)
+		--enable-elf-shlibs
 		$(tc-has-tls || echo --disable-tls)
 		--without-included-gettext
 		$(use_enable fuse fuse2fs)
@@ -84,6 +85,7 @@ src_configure() {
 		--disable-uuidd
 	)
 	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
+
 	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
 		eerror "INTL sanity check failed, aborting build."
 		eerror "Please post your ${S}/config.log file as an"
@@ -107,10 +109,11 @@ 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
-	dodoc README RELEASE-NOTES
+
+	einstalldocs
 
 	insinto /etc
 	doins "${FILESDIR}"/e2fsck.conf
@@ -118,8 +121,11 @@ src_install() {
 	# Move shared libraries to /lib/, install static libraries to
 	# /usr/lib/, and install linker scripts to /usr/lib/.
 	gen_usr_ldscript -a e2p ext2fs
+
 	# configure doesn't have an option to disable static libs :/
-	use static-libs || find "${D}" -name '*.a' -delete
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
 
 	if use elibc_FreeBSD ; then
 		# Install helpers for us
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch
new file mode 100644
index 000000000000..576291531922
--- /dev/null
+++ b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.6-parallel_install.patch
@@ -0,0 +1,10 @@
+--- e2fsprogs-1.44.6/Makefile.in
++++ e2fsprogs-1.44.6/Makefile.in
+@@ -72,6 +72,7 @@
+ uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
+ 
+ install-libs: install-libs-recursive
++install-libs-recursive:: | install-shlibs-libs-recursive
+ 
+ uninstall-libs: uninstall-libs-recursive
+