diff options
| author |   Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-10 00:07:45 +0000 |
|---|---|---|
| committer | Diego Elio Pettenò <flameeyes@gentoo.org> | 2006-01-10 00:07:45 +0000 |
| commit | b92caa8797cc64542f4d3ab3f43a8e7ca8e14e55 (patch) | |
| tree | 1be6d1be070365991298af1a318e80c689e32312 /app-antivirus | |
| parent | quote $D (diff) | |
| download | gentoo-2-b92caa8797cc64542f4d3ab3f43a8e7ca8e14e55.tar.gz gentoo-2-b92caa8797cc64542f4d3ab3f43a8e7ca8e14e55.tar.bz2 gentoo-2-b92caa8797cc64542f4d3ab3f43a8e7ca8e14e55.zip | |
Added patch to fix parallel make issues, bug #115912.
(Portage version: 2529-svn)
Diffstat (limited to 'app-antivirus')
| -rw-r--r-- | app-antivirus/klamav/ChangeLog | 8 | ||||
| -rw-r--r-- | app-antivirus/klamav/files/klamav-0.32-parallelmake.patch | 31 | ||||
| -rw-r--r-- | app-antivirus/klamav/klamav-0.32.ebuild | 12 |
3 files changed, 47 insertions, 4 deletions
diff --git a/app-antivirus/klamav/ChangeLog b/app-antivirus/klamav/ChangeLog index a939e06a0a5d..f756e3df822d 100644 --- a/app-antivirus/klamav/ChangeLog +++ b/app-antivirus/klamav/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-antivirus/klamav -# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.9 2005/12/03 21:09:24 carlo Exp $ +# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/ChangeLog,v 1.10 2006/01/10 00:07:45 flameeyes Exp $ + + 10 Jan 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/klamav-0.32-parallelmake.patch, klamav-0.32.ebuild: + Added patch to fix parallel make issues, bug #115912. *klamav-0.32 (03 Dec 2005) diff --git a/app-antivirus/klamav/files/klamav-0.32-parallelmake.patch b/app-antivirus/klamav/files/klamav-0.32-parallelmake.patch new file mode 100644 index 000000000000..4c42556b8f38 --- /dev/null +++ b/app-antivirus/klamav/files/klamav-0.32-parallelmake.patch @@ -0,0 +1,31 @@ +Index: klamav-0.32-source/klamav-0.32/src/arkollon/uninstallwizard.cpp +=================================================================== +--- klamav-0.32-source.orig/klamav-0.32/src/arkollon/uninstallwizard.cpp ++++ klamav-0.32-source/klamav-0.32/src/arkollon/uninstallwizard.cpp +@@ -318,5 +318,5 @@ void UninstallWizard::finished() + nextButton->setEnabled(true); + } + +- ++#include "uninstallwizard.moc" + +Index: klamav-0.32-source/klamav-0.32/src/arkollon/wizard.cpp +=================================================================== +--- klamav-0.32-source.orig/klamav-0.32/src/arkollon/wizard.cpp ++++ klamav-0.32-source/klamav-0.32/src/arkollon/wizard.cpp +@@ -913,5 +913,5 @@ void Wizard::logPressed() + logDialog->show(); + } + +- ++#include "wizard.moc" + +Index: klamav-0.32-source/klamav-0.32/Makefile.am +=================================================================== +--- klamav-0.32-source.orig/klamav-0.32/Makefile.am ++++ klamav-0.32-source/klamav-0.32/Makefile.am +@@ -20,4 +20,3 @@ EXTRA_DIST = admin COPYING configure.in. + dist-hook: + cd $(top_distdir) && perl admin/am_edit -padmin + cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs +-_SOURCES = dcopklamscan.h diff --git a/app-antivirus/klamav/klamav-0.32.ebuild b/app-antivirus/klamav/klamav-0.32.ebuild index c834b286d1b0..15289f4c2281 100644 --- a/app-antivirus/klamav/klamav-0.32.ebuild +++ b/app-antivirus/klamav/klamav-0.32.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2005 Gentoo Foundation +# Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.32.ebuild,v 1.1 2005/12/03 21:09:24 carlo Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-antivirus/klamav/klamav-0.32.ebuild,v 1.2 2006/01/10 00:07:45 flameeyes Exp $ inherit kde @@ -19,3 +19,11 @@ IUSE="" DEPEND="app-antivirus/clamav" need-kde 3 + +src_unpack() { + kde_src_unpack + + epatch "${FILESDIR}/${P}-parallelmake.patch" + rm -f ${S}/configure +} + |