gentoo resync : 18.05.2019

3 files changed, 96 insertions, 72 deletions

diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index cb43ed98bfc4..86f8e1f450fc 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -2,9 +2,9 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b
 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-libs-1.43.9.tar.gz 595452 BLAKE2B 2f4c8b07abe343f304f3217984ec03a38dca2d69765d7e9edef184c5b478fb0aa860fb0338a41e9d2d47c55780b0e44450efbe2528110403a77696af9e0c9d7c SHA512 c4b78000ace629a7e6f12d7c63f5ff36885bc7ba69a22654f95fd384bb347f0f28ba544644b40cdcbf14ec211e724901fbe44cc2b730f2dafba77632b3e2d0b1
-EBUILD e2fsprogs-libs-1.43.9.ebuild 1855 BLAKE2B c76037365439d40f9bb1f00c25149d124804897e46c90484d9661a71592559c727b7e2e1af526d7b5cce68ecb70bcf6fd99037548728598629dd9ab323d6649b SHA512 2f007b3f188fcafee57bb2631649991546fa247046341c4f3d50d9605180efbea87e1c03a7d7b3b39491d02e7fb59dc71034fe60f0697cda8ebfb13fa478db3d
+DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779
 EBUILD e2fsprogs-libs-1.44.5.ebuild 2407 BLAKE2B df567fb7e16ded48f10d8935c50eff9d373534f11e05a69372a22883508260a2e2e07290492bea45e92fbd8e812a292671edb95dec284c59d52ce3903435fcef SHA512 7605db691d49a09a1c8e4dcde6f2d225d186c4f61f45f51ae0fd4d43cd7c87e185a17ef80a4530f193eebe96948d47eafe83225b0aafe01492fa6b5e8aa1c1fd
 EBUILD e2fsprogs-libs-1.44.6.ebuild 2420 BLAKE2B 430914024959439be78ee6af7b01ac99746b429d008fc7685f7d26dbbadcc5f38635dce816c88cc412f79bcb59d6ec1740c251d6218a0ff3d969b721190a3755 SHA512 55fa21281b36e66c4442be12003ccfafefddffa879caa2ba92c237d8541499feae5aedf0fbcde2a7ed4236adc70c0946d16e3022de99c9da2ec956f7436a6d88
 EBUILD e2fsprogs-libs-1.45.0.ebuild 2427 BLAKE2B 3ca84a4cfe53fdb3545f0b153083f884513023adb49c8dd6ce99f79f777c1d5bdb6ec820b0d9e2cfa270baec141018733b55adbbbb0c59be430cdf005c3af2f7 SHA512 c971d649eaae767938cc7e2888163688b83b291b2005f35a25d68b6827adc5c12abb20384867b697852492564ecce7cf235541dcfda69ddff56e7930633b94d8
+EBUILD e2fsprogs-libs-1.45.1.ebuild 2420 BLAKE2B e6f6bc56eabb36eca2c030fd2237bd7be695206b85ad445ea7b1e0ab047f6469de2c2b0b781a2d481bb12c30a119156210160add9abc68de7df3eec8fc56b3d5 SHA512 8c02c7ff1f7b6148e298ff2c2043eb49027a0d55ced0a9c7bb2be49151b61747da3a9d7bd4ac6ecf469e9f3ebd90077684c57f39fab8e57bbc02ca8d7f92e07c
 MISC metadata.xml 329 BLAKE2B 03dc6edded63d4d10b064515402e963a4770ffc36e17de351d5617849ea138796e4bf20c7feb383cc8ca3a88fba1caaf68b5411241a2558db832f9b659193644 SHA512 39e1ddf508b648594e45cd4e72a41997ab4ae7b5cfdefa136a18a1e68ac5a2bfb1f6a12328f1faee5501fbeff0c61cd91417de717c4869f530a18a05ea5d4c71
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
deleted file mode 100644
index bb3a3ded02e3..000000000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.43.9.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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 toolchain-funcs eutils multilib-minimal
-
-DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
-IUSE="nls static-libs"
-
-RDEPEND="!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41.8"
-DEPEND="nls? ( sys-devel/gettext )
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${P%_pre*}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-)
-
-src_prepare() {
-	printf 'all:\n%%:;@:\n' > doc/Makefile.in # don't bother with docs #305613
-	default
-}
-
-multilib_src_configure() {
-	local myconf=(
-		$(tc-is-static-only || echo --enable-elf-shlibs)
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-	)
-	# we use blkid/uuid from util-linux now
-	if use kernel_linux ; then
-		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
-		myconf+=( --disable-lib{blkid,uuid} )
-	fi
-	ac_cv_path_LDCONFIG=: \
-	ECONF_SOURCE="${S}" \
-	CC="$(tc-getCC)" \
-	BUILD_CC="$(tc-getBUILD_CC)" \
-	BUILD_LD="$(tc-getBUILD_LD)" \
-	econf "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	emake V=1
-}
-
-multilib_src_install() {
-	emake V=1 STRIP=: DESTDIR="${D}" install || die
-	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
-	# configure doesn't have an option to disable static libs :/
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-}
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.1.ebuild
new file mode 100644
index 000000000000..79ee32709eb3
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.45.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal
+
+MY_PN=${PN%-libs}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/"
+SRC_URI="mirror://sourceforge/e2fsprogs/${MY_P}.tar.xz
+	mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${PV}/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND="!sys-libs/com_err
+	!sys-libs/ss
+	!<sys-fs/e2fsprogs-1.41.8"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
+)
+
+src_prepare() {
+	default
+
+	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
+}
+
+multilib_src_configure() {
+	local myconf=(
+		--enable-elf-shlibs
+		$(tc-has-tls || echo --disable-tls)
+		--disable-e2initrd-helper
+		--disable-fsck
+	)
+
+	# we use blkid/uuid from util-linux now
+	if use kernel_linux ; then
+		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
+		myconf+=( --disable-lib{blkid,uuid} )
+	fi
+
+	ac_cv_path_LDCONFIG=: \
+	ECONF_SOURCE="${S}" \
+	CC="$(tc-getCC)" \
+	BUILD_CC="$(tc-getBUILD_CC)" \
+	BUILD_LD="$(tc-getBUILD_LD)" \
+	econf "${myconf[@]}"
+}
+
+multilib_src_compile() {
+	emake -C lib/et V=1 || die "Failed to build libcom"
+
+	emake -C lib/ss V=1 || die "Failed to build libss"
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		emake -C lib/et V=1 check || die "Failed to test libcom"
+
+		emake -C lib/ss V=1 check || die "Failed to test libss"
+	fi
+}
+
+multilib_src_install() {
+	emake -C lib/et V=1 DESTDIR="${D}" install || die "Failed to install libcom"
+
+	emake -C lib/ss V=1 DESTDIR="${D}" install || die "Failed to install libss"
+
+	# We call "gen_usr_ldscript -a" to ensure libs are present in /lib to support
+	# split /usr (e.g. "e2fsck" from sys-fs/e2fsprogs is installed in /sbin and
+	# links to libcom_err.so).
+	gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid')
+
+	if ! use static-libs ; then
+		find "${ED}" -name '*.a' -delete || die
+	fi
+}
+
+multilib_src_install_all() {
+	# Package installs same header twice -- use symlink instead
+	dosym et/com_err.h /usr/include/com_err.h
+
+	einstalldocs
+}