gentoo auto-resync : 16:05:2024 - 00:01:30

4 files changed, 25 insertions, 102 deletions

diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 138e009dd016..b9f9f3887ec6 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -8,7 +8,6 @@ DIST xfsprogs-6.4.0.tar.xz 1344720 BLAKE2B 566a80a1fa90520c6cc2b20c8e8cde41eb83a
 DIST xfsprogs-6.6.0.tar.xz 1351792 BLAKE2B a479126ed19389c057af28ac3564893826a6d27859984cfadb28b17663759d8f19b1796031d43f294bf8001f5ddda8854b6b0d90d0229092bd31fbdf6e5d1554 SHA512 89b4436a958075ac77cc2b5b5f0618164d47f7d6fbc2271a7927c886fba7bf67284e1825c1ecc259969235222b4d084a40c354edb6d83c21029d737108aa38da
 DIST xfsprogs-6.7.0.tar.xz 1349748 BLAKE2B e16db682cafbd35266e9130a64943c19304174ebd501e30aa32fb8f0d1904286ccdef62c0820480541c7272575d770eea7e73e7dc83c0b452eb5fb2a3a7085ca SHA512 4f543e4c5c4e88e4f9ce16b82ca1151330f687469368fe7470b68e8bb21d1d3c7280eb2e691d3bdf24ae3d4fa2ee5764dc34637198bca0d4ffa65eea2f10ac74
 EBUILD xfsprogs-6.4.0.ebuild 2414 BLAKE2B b71c91b69eb958bda96f1eea3feed717576397a214343c7474c8530ee7f60c0ca10260d98adf9ba3bc40d46498d1fd13bd71e216a52af08790e66d6d2498d6e0 SHA512 69a5eec472d87155e9343e7a9de65a65e15de3b5d4c831fd43636aa54a6435b708342d93cc4d93b132710db08446b3aab37ae75d37497a2ee8736e12c050a83e
-EBUILD xfsprogs-6.6.0.ebuild 2597 BLAKE2B dc6af5002422c3856017fba361f54bbcfdd01e25bc38eb16d42f7495fd23dc10cb9538363019af983ae6ac9df271c3b341395aa687368a0d5b6052b94296bd9c SHA512 8287ecd8a4eb46d6cb9b31dcbde5a2be9d54ef30ea8163fc904d3e5598401e6fbb8a432c0aaeaaab7318e8d668fa09f76fe46480a9408b243f5c1f7e71e89651
-EBUILD xfsprogs-6.7.0-r1.ebuild 2488 BLAKE2B 3dfb40209eb0d94cde8431b9e6ac66db8c286c5d2bd4cd3d30d45817a2a28cdd7fc85146488a0b08380c8052df9e491c6e62435f1aaeac750d70398abe48eecf SHA512 0bfba71c4a1f6e11966c052446bfa09b5a0a2c50b199eb2271138dd163f17cb76e8c0b587c6df8773ad396ffa98cc8e5f9b518d39b43321deb86be546df9dcf6
-EBUILD xfsprogs-6.7.0.ebuild 2461 BLAKE2B 988002ce6b777d5f306ddfe8d4295cdddc853584ec7f2bbae783b4e5ca3da9e1fafd5204987a85ed496527c56df75ddd57341b9ef26953c0a10198c16023fb18 SHA512 d42e204d92b358e16d35c98d0410c8bc26b881fd6ef4f59dcefbbfaf3384078571a2284e6b3d2a4fcd3f18079f7f307ceae34aa4dee0de90cd5971cc369ee233
+EBUILD xfsprogs-6.6.0-r1.ebuild 2669 BLAKE2B f40fffb2885c1099dc8e1f9ff6ce104f892361a60b62a2c59b985d9f98c0022035dd3532109c23e2155a61f93e86fb462a791fd93361230b4dfdeae3fdd4ac7c SHA512 cf4997080768a9252c4b40f1c58427ecabfb21324798e7f1242632a8e9e90415eed484a5b2a1624a0c8381118cb8bfb5d90afe823bef1c1c2d7247bd0449fc7c
+EBUILD xfsprogs-6.7.0-r3.ebuild 2655 BLAKE2B 631390af82f532fff724e54110881e7cad750318a2257e4f65200f47316e03a718d9c88ce5b33532dd37ec968df5060d44c4796d4fc909fbbb7eac15226d6f2e SHA512 6c72ab4b71f401805d61d0e1712ba7a59e0704857e92a0757f3a2818e3888dc42174138b1d531cc054fce02304c3c7f4a4f0358ce18d033da05aabf70df7fff9
 MISC metadata.xml 339 BLAKE2B b7d67fc8bcf854e7a2453c23e5d5d8c193525ccd16a643e80415a103d2d22c892458ea6ada32653d04b3d471c780f07b2b0537a317d9e64468130e065c6f5ab1 SHA512 445b4f6d853a272cc6bf8fde42745adf226512fa310f9af4bbabad4cfa5a6888b2c2215dfc0896c07b800820b69417c6d408bb21ed17a5224b5c9e3412c5f62d
diff --git a/sys-fs/xfsprogs/xfsprogs-6.6.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild
index c46c41e10726..6d8a45f9081c 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.6.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.6.0-r1.ebuild
@@ -78,7 +78,7 @@ src_configure() {
 		--disable-lto
 		--with-crond-dir="${EPREFIX}/etc/cron.d"
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rule-dir="$(get_udevdir)"
+		--with-udev-rule-dir="$(get_udevdir)/rules.d"
 		$(use_enable icu libicu)
 		$(use_enable nls gettext)
 		$(use_enable libedit editline)
@@ -97,3 +97,11 @@ src_install() {
 
 	gen_usr_ldscript -a handle
 }
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
+}
diff --git a/sys-fs/xfsprogs/xfsprogs-6.7.0-r1.ebuild b/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild
index d748990bfbd3..e5ba87bba74e 100644
--- a/sys-fs/xfsprogs/xfsprogs-6.7.0-r1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-6.7.0-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="icu libedit nls selinux"
+IUSE="icu libedit nls selinux static-libs"
 
 RDEPEND="
 	dev-libs/inih
@@ -75,7 +75,7 @@ src_configure() {
 		--disable-lto
 		--with-crond-dir="${EPREFIX}/etc/cron.d"
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rule-dir="$(get_udevdir)"
+		--with-udev-rule-dir="$(get_udevdir)/rules.d"
 		$(use_enable icu libicu)
 		$(use_enable nls gettext)
 		$(use_enable libedit editline)
@@ -92,4 +92,16 @@ src_install() {
 	# XXX: There's a missing dep in the install-dev target, so split it
 	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
 	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
+
+	if ! use static-libs; then
+		rm "${ED}/usr/$(get_libdir)/libhandle.a" || die
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
+
+pkg_postinst() {
+	udev_reload
 }
diff --git a/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild b/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild
deleted file mode 100644
index 13c8f04b9c6e..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-6.7.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic systemd udev usr-ldscript
-
-DESCRIPTION="XFS filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/ https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="icu libedit nls selinux"
-
-RDEPEND="
-	dev-libs/inih
-	dev-libs/userspace-rcu:=
-	>=sys-apps/util-linux-2.17.2
-	icu? ( dev-libs/icu:= )
-	libedit? ( dev-libs/libedit )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-RDEPEND+=" selinux? ( sec-policy/selinux-xfs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
-	"${FILESDIR}"/${PN}-6.7.0-fix-porting-to-6.7.patch
-)
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	# include/builddefs.in will add FCFLAGS to CFLAGS which will
-	# unnecessarily clutter CFLAGS (and fortran isn't used)
-	unset FCFLAGS
-
-	# If set in user env, this breaks configure
-	unset PLATFORM
-
-	export DEBUG=-DNDEBUG
-
-	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
-	# However, we have to provide an empty value to avoid default
-	# flags.
-	export OPTIMIZER=" "
-
-	# Avoid automagic on libdevmapper (bug #709694)
-	export ac_cv_search_dm_task_create=no
-
-	# bug 903611
-	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
-	# Build fails with -O3 (bug #712698)
-	replace-flags -O3 -O2
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-static
-		# Doesn't do anything beyond adding -flto (bug #930947).
-		--disable-lto
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rule-dir="$(get_udevdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable libedit editline)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install
-	emake DIST_ROOT="${ED}" HAVE_ZIPPED_MANPAGES=false install-dev
-
-	gen_usr_ldscript -a handle
-}