gentoo resync : 25.11.2020

5 files changed, 23 insertions, 46 deletions

diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest
index 8f6b6cb65ba6..5b984722226f 100644
--- a/sys-fs/clamfs/Manifest
+++ b/sys-fs/clamfs/Manifest
@@ -1,7 +1,5 @@
-AUX clamfs-1.0.1-gcc45.patch 391 BLAKE2B 1510b32786a059127d58651df0c9220407d018272431ac28c2a6bd3c3c42b8c42ed74903349c1820ab622a3f223af691b8dd0fabef9e015457028162f522f1e0 SHA512 00bc13b5abfb07d08e5b34d2490d62de6f8c0daf78f920dcf5a0c92b203d3fd769ea631247cc3f61992ee4453875a8707379a1c9e399e805dec9c8c47cf2a5de
-AUX clamfs-1.0.1-gentoo.patch 675 BLAKE2B 4e0e8658444f706aed06b69c9c0d110dc7ea81839243042ef06040d28525091053f3ecdfc1c79ff8e84c0414dc9b0f4fff1ba5c54df21d83b5a126e20f33d9ef SHA512 3b96022c30b66cf62c440d4150168bed5a25b4bdac1cca8ac97d3383c5bf16749712185a7011aebc97c2730d42d6b90e48dd9b1825988c2a5366ca1af916296c
 AUX clamfs.confd 41 BLAKE2B bfca4ec45eab1c94f54e9f470797be54c2bcb363bccf2565e391803189ae614f8d17d0eee6bcd83bfac5b7829dbd5a1ccbbebbf34a4f5033ed87d632f0f9358a SHA512 a49afb1e2684732581c4b6274744be71193e48137d71abf4d12b943d1b91502b52fd077a6124c33182e6796cbdb609c000e0f3c1baa05b9349ab4a38b247280d
 AUX clamfs.initd 441 BLAKE2B d14da6b7120e4ab864be2faa1c8387044be9ee8d666eff0a57e45ad0ffc0ea2609a36a5ab97e8255aeb9d68f615ddcb40199eb8bb68626aae3e24f25f59faf38 SHA512 5a3b2de57733893df42d307ac299ec785f9e7a9d52bbd4139c166b607c5e803d3052afaee5dcc95b430fdb76a0da05c198c419dd8f3885e7d2d1b5d5e3c6e8b6
-DIST clamfs-1.0.1.tar.gz 142386 BLAKE2B d4333ddebae3aec1ffa36cd5db361b07daa4007c75e6f6e7e3c296f99573bde5ac77722b7af95fe194fd2ba0d56550a608911235da6cc7e9c25359af6554fcbd SHA512 8a9912c068c178049e8538da729635af1372e8ad1f7bc0e14cc7506208d15a4c1fdab7cf229dd683a3245168c627a3d994ec5b24bca5f12efc9ff638040e3258
-EBUILD clamfs-1.0.1-r3.ebuild 879 BLAKE2B 2d5134ccafa339a451c8bed3b5e88f76a4027417f6d8fc6c9618be1ba732a7c17cc466b45a918211176977f1a9f47a563c7aead84e404a460e25cf41f14bdd33 SHA512 d997aad74ff871769af91dc4fc46a013077970405384da336cd7c7c1cccb12e55f2b817d2562147c587f12fcf71271906892caf7b8dd510ec0878e57f8b54fd6
-MISC metadata.xml 475 BLAKE2B 6f62f5c3c67b45ea22c1075f4698e51d00e64da546d62ba7f6bd3f1e65e2f29eafc9d14e577c543fb25a0d76e95f32f37a97d696d2c32653658de917b42958a7 SHA512 b6df75e41f257bd6d420906c1aadbdab5efac2e6910ffcdf41f6353d3745f17f1f7df7733e816944c87f8f7503082bcdc422430c601ab06701408663fc150011
+DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626
+EBUILD clamfs-1.2.0.ebuild 884 BLAKE2B 6980e4d40b869b5de9b7f4d1a4442a02e416d5303a0a32843cbcba960698f959a791137da39d4014d13596ec281f1d5d6a103d2941e85ba469380b7b6f7a988a SHA512 c075fdda1cfef3b76d37a3f6a139a0677a3d0af6c75ae46d376061b0f5b5906ef69157f9c7764dd14c0e7979a6ac6ec90b574403f64a94db6c4eaf1683053afb
+MISC metadata.xml 687 BLAKE2B 37829356f4f52cd8839f2ef33ae462c2a5e8a062bd3293bb177c4ebd31a933912e7ea30f26cbaf149de613ef8e4913e9adce1a223c1a9715d81af3b70657663c SHA512 f18160b3711dd7e8f064abd9b4e929d50ff9c7996807402916e4532902aed5c52f3ca0460c44c280e89d79ee4c4ffd0c682fc8cc56001eb93064304157d8659d
diff --git a/sys-fs/clamfs/clamfs-1.0.1-r3.ebuild b/sys-fs/clamfs/clamfs-1.2.0.ebuild
index 8a8bf827a5ba..c7a90b3a7d45 100644
--- a/sys-fs/clamfs/clamfs-1.0.1-r3.ebuild
+++ b/sys-fs/clamfs/clamfs-1.2.0.ebuild
@@ -1,36 +1,35 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit eutils linux-info
+EAPI=7
+inherit autotools linux-info
 
 DESCRIPTION="A FUSE-based user-space file system with on-access anti-virus file scanning"
-HOMEPAGE="http://clamfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/burghardt/clamfs"
+SRC_URI="https://github.com/burghardt/clamfs/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=dev-libs/boost-1.33
-	sys-fs/fuse:0
-	dev-cpp/commoncpp2
+	dev-libs/poco
 	dev-libs/rlog
-	dev-libs/poco"
+	sys-fs/fuse:3"
 RDEPEND="${DEPEND}
 	app-antivirus/clamav"
 
 CONFIG_CHECK="~FUSE_FS"
 
 src_prepare() {
-	eapply "${FILESDIR}/${P}-gentoo.patch"
-	eapply -p0 "${FILESDIR}/${P}-gcc45.patch"
-	eapply_user
+	# Do not use Werror ( #754180 )
+	sed -i 's/\-Werror//g' configure.ac || die "Sed failed"
+	default
+	eautoreconf
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 
 	insinto /etc/clamfs
 	doins doc/clamfs.xml
diff --git a/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch b/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch
deleted file mode 100644
index 1f5f63a252f2..000000000000
--- a/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix building with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=320107
-
---- src/scancache.cxx
-+++ src/scancache.cxx
-@@ -37,7 +37,7 @@
- }
- 
- ScanCache::ScanCache(long int elements, long int expire):
--    ExpireLRUCache<ino_t, CachedResult>::ExpireLRUCache<ino_t, CachedResult>(elements, expire) {
-+    ExpireLRUCache<ino_t, CachedResult>(elements, expire) {
- }
- 
- ScanCache::~ScanCache() {
diff --git a/sys-fs/clamfs/files/clamfs-1.0.1-gentoo.patch b/sys-fs/clamfs/files/clamfs-1.0.1-gentoo.patch
deleted file mode 100644
index f5c02daca6d6..000000000000
--- a/sys-fs/clamfs/files/clamfs-1.0.1-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur clamfs-1.0.1.orig/doc/clamfs.xml clamfs-1.0.1/doc/clamfs.xml
---- clamfs-1.0.1.orig/doc/clamfs.xml	2009-02-07 23:09:26.000000000 +0900
-+++ clamfs-1.0.1/doc/clamfs.xml	2010-01-08 18:19:13.000000000 +0900
-@@ -16,7 +16,7 @@
-          check  - (yes or no) check if clamd is available on startup (useful if
-                   mounting clamfs file systems from /etc/fstab early on startup,
-                   while clamav daemon is not yet started) -->
--    <clamd socket="/var/run/clamav/clamd.ctl" check="yes" />
-+    <clamd socket="/var/run/clamav/clamd.sock" check="yes" />
- 
-     <!-- File system settings
-          root       - real directory to attach as our root
diff --git a/sys-fs/clamfs/metadata.xml b/sys-fs/clamfs/metadata.xml
index dfe00d7ec76e..57d224d33e73 100644
--- a/sys-fs/clamfs/metadata.xml
+++ b/sys-fs/clamfs/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   ClamFS is a FUSE-based user-space file system for Linux with on-access
   anti-virus file scanning through clamd daemon (a file scanning service