summaryrefslogtreecommitdiff
path: root/sys-fs/e2fsprogs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2025-01-23 06:45:02 +0000
committerV3n3RiX <venerix@koprulu.sector>2025-01-23 06:45:02 +0000
commitc78477d222e1ceb9516a9bbbadbba0b5c1ce11db (patch)
tree5187cbad4740387edb2c1cca0942036a0fdccd88 /sys-fs/e2fsprogs
parent564687d289b862b8b079569a45a2d39d7b8c3585 (diff)
gentoo auto-resync : 23:01:2025 - 06:45:02
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r--sys-fs/e2fsprogs/Manifest3
-rw-r--r--sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild170
-rw-r--r--sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-parallel-make.patch68
3 files changed, 0 insertions, 241 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index a3e86f2bb0d6..65b8a3c39ea7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,12 +1,9 @@
AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef
AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
AUX e2fsprogs-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch 1140 BLAKE2B bd454a4cf073db6e2e102ad814065e3a0c9a81282db932a2259a615417a9dea5879e53ca6d4bd41537147e7706edc88ecbd06ad71dc57305e8b0b835c2b15ae9 SHA512 90afefd47bbec59537cd646515dc320eac7b6e0f89ce5100b0d518d2386f8f57f84cf182f62130a7530e9a78132fc971e3195f4cef1836a8175261ddb1beaf11
-AUX e2fsprogs-1.47.0-parallel-make.patch 3491 BLAKE2B b3848202f038cc86a07e784bfeff266096f241e38cd96eec176aa05423cc1286b30b879b202bec103851c3b59394ea4f894b03e1b4868dd035fb47679f984cc3 SHA512 08764ccb47b8790c390f47440082ce0dcd844bb3bddada647c63cc176d3daab29f8815380ddb65ed8a60b91b6a5af9c0bc32d32029c39b2c2c996a6026992121
AUX e2fsprogs-1.47.1-c23.patch 1293 BLAKE2B 9c297e1c99c9f3b071286223ecdf20a7d5f40aa3705a4e652a4d725831e7270d3a76aa225fc9b1e76a9573509604eb563ad879a4e249849e31b1324209de09c4 SHA512 2818e1e93295231490fcd18478eb14be80a509de435baeb39c87a6c63ed53593624e0dfdc77ed76a448abaafae0f7f6d51422fcbc5fca2f71c7ad3b376e8a4c3
-DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
DIST e2fsprogs-1.47.1.tar.xz 7271444 BLAKE2B 67924c38a6b688e0db5ee77b0e11a8b34ec602a729d48516668e9fdf7f36964c8a9369295f0313bfacdc8e5f3f5a27d79a8d99a1aca3b4fe0ced98a4db4884ea SHA512 2ac51f7654a44adf3ee5a5e32cecd7f129e423bdf3074c60b22a7acdba131e7dd0bb2964c107a06ae133f51836272be166f5da1f996f67ceb6c22e2636117beb
DIST e2fsprogs-1.47.2.tar.xz 7299932 BLAKE2B 20f93b53c18396dbbf8a9564fd80181e391120554bd63a76c90c88d32616596fb7cf8e1252417b835ef3918ecf3211aebdd7a75daebee11bcb6e7b0f9bd88053 SHA512 a32632e072e535bf164503cf9992a4da7ea971e80f8f84ead4e7bc8899a92c27e4670bdebef1de0187596672e44af7b96078888e0cd4eefa3e3f551344d434d8
-EBUILD e2fsprogs-1.47.0-r3.ebuild 4455 BLAKE2B d7e9e8db1092f3fe831694282f768233e53665f7879eb29bf445a1f36e2ca6fc468cbd5e0bb8447ce40ccce7f0bedc5a1fdd49c1b9933395b608bcf496b663b7 SHA512 beeb0dcca050765f805b9f8f53badac4c8a2d32d076581ae8b775195abe33a82c4291384922185060a3d071d670968db8b18de3498299580aed3b08acef28afe
EBUILD e2fsprogs-1.47.1.ebuild 4673 BLAKE2B 2c4b56e3067dc5134f2cf5e5af08dc6ae7a0187efc3004a03a040c33f324fa5347f0a75d712cf54a8203a33d7f53aebedee54e487ea43ee721b26de48a9d2ad1 SHA512 e53757aef306901431810284bd08fd1ab4288bd4a8c32bf6edfc7f71e03c83815f26a4981faa0cc891dc38893444436a58a1e1b93dc8fcb51deae689abd63222
EBUILD e2fsprogs-1.47.2.ebuild 4643 BLAKE2B 4817ffecc875ab52890cbfb17ae22aaf6384eff11c7f16be131cf073b16df66bbee42300ccbf58c3ab756777802498ebec337c8eb7615107f5da164a3b9627a1 SHA512 c1e051d5d9aea7c1482dc8cfa8db658e6cd6db55e7ef970ed4d70f93cb172465af5d87e1a580efe6b64df0fe9c75c23a8a73419a2540006e6a9bc291d4b25812
MISC metadata.xml 870 BLAKE2B bf57e8f24b302ed91357fb10dbc9b15656002983281fd287ee241a9a097d00e6af56d4a42de4109728dbb826ea58e58eba26ec1840299e43f7728495b1a133f4 SHA512 fa0ea6b3db855719976d3c627dcf88f62cf7fdacc132686ea06bcdfce03bb9ccef035d9aa674fc43844a0a111198c34921016183966be5f887aabed06bf0f369
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
deleted file mode 100644
index 3450bc2f5860..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev
-
-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"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="cron fuse nls static-libs test +tools"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- !sys-libs/${PN}-libs
- cron? ( sys-fs/lvm2[lvm] )
- fuse? ( sys-fs/fuse:0 )
- nls? ( virtual/libintl )
- tools? ( sys-apps/util-linux )
-"
-# For testing lib/ext2fs, lib/support/libsupport.a is required, which
-# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
-DEPEND="
- ${RDEPEND}
- test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
-"
-BDEPEND="
- sys-apps/texinfo
- virtual/pkgconfig
- nls? ( sys-devel/gettext )
-"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/ext2fs/ext2_types.h
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
- # We can drop this metadata patch after 6 months or so to let initramfses
- # upgrade. See bug #904093 and bug #904048.
- "${FILESDIR}"/${PN}-1.47.0-disable-metadata_csum_seed-and-orphan_file-by-default.patch
-
- "${FILESDIR}"/e2fsprogs-1.47.0-parallel-make.patch
-
- # Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
- 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"
-
- # Prevent included intl cruft from building, bug #81096
- sed -i -r \
- -e 's:@LIBINTL@:@LTLIBINTL@:' \
- MCONFIG.in || die 'intl cruft'
-}
-
-multilib_src_configure() {
- # Keep the package from doing silly things, bug #261411
- export VARTEXFONTS="${T}/fonts"
-
- # needed for >=musl-1.2.4, bug 908892
- use elibc_musl && append-cflags -D_FILE_OFFSET_BITS=64
-
- 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)
- $(multilib_native_use_enable fuse fuse2fs)
- $(use_enable nls)
- $(multilib_native_use_enable tools e2initrd-helper)
- --disable-fsck
- --disable-uuidd
- --disable-lto
- --with-pthread
- --enable-largefile
- )
-
- # 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
- myeconfargs+=( --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 "${myeconfargs[@]}"
-
- if 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/81096"
- die "Preventing included intl cruft from building"
- fi
-}
-
-multilib_src_compile() {
- if multilib_is_native_abi && use tools ; then
- emake V=1
- else
- emake -C lib/et V=1
- emake -C lib/ss V=1
- emake -C lib/ext2fs V=1
- emake -C lib/e2p V=1
- fi
-}
-
-multilib_src_test() {
- if multilib_is_native_abi && use tools ; then
- emake V=1 check
- else
- # Required by lib/ext2fs's check target
- emake -C lib/support V=1
-
- # For non-native, there's no binaries to test. Just libraries.
- emake -C lib/et V=1 check
- emake -C lib/ss V=1 check
- emake -C lib/ext2fs V=1 check
- emake -C lib/e2p V=1 check
- fi
-}
-
-multilib_src_install() {
- if multilib_is_native_abi && use tools ; then
- emake STRIP=':' V=1 DESTDIR="${D}" install
- else
- emake -C lib/et V=1 DESTDIR="${D}" install
- emake -C lib/ss V=1 DESTDIR="${D}" install
- emake -C lib/ext2fs V=1 DESTDIR="${D}" install
- emake -C lib/e2p V=1 DESTDIR="${D}" install
- fi
-
- # configure doesn't have an option to disable static libs
- if ! use static-libs ; then
- find "${ED}" -name '*.a' -delete || die
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use tools ; then
- insinto /etc
- doins "${FILESDIR}"/e2fsck.conf
- fi
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-parallel-make.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-parallel-make.patch
deleted file mode 100644
index 3396aa467db6..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.47.0-parallel-make.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 711ed1823c7676533d5f6d5e4d1558a792d43837 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Tue, 25 Apr 2023 21:53:19 +0200
-Subject: [PATCH] Add missing Makefile dependencies
-
-* With very high -j parallelism, we get failures in Gentoo:
-
- In file included from lib/ext2fs/blknum.c:15:
- lib/ext2fs/ext2fs.h:105:10: fatal error: ext2fs/ext2_err.h: No such file or directory
- 105 | #include <ext2fs/ext2_err.h>
- | ^~~~~~~~~~~~~~~~~~~
- compilation terminated.
- In file included from lib/ext2fs/fallocate.c:19:
- lib/ext2fs/ext2fs.h:105:10: fatal error: ext2fs/ext2_err.h: No such file or directory
- 105 | #include <ext2fs/ext2_err.h>
- | ^~~~~~~~~~~~~~~~~~~
-
-Bug: https://bugs.gentoo.org/806875#c17
-Signed-off-by: David Seifert <soap@gentoo.org>
----
- lib/ext2fs/Makefile.in | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
-index 798ff609..2c4e0277 100644
---- a/lib/ext2fs/Makefile.in
-+++ b/lib/ext2fs/Makefile.in
-@@ -731,6 +731,12 @@ blkmap64_rb.o: $(srcdir)/blkmap64_rb.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
- $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h $(srcdir)/rbtree.h \
- $(srcdir)/compiler.h
-+blknum.o: $(srcdir)/blknum.c $(top_builddir)/lib/config.h \
-+ $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
-+ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
-+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
-+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
-+ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h
- block.o: $(srcdir)/block.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
-@@ -842,6 +848,12 @@ extent.o: $(srcdir)/extent.c $(top_builddir)/lib/config.h \
- $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
- $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
- $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/e2image.h
-+fallocate.o: $(srcdir)/fallocate.c $(top_builddir)/lib/config.h \
-+ $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
-+ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
-+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
-+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
-+ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h
- fileio.o: $(srcdir)/fileio.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2_fs.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2fs.h \
-@@ -1049,6 +1061,12 @@ openfs.o: $(srcdir)/openfs.c $(top_builddir)/lib/config.h \
- $(srcdir)/ext2_io.h $(top_builddir)/lib/ext2fs/ext2_err.h \
- $(srcdir)/ext2_ext_attr.h $(srcdir)/hashmap.h $(srcdir)/bitops.h \
- $(srcdir)/e2image.h
-+orphan.o: $(srcdir)/orphan.c $(top_builddir)/lib/config.h \
-+ $(srcdir)/ext2_fs.h $(top_builddir)/lib/ext2fs/ext2_types.h \
-+ $(srcdir)/ext2fs.h $(srcdir)/ext2_fs.h $(srcdir)/ext3_extents.h \
-+ $(top_srcdir)/lib/et/com_err.h $(srcdir)/ext2_io.h \
-+ $(top_builddir)/lib/ext2fs/ext2_err.h $(srcdir)/ext2_ext_attr.h \
-+ $(srcdir)/hashmap.h $(srcdir)/bitops.h $(srcdir)/bmap64.h
- progress.o: $(srcdir)/progress.c $(top_builddir)/lib/config.h \
- $(top_builddir)/lib/dirpaths.h $(srcdir)/ext2fs.h \
- $(top_builddir)/lib/ext2fs/ext2_types.h $(srcdir)/ext2_fs.h \
---
-2.40.0