gentoo auto-resync : 07:02:2024 - 21:58:53

4 files changed, 16 insertions, 184 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 818ecc0e85fa..4a04aa7134ba 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 788df072e63f..68408358eae0 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -3,10 +3,7 @@ AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68
 AUX e2fsprogs-1.46.5-parallel-make.patch 1646 BLAKE2B f3e0158afa723e436a5b4004a6e331c4ad2405f9d4e25ab4a11baaa7ac88d120362d004a69067850ae1ebdc437eef586e381101f9e96736a4e707cf2d18fe6f6 SHA512 c5cb7d01293465621e90e0807b6dad32b2f0105686d91bb886935967eb184463036d34dfc716da1a92c75bfe99300d07a84a7770499b6f38ecee15fbc0f9905b
 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
-DIST e2fsprogs-1.46.5.tar.xz 7040672 BLAKE2B 8d8c02e891c464782a7cff518c41d793fc73366b57e17d80ffc5afd96e6144e354290e667e9710509a9dde4e5dab7e7185c5bf084c5bfd26219f05e5e92e0830 SHA512 53282e1c524f62a95012b1aceef296d494f5238c82c9b08b29fbe6a803dbf7ccfdcd9124eb2f11fe2ff9de26387c78751a92c3217ca414f6db6242098a72d3fa
-DIST e2fsprogs-1.46.6.tar.xz 7051160 BLAKE2B 683274bf9468a3aaf41e542f22266482e75522b1fd2a255c6d852a28b08f027918d4f09239259d443a243c41eae49b3c27454f7d140da2c361c36a71ff77dcf6 SHA512 aca5ef77e36885ce9ce2995d9fae5d278c33e276e74f2a73977380f3e1cf1b3bd115fe6199e44a2f79a2827ba985b5554b8d898e88b7d04387fbba659a08e771
 DIST e2fsprogs-1.47.0.tar.xz 7059372 BLAKE2B 84f58b05a9f0e14e1a66c6e5171ff23b022f51c4e9a02d4d6d1d26c91909f3c7ec9c9f0462663a4457b4479043774502b8891f691e58a61f4ef6bf9ba33f33aa SHA512 0e6d64c565b455becb84166b6a5c7090724bac5cfe69098657a31bf0481b4e2cace3de1363121b7d84820fbae85b7c83ac5f2a2b02bb36280f0e3ae83a934cec
-EBUILD e2fsprogs-1.46.5-r4.ebuild 4371 BLAKE2B 80744fbe4c68bef79dc3d2819469c05de76e45d304cee44305f46978f51a5d5c7c665ace9963301c300b207383753251b5ace19f3e1e217b957ff9ef382db366 SHA512 2aec21d9853f28a2d61fcea50105bea642531496c151bf4f25ecd83f4af2acc4f9ca0467ed949f435ef418030a5bbc385d1c8c4406eb9e81309b3382f15a93f6
-EBUILD e2fsprogs-1.46.6.ebuild 4383 BLAKE2B 38ecae31ca1d4add331c439f658b1b4ae6b3aa500fe62b9fffb71019b12a1fb9dce9644f4dd736c15faeade04c638704132448b4258f3a2cd06590cfc7d1ce3b SHA512 2354906f334b374ffd97910d37098925d36bfa653a836043113f14708084ac8209286fd136accd52dbaf146ccde3c5fb283a008c80e6032b3e6a61c0e0cd4216
 EBUILD e2fsprogs-1.47.0-r2.ebuild 4636 BLAKE2B 5c02f3d845ed37588a79120fbecf5545037a5b6e2cec22c3335f45c060602ab1904bb78828501e2580f37057317a6d364bfe67b9b05a266f02d73450c971d5a1 SHA512 aba9867d7009da3174a152fbdaf67523a5305a132d1f778311c2b4d949c93608508a9192de85e438b58e78033794ab703b06f388d3024623ca0f2fd4b194490a
+EBUILD e2fsprogs-1.47.0-r3.ebuild 4469 BLAKE2B cd75f5b01de8d6da844f2c26639615b046b73429ca9f47b79272f58a48a24b3402b01f0369c0705e7c184a4781a0ccc8c5d528b2aac87d7e9848370d8b347c9a SHA512 a9310be61fe557ec76da8b77e571b8da2f91b945a1cbb27844f9cf80bd3885e73721a70f0814cf4e1ede6c2b4053c4dee56738eaadd94e89b5db454b6bd70187
 MISC metadata.xml 715 BLAKE2B 7a5d2ea0cd9b404d7ac0916648edd979852fc477513f55ed887b2198ec14f78cc42e13c52f7851605e16a0ac1a717484f2cd7ac6f953dd5ceec18a9738eba2c1 SHA512 286aedab5c877c6b3de25bc4764bb92e1f95d41a996003f86cd5050a122eb59d1bd6f06a6a5e27ff42d404c14baa1e71cf450e7a3aaeecb17f6db067eebf1c3f
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
deleted file mode 100644
index 2dc05ea69a5a..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2023 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 multilib-minimal
-
-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 ~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="
-	virtual/pkgconfig
-	sys-apps/texinfo
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-	# Upstream patches (can usually removed with next version bump)
-	"${FILESDIR}"/${P}-parallel-make.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ext2fs/ext2_types.h
-)
-
-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 #81096
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		MCONFIG.in || die 'intl cruft'
-}
-
-multilib_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)
-		$(multilib_native_use_enable fuse fuse2fs)
-		$(use_enable nls)
-		$(multilib_native_use_enable tools e2initrd-helper)
-		--disable-fsck
-		--disable-uuidd
-		--disable-lto
-		--with-pthread
-	)
-
-	# 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/show_bug.cgi?id=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
-
-	# 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
-		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.46.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
index 0525653700ff..0e8b8f57eaef 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.46.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.47.0-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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 usr-ldscript
+inherit flag-o-matic multilib-minimal systemd toolchain-funcs udev
 
 DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
 HOMEPAGE="http://e2fsprogs.sourceforge.net/"
@@ -11,7 +11,7 @@ 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="cron fuse nls static-libs test +tools"
 RESTRICT="!test? ( test )"
 
@@ -34,14 +34,19 @@ BDEPEND="
 	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}"/e2fsprogs-1.47.0-parallel-make.patch
 
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/ext2fs/ext2_types.h
+	# Upstream patches (can usually removed with next version bump)
 )
 
 src_prepare() {
@@ -63,8 +68,8 @@ multilib_src_configure() {
 	# Keep the package from doing silly things, bug #261411
 	export VARTEXFONTS="${T}/fonts"
 
-	# Needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
+	# needed for >=musl-1.2.4, bug 908892
+	use elibc_musl && append-cflags -D_FILE_OFFSET_BITS=64
 
 	local myeconfargs=(
 		--with-root-prefix="${EPREFIX}"
@@ -80,8 +85,8 @@ multilib_src_configure() {
 		--disable-fsck
 		--disable-uuidd
 		--disable-lto
-		--disable-largefile # need to check effect on ABI
 		--with-pthread
+		--enable-largefile
 	)
 
 	# We use blkid/uuid from util-linux now
@@ -141,10 +146,6 @@ multilib_src_install() {
 		emake -C lib/e2p V=1 DESTDIR="${D}" install
 	fi
 
-	# 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
 		find "${ED}" -name '*.a' -delete || die