Properly apply patches from FILESDIR using epatch (bug #472788).

Package-Manager: portage-2.2.0_alpha179/cvs/Linux x86_64
Manifest-Sign-Key: 0x4AB3E85B4F064CA3

4 files changed, 19 insertions, 21 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/Manifest b/app-antivirus/clamav/Manifest
index 76f7fa610cf5..91c33e3b924c 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -9,18 +9,18 @@ AUX clamd.initd-r3 3118 SHA256 68bfcbd582667c719b81a7f0c396de9733bc5efefa4e7b8dd
 AUX clamd.initd-r5 3267 SHA256 be51b60549925ef9fa81d71405c9d4ecbcededa746137c7ac90d23a203881bc3 SHA512 5db7ec5374881ca4342e4fcdb58584a73d6f96e3900161ff4ba48792d3168ec4a786def808f17a2f0c3c30649d13c49a60495539d40bbc3e445f3d47a160b3a4 WHIRLPOOL 62e8b9dd6115ba16d810a1f438813ad6c212bc7b0e99c69bdeb8d1dec6276dfaae3bb45bceca2ca847ca0507b5acdc123a077b23f0bc3a28d038bf1fbe1f7b08
 DIST clamav-0.97.7.tar.gz 14598481 SHA256 8527754e7eb235317e37a50706d94d3fc9d880fd0bf6f3cb83757d64a720e9ff SHA512 92120250afb882b7fb9f956f2095797f8e3c93076a229967123261c907d9b4436cda6cf2d18b2c61cec8b33afeacba9c2701ad3322aa3316163fe4f36f7a7bc7 WHIRLPOOL 1f3fb155ad4e35ef1ea3835941e40363f9da9c37ab46fe1b9d44e29add6fee9d775e1f5858648a6229f9d0f41c40ed4ade726a4fc044156d208bf10f6cc8c705
 DIST clamav-0.97.8.tar.gz 14609966 SHA256 d872bdfd692d440bc2ade2f4e5a7befc37feb8885cd81adfb6346a8214aafc12 SHA512 e3a80bbfc90922f7f49521d1ab53ec63fb948a42d448ecaa933023cbb256f35e5b695305bd2d56480ee1f94ac93703d10aa4193566c521a1fa62f2c0e1019fda WHIRLPOOL b0ddc29edd096007abc0183400f2b3ee54cf87f13bb2eab2388c444f038fab33eb25b6b5d678449d49da2258017a630ff2e6b36c27028557038a033b415b026c
-EBUILD clamav-0.97.7.ebuild 3800 SHA256 0b9e96b2ea91349223a9c406743ccb6285d5d3d737df95712ff893495d41b06a SHA512 e8025f11c4797a452f6e0030b2e5ed7d688c22842d0c5f5de8649ff647785ba5e83e4d61c8c4dbfc3ca92a93fde66d8621c672b4c41842c1b50d65b6c57a206f WHIRLPOOL 84942636431bfa0d9b3b83cef03261f01e4322165d5a141224fcc961834e44cae6701aebaa5cd7032a8929f1df075a877eaf3a15d7b74c61d56ff1e57df28015
-EBUILD clamav-0.97.8.ebuild 3812 SHA256 aa20186d749861f98aa835b12d4a50a0f0f975861adb0be24231cf5c5f59369b SHA512 744af1ca279e37b14494089c9b31bc49fb0ec3741bb3221ef983931ef9e4f47a6fd3dfc20ef695201d8edfd515f99e73f6a92d324a64b4e97d22235e48e40f05 WHIRLPOOL 67d1edc2b9082aca0b9a810633a68e911fa5d6e8304f77377383be9c8b9c47f2dfe18e99b5e78bfbb8ea2efa48639d39123d9399da9787085516d70a8ed61f8a
-MISC ChangeLog 66580 SHA256 f939ffd87b0fbb6dc18dc0b442095eb73651cb3e64aaa348f48577eec2ca8a61 SHA512 9ab1440c9a43735e61cd162f300f5bd005365e23528f9079e8d5e59f6d14b95b788861f38401533edf90bdc31346e763ce85198cb96a95bdf88e995913628f2f WHIRLPOOL 17f6d3c983c76da5e8a44e8f5f4c167a8530b7dba5e64e17772355ba1d346e0cf7ef18c0c9943266d77f7b39c017f67aa9467ba587493187607a5f06152ac5ea
+EBUILD clamav-0.97.7.ebuild 3801 SHA256 4b863c122e291bb2e2b6677cdc12c2d8f7b01d7189ff962378e1cbbacd76ee0c SHA512 a23307ef987345072a16040cbb592ce776ba7b3396b58f0a078ac0ac686ed75a596c21ab72987d84cf206ec23dfdae84c4b6a05e99b30f43938dbbc62b589fc1 WHIRLPOOL b242d845e96c98a27656ff27f765eda6fd824a687253100b5ab4a9e223b4e069227863d86f23f2b89b35612f5fab02e28f706f129eb325785f8f379546eca130
+EBUILD clamav-0.97.8.ebuild 3808 SHA256 3900b6c7f9c25b8b6a2246462bfdb14175e5cdb2c1232173e28c2d564116c460 SHA512 4a1901e3181d8f69a987ee59e474d51a6a795fce71588e267b49b29904e7ddd88836766a355d94a1815a00075e8f6b915561fc1de664e86108589c6185498136 WHIRLPOOL a796948f0dcc9ea43fe3cb70647e6c1ec3728d9737e351f13eeeed8c49a3acba1fa960a7b46a6f6bb9f43b90c9b4ed947ce5864b4c4fa4324180917ddf66f24e
+MISC ChangeLog 66743 SHA256 4a705bd0add01a82102fb57b2ebf72d140f9438614007934fe3a4a12020469fa SHA512 db2a4579292a686ee906a94178a39b4ed44a29f50da99512b291d07b3e6b9bbe86d8c01e175ea07250071dcac6a38ec9459030e79554a47bbb942ed0da3de9af WHIRLPOOL 41b06f87f52eaabb35f4c959eddf6abcac9af8f56f5fa2634dbaa07b8c45046370ababaec2bcfb94372e8aa6a98f83e52bc8621227038f806874d1f50d55667c
 MISC metadata.xml 320 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d SHA512 c5bb20c993b91112d9c9e0b7bb6c116ac7f711c769084eaaacc28bc7eeb54db09c9794c6ef057747d80a08cf1502f0f688cdefc741423a38da55b2deaebd6476 WHIRLPOOL 741ff80258dee2c145d08f72f10982bd5c1fcba44ed84054cd1a33787864a7d8821b432c3246ad5a04ce11edde7d045f3eb6e056200e3bd2e8505eeea3d7277d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRuOKkAAoJEEqz6FtPBkyjJf0H+wQYv7BJoDbHQy/ilawDCpCd
-tAYebVpA90meaBPUYOR6fI+WJ9wGTvPx8wXmDQ1dpYFYPqvjqqQ/Zipqv3+mMwW7
-l9nOLHpVxkA2nup/OXknimZsGIdkQDIi/AoktgCuw7xFpERCjpfgUbnf+NEBni0l
-1nMEwP0IGysyodVv2pGJqEE94oqG9GZnn31Cibi8j9YmYaaMFz1aQNFM12LzN6r3
-43axUUlP27BL4wd3oaIziz5oLCZfoViBak30QMNCB90VTcGRovdxUzshknO5/cj6
-nF8SiOjm+/hWf30vHFKUG82AOK2zEReKL8lUPQR1zRUGbaFmsI1HwirYpDqbgo8=
-=qPHx
+iQEcBAEBCAAGBQJRuORxAAoJEEqz6FtPBkyjjCQIAIS5F0v9YJMVsrMKpCI6c0Vo
+wydEwWKNaeCjhzlsVwE9lYWCk71tV9HZLTKnMgXK2xKPgU3vHf5KO/+AxRl0zmhj
+mNN/bYEFFC7lCKVdrEF5wvGkHaPSbwkCAvrio3PPlbmeLxGD2E2LiOjkg5JNEYU4
+mfgcZyQXIvuKawnZZoMJ+qn+LT5imb5NfPTVvySXXb+w2rBXCrG9snIi4iLC9p7O
+oLZdC5HqjZVoTWAXqj3Isuluh6FEjDLuSqJJaLHIuk/XjdiSqdQe0ls8BSNwl/8m
+ex6L4kLvVcwMpqQhg/ellyoy5w85MchjbnfEKz7VRgCNjt6U/BJR9gc+pIWN9jQ=
+=iamp
 -----END PGP SIGNATURE-----
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() {