diff options
author | Lars Wendler <polynomial-c@gentoo.org> | 2021-08-20 11:02:06 +0200 |
---|---|---|
committer | Lars Wendler <polynomial-c@gentoo.org> | 2021-08-20 11:02:33 +0200 |
commit | fbcfa09e85551d57abd743a31d48ff53b89ab630 (patch) | |
tree | 9857b389322c1456dd55486a6342a693b2785ed2 /sys-fs | |
parent | sys-libs/e2fsprogs-libs: Bump to version 1.46.4 (diff) | |
download | gentoo-fbcfa09e85551d57abd743a31d48ff53b89ab630.tar.gz gentoo-fbcfa09e85551d57abd743a31d48ff53b89ab630.tar.bz2 gentoo-fbcfa09e85551d57abd743a31d48ff53b89ab630.zip |
sys-fs/e2fsprogs: Bump to version 1.46.4
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/e2fsprogs/Manifest | 1 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 143 |
2 files changed, 144 insertions, 0 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index f2096fcd9d2c..00db6634ad8d 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -2,3 +2,4 @@ DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d 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-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild new file mode 100644 index 000000000000..963bf42ad0c5 --- /dev/null +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript + +DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities" +HOMEPAGE="http://e2fsprogs.sourceforge.net/" +SRC_URI="https://www.kernel.org/pub/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 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +IUSE="cron fuse lto nls static-libs +threads elibc_FreeBSD" + +RDEPEND="~sys-libs/${PN}-libs-${PV} + >=sys-apps/util-linux-2.16 + cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) + fuse? ( sys-fs/fuse:0 ) + nls? ( virtual/libintl )" +DEPEND="${RDEPEND}" +BDEPEND=" + nls? ( sys-devel/gettext ) + virtual/pkgconfig + sys-apps/texinfo +" + +PATCHES=( + "${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 + + 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 + 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}" + $(use_with cron 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 + --enable-elf-shlibs + $(tc-has-tls || echo --disable-tls) + $(use_enable fuse fuse2fs) + $(use_enable nls) + --disable-libblkid + --disable-libuuid + --disable-fsck + --disable-uuidd + $(use_enable lto) + $(use_with threads pthread) + ) + 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 + + einstalldocs + + 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 "${ED}" -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 +} |