added prefix support (bug #430604)

Package-Manager: portage-2.2.0_alpha125/cvs/Linux i686

3 files changed, 34 insertions, 16 deletions

diff --git a/app-antivirus/clamav/ChangeLog b/app-antivirus/clamav/ChangeLog
index 471936f417f0..8edc1ecefc99 100644
--- a/app-antivirus/clamav/ChangeLog
+++ b/app-antivirus/clamav/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-antivirus/clamav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.425 2012/08/28 18:52:36 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/ChangeLog,v 1.426 2012/09/11 03:29:29 ottxor Exp $
+
+  11 Sep 2012; Christoph Junghans <ottxor@gentoo.org> clamav-0.97.5-r1.ebuild:
+  added prefix support (bug #430604)
 
   28 Aug 2012; Brent Baude <ranger@gentoo.org> clamav-0.97.5-r1.ebuild:
   Marking clamav-0.97.5-r1 ppc64 for bug 428584
diff --git a/app-antivirus/clamav/Manifest b/app-antivirus/clamav/Manifest
index 370a23f7d5bb..ed5df73b63b7 100644
--- a/app-antivirus/clamav/Manifest
+++ b/app-antivirus/clamav/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX clamav-0.97-nls.patch 269 SHA256 088b9edcdb678ce9c072042cf51266e061ab5f5ab0e8e42bd953242138c64fd1 SHA512 a0508590353c699d62d203398e4b84ea134348567fa5530e5c9c7ce850a9eeca106544e641ce011cc0a5097313dea780490e7db6fdda1ec2ab61dd6474e31458 WHIRLPOOL 95ce0a012bbb8d0cde2c255d7f15ab8eb24d412cd7b664ce2e7dc6ea887c608252076e45f7f4a007edda455f07b62884002a6d914b25b889da2682140d31f20c
 AUX clamav-0.97.4-gcc47.patch 875 SHA256 62a54f42bcb068953f7af80d52b3e03b5506408695c09b87b29abfb8dd3ca7b9 SHA512 c65ec8351e729f9f4b061d73c0617c11e96a8fa9436671239dfae5ee1336a98f1b95c32a31d20619b91b4e849e25d36a4025d3eb0482c498c68c01d5f2b0d026 WHIRLPOOL 153092d5dcd94d803df637a08c9848ab5604608cefb033c022d8f87eb4e5f2c0cdab0cf340deb54e2d4713640fa0e4a1f88f17510a83282aa54df83fbaa0f6db
 AUX clamav-milter.README.gentoo 1124 SHA256 5e7b142b68964bc3463b077e5698fa77cace45ea9612258b1e1849cee944dd11 SHA512 1c6160e48eddd28f83ec5f24757f788781cef55789d1934dfccc12c7c5e5635a226d26b0983cab7344c142f5a2f1db172640b1d0e6c840a6fa83abed9be1211a WHIRLPOOL f85b17448fd93205e2f38d024b96410cc8d143d077201e0a1b8f4cda95ae2447a70eded4cb90968a593ad2637229300fa04bfe5dba96d3d68c2d09c105ee3f16
@@ -10,7 +13,18 @@ DIST clamav-0.97.4.tar.gz 48386114 SHA256 958dd09c9da9ceb50c9e556b3ced9cbdf40e83
 DIST clamav-0.97.5.tar.gz 14754465 SHA256 db6c5e1a5ec8ca0b8006cf82661d3158d3365ba1b4bc14c03c5d0bca89a93c0d SHA512 618ef2f1d256f2e3cd76beaf92b76d9df0963d449c2d80885ed6039f4edd59ddf9a73ebe0b93549c62264d7df4ac918d306d631f8c0b1df8e47a7e763550f1cc WHIRLPOOL 7d148323a4510acfe706a17f27c12bd808a013aa91807257b03af83e4a6daeb619962243689eee5614ce2922dfa39d21ae357d2509617be4642f162ac91d5d7e
 EBUILD clamav-0.97.3.ebuild 3631 SHA256 50f6f775d254bc9c85689ad22b7cdf262ea87c0da9e88d680c85360415b2d6e4 SHA512 7c5ae7ab0c6ae83a9a5cf1b9133f574a3f40178cee3457dd67312bbd7f57ab865e4d0308530966f271a54822dffc0d9b775cc6963f327b5bd7a1ee63994fd6b1 WHIRLPOOL 3fbdf894eec40d46e1906dc4e61d556dc01fc7b755cc58b47d1941039f061ab2e1cb1e097ab819d9b7b9ae91196448f57286084aeba3a29ecb259d7d10e195be
 EBUILD clamav-0.97.4.ebuild 3681 SHA256 0c710c93eec32d44d28ea7940892d157e2224f5e42310a4bc272275933471019 SHA512 69da0f89296400bdc5cbff82a3cf33a931c6449bca6de655f806af544e4c2ccba2bb9f355eed29fc14cbe22910033082a0ff21117d60c0b05d717703f728b4fb WHIRLPOOL 9e8afe4dcf5741d9862c388732f29a464b40fe74e73410685bad62985b6873d61c8fd78c0313268486c8f4f52ec770b2b7507ea2714822ddd192de18802546a8
-EBUILD clamav-0.97.5-r1.ebuild 3601 SHA256 2f139e31f2c3e966d4b3fb9a33fccc1dd5542a5d4e0f70658b9aaceec238089c SHA512 0def331bf52970760b63404d29767669e267ba4d056f3e67ba6e15ca1717eb8f8b728dc28104acc845ef4485b91fe20764a1e319e0ef74185979fea39d0e5121 WHIRLPOOL 34fe7bfa07b714bbe12b307568c991837ad50c62466ded08d650102189bc86c95b8a3b5b8c40a50f5c83f99429d380282d6eacf16fb2dbd166950b4cc222f075
+EBUILD clamav-0.97.5-r1.ebuild 3807 SHA256 9855b71691859ab798d0ad36b5d6833cdd52f32f5668116304070ebf0db4e958 SHA512 79fcbf89af0ccc3e4b6dcd61940eccac1b8cf9749cecb81a53375fa3c6c57046118236bb1bfdc22ed026f4fc0e2bda321959e15871994becc1d881aca3ba33e0 WHIRLPOOL e7a5b7d68c4b2ab6b856968fc690c9e311455a8cc48260d7c823f9aef28d34eb009a7d6b076c48acd66db2ab668895a355ffe5f8086258ee377ef45ea65063cf
 EBUILD clamav-0.97.5.ebuild 3605 SHA256 27e8697709c41729013e43b15f608846e9582ca0c1495a3c22941a2c894167c7 SHA512 4abdab560d4d0e6cf54e86abb6f56111aac7e44b732f046b6c84957b80dd957f39e4f6b77d3fff3e54f2d0f92016189dc2eb6939ff13e17cfcbdd014e4bf0b46 WHIRLPOOL 11ae359f943b7ca183cd2461b2f2d55b82d038dffe0a954527b1b78133583537e30c060e28d249862d9797c28a6045e776c4306428666ac281192e995eadaa3b
-MISC ChangeLog 62484 SHA256 29653ef1836d019de3c077fdfa79b23d7ef1425860be6a485d9d13cc1e806aea SHA512 da29fb2987a3acbd6e0dd7b8b98850a2d813d10dddf495edd8dce9d554c4d2ead35b5cef4b581c370b1ffe63ff20293010e02fdc1533f51a65f4b8a6b4f200ea WHIRLPOOL 71ae8b6d2ff00793f3b4752406032cea2bc861468e9f54fc6e7c277cb72bfde8f6a61bfb194d668e76e22cc55b747f2ff452ed5687dac4e59f8ac8890d23cc97
+MISC ChangeLog 62601 SHA256 694b6f2c3039b30aa1c5197f2bf43306797b93a7e91b6947b16119a6d06047a6 SHA512 71f578e50eeafec2b7127296ef09e4b1f38f571e30e1e5a1723cfedb97627a7c70894ada8e115c0deded8c7ebc035f4f525bcf0660b84446d1f160f8a7080c3d WHIRLPOOL 3be13d581aa4fa1312135b39fa0c57121323dd288465bea8e6d6829b3c0f2a8d4e9cd25acdded0015b79030df5178eee435abd2ae4c617be4bca0a6ef6accf7a
 MISC metadata.xml 320 SHA256 e2a8c4c8bedbffe50a126c1c7395a4d92652c2d95347b9496d54aea1f230a22d SHA512 c5bb20c993b91112d9c9e0b7bb6c116ac7f711c769084eaaacc28bc7eeb54db09c9794c6ef057747d80a08cf1502f0f688cdefc741423a38da55b2deaebd6476 WHIRLPOOL 741ff80258dee2c145d08f72f10982bd5c1fcba44ed84054cd1a33787864a7d8821b432c3246ad5a04ce11edde7d045f3eb6e056200e3bd2e8505eeea3d7277d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQTrAfAAoJEOeBhlrCAAWGp+EIAKPrdNsZY10T4rKjXLEF95Ce
+BM/Hu7RUSdkY4Z+ykb3p0PZPcYLG21nqj12pbUJkzmE7WInJQy7bjXLV1apVhrLz
+AfkkNOMZfSESkt0cwAz6vSdep5cDwpoNjjSdrsACD+7+8lx8zsS57cRnxVEAKtwe
+SbyCzuevG7MoA7xUP/P4PPvbLPPfgMpMqVEgAW7gsete/twZe6XwIdnVJiM9xDQT
+OHfIK9WWxMGBVsw09UKeKxL8tlCLYmsu3NYIwhTTMnq7MU9++o+ya1zPRhl0DNj4
+8AtenPDFKaSuXa8I3N7kEHAsWuWEo1XRKiUd3um4iyfGGgcpgQNxmzAnxhiAOBk=
+=vnV0
+-----END PGP SIGNATURE-----
diff --git a/app-antivirus/clamav/clamav-0.97.5-r1.ebuild b/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
index b938318c82b3..ef8fe1c7241a 100644
--- a/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
+++ b/app-antivirus/clamav/clamav-0.97.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5-r1.ebuild,v 1.6 2012/08/28 18:52:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/clamav/clamav-0.97.5-r1.ebuild,v 1.7 2012/09/11 03:29:29 ottxor Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="bzip2 clamdtop iconv ipv6 milter selinux static-libs"
 
 CDEPEND="bzip2? ( app-arch/bzip2 )
@@ -48,8 +48,9 @@ src_configure() {
 	econf \
 		--disable-experimental \
 		--enable-id-check \
-		--with-dbdir=/var/lib/clamav \
+		--with-dbdir="${EPREFIX}"/var/lib/clamav \
 		--with-system-tommath \
+		--with-zlib="${EPREFIX}"/usr
 		$(use_enable bzip2) \
 		$(use_enable clamdtop) \
 		$(use_enable ipv6) \
@@ -78,18 +79,18 @@ src_install() {
 
 	# Modify /etc/{clamd,freshclam}.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:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.pid:" \
+		-e "s:.*\(LocalSocket\) .*:\1 ${EPREFIX}/var/run/clamav/clamd.sock:" \
 		-e "s:.*\(User\) .*:\1 clamav:" \
-		-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamd.log:" \
+		-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamd.log:" \
 		-e "s:^\#\(LogTime\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
 		"${ED}"/etc/clamd.conf
 	sed -i -e "s:^\(Example\):\# \1:" \
-		-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/freshclam.pid:" \
+		-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/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:^\#\(UpdateLogFile\) .*:\1 ${EPREFIX}/var/log/clamav/freshclam.log:" \
+		-e "s:^\#\(NotifyClamd\).*:\1 ${EPREFIX}/etc/clamd.conf:" \
 		-e "s:^\#\(ScriptedUpdates\).*:\1 yes:" \
 		-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
 		"${ED}"/etc/freshclam.conf
@@ -99,12 +100,12 @@ src_install() {
 		# inet: which we want to leave
 		dodoc "${FILESDIR}"/clamav-milter.README.gentoo
 		sed -i -e "s:^\(Example\):\# \1:" \
-			-e "s:.*\(PidFile\) .*:\1 /var/run/clamav/clamav-milter.pid:" \
-			-e "s+^\#\(ClamdSocket\) .*+\1 unix:/var/run/clamav/clamd.sock+" \
+			-e "s:.*\(PidFile\) .*:\1 ${EPREFIX}/var/run/clamav/clamav-milter.pid:" \
+			-e "s+^\#\(ClamdSocket\) .*+\1 unix:${EPREFIX}/var/run/clamav/clamd.sock+" \
 			-e "s:.*\(User\) .*:\1 clamav:" \
-			-e "s+^\#\(MilterSocket\) /.*+\1 unix:/var/run/clamav/clamav-milter.sock+" \
+			-e "s+^\#\(MilterSocket\) /.*+\1 unix:${EPREFIX}/var/run/clamav/clamav-milter.sock+" \
 			-e "s:^\#\(AllowSupplementaryGroups\).*:\1 yes:" \
-			-e "s:^\#\(LogFile\) .*:\1 /var/log/clamav/clamav-milter.log:" \
+			-e "s:^\#\(LogFile\) .*:\1 ${EPREFIX}/var/log/clamav/clamav-milter.log:" \
 			"${ED}"/etc/clamav-milter.conf
 		cat > "${ED}"/etc/conf.d/clamd <<-EOF
 			MILTER_NICELEVEL=19