gentoo resync : 25.09.2021

4 files changed, 59 insertions, 24 deletions

diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index 2ec08847aaaa..0c1fcc61a68e 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,8 +1,9 @@
-AUX inotify-tools-3.20.1-rm-unused-cmd-arg.patch 495 BLAKE2B e838d5af6f64a1bc9b7693d61b822199de43afa79b071390df20fc301f5c1fd27c71d4470b0ad8844f2b3f9421382f3fba505336f5ba9433590b63017b62e896 SHA512 baf8805d3463f849dc6830177c2b72273dfde7baf025266d95b26662b69f003ca0fd9511561d523a59f37a2e9a2d23bf3e51d3687be000263ef60136af87b677
-DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
 DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
-EBUILD inotify-tools-3.20.1.ebuild 878 BLAKE2B 9b6f38589aeefaeacb4d2591c4dfd01566b195a076a385f814db48e909ab0cc77b402164215f989a6645f2b390f312bbf372fcc180fb4ab38728e86b31b7f2de SHA512 17aa77439aaccb143eca5509373d3ff05499eec793bced223dc508291b7130c27ed9c64070118da6be24751bfba49bc695309894e4d2fecbe571e1adb2a21f93
+DIST inotify-tools-3.21.9.1.tar.gz 91378 BLAKE2B a7d5d7ed2f63e186ed68d42ec443c43ae75e575d553221a11cd6991421d5d5b8c5447144a2e5cbc7dbad1d603e3cc120429ef5c91ac67994a82ea530c54142c0 SHA512 2a4d9f2e98b1f0263745c533fc06cd9f23bf9c793e9a8a3a944c7312f8d2b8e223caafbdd17b81e6dc0e29d85dd1730aef9341ed282992b4333d6d79cbfb3f99
+DIST inotify-tools-3.21.9.5.tar.gz 91711 BLAKE2B cf6575cdd445a823c8272a9f8394ed241af1cc729784ec363c9dac6cd3c5cf37856076e88d389669d9da768b899e7ecb64c997e25b42cd5fccc2ebbbf145b273 SHA512 d0ae070f4fa3ea261913bba4ed6edf865aa8ddb9235cf5e967d11f54168a78d92739a5110a1afbdedbe3e6f0cbaf395883e2d47a182c9e6847986da184a52a97
 EBUILD inotify-tools-3.20.11.0.ebuild 930 BLAKE2B d80311a5642e7af833733c6f75258d857762582b7ff9663d623aad2d32a788d708571f6942faeaf2d124f76d9209748ba1973bf1ca04d08de2e0935d5e619c43 SHA512 61ee8874dbdc03f3749285a7fe072cca38353151d2ae8db10674ac38e850c6f6be872924ee5e2f6f953e7bb2f1d13dd1498d0bde95d62a78a58344ddc0e286e7
 EBUILD inotify-tools-3.20.2.2.ebuild 928 BLAKE2B 4edaa4cc87786d20501912537865ddd7d593e97c621908076c99a0f3e1e94d19edc39891b91f393dcaa6cb58fb2c0aa4cc1d1f525eb2ec0d74dd9b979b121841 SHA512 8c950cb06d35fae591f4ae6d37158fe338ed6e89e66b73058996661b54d2b43fc6c02c38a6f0e890008177f58e345c94e22ce3c2528cbe653599e86802385a57
+EBUILD inotify-tools-3.21.9.1.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f
+EBUILD inotify-tools-3.21.9.5.ebuild 938 BLAKE2B c4f9afb42994e6d5cefee3a873fad716546ea7039d0c865c8615e5b22e982c783f7fadc83b58a517c7bf0af50fa2ecffcd0bfc6cf615ea055516d087c89e729a SHA512 84515f2be8956452afa03148af886fb9d0e03c56b7160a652e12f457c457517a1d44edb77052bff3aea90e79c92c3dd561ce2f833805891e2a7b5d89ce26dd7f
 MISC metadata.xml 650 BLAKE2B c9ba61d027e41cbf654b86cd305377637833d117431ce3b88ffd300627ea3b040b42ba69a8e1cd11a6cc83457009a2529f5e498bde3809dc6c098c86cd9439d7 SHA512 cfd57d3d0ada7f845cc8dbdfd19024fafd9603b5532ce3aa03b78f0910b9fd4de59e43d3f5bb0ead8d0ae61fa37f62f9b4320caa6f0be4776a2ad775b5efb833
diff --git a/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch b/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch
deleted file mode 100644
index 8c4f6f510e2f..000000000000
--- a/sys-fs/inotify-tools/files/inotify-tools-3.20.1-rm-unused-cmd-arg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- inotify-tools-3.20.1/src/Makefile.am
-+++ inotify-tools-3.20.1/src/Makefile.am
-@@ -2,7 +2,7 @@
- inotifywait_SOURCES = inotifywait.c common.c common.h
- inotifywatch_SOURCES = inotifywatch.c common.c common.h
- 
--AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src -L../libinotifytools/src
-+AM_CFLAGS = -Wall -Werror -Wpointer-arith -std=c99 -I../libinotifytools/src
- AM_CPPFLAGS = -I$(top_srcdir)/libinotifytools/src
- LDADD = ../libinotifytools/src/libinotifytools.la
- 
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild
index 8874ede472d9..1cc912c8d9cc 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.1.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.1.ebuild
@@ -1,32 +1,35 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
 DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
-HOMEPAGE="https://github.com/rvoicilas/inotify-tools/wiki"
-SRC_URI="https://github.com/rvoicilas/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+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 sparc x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
 IUSE="doc"
 
-DEPEND="doc? ( app-doc/doxygen )"
-RDEPEND=""
-
-PATCHES=( "${FILESDIR}/${P}-rm-unused-cmd-arg.patch" )
+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)
 	)
@@ -35,5 +38,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${ED%/}" \( -name '*.a*' -o -name '*.la' \) -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
new file mode 100644
index 000000000000..1cc912c8d9cc
--- /dev/null
+++ b/sys-fs/inotify-tools/inotify-tools-3.21.9.5.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 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 ~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
+}