summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2013-06-12 21:13:19 +0000
committerTim Harder <radhermit@gentoo.org>2013-06-12 21:13:19 +0000
commitcbb710379ee4a251c42f62b9c8df0fd6417866f9 (patch)
tree8630b93413e8ce0253bc7852f31935c9ffe7a557
parentRemove old. (diff)
downloadgentoo-2-cbb710379ee4a251c42f62b9c8df0fd6417866f9.tar.gz
gentoo-2-cbb710379ee4a251c42f62b9c8df0fd6417866f9.tar.bz2
gentoo-2-cbb710379ee4a251c42f62b9c8df0fd6417866f9.zip
Properly apply patches from FILESDIR using epatch (bug #472788).
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
-rw-r--r--app-antivirus/clamav/ChangeLog6
-rw-r--r--app-antivirus/clamav/clamav-0.97.7.ebuild7
-rw-r--r--app-antivirus/clamav/clamav-0.97.8.ebuild7
3 files changed, 9 insertions, 11 deletions
diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 10eafbba40fa..1bd3d9869dd5 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,10 @@
# 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.457 2013/06/12 21:05:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.458 2013/06/12 21:13:19 radhermit Exp $
+
+ 12 Jun 2013; Tim Harder <radhermit@gentoo.org> clamav-0.97.7.ebuild,
+ clamav-0.97.8.ebuild:
+ Properly apply patches from FILESDIR using epatch (bug #472788).
12 Jun 2013; Tim Harder <radhermit@gentoo.org> -clamav-0.97.5-r1.ebuild,
-clamav-0.97.6.ebuild, -clamav-0.97.6-r1.ebuild, -clamav-0.97.6-r2.ebuild,
diff --git a/app-antivirus/clamav/clamav-0.97.7.ebuild b/app-antivirus/clamav/clamav-0.97.7.ebuild
index 10e3e6b58ea2..8a5491ec080c 100644
--- a/app-antivirus/clamav/clamav-0.97.7.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.7.ebuild
@@ -1,6 +1,6 @@
# 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.9 2013/04/02 10:55:04 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.7.ebuild,v 1.10 2013/06/12 21:13:19 radhermit Exp $
EAPI=5
@@ -31,10 +31,6 @@ RESTRICT="test"
DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
pkg_setup() {
enewgroup clamav
enewuser clamav -1 -1 /dev/null clamav
@@ -43,6 +39,7 @@ pkg_setup() {
src_prepare() {
use ppc64 && append-flags -mminimal-toic
use uclibc && export ac_cv_type_error_t=yes
+ epatch "${FILESDIR}"/${PN}-0.97-nls.patch
}
src_configure() {
diff --git a/app-antivirus/clamav/clamav-0.97.8.ebuild b/app-antivirus/clamav/clamav-0.97.8.ebuild
index fdbc7b3962a7..6ff201166df0 100644
--- a/app-antivirus/clamav/clamav-0.97.8.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.8.ebuild
@@ -1,6 +1,6 @@
# 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.1 2013/04/23 18:02:01 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.8.ebuild,v 1.2 2013/06/12 21:13:19 radhermit Exp $
EAPI=5
@@ -31,10 +31,6 @@ RESTRICT="test"
DOCS=( AUTHORS BUGS ChangeLog FAQ INSTALL NEWS README UPGRADE )
-PATCHES=(
- "${FILESDIR}"/${PN}-0.97-nls.patch
-)
-
pkg_setup() {
enewgroup clamav
enewuser clamav -1 -1 /dev/null clamav
@@ -43,6 +39,7 @@ pkg_setup() {
src_prepare() {
use ppc64 && append-flags -mminimal-toic
use uclibc && export ac_cv_type_error_t=yes
+ epatch "${FILESDIR}"/${PN}-0.97-nls.patch
}
src_configure() {