cleanout and version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64

6 files changed, 31 insertions, 292 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index addf2d3fcd3d..c85fd4d3f80e 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-antivirus/clamav
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.470 2013/12/24 16:55:00 ago Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.471 2014/01/27 12:32:56 lordvan Exp $
+
+*clamav-0.98.1 (27 Jan 2014)
+
+  27 Jan 2014; <lordvan@gentoo.org> -clamav-0.97.7.ebuild,
+  -clamav-0.97.8.ebuild, -clamav-0.97.8-r2.ebuild, +clamav-0.98.1.ebuild,
+  -files/clamav-0.97-nls.patch:
+  cleanout old versions and version bump to 0.98.1 - fixes bug #498354
 
   24 Dec 2013; Agostino Sarubbo <ago@gentoo.org> clamav-0.97.8-r2.ebuild:
   Stable for ppc64, wrt bug #480038
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 034e62fb98cb..8572eeab311a 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,7 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-AUX clamav-0.97-nls.patch 269 SHA256 088b9edcdb678ce9c072042cf51266e061ab5f5ab0e8e42bd953242138c64fd1 SHA512 a0508590353c699d62d203398e4b84ea134348567fa5530e5c9c7ce850a9eeca106544e641ce011cc0a5097313dea780490e7db6fdda1ec2ab61dd6474e31458 WHIRLPOOL 95ce0a012bbb8d0cde2c255d7f15ab8eb24d412cd7b664ce2e7dc6ea887c608252076e45f7f4a007edda455f07b62884002a6d914b25b889da2682140d31f20c
 AUX clamav-milter.README.gentoo 1124 SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a WHIRLPOOL f85b17448fd93205e2f38d024b96410cc8d143d077201e0a1b8f4cda95ae2447a70eded4cb90968a593ad2637229300fa04bfe5dba96d3d68c2d09c105ee3f16
 AUX clamav-milter.service 284 SHA256 b371725acfd102b6b7ee15ab0059e8795b7d3716d041d0dc11d0fe8f7454d5a9 SHA512 442148ac3c42ecbb893de5c6edde337b72a745d20f6c5ffa33131f9a0b2daadcffac39b686ada986a5ab500ea7b9153c448abc1b819e15fef488da1812bb0cee WHIRLPOOL 56b4ed79e06c764df37022f0638ceddb5fe8185c54b2e460b076a46ed4f5a68b67fb7966d424dabe836bfd7d6b9d770eb60cad4633ee17083baa50ad2c0a89cd
 AUX clamav.logrotate 355 SHA256 ab91f784d5098d2162be9277e3a006bdb392d9d89975838ad4ac7dfd8b418170 SHA512 39e8027db4cb2cf1b45dac6777dbd922640b41f47deb34199d910560d56431051432b68ab387101542d8f98069253c85bb2ab39c274eb99c2db26c5967abf512 WHIRLPOOL 0d201d6909d309e22526ed0d40da588602d0b34367b9e7d54b42d6626c7b7bac1150c1671740cead5d900baa8a6a098feaeb1127251d9a45eb35203016197193
@@ -14,29 +10,9 @@ AUX clamd.service 136 SHA256 d50b2d7b291e1d03f142e0b113a90c600cf5a0f73f1a4847d8c
 AUX clamd_at.service 190 SHA256 7fb3eb55fbb0bff9884aa943ffc6439e328bc0e4a607c1615c924be9c3711c30 SHA512 b5121bfe761d21152356c8b1e0f0974a9c0bb9002b3d5b1af1c7940d94314250a4890388876b150b0f071c24b7261b93bbc9a6b94b896294c549fe6b572ee70a WHIRLPOOL d58f1d19de54183224ecccc78f9968473c8b891c6ce1f5a9045c1a1db962c152a4b22f58dc55ae54a3b21df20a422e173143e6b893a8913e7f038904e991cce6
 AUX freshclamd.service 191 SHA256 dd5ff6c79ee360da5f2221c4d9110a2a8886d86293f6c93c16bf74fdb126593c SHA512 aaf78e763d2aa9c17fc95edb1550547b6681a91fd239a86535e5193d36ff0e152c51c3a3957542f80d5b170805f296159958ac347886981ddd324bec4237da92 WHIRLPOOL f3d5273151e6cc0b2a245db07ea526b9a7d051efcfa902924ca63529618318524c359fb638b10caed38313f93fc283175ae9d2ec9314556593d818518931512c
 AUX tmpfiles.d/clamav.conf 33 SHA256 893bda174539a1a2ffc7f713f563d172593d9707da5c49e6c151832c57da6846 SHA512 eabe5a94c2679b82ea3e29272eb448b47e60b271381d3e97f3970b1a9e086d61662aff2d29887950a911025294aa7cea8bfd9003d257963566b251bcaeb5f6b2 WHIRLPOOL 74d92a4a54f6d38bd752ff46ed494abc823781f41e7663468cd94125076538a4a315808fd0efd2e988d94dcfb05251aef194225cb4bbc1cf05c23fcb491d7e98
-DIST clamav-0.97.7.tar.gz 14598481 SHA256 8527754e7eb235317e37a50706d94d3fc9d880fd0bf6f3cb83757d64a720e9ff SHA512 92120250afb882b7fb9f956f2095797f8e3c93076a229967123261c907d9b4436cda6cf2d18b2c61cec8b33afeacba9c2701ad3322aa3316163fe4f36f7a7bc7 WHIRLPOOL 1f3fb155ad4e35ef1ea3835941e40363f9da9c37ab46fe1b9d44e29add6fee9d775e1f5858648a6229f9d0f41c40ed4ade726a4fc044156d208bf10f6cc8c705
-DIST clamav-0.97.8.tar.gz 14609966 SHA256 d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12 SHA512 e3a80bbfc90922f7f49521d1ab53ec63fb948a42d448ecaa933023cbb256f35e5b695305bd2d56480ee1f94ac93703d10aa4193566c521a1fa62f2c0e1019fda WHIRLPOOL b0ddc29edd096007abc0183400f2b3ee54cf87f13bb2eab2388c444f038fab33eb25b6b5d678449d49da2258017a630ff2e6b36c27028557038a033b415b026c
+DIST clamav-0.98.1.tar.gz 15431484 SHA256 35f5e84d734cdd4532c1cc6c92560c5b31d1c24f2e1e203bef0ca1351eb223dc SHA512 5daac24d346a03acc7e4d8f9e5962a009a908326663008557cbc2af4426e6059cbebbb8fac6d718edf9a567075b823c457f3f9a3aea3c558f5ee272274030b42 WHIRLPOOL 0af4baeefb5e384db0679bdbad2902ced213adb4993c61755fb4065845106779b3467e61dd6fc38b4d7fcecf492069e2a02178a259c618fd6e2f309faf9d1eb1
 DIST clamav-0.98.tar.gz 37075245 SHA256 113450537f46ed47f010a179be333a0dcd79eac13f264dce26db7aac8d52b3b6 SHA512 532f9fa2616065879b3ecace2672fad26cf3863943e0ecb8835fbed7e5907600ef50b8df820a08a6586bf77c9bf7c6e50af671f31b7c3ee372c31745a173099f WHIRLPOOL a4ee9efd09193aee7fd740dbb60acabdd4a1f6d5171a4e0fa220441457e3431bf99b27c7300ca0e3e124bb5406f65acf106fa51bfc34d87335ca83ccbc942979
-EBUILD clamav-0.97.7.ebuild 3801 SHA256 fd0ef12dc9dd422e657d6806dade1f375ed941200f4ba9c36b2e38ab91163cea SHA512 aa91a3622322878581db7de71d6eaedf59179942a73c0033a5a701bb3e73806e7770574d8ce92e647858f317a1472893bff397b37425b18d0916a8e84ad93531 WHIRLPOOL c0c23b7ab5bb144309ea3fd938432d936f9da59bcc013256d874779c959ac7ba6002b498e864c6fd1b844f1d67f070d07e378b1daef2693caa8af587116b3ccc
-EBUILD clamav-0.97.8-r2.ebuild 4079 SHA256 1d6f1af76e82f243d6780294fddc2f1b45c747a47a98f99e7462bdd859566aae SHA512 92a683d025d419ab747679e6b3af1046587511a8a18314991e414f0561f1fbd4bb3984719b3dedfa4b99847f6c9eee5b747d7d46320d0245300a1f0c3714c4fa WHIRLPOOL bded90ee3927c59dc8feafeec5b073e12f0dc83e820e3b8fff8baae0434982ed73c0b676f870fc460de3358b340570017c8873d0257fc9bc30d39090658b4be0
-EBUILD clamav-0.97.8.ebuild 3806 SHA256 53a6f292608f8d7eac9fac218db0754b41e2e1705ab8ebf6a161ee79e0be43e7 SHA512 a44c09bba44d56c8779a174303a734024363c21d50e9a68a0cdf613d061bd0c5bbeaf6c4046239c8c5bd302d72dc900810a9ed0966d36f22dfcb95cc24823cf3 WHIRLPOOL 769a8fc35a752dd3cbdf2b367552d9a5261e9544bd8864b0f876c8cc2443636c8e9790991f28f78057fd71a93dd937bef43629db51cbd1655662570d7881b2e5
+EBUILD clamav-0.98.1.ebuild 4454 SHA256 75b97241488e354fffdbdc8258b1d2f3baecf49ba3b94354ef47aa4d1a117f25 SHA512 3e7b9c85e61d11dcef48bdb86581e2a0c331c36dda2937a998d687ffa2b9c3739a469da35f584cd39c0ad3c3c87bb1f65c3e7fabd7ccf006ba8b7cfe37c172aa WHIRLPOOL 4683e82afd3034185c9c164f8b973fdb5fc369e82b1b9343b783913475b82947371fcb61f6c22fe0e31544606fa8d67386f6d59fad0e21aa9162a04a969ddfcb
 EBUILD clamav-0.98.ebuild 4445 SHA256 36f1955fd140dd06cd88cccc79029b5bb5a121fa85002a6f13500f43bf7c784a SHA512 90f28877771019c3a26840184b269a20a5f22519c2e77be2b49d7647e4402634fed7e273ea38f846300171c59f60c5b6b0b5daf1d4c6bf90f8d8ee20b1714a0e WHIRLPOOL 22fcd5cad02c1ff599ea686662a78deca82bd88712418b3e6897e7206f7c12c8595ddd767afe4bc141607d0601f35f1c2d3cd9b71f00ea351107b8afd16f96bb
-MISC ChangeLog 68624 SHA256 b1a4cd4111abcdce05e2e6aa5d0586940d78f3e410e41b960305de940dbf37ab SHA512 0c9403d6edac8a0cf113f8eb9deca713bf08a69fb0c638239da2da2c37ef2bf06ef2ec22ee013f26a00c5ca0c5dd6fbb9bfc1d5829d0021cc1eedf4e4c3b7366 WHIRLPOOL 1a161bb9356605c1961c42c739649da80a36898ecc4fece4daa09937d8ee190971fa9dd9aa166b310963d7d0089dd986ab75630da54e21b9501fd53d3776920e
+MISC ChangeLog 68895 SHA256 6b119e38d53006fccf7994c164aa960f70fbdc490ab9c4af209ce5ebef97443d SHA512 63284027dd91dc73c53f1bddb4f6566304f16bcda49050bd339de71a15defa061339c4f56f687397129bb74cc654e67bb297a8a058ad3e82d4adfc975e9bde8d WHIRLPOOL 12da77c90930681a4683c39a20e6632d314c0f9f5c67cdae2a834ad8c229de84133e6f6529ddd3f00b6ad32ecf06224502ff063cf38b1a40486795121b41eaf0
 MISC metadata.xml 320 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d SHA512 c5bb20c993b91112d9c9e0b7bb6c116ac7f711c769084eaaacc28bc7eeb54db09c9794c6ef057747d80a08cf1502f0f688cdefc741423a38da55b2deaebd6476 WHIRLPOOL 741ff80258dee2c145d08f72f10982bd5c1fcba44ed84054cd1a33787864a7d8821b432c3246ad5a04ce11edde7d045f3eb6e056200e3bd2e8505eeea3d7277d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCgAGBQJSubtzAAoJELp701BxlEWfRC8QAKCYnleqc7BAbSIVvttSEx6k
-OObdbmLXikbijGBu8ArtmNkgKZovNOKNH9XCElFprMeTHkGtAG3+KbCk9Mp1BqiU
-/+OI85cyk8zyb2q81v7UtnIks11+mODDkNRRx4BQ143XTbJ1o6gRltoyJir45Bqx
-GlK/FTgGy2UAj0YGuB2f3lfhyqaG961bM6Yj1Q8Vv67mmfShQiuDs+zsqngBmDTs
-oDWf5glcGmBn0G2V5qfewJnHqZOobnQOqdW2h1wBIXPmmM88Edf1gZhdv1vz6D9a
-A5oT+h5bIJU8y5x72HmLxAJBJbc/VBeCdIQ0syFpNVEdECogI2iQ3pdBp4AQ5r04
-TmMMqW6D9oAwOWkfJps9Yg8AGLVEuFWR1GY9jHuurRv2dYdE124tLDC/5Pv1Rysi
-jC3GZfEVUX4VciLKC0G58d/hRnR8QUpvc1P7o7FY3XMj6srT257aHQWFnoBmLN0J
-iB6ODa4ZZACrcbshAz1njIgg3l4BapuUWLuxBrMWxy8KFaltWWkDkPTLit6wMzZV
-vMBzsMyzAKXrlY/fg5yQdCJAP8jy1C/EWP86dtBC+6/rVERFasO1abvhMWRuxyBk
-Nludkl3MlCiybVP3jIi6NaLg6Uz7N4ltdgtMAOT7D1cevZvuYQpfFYTgzLJ5LvAs
-vizf/BUvBdflSdXRMYJB
-=C217
------END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.7.ebuild b/app-antivirus/clamav/clamav-0.97.7.ebuild
deleted file mode 100644
index c1407e644d96..000000000000
--- a/app-antivirus/clamav/clamav-0.97.7.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.7.ebuild,v 1.11 2013/10/09 11:28:32 xarthisius Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-	epatch "${FILESDIR}"/${PN}-0.97-nls.patch
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r3 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.97.8.ebuild b/app-antivirus/clamav/clamav-0.97.8.ebuild
deleted file mode 100644
index d5bac2d7fcb7..000000000000
--- a/app-antivirus/clamav/clamav-0.97.8.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8.ebuild,v 1.5 2013/11/29 09:06:23 pinkbyte Exp $
-
-EAPI=5
-
-inherit eutils flag-o-matic user
-
-DESCRIPTION="Clam Anti-Virus Scanner"
-HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
-
-CDEPEND="bzip2? ( app-arch/bzip2 )
-	clamdtop? ( sys-libs/ncurses )
-	iconv? ( virtual/libiconv )
-	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
-	dev-libs/libtommath
-	>=sys-libs/zlib-1.2.2
-	sys-devel/libtool"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-clamav )"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-
-pkg_setup() {
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_prepare() {
-	use ppc64 && append-flags -mminimal-toc
-	use uclibc && export ac_cv_type_error_t=yes
-	epatch "${FILESDIR}"/${PN}-0.97-nls.patch
-}
-
-src_configure() {
-	econf \
-		--disable-experimental \
-		--enable-id-check \
-		--with-dbdir="${EPREFIX}"/var/lib/clamav \
-		--with-system-tommath \
-		--with-zlib="${EPREFIX}"/usr \
-		$(use_enable bzip2) \
-		$(use_enable clamdtop) \
-		$(use_enable ipv6) \
-		$(use_enable milter) \
-		$(use_enable static-libs static) \
-		$(use_with iconv)
-}
-
-src_install() {
-	default
-
-	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r5 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
-
-	keepdir /var/lib/clamav
-	fowners clamav:clamav /var/lib/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	dodir /etc/logrotate.d
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/clamav.logrotate clamav
-
-	# Modify /etc/{clamd,freshclam}.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf
-
-	if use milter ; then
-		# MilterSocket one to include ' /' because there is a 2nd line for
-		# inet: which we want to leave
-		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
-			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
-			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
-			MILTER_NICELEVEL=19
-			START_MILTER=no
-		EOF
-	fi
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter read the"
-		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
-	fi
-}
diff --git a/app-antivirus/clamav/clamav-0.97.8-r2.ebuild b/app-antivirus/clamav/clamav-0.98.1.ebuild
index b9d0e9ef861f..871c79d6daeb 100644
--- a/app-antivirus/clamav/clamav-0.97.8-r2.ebuild
+++ b/app-antivirus/clamav/clamav-0.98.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8-r2.ebuild,v 1.6 2013/12/24 16:55:00 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.98.1.ebuild,v 1.1 2014/01/27 12:32:56 lordvan Exp $
 
 EAPI=5
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs uclibc"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
@@ -27,8 +27,6 @@ DEPEND="${CDEPEND}
 RDEPEND="${CDEPEND}
 	selinux? ( sec-policy/selinux-clamav )"
 
-RESTRICT="test"
-
 DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
 
 pkg_setup() {
@@ -39,12 +37,12 @@ pkg_setup() {
 src_prepare() {
 	use ppc64 && append-flags -mminimal-toc
 	use uclibc && export ac_cv_type_error_t=yes
-	epatch "${FILESDIR}"/${PN}-0.97-nls.patch
 }
 
 src_configure() {
 	econf \
 		--disable-experimental \
+		--disable-fanotify \
 		--enable-id-check \
 		--with-dbdir="${EPREFIX}"/var/lib/clamav \
 		--with-system-tommath \
@@ -61,8 +59,8 @@ src_install() {
 	default
 
 	rm -rf "${ED}"/var/lib/clamav
-	newinitd "${FILESDIR}"/clamd.initd-r5 clamd
-	newconfd "${FILESDIR}"/clamd.conf clamd
+	newinitd "${FILESDIR}"/clamd.initd-r6 clamd
+	newconfd "${FILESDIR}"/clamd.conf-r1 clamd
 
 	systemd_dotmpfilesd "${FILESDIR}/tmpfiles.d/clamav.conf"
 	systemd_newunit "${FILESDIR}/clamd_at.service" "clamd@.service"
@@ -86,7 +84,7 @@ src_install() {
 		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
 		-e "s:^\#\(LogTime\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/clamd.conf
+		"${ED}"/etc/clamd.conf.sample || die
 	sed -i -e "s:^\(Example\):\# \1:" \
 		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/freshclam.pid:" \
 		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
@@ -94,7 +92,7 @@ src_install() {
 		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
 		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${ED}"/etc/freshclam.conf
+		"${ED}"/etc/freshclam.conf.sample || die
 
 	if use milter ; then
 		# MilterSocket one to include ' /' because there is a 2nd line for
@@ -107,8 +105,8 @@ src_install() {
 			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
 			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
 			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
-			"${ED}"/etc/clamav-milter.conf
-		cat > "${ED}"/etc/conf.d/clamd <<-EOF
+			"${ED}"/etc/clamav-milter.conf.sample || die
+		cat >> "${ED}"/etc/conf.d/clamd <<-EOF
 			MILTER_NICELEVEL=19
 			START_MILTER=no
 		EOF
@@ -116,6 +114,11 @@ src_install() {
 		systemd_dounit "${FILESDIR}/clamav-milter.service"
 	fi
 
+	for i in clamd freshclam clamav-milter
+	do
+		[[ -f "${D}"/etc/"${i}".conf.sample ]] && mv "${D}"/etc/"${i}".conf{.sample,}
+	done
+
 	prune_libtool_files --all
 }
 
@@ -124,4 +127,8 @@ pkg_postinst() {
 		elog "For simple instructions how to setup the clamav-milter read the"
 		elog "clamav-milter.README.gentoo in /usr/share/doc/${PF}"
 	fi
+	if test -z $(find "${ROOT}"var/lib/clamav -maxdepth 1 -name 'main.c*' -print -quit) ; then
+		ewarn "You must run freshclam manually to populate the virus database files"
+		ewarn "before starting clamav for the first time.\n"
+	fi
 }
diff --git a/app-antivirus/clamav/files/clamav-0.97-nls.patch b/app-antivirus/clamav/files/clamav-0.97-nls.patch
deleted file mode 100644
index 6ca0c0e91bfe..000000000000
--- a/app-antivirus/clamav/files/clamav-0.97-nls.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- clamav-0.97/shared/output.c.orig
-+++ clamav-0.97/shared/output.c
-@@ -63,7 +63,7 @@
- pthread_mutex_t mdprintf_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
- 
--#ifdef  C_LINUX
-+#if defined(C_LINUX) && defined(HAVE_LIBINTL_H)
- #include <libintl.h>
- #include <locale.h>
-