fix from bug #263740 (thanks to dertobi123), other changes, check changelog

Package-Manager: portage-2.1.6.7/cvs/Linux x86_64

4 files changed, 18 insertions, 35 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 0961d09d15ed..2026a1d09499 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.322 2009/03/31 13:26:26 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.323 2009/04/03 08:20:19 lordvan Exp $
+
+  03 Apr 2009; Thomas Raschbacher <lordvan@gentoo.org> metadata.xml,
+  clamav-0.95.ebuild:
+  ebuild from Bug #263740 with libtool fix, nls use flag removed for
+  autoconf reasons and clamdtop local use flag added
 
 *clamav-0.95 (31 Mar 2009)
 
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index af7949cd0537..b73d3115572e 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -10,6 +10,6 @@ DIST clamav-0.94.2.tar.gz 22107637 RMD160 ae75e5f546f96b7fd0f76dcf9f4977ec95ba4d
 DIST clamav-0.95.tar.gz 24104169 RMD160 bd2431d12f3bb740a2cf535da4be512aa9ba2c14 SHA1 8550b79dc6a6e9a0782ee5bd029bbd107f9e085a SHA256 4f126ecfd20086c452f25aeb6757a200f68e87da82aa39542520435e2f7d31a7
 EBUILD clamav-0.94.1.ebuild 5167 RMD160 15748d0d4e646258e24a76598896dcdc1d0ba1ae SHA1 0cca0f3412deb34d5b66dc1420cc7545b4fe9d15 SHA256 b352ee414341a8ebce79c9afd20633b361674ef016b916b5bd8e77235a54a13a
 EBUILD clamav-0.94.2.ebuild 5168 RMD160 40853f0e7b8dacf816e417e07836cac050682d8b SHA1 102880cdaf4cf50912a367fe6aceae5702f3d5fb SHA256 b2ca2c7bae5be63092d1ee522327114e913c0ae73b5849f4fd6aaa803a7b15e4
-EBUILD clamav-0.95.ebuild 5177 RMD160 f083e33eea91d748f10df3ea81cc1e58f952d80f SHA1 fadc047a5a0fe2171f40667dce57a7a407f6e1a8 SHA256 d5ac4f45bfe5ed98378e42a90b9583e49f7d57c47ff2d00b0cfa08a7efb6c12f
-MISC ChangeLog 49021 RMD160 7f4eb61286f6800af23e0c13811cb43ca0c5b49e SHA1 8b59865e2941e1e4de5faa7e794f5e6ee9f8db34 SHA256 05b0d3b9c13d32c4f766ecf99e87855a831f767acd174cdf91ae94dbbd6642b4
-MISC metadata.xml 184 RMD160 c37bff1fc1cd7139c91dae9b0fa5082e1d81f153 SHA1 cc0a188d9ad2411e78747326c62dd046bd5413c8 SHA256 d51011aa837db802ef539a1321a4af0a4a00879d475b92fd58f3c01df7320b58
+EBUILD clamav-0.95.ebuild 4129 RMD160 2fb63a14f49fd2763692fa46d6ce76960202117f SHA1 33e6a2cfd3982b3fc83ad300ed258a933912c2e9 SHA256 594edb569ae0aef8276ba5e35c6ca4936ae7b9e5013e03cf3940f7810cde1dd3
+MISC ChangeLog 49235 RMD160 7e95bd94138d9cf3388e70fa70b986de7315e38c SHA1 abce990ad48455ca0411628a5d1961dc7e3e71be SHA256 66c765d3b90ca41e60e4187e9d587db2eadbf7cba37a300c1b147539268fbf1e
+MISC metadata.xml 320 RMD160 3546393e30d87f0b0a2fb17e2f15f57dd8c19661 SHA1 b959e38933418e6fc818ed40cd9a4921b8c66102 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d
diff --git a/app-antivirus/clamav/clamav-0.95.ebuild b/app-antivirus/clamav/clamav-0.95.ebuild
index 62a4af9be336..a2834c8fa78f 100644
--- a/app-antivirus/clamav/clamav-0.95.ebuild
+++ b/app-antivirus/clamav/clamav-0.95.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.ebuild,v 1.1 2009/03/31 13:26:26 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.95.ebuild,v 1.2 2009/04/03 08:20:19 lordvan Exp $
 
 inherit autotools eutils flag-o-matic fixheadtails multilib versionator
 
@@ -16,14 +16,13 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="bzip2 crypt iconv mailwrapper milter nls selinux ipv6"
+IUSE="bzip2 clamdtop crypt iconv milter selinux ipv6"
 
 COMMON_DEPEND="bzip2? ( app-arch/bzip2 )
 	crypt? ( >=dev-libs/gmp-4.1.2 )
 	milter? ( || ( mail-filter/libmilter mail-mta/sendmail ) )
 	iconv? ( virtual/libiconv )
-	nls? ( sys-devel/gettext )
-	dev-libs/gmp
+	clamdtop? ( sys-libs/ncurses )
 	>=sys-libs/zlib-1.2.1-r3
 	>=sys-apps/sed-4"
 
@@ -50,28 +49,6 @@ pkg_setup() {
 	enewuser clamav -1 -1 /dev/null clamav
 }
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# This newer version of ClamAV packages libtool.m4 and lt*.m4 in m4,
-	# while previous versions did not.
-	# Since autoreconf invokes libtoolize, a different version of ltmain.sh that doesn't
-	# match up with the version of the *.m4 files gets thrown into this directory.
-	# This problem showed up for me in the packages libtool's use of $ECHO while my
-	# system's libtool's instead used $echo internally, and the .m4 file provides the value of
-	# $echo or $ECHO.
-	einfo "removing possibly incompatible libtool-related m4 files"
-	rm m4/libtool.m4 m4/lt*.m4 || die "unable to remove possibly incompatible libtool-related m4 files"
-	#epatch "${FILESDIR}"/${PN}-0.94.1-buildfix.patch
-	#epatch "${FILESDIR}"/${PN}-0.94-nls.patch
-
-	# If nls flag is disabled, gettext may not be available, but eautoreconf
-	# needs this file (bug #218892).
-	use nls || cp "${FILESDIR}"/lib-ld.m4 m4/
-
-	AT_M4DIR="m4" eautoreconf
-}
-
 src_compile() {
 	has_version =sys-libs/glibc-2.2* && filter-lfs-flags
 
@@ -84,15 +61,13 @@ src_compile() {
 	myconf="${myconf} --enable-id-check"
 	use milter && {
 		myconf="${myconf} --enable-milter"
-		use mailwrapper && \
-			myconf="${myconf} --with-sendmail=/usr/sbin/sendmail.sendmail"
 	}
 
 	ht_fix_file configure
 	econf ${myconf} \
 		$(use_enable bzip2) \
-		$(use_enable nls) \
 		$(use_enable ipv6) \
+		$(use_enable clamdtop) \
 		$(use_with iconv) \
 		--disable-experimental \
 		--with-dbdir=/var/lib/clamav || die
diff --git a/app-antivirus/clamav/metadata.xml b/app-antivirus/clamav/metadata.xml
index 0f4f00996a87..e2cc2031a88f 100644
--- a/app-antivirus/clamav/metadata.xml
+++ b/app-antivirus/clamav/metadata.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-mail</herd>
-<herd>antivirus</herd>
+  <herd>net-mail</herd>
+  <herd>antivirus</herd>
+  <use>
+    <flag name="clamdtop">A Top like tool which shows what clamd is currently scanning amongst other things</flag>
+  </use>
 </pkgmetadata>