From 3517852e3b8a68d1e997770fc0650c5053bafc6c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 4 Jan 2022 01:27:12 +0000 Subject: gentoo resync : 04.01.2022 --- sys-libs/e2fsprogs-libs/Manifest | 2 +- .../e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild | 91 +++++++++++++++++++++ .../e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild | 93 ---------------------- 3 files changed, 92 insertions(+), 94 deletions(-) create mode 100644 sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild delete mode 100644 sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild (limited to 'sys-libs/e2fsprogs-libs') diff --git a/sys-libs/e2fsprogs-libs/Manifest b/sys-libs/e2fsprogs-libs/Manifest index 27a122f13157..4862c9640071 100644 --- a/sys-libs/e2fsprogs-libs/Manifest +++ b/sys-libs/e2fsprogs-libs/Manifest @@ -1,4 +1,4 @@ AUX e2fsprogs-libs-1.42.13-fix-build-cflags.patch 300 BLAKE2B a6cfc44d27991cb98b1cf94854dabb4bfefd0d44d7605cbca6353b27730dcc37ed65c1d4b35f2b7e5386a607056f7397afbf4e3dadc57efb0e3172a94287f5b7 SHA512 0c0a39a7cdf1930c2c8da0072f935eb02e15ce7a5202990b4ee5458a4ba7a5c1848a7b759e91e32c76f38ea419059179b04ff94fa336cbf77e4ecde55f9dc1d3 DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d -EBUILD e2fsprogs-libs-1.46.4.ebuild 2161 BLAKE2B 6f7bcb58e36d06f3c0fcbe9ad5d0ed63be6b815fb7ad20ed1084f17b9c328ec7ec2672ece06812a97291d0018405f7070aa032d67892133a894e790d3eedb77d SHA512 c1cdcd01d6857317ede20b982d8db869b1c0348f7e0825ad32e498d92fcdaf2187d6482c0278c2d025b91eb1c5234d00e157fa589f2d3f9877970a7b091e87ec +EBUILD e2fsprogs-libs-1.46.4-r1.ebuild 2133 BLAKE2B b7eb174de385458afe76c9ea9428a8975c2baede725f97e99f6cfee3ef70e96e9c4504950fc5fb4e0932a4b762fc792587a2d000d1210c625d674ccc3058793e SHA512 7145e1bea6deff81d89b8c086a0469894863aa6d6d30b9a55cdc74e72bda0b66ee5ee5fae599ecef5c448115ec7a05003c7bc661636ff54b16caffb592f0c958 MISC metadata.xml 463 BLAKE2B 076bfa2742b1e6abbd07bbf94f817aab64fcfa17e9c51314220e02bae2e9a209ebdafbd358e59655b471c25e47dfbe27745a50b0f929f2d640f06409f3e51804 SHA512 faab1a2ea1ddd7d9992fab3131b2a9b70a7f63b81f055856c8fbe9fe3c19a19044d1f2512252b29584914e06b0bc16d8d3ac02a59bc5706ea3509ebe1f65f5ed diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild new file mode 100644 index 000000000000..666389defb2c --- /dev/null +++ b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4-r1.ebuild @@ -0,0 +1,91 @@ +# 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-fs/e2fsprogs-1.46.4-r51" +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 +} diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild deleted file mode 100644 index 722e3a0df067..000000000000 --- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.46.4.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# 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 - !