done right

2 files changed, 21 insertions, 23 deletions

diff --git a/net-mail/clamav/ChangeLog b/net-mail/clamav/ChangeLog
index 458ff8f21ae9..6078dc46bcd0 100644
--- a/net-mail/clamav/ChangeLog
+++ b/net-mail/clamav/ChangeLog
@@ -1,14 +1,18 @@
 # ChangeLog for net-mail/clamav
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/clamav/ChangeLog,v 1.3 2003/04/19 23:19:29 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/clamav/ChangeLog,v 1.4 2003/04/24 10:37:58 vapier Exp $
 
 *clamav-0.54-r1 (19 Apr 2003)
 
+  24 Apr 2003; Mike Frysinger <vapier@gentoo.org> :
+  Redid user/group addition since the last version was wrong
+
   19 Apr 2003; Preston A. Elder <prez@gentoo.org> clamav-0.54-r1.ebuild:
   Made ebuild provide virtual/virus
 
   19 Apr 2003; Preston A. Elder <prez@gentoo.org> clamav-0.54-r1.ebuild,
   files/digest-clamav-0.54 files/clamd.rc files/clamd.conf:
+  Automated user/group adding
 
 *clamav-0.54 (03 Feb 2003)
 
@@ -16,4 +20,3 @@
   files/digest-clamav-0.54 :
   Ebuild suggested by Pavel Tcholakov on bug #14580.  I have a funny
   feeling we are going to need an app-virus category soon.
-
diff --git a/net-mail/clamav/clamav-0.54-r1.ebuild b/net-mail/clamav/clamav-0.54-r1.ebuild
index 7599980f5f68..5fcea5eef244 100644
--- a/net-mail/clamav/clamav-0.54-r1.ebuild
+++ b/net-mail/clamav/clamav-0.54-r1.ebuild
@@ -1,39 +1,34 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/clamav/clamav-0.54-r1.ebuild,v 1.4 2003/04/19 23:39:00 prez Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/clamav/clamav-0.54-r1.ebuild,v 1.5 2003/04/24 10:37:58 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="Clam Anti-Virus Scanner"
 HOMEPAGE="http://clamav.elektrapro.com"
 SRC_URI="http://clamav.elektrapro.com/stable/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~hppa ~sparc ~sparc64 ~ppc ~arm ~mips"
-IUSE=""
-PROVIDES="virtual/antivirus"
-DEPEND="virtual/glibc"
-S=${WORKDIR}/${P}
+KEYWORDS="x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa"
 
-src_compile() {
-	if ! grep -q ^clamav: /etc/group ; then
-                groupadd clamav \
-			|| die "problem adding the clamav group"
-		grpconv || die "failed running grpconv"
-        fi
+DEPEND="virtual/glibc"
+PROVIDE="virtual/antivirus"
 
-	if ! grep -q ^clamav: /etc/passwd ; then
-                useradd -g clamav clamav \
-			|| die "problem adding the clamav user"
-		pwconv || die "failed running pwconv"
-        fi
+pkg_setup() {
+	enewgroup clamav
+	enewuser clamav -1 /bin/false /dev/null clamav
+	pwconv || die
+}
 
-	econf
+src_compile() {
+	econf || die
 	emake || die
 }
 
 src_install() {
-	dodir /etc/init.d /etc/conf.d
 	make DESTDIR=${D} install || die
-	cp ${FILESDIR}/clamd.rc ${D}/etc/init.d
-	cp ${FILESDIR}/clamd.conf ${D}/etc/conf.d
 	dodoc AUTHORS BUGS NEWS README ChangeLog TODO FAQ INSTALL
+	exeinto /etc/init.d ; newexe ${FILESDIR}/clamd.rc clamd
+	insinto /etc/conf.d ; newins ${FILESDIR}/clamd.conf clamd
 }