From: Matsuu Takuto <matsuu@gentoo.org>
Date: Thu, 17 Jun 2010 17:29:26 +0000 (+0000)
Subject: Fixed gcc-4.5 issue, bug #320107.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0748eec5a540296b5bf55d4833374abc1e541d57;p=gentoo.git

Fixed gcc-4.5 issue, bug #320107.
Package-Manager: portage-2.1.8.3/cvs/Linux x86_64
---

diff --git a/sys-fs/clamfs/ChangeLog b/sys-fs/clamfs/ChangeLog
index cb7cd56bd248..dc317ecd51cf 100644
--- a/sys-fs/clamfs/ChangeLog
+++ b/sys-fs/clamfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/clamfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/clamfs/ChangeLog,v 1.1 2010/01/08 16:29:26 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clamfs/ChangeLog,v 1.2 2010/06/17 17:29:26 matsuu Exp $
+
+*clamfs-1.0.1-r1 (17 Jun 2010)
+
+  17 Jun 2010; MATSUU Takuto <matsuu@gentoo.org> +clamfs-1.0.1-r1.ebuild,
+  +files/clamfs-1.0.1-gcc45.patch:
+  Fixed gcc-4.5 issue, bug #320107.
 
 *clamfs-1.0.1 (08 Jan 2010)
 
diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest
index 13f8c9bca6ed..7a925dd9b6de 100644
--- a/sys-fs/clamfs/Manifest
+++ b/sys-fs/clamfs/Manifest
@@ -1,7 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX clamfs-1.0.1-gcc45.patch 391 RMD160 2447355a8b7126bfb4163cdc715a468e4211e9a6 SHA1 37ad3cc08c0267ad2c37426d4c5d9160c449aee3 SHA256 6d630a0f87c9f99f6718152a9bda58834de99f7e83a14b84d40a539aef4d041c
 AUX clamfs-1.0.1-gentoo.patch 675 RMD160 982e1cba32397d99d5dd035947fa7909a13b9d59 SHA1 3d872d4450a593f9c55ce00a1e04c787b1227673 SHA256 b32331afa6d317a98fea26496c102778dae8acd751085a80769bd450efaaeb92
 AUX clamfs.confd 41 RMD160 4e8d61e6e3f0b768e269296e35a72bfe1e6b40a6 SHA1 9ee090e5caf53f01d9ff4d3977a539d1e6dd4332 SHA256 81e44ff517a49b97382e9d42f4f829d1c7b20a7e6689ff7f99ed611b13498bd4
 AUX clamfs.initd 547 RMD160 84d4ae4994d6395ffdbf5433b3f9829ab97fd885 SHA1 f5f11fb50cafbece5d9804e8fe4a0d6b2a43ea25 SHA256 6b359a82fdc7ac39ebca83bed4eee2d614c50e1f96474a4ba3cb966642836696
 DIST clamfs-1.0.1.tar.gz 142386 RMD160 1dbeb74856b55e3f39fad0ec8c5714a00d989ddf SHA1 d2aa6eabcce95a9ee21d01dd67f76a55b395d199 SHA256 d4f8b0ce767fab3deeb356e8c7cd45a34b5e3de43177735b4f315fc16aa11d03
+EBUILD clamfs-1.0.1-r1.ebuild 1032 RMD160 e20bec8bd9c632af1b5d49c92c9960014d504bf4 SHA1 4fa0a157e8bba1307bfc7536e4b6f17e3384e710 SHA256 7398c35c6c5d1c444ade0ef21b3fc8b3907b6cf0cb3d19f3ac8138a971296812
 EBUILD clamfs-1.0.1.ebuild 990 RMD160 8eaf630ee84699abb80b6931c0efbcc8e24c64f2 SHA1 5b1905f1bc0997de4cbc1701a620094485e56ede SHA256 6635d0cbd84f6f53cf80d1b7cca3f9a7668c2a30c10f7a65488cd65a283d92a9
-MISC ChangeLog 426 RMD160 085138b81bbe3526cc922040705d84b73611df35 SHA1 219f45900c411801d010ef872a15fcd6dbe50155 SHA256 515abaca28aee844a25df0d95c7c3b6133c86ab3f798672bdb18004f36f6cae1
+MISC ChangeLog 604 RMD160 a9fad6058237df6fa59d3cadb1ee8da65d1cd8ab SHA1 3935b2d20e723cc6806628d01148996802f17d34 SHA256 eba5c446da05efd22666d503685c143d749e8bdac2c6762be2ee2308702135a3
 MISC metadata.xml 446 RMD160 923fb82a41cfbfe2f51ce2f7f0529052919b3c6d SHA1 11416dd25f8baa9959f65251656292485ab6c04a SHA256 9b0d4368ea1cd8cf222ad8f6133bd9355af8e8894eef0fa8d95e1e1faf8b399c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iQIcBAEBAgAGBQJMGluAAAoJECaGw+YFKA1p2AUP/RrmdnYo1P3DgR+EB5AkBU9W
+FLeN1tLAVAwbEP0GW6eNy0p8cPgxm6Sf1e8Rwc4xCLwA8HxRKk1mX+C3clNT/xEb
+eSCDL3v5jToxmmR+cAXuliNQCdz6vM3eJie7nPK9YQylGAMqMhJAdzzwaDr+rvI3
+6ZrBX53lXYkiAtFsFT27MABC6WnuH2jldV5+UOQqs5YlGeK78DPGcoB2KGgFxc8z
+2MEVJgAMuswJtFCG/vsT13MCnTkGnZceJIHnsfGVg7RJI6Md8PA4aqkzveJeOOJW
+XSp0a6OHAKvpg+fvGxtwRhcrgaQNRwlFt6aoJqZt3KWDTXxgC+edWuE6FGd045Jz
+YZNouun0uy6qDclUMfZIUEBH5Cm9f/+BES1WlvA1V6DfQDBNbGjTYYgOqroEr374
+a36U8RXLygF8pcRptThvv5uM62Ay+BSKj539TcVfy5VczOvZMPdssoEGd87l5lzj
+zWQEgXWVhQGCe3GEKmnv7yDROA28elzYs+5AMv73r7FtBaRgQzUlU5vYir5plsil
+L1LskqqW+4UG+NS5n8LWyTIwEgkBcPf5E7McYPKd9P+XKO9/tcuy982eIN5HLHQk
+glHE5qh+BaQBhrX3x8uGv2tP4tx4qa8DJZRr2+zP72y0xMaq2RcuP09u9nf4BANf
+jItNYnolPUimUDZ1n1va
+=Oq6+
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/clamfs/clamfs-1.0.1-r1.ebuild b/sys-fs/clamfs/clamfs-1.0.1-r1.ebuild
new file mode 100644
index 000000000000..a97c5a988546
--- /dev/null
+++ b/sys-fs/clamfs/clamfs-1.0.1-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/clamfs/clamfs-1.0.1-r1.ebuild,v 1.1 2010/06/17 17:29:26 matsuu Exp $
+
+EAPI="2"
+inherit eutils 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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=">=dev-libs/boost-1.33
+	sys-fs/fuse
+	dev-cpp/commoncpp2
+	dev-libs/rlog
+	dev-libs/poco"
+RDEPEND="${DEPEND}
+	app-antivirus/clamav"
+
+CONFIG_CHECK="~FUSE_FS"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${P}-gentoo.patch" \
+		"${FILESDIR}/${P}-gcc45.patch"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "emake install failed"
+
+	insinto /etc/clamfs
+	doins doc/clamfs.xml || die
+
+	newinitd "${FILESDIR}/${PN}.initd" ${PN} || die
+	newconfd "${FILESDIR}/${PN}.confd" ${PN} || die
+
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
+}
diff --git a/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch b/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch
new file mode 100644
index 000000000000..1f5f63a252f2
--- /dev/null
+++ b/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch
@@ -0,0 +1,15 @@
+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() {