don't assign to P; inherit eutils for epatch; error messages

3 files changed, 25 insertions, 18 deletions

diff --git a/net-www/dansguardian/ChangeLog b/net-www/dansguardian/ChangeLog
index ce9830528fa7..0dfe41325c7c 100644
--- a/net-www/dansguardian/ChangeLog
+++ b/net-www/dansguardian/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-www/dansguardian
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/ChangeLog,v 1.6 2004/03/15 00:23:43 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/ChangeLog,v 1.7 2004/03/15 00:32:13 mr_bones_ Exp $
+
+  14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
+  dansguardian-2.7.1.ebuild, dansguardian-2.7.6.ebuild:
+  don't assign to P; inherit eutils for epatch; error messages
 
   14 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org>
   dansguardian-2.6.0.ebuild, dansguardian-2.7.2.ebuild,
diff --git a/net-www/dansguardian/dansguardian-2.7.1.ebuild b/net-www/dansguardian/dansguardian-2.7.1.ebuild
index 4a330ca5e109..2f0673666c35 100644
--- a/net-www/dansguardian/dansguardian-2.7.1.ebuild
+++ b/net-www/dansguardian/dansguardian-2.7.1.ebuild
@@ -1,29 +1,31 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/dansguardian-2.7.1.ebuild,v 1.3 2003/08/05 06:07:30 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/dansguardian-2.7.1.ebuild,v 1.4 2004/03/15 00:32:13 mr_bones_ Exp $
 
+MY_P="DansGuardian-${PV}"
+S="${WORKDIR}/${MY_P}"
 DESCRIPTION="Web content filtering via proxy"
 HOMEPAGE="http://dansguardian.org"
-P="DansGuardian-${PV}"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Alpha/${P}-0.source.tar.gz"
+SRC_URI="http://mirror.dansguardian.org/downloads/2/Alpha/${MY_P}-0.source.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86"
 IUSE=""
+
 DEPEND="net-www/squid"
-S=${WORKDIR}/${P}
 
 src_compile() {
 	./configure \
 		--prefix= \
 		--installprefix=${D} \
 		--mandir=/usr/share/man/ || die "./configure failed"
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	if [ -d "/etc/logrotate.d" ]; then mkdir -p ${D}/etc/logrotate.d; fi
-	make install || die
+	make install || die "make install failed"
 
 	dodir /etc/init.d
 	cp ${FILESDIR}/dansguardian.init ${D}/etc/init.d/dansguardian
diff --git a/net-www/dansguardian/dansguardian-2.7.6.ebuild b/net-www/dansguardian/dansguardian-2.7.6.ebuild
index 4d5d25c72079..97a3eac156e5 100644
--- a/net-www/dansguardian/dansguardian-2.7.6.ebuild
+++ b/net-www/dansguardian/dansguardian-2.7.6.ebuild
@@ -1,19 +1,20 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/dansguardian-2.7.6.ebuild,v 1.1 2003/12/05 20:25:07 method Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-www/dansguardian/dansguardian-2.7.6.ebuild,v 1.2 2004/03/15 00:32:13 mr_bones_ Exp $
 
+inherit eutils
+
+MY_P="DansGuardian-${PV}"
+S="${WORKDIR}/${MY_P}-1"
 DESCRIPTION="Web content filtering via proxy"
 HOMEPAGE="http://dansguardian.org"
-P="DansGuardian-${PV}"
-SRC_URI="http://mirror.dansguardian.org/downloads/2/Alpha/${P}-1.source.tar.gz"
+SRC_URI="http://mirror.dansguardian.org/downloads/2/Alpha/${MY_P}-1.source.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
-#DEPEND="net-www/squid"
-DEPEND=""
-RDEPEND=""
-S=${WORKDIR}/${P}-1
+DEPEND="virtual/glibc"
 
 src_unpack() {
 	unpack ${A}
@@ -26,12 +27,12 @@ src_compile() {
 		--prefix= \
 		--installprefix=${D} \
 		--mandir=/usr/share/man/ || die "./configure failed"
-	emake || die
+	emake || die "emake failed"
 }
 
 src_install() {
 	if [ -d "/etc/logrotate.d" ]; then mkdir -p ${D}/etc/logrotate.d; fi
-	make install || die
+	make install || die "make install failed"
 
 	dodir /etc/init.d
 	cp ${FILESDIR}/dansguardian.init ${D}/etc/init.d/dansguardian