diff options
Diffstat (limited to 'sys-fs/e2fsprogs')
-rw-r--r-- | sys-fs/e2fsprogs/Manifest | 5 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild | 120 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild (renamed from sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild) | 71 | ||||
-rw-r--r-- | sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch | 11 |
4 files changed, 34 insertions, 173 deletions
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest index a754e47b6f78..8a856b11fd95 100644 --- a/sys-fs/e2fsprogs/Manifest +++ b/sys-fs/e2fsprogs/Manifest @@ -1,9 +1,6 @@ AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef -AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b -DIST e2fsprogs-1.46.4.tar.xz 7035200 BLAKE2B 473f7fd3f521b94cdaa68e37784a518fc1919387dd114f31b5338f1b4c472f86b150229ec3dcae8b73eac95330c0dea729befc8cea08bcf1e455c0b6652d6d2b SHA512 7d9cfdf00ed58e66049585e8382fe4977088956421a0fb8155900c69afd8857309ad2b9301b3f74c9c0afa7287a0ddba2fd1538fcf57858b37a9ab712390016d DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa -EBUILD e2fsprogs-1.46.4.ebuild 3435 BLAKE2B dbb124b159cd882564968c664ee91d2c5db14b814e5baba75cb4f923ec041b4826d280c0b7f633dd11c1bfcc92850182ea7aa3ac63a79d76cdba201bff7bbe7e SHA512 c091444159c4795ae180c966de199016b7cf2de484a95f6123ae11070d72aaa05cb523aa4b28536ba975f3c672a430476269a319843c593c567ba06d7de81671 -EBUILD e2fsprogs-1.46.5.ebuild 4212 BLAKE2B 5846066a51da6226a8269184e49fb0786347c9687c19454dddc9b06cd5bcae864ea304b3e7f8521ab823cf64b919b323988d211d5c01302f5516a574dc360ada SHA512 25756c2892a8ca9199ffafa7678a01ed57858ba3ea8fce6be65b0950368fe9bb65b1649bf4ca3d934cc4037e27f511a3f8b7865aee4d091536c6cc3b62f1dadf +EBUILD e2fsprogs-1.46.5-r1.ebuild 4356 BLAKE2B 83e304c0f1f189b3b746258fcfc77e72d307371655342e18d2eb888f9510ce256b9d6a791130a0cb18a10bf292f78f03ae5e3c417c6318b8757357144ddc6f19 SHA512 3d729a51e3bf3dc3bceda82240af399a601f6932b4746955d0f56e441c89e963d83d569b2a769b98abcb46eea5a476a2d0d26153a39adfc63c9fa563e580f63c MISC metadata.xml 782 BLAKE2B 6010ef2af50bc0ec4f7511d28e47cd6f0fc76e3ef88afed222f5a6775e3a1ac51940b2272c37713c0f594b10202391073776f1f8330bc9f45ce0c3a03548f135 SHA512 3a18335967f411f387ecdd066db068d05c90abd1af4a91b226d52a6b9507932528d006ef5e463a423bb635d88b12d81ca1e2d403bd9de2dd12c04a50abc94474 diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild deleted file mode 100644 index 225c1d41eb95..000000000000 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.4.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2022 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" - -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" - -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() { - 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 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 -} - -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 -} diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild index 1ba2b391588e..26512e0a9bf7 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild @@ -11,35 +11,36 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$ 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 +tools" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" +IUSE="cron fuse lto nls static-libs test +threads +tools" +RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/${PN}-libs cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) - tools? ( >=sys-apps/util-linux-2.16 )" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig + 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=" + virtual/pkgconfig sys-apps/texinfo nls? ( sys-devel/gettext )" 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) "${FILESDIR}"/${P}-parallel-make.patch ) -pkg_setup() { - if use tools ; then - MULTILIB_WRAPPED_HEADERS=( - /usr/include/ext2fs/ext2_types.h - ) - fi -} +MULTILIB_WRAPPED_HEADERS=( + /usr/include/ext2fs/ext2_types.h +) src_prepare() { default @@ -102,50 +103,44 @@ multilib_src_configure() { } multilib_src_compile() { - if ! multilib_is_native_abi || ! use tools ; then + if multilib_is_native_abi && use tools ; then + emake V=1 + else emake -C lib/et V=1 emake -C lib/ss V=1 - if use tools ; then - emake -C lib/ext2fs V=1 - emake -C lib/e2p V=1 - fi - return 0 + emake -C lib/ext2fs V=1 + emake -C lib/e2p V=1 fi - - emake V=1 } multilib_src_test() { - if multilib_is_native_abi ; then + 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 + 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 - - if use tools ; then - emake -C lib/ext2fs V=1 DESTDIR="${D}" install - emake -C lib/e2p V=1 DESTDIR="${D}" install - fi - else - emake \ - STRIP=: \ - DESTDIR="${D}" \ - install - - # Move shared libraries to /lib/, install static libraries to - # /usr/lib/, and install linker scripts to /usr/lib/. - gen_usr_ldscript -a e2p ext2fs + emake -C lib/ext2fs V=1 DESTDIR="${D}" install + emake -C lib/e2p V=1 DESTDIR="${D}" install fi - gen_usr_ldscript -a com_err ss $(usex kernel_linux '' 'uuid blkid') + # Move shared libraries to /lib/, install static libraries to + # /usr/lib/, and install linker scripts to /usr/lib/. + gen_usr_ldscript -a com_err ss ext2fs e2p # configure doesn't have an option to disable static libs :/ if ! use static-libs ; then diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch deleted file mode 100644 index 7d0919600d05..000000000000 --- a/sys-fs/e2fsprogs/files/e2fsprogs-1.40-fbsd.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/lib/ext2fs/ext2_fs.h -+++ b/lib/ext2fs/ext2_fs.h -@@ -414,7 +414,7 @@ - - #define i_size_high i_dir_acl - --#if defined(__KERNEL__) || defined(__linux__) -+#if defined(__KERNEL__) || defined(__linux__) || defined(__FreeBSD__) - #define i_reserved1 osd1.linux1.l_i_reserved1 - #define i_frag osd2.linux2.l_i_frag - #define i_fsize osd2.linux2.l_i_fsize |