inter-block with dansguardian-dgav

(Portage version: 2.0.51.19)

5 files changed, 19 insertions, 11 deletions

diff --git a/www-proxy/dansguardian/ChangeLog b/www-proxy/dansguardian/ChangeLog
index 5df831f495a3..818ffd7a2868 100644
--- a/www-proxy/dansguardian/ChangeLog
+++ b/www-proxy/dansguardian/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-proxy/dansguardian
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/ChangeLog,v 1.9 2005/02/25 22:29:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/ChangeLog,v 1.10 2005/03/08 19:47:54 mrness Exp $
+
+  08 Mar 2005; Alin Nastac <mrness@gentoo.org> dansguardian-2.7.1.ebuild,
+  dansguardian-2.7.6.ebuild, dansguardian-2.8.0.2.ebuild,
+  dansguardian-2.8.0.4.ebuild:
+  Inter-block this package with dansguardian-dgav.
 
 *dansguardian-2.8.0.4 (26 Feb 2005)
 
diff --git a/www-proxy/dansguardian/dansguardian-2.7.1.ebuild b/www-proxy/dansguardian/dansguardian-2.7.1.ebuild
index 3410f78574dd..9a9bcf00ffbd 100644
--- a/www-proxy/dansguardian/dansguardian-2.7.1.ebuild
+++ b/www-proxy/dansguardian/dansguardian-2.7.1.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/www-proxy/dansguardian/dansguardian-2.7.1.ebuild,v 1.3 2005/02/06 18:33:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.7.1.ebuild,v 1.4 2005/03/08 19:47:54 mrness Exp $
 
 MY_P="DansGuardian-${PV}"
 S="${WORKDIR}/${MY_P}"
@@ -13,7 +13,8 @@ SLOT="0"
 KEYWORDS="x86"
 IUSE=""
 
-DEPEND="www-proxy/squid"
+DEPEND="!www-proxy/dansguardian-dgav
+	www-proxy/squid"
 
 src_compile() {
 	./configure \
diff --git a/www-proxy/dansguardian/dansguardian-2.7.6.ebuild b/www-proxy/dansguardian/dansguardian-2.7.6.ebuild
index 49c7c729802a..fba5ae1a2aae 100644
--- a/www-proxy/dansguardian/dansguardian-2.7.6.ebuild
+++ b/www-proxy/dansguardian/dansguardian-2.7.6.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/www-proxy/dansguardian/dansguardian-2.7.6.ebuild,v 1.2 2005/02/06 18:33:02 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.7.6.ebuild,v 1.3 2005/03/08 19:47:54 mrness Exp $
 
 inherit eutils
 
@@ -14,7 +14,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc"
 IUSE=""
-DEPEND="virtual/libc"
+DEPEND="!www-proxy/dansguardian-dgav
+	virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild b/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild
index feff32492e06..e6b45b83656c 100644
--- a/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild
+++ b/www-proxy/dansguardian/dansguardian-2.8.0.2.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/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild,v 1.5 2005/02/25 22:29:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.8.0.2.ebuild,v 1.6 2005/03/08 19:47:54 mrness Exp $
 
 inherit eutils
 
@@ -12,7 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ~sparc ~ppc ppc64"
 IUSE=""
-DEPEND="virtual/libc"
+DEPEND="!www-proxy/dansguardian-dgav
+	virtual/libc"
 
 src_unpack() {
 	unpack ${A}
diff --git a/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild b/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
index 2fe85cc14c80..2846f2c7da8f 100644
--- a/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild
+++ b/www-proxy/dansguardian/dansguardian-2.8.0.4.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/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild,v 1.1 2005/02/25 22:29:55 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-proxy/dansguardian/dansguardian-2.8.0.4.ebuild,v 1.2 2005/03/08 19:47:54 mrness Exp $
 
 inherit eutils
 
@@ -12,7 +12,8 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~sparc ~ppc ~ppc64"
 IUSE=""
-DEPEND="virtual/libc"
+DEPEND="!www-proxy/dansguardian-dgav
+	virtual/libc"
 
 src_unpack() {
 	unpack ${A}
@@ -26,8 +27,7 @@ src_compile() {
 		--installprefix=${D} \
 		--mandir=/usr/share/man/ \
 		--cgidir=/var/www/localhost/cgi-bin/ || die "./configure failed"
-	sed -i -e 's/^\(CFLAGS *\)=/\1+=/' Makefile #add user CFLAGS
-	emake || die "emake failed"
+	emake OPTIMISE="${CFLAGS}" || die "emake failed"
 }
 
 src_install() {