Cleanup; Version bump, fixes bug #248798

Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.25-gentoo-r7 x86_64

3 files changed, 0 insertions, 114 deletions

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";