diff options
Diffstat (limited to 'sys-fs/e2fsprogs')
| -rw-r--r-- | sys-fs/e2fsprogs/Manifest | 6 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild | 177 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild (renamed from sys-fs/e2fsprogs/e2fsprogs-1.47.2-r1.ebuild) | 2 | ||||
| -rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild (renamed from sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild) | 2 |
4 files changed, 4 insertions, 183 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index 8f047d72262a..3ce7ecd674ca 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -2,9 +2,7 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e83 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.1-c23.patch 1293 BLAKE2B 9c297e1c99c9f3b071286223ecdf20a7d5f40aa3705a4e652a4d725831e7270d3a76aa225fc9b1e76a9573509604eb563ad879a4e249849e31b1324209de09c4 SHA512 2818e1e93295231490fcd18478eb14be80a509de435baeb39c87a6c63ed53593624e0dfdc77ed76a448abaafae0f7f6d51422fcbc5fca2f71c7ad3b376e8a4c3 -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.1.ebuild 4673 BLAKE2B 2c4b56e3067dc5134f2cf5e5af08dc6ae7a0187efc3004a03a040c33f324fa5347f0a75d712cf54a8203a33d7f53aebedee54e487ea43ee721b26de48a9d2ad1 SHA512 e53757aef306901431810284bd08fd1ab4288bd4a8c32bf6edfc7f71e03c83815f26a4981faa0cc891dc38893444436a58a1e1b93dc8fcb51deae689abd63222 -EBUILD e2fsprogs-1.47.2-r1.ebuild 4435 BLAKE2B 41086b2e8d4ced00c6b03de01ffa2fb31d04007a29e38235c9040107df22edd10d12034082f59debc5250207805a66ac6f5f34012bc504565cd5d5076b734a7d SHA512 866e21b6579bd157bfdc165b6204eafe801e77e289f8bbb8135bc875c87a1030490e282dc99cda1c55aac0826df842896c704cba1bb7168a754bef4674d9b9e9 -EBUILD e2fsprogs-1.47.2.ebuild 4635 BLAKE2B 8cf2bad93b49089dd69c3ad575802b8b154b03959b087a06ae0903a8c8719b6d65b4840f8e8badd4b1f0d7f677806058be9a3c6ddb834be3330445303fadd116 SHA512 e5ec7d5b3cdc1569e92ababf1ebd39eb64116f04d94a5fe55b87f58912312a3a1f5c8d42754fe83174a13fb77bed7aa21394471623f8a0196db7dd8ff0c3add6 +EBUILD e2fsprogs-1.47.2-r10.ebuild 4436 BLAKE2B 7a6eb1bca0181ea9bfc94735ce99e9f11ed45680a7987ef5ef01ff612f4b61912974557f92b46acade70c7fb7268620044291b3b933021f31269259ae7c90638 SHA512 b0d51008341d49ada4bfd1a8d12cc5489beabc11805e91adce5d1de66a92f5b3e414d1b57b0de76906b428f3696a8623944ffd98822c2b316976025c89f5bde9 +EBUILD e2fsprogs-1.47.2-r3.ebuild 4636 BLAKE2B 55f4b531a09a5531ffbf2f15235b7ab1aff98870e6ec1717fc1d6609b9bd505eb14de0866e04ef29fcfa324e80abcfe06cd7e9291f20a1f71ac7e687301a4629 SHA512 4af2cfed7c7002e77db3a202e7ae1b1a2a5e9c3ed5a831cd96a96fd5454812d732e5431c4ba636540f02b8ba491cfd405b76e19c5f794199d6e87365351ee284 MISC metadata.xml 870 BLAKE2B bf57e8f24b302ed91357fb10dbc9b15656002983281fd287ee241a9a097d00e6af56d4a42de4109728dbb826ea58e58eba26ec1840299e43f7728495b1a133f4 SHA512 fa0ea6b3db855719976d3c627dcf88f62cf7fdacc132686ea06bcdfce03bb9ccef035d9aa674fc43844a0a111198c34921016183966be5f887aabed06bf0f369 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild deleted file mode 100644 index d1f1284271fc..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.1.ebuild +++ /dev/null @@ -1,177 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit 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="archive cron fuse nls static-libs test +tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - !sys-libs/${PN}-libs - archive? ( app-arch/libarchive:= ) - cron? ( sys-fs/lvm2[lvm] ) - fuse? ( sys-fs/fuse:3 ) - 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 - - # Upstream patches (can usually removed with next version bump) - "${FILESDIR}"/${PN}-1.47.1-c23.patch -) - -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" - - cat <<-'EOF' > tests/m_rootdir_acl/script || die - echo "$test_name: $test_description: skipped (bgo#905221, fails on btrfs)" - return 0 - EOF - - # 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" - - 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_with archive libarchive direct) - $(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() { - # Parallel make issue #936493 - emake -C lib/et V=1 compile_et - emake -C lib/ext2fs V=1 ext2_err.h - - 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/e2fsprogs-1.47.2-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild index 0c21b2eeb022..9b72df228c78 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r10.ebuild @@ -19,7 +19,7 @@ RDEPEND=" !sys-libs/${PN}-libs archive? ( app-arch/libarchive:= ) cron? ( sys-fs/lvm2[lvm] ) - fuse? ( sys-fs/fuse:3 ) + fuse? ( sys-fs/fuse:3= ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) " diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild index 4a7c1a042720..5a09f77b3fda 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.47.2.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.2-r3.ebuild @@ -19,7 +19,7 @@ RDEPEND=" !sys-libs/${PN}-libs archive? ( app-arch/libarchive:= ) cron? ( sys-fs/lvm2[lvm] ) - fuse? ( sys-fs/fuse:3 ) + fuse? ( sys-fs/fuse:3= ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux ) " |