Diff e2fsprogs-1.46.5-r4 with a e2fsprogs-1.46.6

/usr/portage/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild 2023-10-09 14:52:35.508368502 +0300
1 1
# Copyright 1999-2023 Gentoo Authors
2 2
# Distributed under the terms of the GNU General Public License v2
3 3

  
4
EAPI=7
4
EAPI=8
5 5

  
6
inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript multilib-minimal
6
inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev usr-ldscript
7 7

  
8 8
DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
9 9
HOMEPAGE="http://e2fsprogs.sourceforge.net/"
......
11 11

  
12 12
LICENSE="GPL-2 BSD"
13 13
SLOT="0"
14
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
14
KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
15 15
IUSE="cron fuse nls static-libs test +tools"
16 16
RESTRICT="!test? ( test )"
17 17

  
......
20 20
	cron? ( sys-fs/lvm2[lvm] )
21 21
	fuse? ( sys-fs/fuse:0 )
22 22
	nls? ( virtual/libintl )
23
	tools? ( sys-apps/util-linux )"
23
	tools? ( sys-apps/util-linux )
24
"
24 25
# For testing lib/ext2fs, lib/support/libsupport.a is required, which
25 26
# unconditionally includes '<blkid/blkid.h>' from sys-apps/util-linux.
26 27
DEPEND="
27 28
	${RDEPEND}
28
	test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )"
29
	test? ( sys-apps/util-linux[${MULTILIB_USEDEP}] )
30
"
29 31
BDEPEND="
30
	virtual/pkgconfig
31 32
	sys-apps/texinfo
32
	nls? ( sys-devel/gettext )"
33
	virtual/pkgconfig
34
	nls? ( sys-devel/gettext )
35
"
33 36

  
34 37
PATCHES=(
35
	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
38
	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch # bug #516854
36 39

  
37 40
	# Upstream patches (can usually removed with next version bump)
38
	"${FILESDIR}"/${P}-parallel-make.patch
39 41
)
40 42

  
41 43
MULTILIB_WRAPPED_HEADERS=(
......
51 53
	# violation due to mktexfmt invocation
52 54
	rm -r doc || die "Failed to remove doc dir"
53 55

  
54
	# prevent included intl cruft from building #81096
56
	# Prevent included intl cruft from building, bug #81096
55 57
	sed -i -r \
56 58
		-e 's:@LIBINTL@:@LTLIBINTL@:' \
57 59
		MCONFIG.in || die 'intl cruft'
58 60
}
59 61

  
60 62
multilib_src_configure() {
61
	# Keep the package from doing silly things #261411
63
	# Keep the package from doing silly things, bug #261411
62 64
	export VARTEXFONTS="${T}/fonts"
63 65

  
64
	# needs open64() prototypes and friends
66
	# Needs open64() prototypes and friends
65 67
	append-cppflags -D_GNU_SOURCE
66 68

  
67 69
	local myeconfargs=(
......
78 80
		--disable-fsck
79 81
		--disable-uuidd
80 82
		--disable-lto
83
		--disable-largefile # need to check effect on ABI
81 84
		--with-pthread
82 85
	)
83 86

  
84
	# we use blkid/uuid from util-linux now
87
	# We use blkid/uuid from util-linux now
85 88
	if use kernel_linux ; then
86 89
		export ac_cv_lib_{uuid_uuid_generate,blkid_blkid_get_cache}=yes
87 90
		myeconfargs+=( --disable-lib{blkid,uuid} )
......
97 100
	if grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
98 101
		eerror "INTL sanity check failed, aborting build."
99 102
		eerror "Please post your ${S}/config.log file as an"
100
		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
103
		eerror "attachment to https://bugs.gentoo.org/81096"
101 104
		die "Preventing included intl cruft from building"
102 105
	fi
103 106
}
......
117 120
	if multilib_is_native_abi && use tools ; then
118 121
		emake V=1 check
119 122
	else
120
		# required by lib/ext2fs's check target
123
		# Required by lib/ext2fs's check target
121 124
		emake -C lib/support V=1
122 125

  
123 126
		# For non-native, there's no binaries to test. Just libraries.
......
142 145
	# /usr/lib/, and install linker scripts to /usr/lib/.
143 146
	gen_usr_ldscript -a com_err ss ext2fs e2p
144 147

  
145
	# configure doesn't have an option to disable static libs :/
148
	# configure doesn't have an option to disable static libs
146 149
	if ! use static-libs ; then
147 150
		find "${ED}" -name '*.a' -delete || die
148 151
	fi
Thank you!