gentoo resync : 09.07.2022

4 files changed, 41 insertions, 56 deletions

diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 573aed1a70fd..fef7df740b98 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,7 +1,6 @@
+AUX inotify-tools-3.22.6.0-musl.patch 827 BLAKE2B 499aa4517af0ae2eb4d59e9f9128e49a76a8551a03f59b32e8e31d42d3e77d8720eab43d14553daac4ef42cd8e67cefc7ee1c1ff5108c17976d7cfe72683ecf3 SHA512 9af49e57302b76d1bcd807846a3e660a4ed342de0767549a572a51a072da8d00b87069e7ef81ca55f7a900b6c226eefb5f1f440161f7811c26d976bfa4526075
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
-DIST inotify-tools-3.22.1.0.tar.gz 92922 BLAKE2B 42558ca62f79e2bdf5a6071334a05cee826ec00b0666b1c0971af64d769eb7852cbcd8d6e630f88af68f26f5607ca4ef94ec832fbe2e89d42182120aac4896ce SHA512 53317147af4803b69603839c010a2b0b3fa527f0e32b08126f24805600728c0a9570b2a3d94bf987f0b9a4bfbe7207b5faa9337f0d7add91b062e68de4245548
 DIST inotify-tools-3.22.6.0.tar.gz 92918 BLAKE2B 601d3ac6896e445d297a04498c63df4f81c59699ba2d5b2eee2e8c499332913ce2783d13c9906d577ff0b6d7ef91ca826d48b01674adeb3d3569dfc1fbc0df63 SHA512 cda445add4b9d80b70eff9189ed50d05f4b5593a755159d0354431166c6fe6fdb33f7bf37fd50bc09aad3ed0a6e3763b9c74f65e554400f2596b8d492f1d0a21
 EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57
-EBUILD inotify-tools-3.22.1.0.ebuild 945 BLAKE2B 130a42cc3ebdcf4ecc4071d9a4791077d3ef6f5156e8fc8164aeeae0922e4fe516fa07e3c11c343ad604fd8f5a88aea31807d07dd3adca9463559a0ba6a3bda4 SHA512 1b1a74a363d2722c3244972c5433c2f6e34d529f1f72bc4146d2ef2195bff4928869d02c6b7f7d7e6270722e11045825f4c521291259d700d2040b23cd6902d5
-EBUILD inotify-tools-3.22.6.0.ebuild 945 BLAKE2B 130a42cc3ebdcf4ecc4071d9a4791077d3ef6f5156e8fc8164aeeae0922e4fe516fa07e3c11c343ad604fd8f5a88aea31807d07dd3adca9463559a0ba6a3bda4 SHA512 1b1a74a363d2722c3244972c5433c2f6e34d529f1f72bc4146d2ef2195bff4928869d02c6b7f7d7e6270722e11045825f4c521291259d700d2040b23cd6902d5
+EBUILD inotify-tools-3.22.6.0.ebuild 886 BLAKE2B 9df159f6612d93cc7838ea4cd4b8f6a87ce0cdb245b8a518b5c339ffaa799cd8cd24c4499d4580d2106ac520d8235e790c93ccef5522d4a38d3eed730bed9eff SHA512 6892f99b66268e74158179b186b488fc4deb8379a221bcc02ac7e1030e31fa29e935db051c60f4484047a38e33cd8c924e2ae98ad13700978874462b24630ca5
 MISC metadata.xml 644 BLAKE2B faa84a2101847409fcc82427dcbcd1ac7ec4073ee044e970b3f4c65bc1c28484ab4266cdfc4dc4e3980ee1c384186e308d210d02304788d63ccc1b4f54dd5ac8 SHA512 ba77f381e79379995ff395e82c65dacfe9bc3c621d38201bea7ebaac76911aa2de5d472a486e22a5ddbf79565e8d88ea14707d8e5f4abbc7dad8bce3b1e0f05d
diff --git a/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch b/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch
new file mode 100644
index 000000000000..435adc2e797a
--- /dev/null
+++ b/sys-fs/inotify-tools/files/inotify-tools-3.22.6.0-musl.patch
@@ -0,0 +1,26 @@
+Former fix[1] for musl that got reverted[2] for possibly(?) wrong
+reasons[3]. Should be harmless to include here until sorted out.
+https://bugs.gentoo.org/831976
+
+[1] https://github.com/inotify-tools/inotify-tools/commit/b7889c8d
+[2] https://github.com/inotify-tools/inotify-tools/commit/cbab7c0b
+[3] https://github.com/inotify-tools/inotify-tools/issues/155
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 3 Jan 2022 04:42:50 -0800
+Subject: [PATCH] libinotifytools: Bridge differences between musl/glibc/kernel
+ fnotify.h (#154)
+--- a/libinotifytools/src/inotifytools.c
++++ b/libinotifytools/src/inotifytools.c
+@@ -54,6 +54,12 @@ struct fanotify_event_fid {
+ 	struct fanotify_event_info_fid info;
+ 	struct file_handle handle;
+ };
++
++#ifndef __GLIBC__
++#define val __val
++#define __kernel_fsid_t fsid_t
++#endif
++
+ #endif
+ 
+ /**
diff --git a/sys-fs/inotify-tools/inotify-tools-3.22.1.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.22.1.0.ebuild
deleted file mode 100644
index 2d25f84ae71b..000000000000
--- a/sys-fs/inotify-tools/inotify-tools-3.22.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="https://github.com/inotify-tools/inotify-tools"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~riscv ~sparc ~x86"
-IUSE="doc"
-
-BDEPEND="doc? ( app-doc/doxygen )"
-
-src_prepare() {
-	default
-
-	# Remove -Werror from CFLAGS (#745069)
-	find -name "Makefile.am" -print0 \
-		| xargs --null sed 's@ -Werror@@' -i || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# only docs installed are doxygen ones, so use /html
-	local myeconfargs=(
-		--disable-static
-		--docdir='$(datarootdir)'/doc/${PF}/html
-		$(use_enable doc doxygen)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild
index 2d25f84ae71b..8a96f1e65ec8 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.22.6.0.ebuild
@@ -5,9 +5,9 @@ EAPI=8
 
 inherit autotools
 
-DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="https://github.com/inotify-tools/inotify-tools"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="Set of command-line programs providing a simple interface to inotify"
+HOMEPAGE="https://github.com/inotify-tools/inotify-tools/"
+SRC_URI="https://github.com/inotify-tools/inotify-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -16,27 +16,29 @@ IUSE="doc"
 
 BDEPEND="doc? ( app-doc/doxygen )"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-musl.patch
+)
+
 src_prepare() {
 	default
 
-	# Remove -Werror from CFLAGS (#745069)
-	find -name "Makefile.am" -print0 \
-		| xargs --null sed 's@ -Werror@@' -i || die
+	sed -i 's/ -Werror//' {,libinotifytools/}src/Makefile.am || die #745069
 
 	eautoreconf
 }
 
 src_configure() {
-	# only docs installed are doxygen ones, so use /html
-	local myeconfargs=(
-		--disable-static
-		--docdir='$(datarootdir)'/doc/${PF}/html
+	local econfargs=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
 		$(use_enable doc doxygen)
 	)
-	econf "${myeconfargs[@]}"
+
+	econf "${econfargs[@]}"
 }
 
 src_install() {
 	default
+
 	find "${ED}" -type f -name '*.la' -delete || die
 }