Cleanup; Version bump, fixes bug #248798

(Portage version: 2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64)

6 files changed, 34 insertions, 269 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index a38e1ac1a501..b5e7f4c199f3 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.315 2008/11/15 17:54:00 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.316 2008/11/28 22:26:30 dertobi123 Exp $
+
+*clamav-0.94.2 (28 Nov 2008)
+
+  28 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+  -files/clamav-0.93-buildfix.patch, -files/clamav-0.93-nls.patch,
+  -files/clamav-0.94-buildfix.patch, -clamav-0.93.3.ebuild,
+  -clamav-0.94.ebuild, +clamav-0.94.2.ebuild:
+  Cleanup; Version bump, fixes bug #248798
 
   15 Nov 2008; Tobias Scherbaum <dertobi123@gentoo.org>
   clamav-0.94.1.ebuild:
diff --git a/app-antivirus/clamav/clamav-0.93.3.ebuild b/app-antivirus/clamav/clamav-0.93.3.ebuild
deleted file mode 100644
index 80d0515c57f6..000000000000
--- a/app-antivirus/clamav/clamav-0.93.3.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.93.3.ebuild,v 1.6 2008/07/22 16:52:31 dertobi123 Exp $
-
-inherit autotools eutils flag-o-matic fixheadtails multilib
-
-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 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="bzip2 crypt iconv mailwrapper milter nls selinux"
-
-DEPEND="virtual/libc
-	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
-	>=sys-libs/zlib-1.2.1-r3
-	>=sys-apps/sed-4"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-clamav )
-	sys-apps/grep"
-PROVIDE="virtual/antivirus"
-
-pkg_setup() {
-	if use milter; then
-		if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then
-			ewarn "In order to enable milter support, clamav needs sendmail with enabled milter"
-			ewarn "USE flag, or mail-filter/libmilter package."
-		fi
-	fi
-
-	enewgroup clamav
-	enewuser clamav -1 -1 /dev/null clamav
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-0.93-buildfix.patch
-	epatch "${FILESDIR}"/${PN}-0.93-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
-
-	local myconf
-
-	# we depend on fixed zlib, so we can disable this check to prevent redundant
-	# warning (bug #61749)
-	myconf="${myconf} --disable-zlib-vcheck"
-	# use id utility instead of /etc/passwd parsing (bug #72540)
-	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_with iconv) \
-		--disable-experimental \
-		--with-dbdir=/var/lib/clamav || die
-	emake || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-	dodoc AUTHORS BUGS NEWS README ChangeLog FAQ
-	newconfd "${FILESDIR}"/clamd.conf clamd
-	newinitd "${FILESDIR}"/clamd.rc clamd
-	dodoc "${FILESDIR}"/clamav-milter.README.gentoo
-
-	dodir /var/run/clamav
-	keepdir /var/run/clamav
-	fowners clamav:clamav /var/run/clamav
-	dodir /var/log/clamav
-	keepdir /var/log/clamav
-	fowners clamav:clamav /var/log/clamav
-
-	# Change /etc/clamd.conf to be usable out of the box
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamd.pid:" \
-		-e "s:.*\(LocalSocket\) .*:\1 /var/run/clamav/clamd.sock:" \
-		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
-		-e "s:^\#\(LogTime\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${D}"/etc/clamd.conf
-
-	# Do the same for /etc/freshclam.conf
-	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
-		-e "s:.*\(DatabaseOwner\) .*:\1 clamav:" \
-		-e "s:^\#\(UpdateLogFile\) .*:\1 /var/log/clamav/freshclam.log:" \
-		-e "s:^\#\(NotifyClamd\).*:\1 /etc/clamd.conf:" \
-		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
-		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-		"${D}"/etc/freshclam.conf
-
-	if use milter ; then
-		echo "
-START_MILTER=no
-MILTER_NICELEVEL=19" \
-			>> "${D}"/etc/conf.d/clamd
-		echo "MILTER_SOCKET=\"/var/run/clamav/clmilter.sock\"" \
-			>>"${D}"/etc/conf.d/clamd
-		echo "MILTER_OPTS=\"-m 10 --timeout=0\"" \
-			>>"${D}"/etc/conf.d/clamd
-	fi
-
-	diropts ""
-	dodir /etc/logrotate.d
-	insopts -m0644
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${PN}.logrotate ${PN}
-}
-
-pkg_postinst() {
-	echo
-	if use milter ; then
-		elog "For simple instructions how to setup the clamav-milter"
-		elog "read /usr/share/doc/${PF}/clamav-milter.README.gentoo.gz"
-		echo
-	fi
-	ewarn "The soname for libclamav has changed in clamav-0.93."
-	ewarn "If you have upgraded from that or earlier version, it is"
-	ewarn "recommended to run revdep-rebuild, in order to fix anything"
-	ewarn "that links against libclamav.so library."
-	echo
-}
diff --git a/app-antivirus/clamav/clamav-0.94.ebuild b/app-antivirus/clamav/clamav-0.94.2.ebuild
index ab4c26db64f5..d242d5773b9c 100644
--- a/app-antivirus/clamav/clamav-0.94.ebuild
+++ b/app-antivirus/clamav/clamav-0.94.2.ebuild
@@ -1,30 +1,34 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.94.ebuild,v 1.10 2008/09/13 22:48:04 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.94.2.ebuild,v 1.1 2008/11/28 22:26:30 dertobi123 Exp $
 
-inherit autotools eutils flag-o-matic fixheadtails multilib
+inherit autotools eutils flag-o-matic fixheadtails multilib versionator
+
+# for when rc1 is appended to release candidates:
+MY_PV=$(replace_version_separator 3 '');
+MY_P="${PN}-${MY_PV}"
+S="${WORKDIR}/${MY_P}"
 
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://www.clamav.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+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 test"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 crypt iconv mailwrapper milter nls 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 )
-	test? ( dev-libs/check )
 	dev-libs/gmp
 	>=sys-libs/zlib-1.2.1-r3
 	>=sys-apps/sed-4"
 
 DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig"
+	>=dev-util/pkgconfig-0.20"
 
 RDEPEND="${COMMON_DEPEND}
 	selinux? ( sec-policy/selinux-clamav )
@@ -32,6 +36,8 @@ RDEPEND="${COMMON_DEPEND}
 
 PROVIDE="virtual/antivirus"
 
+RESTRICT="test"
+
 pkg_setup() {
 	if use milter; then
 		if [ ! -e /usr/$(get_libdir)/libmilter.a ] ; then
@@ -47,8 +53,17 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${P}-buildfix.patch
-	epatch "${FILESDIR}"/${P}-nls.patch
+	# 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).
@@ -77,6 +92,7 @@ src_compile() {
 	econf ${myconf} \
 		$(use_enable bzip2) \
 		$(use_enable nls) \
+		$(use_enable ipv6) \
 		$(use_with iconv) \
 		--disable-experimental \
 		--with-dbdir=/var/lib/clamav || die
diff --git a/app-antivirus/clamav/files/clamav-0.93-buildfix.patch b/app-antivirus/clamav/files/clamav-0.93-buildfix.patch
deleted file mode 100644
index 803a053f85b3..000000000000
--- a/app-antivirus/clamav/files/clamav-0.93-buildfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -uNr clamav-0.93.orig/configure.in clamav-0.93/configure.in
---- clamav-0.93.orig/configure.in	2008-04-17 18:40:31.041851000 +0200
-+++ clamav-0.93/configure.in	2008-04-17 18:42:42.922065687 +0200
-@@ -387,7 +387,7 @@
-     LDFLAGS="$save_LDFLAGS"
-     if test "$HAVE_LIBBZ2" = "yes"; then
- 	AC_CHECK_HEADER([bzlib.h],
--			[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2";
-+			[LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lbz2";
- 			 AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])],
- 			[AC_MSG_WARN([****** bzip2 support disabled])])
-     else
-@@ -498,7 +498,7 @@
-     dnl we don't need to check for __gmpz_init and mpz_init,
-     dnl since we are not checking directly for symbols
-     if test "$HAVE_LIBGMP" = "yes"; then
--	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBGMP";
-+	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp";
-     else
- 	    AC_MSG_WARN([****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !]);
- 	    want_dsig="no";
diff --git a/app-antivirus/clamav/files/clamav-0.93-nls.patch b/app-antivirus/clamav/files/clamav-0.93-nls.patch
deleted file mode 100644
index d2bc7ddc76fe..000000000000
--- a/app-antivirus/clamav/files/clamav-0.93-nls.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -burN clamav-0.93/clamav-milter/clamav-milter.c clamav-0.93-nls/clamav-milter/clamav-milter.c
---- clamav-0.93/clamav-milter/clamav-milter.c	2008-04-09 17:39:18.000000000 +0200
-+++ clamav-0.93-nls/clamav-milter/clamav-milter.c	2008-04-14 18:31:36.000000000 +0200
-@@ -110,6 +110,7 @@
- 
- #ifdef	C_LINUX
- #include <sys/sendfile.h>	/* FIXME: use sendfile on BSD not Linux */
-+#ifdef ENABLE_NLS
- #include <libintl.h>
- #include <locale.h>
- 
-@@ -122,7 +123,8 @@
- #define	_(s)	s
- #define	N_(s)	s
- 
--#endif
-+#endif /* ENABLE_NLS */
-+#endif /* C_LINUX */
- 
- #ifdef	USE_SYSLOG
- #include <syslog.h>
-@@ -713,7 +715,7 @@
- 	else
- 		progname = "clamav-milter";
- 
--#ifdef	C_LINUX
-+#ifdef	ENABLE_NLS
- 	setlocale(LC_ALL, "");
- 	bindtextdomain(progname, DATADIR"/clamav-milter/locale");
- 	textdomain(progname);
-diff -burN clamav-0.93/configure.in clamav-0.93-nls/configure.in
---- clamav-0.93/configure.in	2008-04-09 17:40:33.000000000 +0200
-+++ clamav-0.93-nls/configure.in	2008-04-14 18:31:36.000000000 +0200
-@@ -399,6 +399,14 @@
- [  --disable-unrar	  don't build libclamunrar and libclamunrar_iface ],
- want_unrar=$enableval, want_unrar="yes")
- 
-+AC_ARG_ENABLE([nls],
-+		AC_HELP_STRING([--disable-nls], [disable NLS support]),
-+		[want_nls=$enableval], [want_nls=yes]
-+)
-+if test $want_nls = yes; then
-+	CPPFLAGS="$CPPFLAGS -DENABLE_NLS"
-+fi
-+
- AC_ARG_ENABLE([dns],
-     AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),
-     [want_dns=$enableval], [want_dns=yes]
-diff -burN clamav-0.93/shared/getopt.c clamav-0.93-nls/shared/getopt.c
---- clamav-0.93/shared/getopt.c	2008-03-06 19:41:02.000000000 +0100
-+++ clamav-0.93-nls/shared/getopt.c	2008-04-14 18:31:36.000000000 +0200
-@@ -82,7 +82,7 @@
- 
- #ifndef _
- /* This is for other GNU distributions with internationalized messages.  */
--# if defined HAVE_LIBINTL_H || defined _LIBC
-+# if (defined(HAVE_LIBINTL_H) || defined(_LIBC)) && defined(ENABLE_NLS)
- #  include <libintl.h>
- #  ifndef _
- #   define _(msgid)	gettext (msgid)
-diff -burN clamav-0.93/shared/output.c clamav-0.93-nls/shared/output.c
---- clamav-0.93/shared/output.c	2008-03-06 19:41:02.000000000 +0100
-+++ clamav-0.93-nls/shared/output.c	2008-04-14 18:31:36.000000000 +0200
-@@ -61,7 +61,7 @@
- pthread_mutex_t logg_mutex = PTHREAD_MUTEX_INITIALIZER;
- #endif
- 
--#ifdef  C_LINUX
-+#if defined(C_LINUX) && defined(ENABLE_NLS)
- #include <libintl.h>
- #include <locale.h>
- 
diff --git a/app-antivirus/clamav/files/clamav-0.94-buildfix.patch b/app-antivirus/clamav/files/clamav-0.94-buildfix.patch
deleted file mode 100644
index 0b140b246d1d..000000000000
--- a/app-antivirus/clamav/files/clamav-0.94-buildfix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Naur clamav-0.94.orig/configure.in clamav-0.94/configure.in
---- clamav-0.94.orig/configure.in	2008-09-01 20:41:06.000000000 +0200
-+++ clamav-0.94/configure.in	2008-09-05 21:09:41.201851168 +0200
-@@ -473,7 +473,7 @@
- 
- 	case "$ac_cv_c_cve_2008_1372" in
- 	ok|bugged)
--		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBBZ2"
-+		LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS  -lbz2"
- 		AC_DEFINE([HAVE_BZLIB_H],1,[have bzip2])
- 		;;
- 	*)
-@@ -566,7 +566,7 @@
-     dnl we don't need to check for __gmpz_init and mpz_init,
-     dnl since we are not checking directly for symbols
-     if test "$HAVE_LIBGMP" = "yes"; then
--	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS $LTLIBGMP";
-+	    LIBCLAMAV_LIBS="$LIBCLAMAV_LIBS -lgmp";
-     else
- 	    AC_MSG_WARN([****** GNU MP 2 or newer NOT FOUND - digital signature support will be disabled !]);
- 	    want_dsig="no";