gentoo resync : 28.04.2021

5 files changed, 56 insertions, 13 deletions

diff --git a/app-admin/watchfolder/Manifest b/app-admin/watchfolder/Manifest
index 6c9876902640..ae0e2c3dd912 100644
--- a/app-admin/watchfolder/Manifest
+++ b/app-admin/watchfolder/Manifest
@@ -1,5 +1,6 @@
-AUX 0.3.3-64bit.patch 450 BLAKE2B 8d88a4677bf59cdd95a6dc539364ef8aab46ab40e59107ba88198113bc79d1b61cdbe88e52a8c9cd805e4133dee2bde9bf068ce8a2822bb5a7201c118ef29a7a SHA512 86d6e072904fed5a168398fd80f648b30a9346745dac7b6ee460122e205f8f627aa4bfff78b007726af95b711c4bb91ca8282ca1a000e6954bf6d33e399f18c0
-AUX 0.3.3-fortify-sources.patch 410 BLAKE2B d44f872bd89cb0c3cccaf5b70e6293937340562ee71ff73185ff466b6dbac1e3b4854afa6eecec6558e36a070a9ed4a1efa275dde5d91ff0f1084509bcd60054 SHA512 0e3b372b9eaf1f4874ecbf7135ed67e1dcf62366516215a5d5fc5a1288893385b24f1d34855fc134eaad0dc29562ec4de0c90365ce87b7071234fcb1750e4676
+AUX 0.3.3-64bit.patch 378 BLAKE2B 5843192ec029f95163aabd7eaccfca794dc5d1eb1085a25c413ceea6ee86ab8fb7fed06cfd01643c20686f5e3846df3040b2fe4cdd6523d93188a9359436abcf SHA512 df3e6e83d93bbf9d1777186f521136ab1c3c80c68ecf206d9962539cf18b71a0581cfdddc22dc587ba538a8916c445f9a0feab4a123846c4aac61904b66360de
+AUX 0.3.3-fortify-sources.patch 338 BLAKE2B 5d8c0688411320ade5154e438800e25c48334093938813b8f3d5a2ce7e34251f960bde60c116ffb0a8290f4a075f110a65e14d39ea5430205c5e284438924ac9 SHA512 f5ace713b309f490761699e30a2250ab5e718bcf4b14fa4454e057a150d2961ff231721666556668594e47b37745ec6d0c951ede1d22221345afb13cee2fda66
+AUX 0.3.3-implicit-decl.patch 765 BLAKE2B 7d00a07f318b3599318831c70dc7808a00ed29814feb8ccc3f8649829f22cf183636e100ea6ed2b7314e11499e8c7e840dfebe92d109aa1798364cc32094d02c SHA512 65a006fb8272326eb693bb864346ee922f34a18db8d3f61c31e8e3212c2b96dbbd41cad66224de9dccbc8b18eea010c4304c4fb48febbf6b24d6655abfcad33b
 DIST watchfolder-0.3.3.tar.gz 86741 BLAKE2B d834f8aade7e648e27f95ca896355ec07afb24bac0f0116280f374e763c6fca8e7e7ffca7850d54b11fdf1c1ccfe8d28bd52a527eeb7110d4783a55de28828fb SHA512 162a3535748d280d06db8b05ddc4c87b578ff4be08aeb7a08858c28fd4612f46c4b8ed866513283edcd6ad24207c94a02e562200ae102d1897b4b28be6717dc6
-EBUILD watchfolder-0.3.3-r1.ebuild 860 BLAKE2B d5f367ed3890197d0434bb306b3f43029bb436e2343e7bdc585b4cbc345f88f8bcdbcd03c631f51daa2db0b2815a8a7eb15cd9c47bf87bad08ad1ec43fc339e9 SHA512 8f85fe02b273632d657dc303d5b3233ff880c1c079f2ba2dcdaeae273f3a5b8226ce9deac473fcf1f64c96ed5b28b92f85229b48527b5a5eaaabde5c89c349f7
+EBUILD watchfolder-0.3.3-r1.ebuild 927 BLAKE2B 892ece87489683a1950f6f7d91c8f62724a68ab51da1abda6955f4032052361a3efd5badbd75b09ba72530f44a4dfd40ab6fe8b7ac8d79eacd23733421a7fbdb SHA512 66ef56727ab68951dca146395bcea3b6ff106a0b7fb9cd7c441f233fd2a2f2e3a6f0ac550e2077ffbe9d82eec8720962bab6c5664c641314060b2070536ce381
 MISC metadata.xml 241 BLAKE2B f902bc0becbcf0a1830c4b9dca2ae4acd8ae91741ff1b6bf7cc68a08be61a26293b94c7690a06446e84f38d46dfe4c22c52a9e736b426c535b82acccb644b13c SHA512 9e7d032c1d5e4be915c726c4a312eb2bdad6eb036827f2aceecf5f370bbc255e72ee420816646fe639a607dee0f5d112d843e897183f8c587ec866fe8248b452
diff --git a/app-admin/watchfolder/files/0.3.3-64bit.patch b/app-admin/watchfolder/files/0.3.3-64bit.patch
index 070e9c019d26..89e0698c3e45 100644
--- a/app-admin/watchfolder/files/0.3.3-64bit.patch
+++ b/app-admin/watchfolder/files/0.3.3-64bit.patch
@@ -1,5 +1,5 @@
---- a/watchd.c	2006-02-23 12:33:32.000000000 -0500
-+++ b/watchd.c	2006-02-23 12:45:30.000000000 -0500
+--- a/watchd.c
++++ b/watchd.c
 @@ -176,7 +176,7 @@
  // free(p2tmp);
  
diff --git a/app-admin/watchfolder/files/0.3.3-fortify-sources.patch b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch
index 175e8ed29ec3..9ccfa76c0934 100644
--- a/app-admin/watchfolder/files/0.3.3-fortify-sources.patch
+++ b/app-admin/watchfolder/files/0.3.3-fortify-sources.patch
@@ -1,5 +1,5 @@
---- a/watchd.c	2009-02-27 23:46:42.000000000 +0000
-+++ b/watchd.c	2009-02-27 23:50:22.000000000 +0000
+--- a/watchd.c
++++ b/watchd.c
 @@ -671,7 +671,7 @@
     {
      if (folder->flags&FL_LOG_FILE)
diff --git a/app-admin/watchfolder/files/0.3.3-implicit-decl.patch b/app-admin/watchfolder/files/0.3.3-implicit-decl.patch
new file mode 100644
index 000000000000..1b8e72d72bf8
--- /dev/null
+++ b/app-admin/watchfolder/files/0.3.3-implicit-decl.patch
@@ -0,0 +1,40 @@
+--- a/chain.c
++++ b/chain.c
+@@ -21,7 +21,7 @@ Author : Peter Turczak <p_turczak@wiwa.de>
+ #include "chain.h"
+ #include <stdio.h>
+ #include <stdlib.h>
+-
++#include <string.h>
+ 
+ struct element* newchain()
+ {
+--- a/filedb.c
++++ b/filedb.c
+@@ -1,5 +1,7 @@
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
++#include <string.h>
+ #include <unistd.h>
+ #include "chain.h"
+ #include "filedb.h"
+--- a/inifile.c
++++ b/inifile.c
+@@ -1,5 +1,6 @@
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "inifile.h"
+ 
+ /*
+--- a/watchd.c
++++ b/watchd.c
+@@ -25,6 +25,7 @@ Syntax   : watchd
+ #include <sys/types.h>
+ #include <sys/timeb.h>
+ #include <sys/stat.h>
++#include <sys/time.h>
+ #include <sys/wait.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
index d6fc7c4146b5..1622add191e4 100644
--- a/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
+++ b/app-admin/watchfolder/watchfolder-0.3.3-r1.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
-DESCRIPTION="watches directories and processes files"
+DESCRIPTION="Watches directories and processes files"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="mirror://gentoo/${P}.tar.gz"
+S="${WORKDIR}/${P/folder/d}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ppc ~x86"
 
-S="${WORKDIR}/${P/folder/d}"
-
 PATCHES=(
 	# patch to remove warnings on 64 bit systems
 	"${FILESDIR}"/${PV}-64bit.patch
 	# and a gcc 4.3.3 / fortify_sources fix
 	"${FILESDIR}"/${PV}-fortify-sources.patch
+	# various implicit declarations
+	"${FILESDIR}"/${PV}-implicit-decl.patch
 )
 
 src_prepare() {
 	default
+
 	sed -i \
 		-e '/-c -o/s:OPT:CFLAGS:' \
 		-e 's:(\(LD\)\?OPT):(LDFLAGS) $(CFLAGS):' \