Fix depend on openresolv, since resolvconf-gentoo is masked

(Portage version: 2.1.4.4)

8 files changed, 23 insertions, 18 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index fa2c78f98da6..f77b7a7f51b5 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-dns/bind
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.189 2008/05/11 03:58:44 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.190 2008/05/29 19:11:36 armin76 Exp $
+
+  29 May 2008; Raúl Porcel <armin76@gentoo.org> bind-9.2.8.ebuild,
+  bind-9.2.8-r3.ebuild, bind-9.3.4.ebuild, bind-9.3.4-r2.ebuild,
+  bind-9.3.4-r3.ebuild, bind-9.4.1-r1.ebuild, bind-9.4.1_p1.ebuild:
+  Fix depend on openresolv, since resolvconf-gentoo is masked
 
   11 May 2008; <solar@gentoo.org> bind-9.4.2.ebuild:
   - cross compile fix
diff --git a/net-dns/bind/bind-9.2.8-r3.ebuild b/net-dns/bind/bind-9.2.8-r3.ebuild
index 36b40ca27a99..9b22434e3fe0 100644
--- a/net-dns/bind/bind-9.2.8-r3.ebuild
+++ b/net-dns/bind/bind-9.2.8-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8-r3.ebuild,v 1.2 2008/02/29 21:59:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8-r3.ebuild,v 1.3 2008/05/29 19:11:36 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -22,7 +22,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
diff --git a/net-dns/bind/bind-9.2.8.ebuild b/net-dns/bind/bind-9.2.8.ebuild
index ec0d46cfeffa..5e4ea2c720d6 100644
--- a/net-dns/bind/bind-9.2.8.ebuild
+++ b/net-dns/bind/bind-9.2.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8.ebuild,v 1.12 2007/05/06 08:50:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.2.8.ebuild,v 1.13 2008/05/29 19:11:36 armin76 Exp $
 
 inherit eutils libtool autotools
 
@@ -22,7 +22,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
diff --git a/net-dns/bind/bind-9.3.4-r2.ebuild b/net-dns/bind/bind-9.3.4-r2.ebuild
index 74ebf1bc8182..714d53bffc81 100644
--- a/net-dns/bind/bind-9.3.4-r2.ebuild
+++ b/net-dns/bind/bind-9.3.4-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r2.ebuild,v 1.11 2007/06/24 22:06:00 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r2.ebuild,v 1.12 2008/05/29 19:11:36 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -22,7 +22,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
 
diff --git a/net-dns/bind/bind-9.3.4-r3.ebuild b/net-dns/bind/bind-9.3.4-r3.ebuild
index eea475d2ac24..d9832a218894 100644
--- a/net-dns/bind/bind-9.3.4-r3.ebuild
+++ b/net-dns/bind/bind-9.3.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r3.ebuild,v 1.3 2008/02/29 21:59:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4-r3.ebuild,v 1.4 2008/05/29 19:11:36 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -22,7 +22,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
 
diff --git a/net-dns/bind/bind-9.3.4.ebuild b/net-dns/bind/bind-9.3.4.ebuild
index 7fbd3e871c99..a460e74b41d8 100644
--- a/net-dns/bind/bind-9.3.4.ebuild
+++ b/net-dns/bind/bind-9.3.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4.ebuild,v 1.14 2007/05/06 08:50:30 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.3.4.ebuild,v 1.15 2008/05/29 19:11:36 armin76 Exp $
 
 inherit eutils libtool autotools
 
@@ -22,7 +22,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
 
diff --git a/net-dns/bind/bind-9.4.1-r1.ebuild b/net-dns/bind/bind-9.4.1-r1.ebuild
index 3f2e6248f44f..f707a9a30d29 100644
--- a/net-dns/bind/bind-9.4.1-r1.ebuild
+++ b/net-dns/bind/bind-9.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1-r1.ebuild,v 1.11 2008/03/17 05:08:52 ricmm Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1-r1.ebuild,v 1.12 2008/05/29 19:11:36 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -21,7 +21,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
diff --git a/net-dns/bind/bind-9.4.1_p1.ebuild b/net-dns/bind/bind-9.4.1_p1.ebuild
index 6959389b65a7..fac4f8dceb3f 100644
--- a/net-dns/bind/bind-9.4.1_p1.ebuild
+++ b/net-dns/bind/bind-9.4.1_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1_p1.ebuild,v 1.10 2008/04/18 21:53:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1_p1.ebuild,v 1.11 2008/05/29 19:11:36 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -21,7 +21,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 	odbc? ( >=dev-db/unixODBC-2.2.6 )
 	ldap? ( net-nds/openldap )
 	idn? ( net-dns/idnkit )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"