8 files changed, 26 insertions, 87 deletions
diff --git a/app-antivirus/f-prot/ChangeLog b/app-antivirus/f-prot/ChangeLog
index 9dd19b90aae3..afb18f65fd83 100644
--- a/app-antivirus/f-prot/ChangeLog
+++ b/app-antivirus/f-prot/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-antivirus/f-prot
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/ChangeLog,v 1.38 2005/08/26 22:41:45 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/ChangeLog,v 1.39 2005/09/05 17:50:15 ticho Exp $
+
+*f-prot-4.6.1 (05 Sep 2005)
+
+  05 Sep 2005; Andrej Kacian <ticho@gentoo.org> -f-prot-4.5.4-r1.ebuild,
+  -f-prot-4.6.0-r1.ebuild, f-prot-4.6.0-r2.ebuild, +f-prot-4.6.1.ebuild:
+  Version bump. 4.6.0-r2 stable on x86. Old ebuild cleanup.
 
   26 Aug 2005; Andrej Kacian <ticho@gentoo.org> metadata.xml:
   Changed herd to antivirus.
diff --git a/app-antivirus/f-prot/Manifest b/app-antivirus/f-prot/Manifest
index d0f1820b53c2..91dd5eee6725 100644
--- a/app-antivirus/f-prot/Manifest
+++ b/app-antivirus/f-prot/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 886e2c224cbc555a71f3a3510b12c29f f-prot-4.5.4-r1.ebuild 1877
-MD5 84082bf24b21de874305c8d1ece7a27e f-prot-4.6.0-r1.ebuild 1898
+MD5 ca0865c5be8934e8b0a3af35646a6321 f-prot-4.6.1.ebuild 1915
+MD5 bd7cb921ee04507c3e2e68f46617cb6a f-prot-4.6.0-r1.ebuild 1897
 MD5 3dd5524625c0dafe189ae459c35da446 ChangeLog 9380
 MD5 d7b2830c3a0f616e8598aafd9c6092db metadata.xml 262
-MD5 20150e043f914ef7c9b7b95f607731cc f-prot-4.6.0-r2.ebuild 2019
+MD5 893327b751aa588f6523905247236d99 f-prot-4.6.0-r2.ebuild 2018
+MD5 eec871175f91e8ee9ed6bf9f541a2934 files/digest-f-prot-4.6.1 70
 MD5 f3be9aa98602afac91eca0dceca62edd files/digest-f-prot-4.5.4-r1 70
 MD5 c0075e0b3eeeaf1ebb478a49c4b9d7f9 files/digest-f-prot-4.6.0-r1 70
 MD5 c0075e0b3eeeaf1ebb478a49c4b9d7f9 files/digest-f-prot-4.6.0-r2 70
 MD5 98949d262752c6e02ac3e64f8c13aa59 files/check-updates.pl.diff 568
 MD5 c07e3b0148a64826500324924b3d71f8 files/f-prot.sh 122
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDD5q4QlM6RnzZP+IRAt9eAKCCk3dKtiH/BYT7j/0KEMSv6EQHJACfZkJu
-mM2ZdeNKN/ACK7xIlzmdfm0=
-=XkkM
------END PGP SIGNATURE-----
diff --git a/app-antivirus/f-prot/f-prot-4.5.4-r1.ebuild b/app-antivirus/f-prot/f-prot-4.5.4-r1.ebuild
deleted file mode 100644
index e45b96da0e76..000000000000
--- a/app-antivirus/f-prot/f-prot-4.5.4-r1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/f-prot-4.5.4-r1.ebuild,v 1.4 2005/08/13 16:38:12 ticho Exp $
-
-IUSE="emul-linux-x86"
-
-MY_P="fp-linux-ws-${PV}"
-S=${WORKDIR}/${PN}
-
-DESCRIPTION="Frisk Software's f-prot virus scanner"
-HOMEPAGE="http://www.f-prot.com/"
-SRC_URI="ftp://ftp.f-prot.com/pub/linux/${MY_P}.tar.gz"
-DEPEND=""
-# unzip and perl are needed for the check-updates.pl script
-RDEPEND=">=app-arch/unzip-5.42-r1
-	dev-lang/perl
-	dev-perl/libwww-perl
-	emul-linux-x86? ( >=app-emulation/emul-linux-x86-baselibs-1.0 )"
-PROVIDE="virtual/antivirus"
-
-SLOT="0"
-LICENSE="F-PROT"
-KEYWORDS="x86 -ppc -sparc ~amd64"
-
-src_install ()
-{
-	cd ${S}
-
-	dobin f-prot.sh
-	dosym /usr/bin/f-prot.sh /usr/bin/f-prot
-
-	dodir /opt/f-prot/tools /var/tmp/f-prot
-	keepdir /var/tmp/f-prot
-
-	insinto /opt/f-prot
-	insopts -m 755
-	doins f-prot
-	insopts -m 644
-	doins *.DEF ENGLISH.TX0
-
-	doman man_pages/*
-	dodoc LICENSE* CHANGES README
-	dohtml doc_ws/*
-
-	insinto /opt/f-prot/tools
-	insopts -m 755
-	doins tools/check-updates.pl
-
-	dosed "s:/usr/local/f-prot:/opt/f-prot:g" /usr/bin/f-prot.sh /opt/f-prot/tools/check-updates.pl
-}
-
-pkg_postinst() {
-	echo
-	einfo "Remember to run /opt/f-prot/tools/check-updates.pl regularly to keep virus"
-	einfo "database up to date. Recommended method is to use cron. See manpages for"
-	einfo "cron(8) and crontab(5) for more info."
-	einfo "An example crontab entry, causing check-updates.pl to run every night at 4AM:"
-	echo
-	echo "0 4 * * * /opt/f-prot/tools/check-updates.pl >/dev/null"
-	echo
-	einfo "For more examples, see /usr/share/doc/${PF}/html/auto_updt.html"
-	echo
-	ewarn "As of 4.5.4, the update script is installed correctly into directory designed"
-	ewarn "by upstream again. Check your crontab, so the path matches the one above."
-	echo
-}
diff --git a/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild b/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild
index cd3828dbed2c..0df82348d766 100644
--- a/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild
+++ b/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild,v 1.1 2005/08/26 22:38:40 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/f-prot-4.6.0-r2.ebuild,v 1.2 2005/09/05 17:50:15 ticho Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ PROVIDE="virtual/antivirus"
 
 SLOT="0"
 LICENSE="F-PROT"
-KEYWORDS="~x86 -ppc -sparc ~amd64"
+KEYWORDS="~amd64 -ppc -sparc x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/app-antivirus/f-prot/f-prot-4.6.0-r1.ebuild b/app-antivirus/f-prot/f-prot-4.6.1.ebuild
index 3e0484575ab5..b8bba56fe2fe 100644
--- a/app-antivirus/f-prot/f-prot-4.6.0-r1.ebuild
+++ b/app-antivirus/f-prot/f-prot-4.6.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/f-prot-4.6.0-r1.ebuild,v 1.1 2005/08/15 00:50:46 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-antivirus/f-prot/f-prot-4.6.1.ebuild,v 1.1 2005/09/05 17:50:15 ticho Exp $
+
+inherit eutils
 
 IUSE="emul-linux-x86"
 
@@ -20,10 +22,16 @@ PROVIDE="virtual/antivirus"
 
 SLOT="0"
 LICENSE="F-PROT"
-KEYWORDS="~x86 -ppc -sparc ~amd64"
+KEYWORDS="~amd64 -ppc -sparc ~x86"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/check-updates.pl.diff || die "epatch failed"
+}
 
-src_install ()
-{
+src_install() {
 	cd ${S}
 
 	dobin ${FILESDIR}/f-prot.sh
diff --git a/app-antivirus/f-prot/files/digest-f-prot-4.5.4-r1 b/app-antivirus/f-prot/files/digest-f-prot-4.5.4-r1
deleted file mode 100644
index de9f677a3464..000000000000
--- a/app-antivirus/f-prot/files/digest-f-prot-4.5.4-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 af4148c9a729f75e0a711866311832db fp-linux-ws-4.5.4.tar.gz 2912664
diff --git a/app-antivirus/f-prot/files/digest-f-prot-4.6.0-r1 b/app-antivirus/f-prot/files/digest-f-prot-4.6.0-r1
deleted file mode 100644
index 733ed69009e9..000000000000
--- a/app-antivirus/f-prot/files/digest-f-prot-4.6.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 cbee04bcb2df84951964ac9c86cf29c0 fp-linux-ws-4.6.0.tar.gz 3714710
diff --git a/app-antivirus/f-prot/files/digest-f-prot-4.6.1 b/app-antivirus/f-prot/files/digest-f-prot-4.6.1
new file mode 100644
index 000000000000..33cffc5a3a56
--- /dev/null
+++ b/app-antivirus/f-prot/files/digest-f-prot-4.6.1
@@ -0,0 +1 @@
+MD5 ca0c1c706712d60bf6b18c2a6677ada8 fp-linux-ws-4.6.1.tar.gz 3881588