gentoo resync : 25.03.2018

5 files changed, 141 insertions, 2 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b355f11a80e2..2da8855615ec 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0c8059012cb1..2eca1c574413 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -12,8 +12,10 @@ DIST e2fsprogs-1.43.3.tar.gz 7405892 BLAKE2B 158aeee327a1ca68ce1bda1f97c9fa25ba1
 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.0.tar.gz 7547084 BLAKE2B 32b16453931e33eb21cd42724c7dbe420c21ebdf1650f7eb9b8bc5a1016166e4fd244e97f7dd2c90c934f7244b9cae75bd9d177685b92a9430f29e3349f47b64 SHA512 a084973097bcc806d63b94c106fb22d840a53863c63016d7e0d68094b01679c6985a195e5f7983cfeb356e0a45636a52d6c444af30275c4c42c49c1d94663fed
+DIST e2fsprogs-1.44.1.tar.gz 7534979 BLAKE2B 1d1dcdfebca41d62bb15e0b0464bcfc848b8c1379f89987f91a59093d497536ccd5e80be67419cad05daf694be1629774f881d026ef834e3a61b00dc64f3543b SHA512 acd612a5146e4a07aa7ab3ef1b38c3ef3f27120f65c519dd02d44e48e5814c86d013315eb30c4f08edecaef6f08f0ec0b91fa133ea9dbd769ee29be3f2ae17c9
 EBUILD e2fsprogs-1.43.3-r1.ebuild 4042 BLAKE2B 9c30738f57c6d066f85eab86b74fd56253a56d1c00d88f40fe95301f51869ed68ecb31f002f44c079b10f4758c9cab09f41ddab3513e26c7d599aa5394c77448 SHA512 8f45b073d5684401e28b44decfa841a0a1ca778a6748081e1f07a3a903220c46a24fc7d5fce4d4e2ecb89bb3dcf54eee7a7b6e581534aaebd88dd2f1b91f16dc
 EBUILD e2fsprogs-1.43.6.ebuild 3796 BLAKE2B dda1c06831a1bae190689363561d34a653b51723dd14be8f910c43e77a58ab9aff566eaaae22879c499c1da7a34c72051b3839538b794f8f9d56fe90aa406aa4 SHA512 bebd95aafb0246723b6228ab3152e438a08c8d6a55f988e822cdb989d688a6b69bae1423ce2a5480c631461f00552d65dbe0420fcc094895ee70b809bcfa1dea
 EBUILD e2fsprogs-1.43.9.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 EBUILD e2fsprogs-1.44.0.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
+EBUILD e2fsprogs-1.44.1.ebuild 3827 BLAKE2B 71bb5aef6c6f5ab2b1fc288821cdeab9f4ba067e481a80115042fd9c2624082a6b9a1dc8fa399071cf85937a451d47ffe007e46d51ab03742bb5fda266ee23e6 SHA512 89086e25c804f89bdd84a870c28e90dd7bb32de1cc4a891fb58f08c3566a53dafada3d65814612e7c0b1d1a34d8ee41de883037da00127a1bc7d769ae47bd9ab
 MISC metadata.xml 520 BLAKE2B 3e908938de1132b5cde97c6b51b40f72c03e91301b54c14339379d2e2380414dd33096a87d64ff2fc7d886cd65fb16b9c16a376b7338c826f44917860f380be2 SHA512 a5ff91610ed175147f1a9c2c725a30380908c02fc04c6b7df2792cb4fd805f9137374d2a910e456128a7bf2fec9e83af3063bcb5f2ad51394bed8bed648e3905
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild
new file mode 100644
index 000000000000..76d036d2679c
--- /dev/null
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.44.1.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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
+
+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
+	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 ~arm-linux ~x86-linux ~m68k-mint"
+IUSE="fuse nls static-libs elibc_FreeBSD"
+
+RDEPEND="~sys-libs/${PN}-libs-${PV}
+	>=sys-apps/util-linux-2.16
+	fuse? ( sys-fs/fuse:0 )
+	nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+	sys-apps/texinfo"
+
+S="${WORKDIR}/${P%_pre*}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
+	"${FILESDIR}"/${PN}-1.40-fbsd.patch
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+
+	# Upstream patches (can usually removed with next version bump)
+)
+
+src_prepare() {
+	if [[ ${CHOST} == *-mint* ]] ; then
+		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
+	fi
+
+	default
+
+	# 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:' \
+		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
+		MCONFIG.in || die "muck libs" #122368
+	sed -i -r \
+		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
+		Makefile.in || die "remove subdirs"
+	ln -s $(which mk_cmds) lib/ss/ || die
+
+	# Avoid rebuild
+	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
+}
+
+src_configure() {
+	# Keep the package from doing silly things #261411
+	export VARTEXFONTS="${T}/fonts"
+
+	# needs open64() prototypes and friends
+	append-cppflags -D_GNU_SOURCE
+
+	local myeconfargs=(
+		--with-root-prefix="${EPREFIX}/"
+		--enable-symlink-install
+		$(tc-is-static-only || echo --enable-elf-shlibs)
+		$(tc-has-tls || echo --disable-tls)
+		--without-included-gettext
+		$(use_enable fuse fuse2fs)
+		$(use_enable nls)
+		--disable-libblkid
+		--disable-libuuid
+		--disable-fsck
+		--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"
+		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
+		die "Preventing included intl cruft from building"
+	fi
+}
+
+src_compile() {
+	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
+
+	# Build the FreeBSD helper
+	if use elibc_FreeBSD ; then
+		cp "${FILESDIR}"/fsck_ext2fs.c .
+		emake V=1 fsck_ext2fs
+	fi
+}
+
+src_install() {
+	# need to set root_libdir= manually as any --libdir options in the
+	# econf above (i.e. multilib) will screw up the default #276465
+	emake \
+		STRIP=: \
+		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
+		install install-libs
+	dodoc README RELEASE-NOTES
+
+	insinto /etc
+	doins "${FILESDIR}"/e2fsck.conf
+
+	# 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 :/
+	if ! use static-libs ; then
+		find "${D}" -name '*.a' -delete || die
+	fi
+
+	if use elibc_FreeBSD ; then
+		# Install helpers for us
+		into /
+		dosbin "${S}"/fsck_ext2fs
+		doman "${FILESDIR}"/fsck_ext2fs.8
+
+		# filefrag is linux only
+		rm \
+			"${ED%/}"/usr/sbin/filefrag \
+			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
+	fi
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 26010981e99c..82e8081948da 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -16,7 +16,7 @@ EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb
 EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a
 EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
 EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
-EBUILD udev-236-r1.ebuild 10183 BLAKE2B a2830dae74165b5d7e86cbf60de0c9e621ec0606369661d911ccceaaf2c794ada11aca457ae83cca388957f6fbf03604fee0fab3e74f4c6a3f8cfedc0f9ea115 SHA512 c304ab971260823bf409563f695ddf943af68b4746f67384281ff9ffcf5d5c9205a11db859964c15956ac1b42d0f64775f4f87006710586b149c0f0a501eee28
+EBUILD udev-236-r1.ebuild 10182 BLAKE2B 60bf63b4ac4a5aae260ebbb7086fb238cb9f7c75abf9300a819bd4925c22858d4fb1b77e556eadf645d58cbee085d391e36dbfe4aac0aa72bf195624a8374e6f SHA512 4384ee213525ef707c0225a3c7fabe2c726ee9660d5db20990583ea029676c51820f1fd21916c31ecbd402dd1cf798ce772d1827fecb4164ee3ecfda9374a82c
 EBUILD udev-237.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
 EBUILD udev-238.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
 EBUILD udev-9999.ebuild 9737 BLAKE2B 0cb90c1e3f0fcc92a82d12191cbf4c69cbe2ca853e31dda0fc904f40d7ea8b5d9ad25ed6c43c1177a7d80d2b018d800fcbac5d2fdd2b6f33fa3d015f782297e8 SHA512 d03d4fc06b24964ac7cb6de2f5847f22566605934788e612fe186cac76660947e75a7f23d2000929fe061af75878d423c52776846fa9c3e4b49ea4f10c35fcd4
diff --git a/sys-fs/udev/udev-236-r1.ebuild b/sys-fs/udev/udev-236-r1.ebuild
index 6817f1b99076..5ba8936e6fcf 100644
--- a/sys-fs/udev/udev-236-r1.ebuild
+++ b/sys-fs/udev/udev-236-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz"
-	KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"