[gentoo-commits] repo/gentoo:master commit in: sys-libs/e2fsprogs-libs/

[Lars Wendler]

commit:     f34c6f7085f1ef969801af100af9438267879364
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 20 08:54:58 2021 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Aug 20 09:02:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f34c6f70

sys-libs/e2fsprogs-libs: Bump to version 1.46.4

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-libs/e2fsprogs-libs/Manifest                   |  1 +
 .../e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild    | 93 ++++++++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest
index 49a5287867f..392f1604efb 100644
--- a/sys-libs/e2fsprogs-libs/Manifest
+++ b/sys-libs/e2fsprogs-libs/Manifest
@@ -1,3 +1,4 @@
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 
237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341
 SHA512 
fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 
0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31
 SHA512 
5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
 DIST e2fsprogs-1.46.3.tar.xz 7024896 BLAKE2B 
86f65cf9997f09aa7a27be35b2f38d6385f565de565b1c4cda710dbbea8312312ff77d92beb2b579a3caffa7ce82ee6b2726eb8f97daf41bba46379a94198c8f
 SHA512 
27da6e38d3463e7a283dacfb88a3210dd6d8c63f4d990db879f63bdf503aaa5c447ef0ccc566b71526c12a8ab0a7a6529014b1010be300ad56a6ad5ce9066196
+DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 
473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b
 SHA512 
7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d

diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild 
b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild
new file mode 100644
index 00000000000..41da9ca3221
--- /dev/null
+++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs multilib-minimal usr-ldscript
+
+MY_PN=${PN%-libs}
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="e2fsprogs libraries (common error and subsystem)"
+HOMEPAGE="http://e2fsprogs.sourceforge.net/";
+SRC_URI="https://www.kernel.org/pub/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 ~sparc ~x86 ~amd64-linux ~x86-linux ~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
+
+       emake -C lib/ss V=1
+}
+
+multilib_src_test() {
+       if multilib_is_native_abi; then
+               emake -C lib/et V=1 check
+
+               emake -C lib/ss V=1 check
+       fi
+}
+
+multilib_src_install() {
+       emake -C lib/et V=1 DESTDIR="${D}" install
+
+       emake -C lib/ss V=1 DESTDIR="${D}" install
+
+       # 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
+}