Remove resolvconf-gentoo dep, as its p.masked and going to be removed

Package-Manager: portage-2.1.4.5

6 files changed, 18 insertions, 24 deletions

diff --git a/net-dns/bind/ChangeLog b/net-dns/bind/ChangeLog
index a4896b0916ea..01bec4066b5a 100644
--- a/net-dns/bind/ChangeLog
+++ b/net-dns/bind/ChangeLog
@@ -1,6 +1,10 @@
 # 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.212 2008/08/17 15:43:14 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/ChangeLog,v 1.213 2008/11/03 13:03:41 armin76 Exp $
+
+  03 Nov 2008; Raúl Porcel <armin76@gentoo.org> bind-9.4.1_p1.ebuild,
+  bind-9.4.2_p2.ebuild, bind-9.4.2_p2-r1.ebuild, bind-9.5.0_p2-r1.ebuild:
+  Remove resolvconf-gentoo dep, as its p.masked and going to be removed
 
   17 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
   add GLEP 56 USE flag desc from use.local.desc
diff --git a/net-dns/bind/Manifest b/net-dns/bind/Manifest
index 78847a7f73fa..32f4c1cebc18 100644
--- a/net-dns/bind/Manifest
+++ b/net-dns/bind/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 10bind.env 27 RMD160 872245707b4f72a212cda162c59495744d77a6e3 SHA1 7b8c1abd5910bb7a07c6b7c820c2b34a534b2593 SHA256 5ad6a4402372b43809618051873b63646746f400447bba30dc4dfecd028e3650
 AUX 127.zone 227 RMD160 66ab92f201d71da613702a85806d2e8d27f6516f SHA1 6787635fd44b1f29dc34b31053ca28e4353f69e0 SHA256 65b909fc1398dfa5b532ab395d6920758937093cf7e5b5bec8242dff4fe15e89
 AUX bind-9.3.2-missing_odbc_test.patch 613 RMD160 ec141cef65e470dfc8df4c641ec96bfbd5d8cdd1 SHA1 dbc3a933cac7e474fa62fb2f71e50be91825b963 SHA256 5e6465bdb01cbb662333cc2b0a00ad51905a0cda2eb6b7abc3a0b2dd3e701f4e
@@ -24,16 +21,9 @@ DIST bind-sdb-ldap-1.1.0.tar.bz2 5883 RMD160 ec2f684f278e5fa72158486a14dfce3005a
 DIST ctrix_dlz_9.3.2b1.patch.bz2 60982 RMD160 dd76c79d58fdcf75d5c991bac4b6de54aeb4f8bb SHA1 a3c65ef330846f62e22655261954a7fe982cb616 SHA256 f0764290a08b4a839eae8b82a6e27301ce9ff41f3132f697139d73698f89cffc
 DIST dyndns-samples.tbz2 22866 RMD160 27d5b2d0edb8e1ff16b3f980c38d7af33ccf0c7d SHA1 0a62e9458d0e16b67a3a2f63ea485ce969f1fb4d SHA256 92fb06a92ca99cbbe96b90bcca229ef9c12397db57ae17e199dad9f1218fdbe8
 EBUILD bind-9.3.2-r5.ebuild 8593 RMD160 7e17f83d1d8435b1afff008fb0f2b6cbdbedb441 SHA1 1ca6afb0a6cc48648ac55dc28d9b1b322fe42060 SHA256 43377769216a078795c27049ca44142f816b8fd9b6ddb5026a2ea67b0e989411
-EBUILD bind-9.4.1_p1.ebuild 8473 RMD160 ecaecdf9e241bd0a13184b46e41406f57631f24d SHA1 1d72a15d20ef3866913017ad1c2bc6579a5c486b SHA256 97bca63f3d2113a0e8feb4c84fca5bff558eea43cbb8324d6c1f68e8496b0a6e
-EBUILD bind-9.4.2_p2-r1.ebuild 9069 RMD160 06e138bbc13c60b83d6028574c12fad4cdc5fa5d SHA1 f7c9b23e95046cbb3b6940b1e996dff924468dbe SHA256 b9c8fcf4b1eb9f0948ce825468a7e10ececfdd4dab721c2c0861767e4199a331
-EBUILD bind-9.4.2_p2.ebuild 8932 RMD160 646df0e2242d3ff4b434089cde46560ab404ac14 SHA1 4492f9730a7c877978e46df8df5565ebe80388e4 SHA256 8839e8cc5a1bfd63b3e1c24c5adb3c31c0b2ccb70d4fc2dae843fb305525e940
-EBUILD bind-9.5.0_p2-r1.ebuild 9395 RMD160 a3512bd212fe7f6f13684da197e512ac8308423f SHA1 2cadc24df689393d9e657c66d364e96c52b97fd0 SHA256 5fb962891a74159c2f599cae37daf82be323b0a8a6013679746629ca670c3b53
-MISC ChangeLog 34867 RMD160 522e38bef00ca99ccffb64403ac0edc0465d2cf2 SHA1 5004efadb0294a0f13da592ba37a3f9ea74e74fb SHA256 f1ff7e5a410e7ed13d7352a166a122283799732c9faa9b8d241a983a81c168fd
+EBUILD bind-9.4.1_p1.ebuild 8437 RMD160 f75f8cd519d3d279bc4a80aed13cf30b0b324f42 SHA1 561f8d33ca4c9a08cfa461236440c333a5f1e661 SHA256 c471eb6dd40862e1b08633adf6c2012f92b503f9d9e106436276aa25e5a53086
+EBUILD bind-9.4.2_p2-r1.ebuild 9033 RMD160 9897469a49733f01ebf3a38b0db9a636275ff83b SHA1 9857b2f12144076a6046db17c8a17eadd4637c02 SHA256 f35d88217c4d91a6f89cf3d550142c734b2e8da8fee1b5248bfb0b0b94cc7a5b
+EBUILD bind-9.4.2_p2.ebuild 8896 RMD160 5aa626182b62492692da76499cee3321f653c7ae SHA1 7b14d27149891fe6d1aab6b78379882a11478777 SHA256 eab9ca8d3c006d66ac545b66f4443e8214d03359e1f138545e5eed34c6e7900f
+EBUILD bind-9.5.0_p2-r1.ebuild 9359 RMD160 69fd19ccd8c21b2d424a3b1f08757d74638980fa SHA1 9601d39b779faf5dc7b66075355bff0877da42c8 SHA256 7c65ecbffc326611e1db109a0fa0bf3ffcdff88262c607bae298b8809e585dcb
+MISC ChangeLog 35086 RMD160 f62fee1bb36af1c85e0486da0957a21aaacad1bc SHA1 4532cc33ad3b0392bbdee627d01cbfb15b5dc034 SHA256 668817b8863204f1c29b69986bbba9d09978830627130c2b30a834694435ad72
 MISC metadata.xml 647 RMD160 410f601bd6c9449561ef54882c0ae1059d78f908 SHA1 688afcfc2258a4498f6c8564a7528a5224a62876 SHA256 379367eae51c6a1ddbd9d5b3c49d99c863b14f5cbef093980488a96849b4aacf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkioRxgACgkQoeSe8B0zEfydIACfdV70SC1b04aM2ZzBd5CRsMdC
-ZGwAn2u7GIx7sjDB9vqwYh03BMto8iSx
-=UfaK
------END PGP SIGNATURE-----
diff --git a/net-dns/bind/bind-9.4.1_p1.ebuild b/net-dns/bind/bind-9.4.1_p1.ebuild
index e2cccde13885..5249ab86a91b 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.12 2008/07/20 09:36:05 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.1_p1.ebuild,v 1.13 2008/11/03 13:03:41 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/openresolv net-dns/resolvconf-gentoo ) )"
+	resolvconf? ( net-dns/openresolv )"
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )"
diff --git a/net-dns/bind/bind-9.4.2_p2-r1.ebuild b/net-dns/bind/bind-9.4.2_p2-r1.ebuild
index 40542c596750..d8db433af2c4 100644
--- a/net-dns/bind/bind-9.4.2_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.4.2_p2-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.2_p2-r1.ebuild,v 1.1 2008/08/03 15:59:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.2_p2-r1.ebuild,v 1.2 2008/11/03 13:03:41 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -26,7 +26,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
+	resolvconf? ( net-dns/openresolv )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/net-dns/bind/bind-9.4.2_p2.ebuild b/net-dns/bind/bind-9.4.2_p2.ebuild
index 773092521a71..a870728b424d 100644
--- a/net-dns/bind/bind-9.4.2_p2.ebuild
+++ b/net-dns/bind/bind-9.4.2_p2.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.2_p2.ebuild,v 1.6 2008/08/03 16:02:46 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.4.2_p2.ebuild,v 1.7 2008/11/03 13:03:41 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -25,7 +25,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
+	resolvconf? ( net-dns/openresolv )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/net-dns/bind/bind-9.5.0_p2-r1.ebuild b/net-dns/bind/bind-9.5.0_p2-r1.ebuild
index cbfe3bda2a84..3e709f5182b7 100644
--- a/net-dns/bind/bind-9.5.0_p2-r1.ebuild
+++ b/net-dns/bind/bind-9.5.0_p2-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.5.0_p2-r1.ebuild,v 1.1 2008/08/03 15:59:48 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/bind/bind-9.5.0_p2-r1.ebuild,v 1.2 2008/11/03 13:03:41 armin76 Exp $
 
 inherit eutils libtool autotools toolchain-funcs flag-o-matic
 
@@ -27,7 +27,7 @@ DEPEND="ssl? ( >=dev-libs/openssl-0.9.6g )
 
 RDEPEND="${DEPEND}
 	selinux? ( sec-policy/selinux-bind )
-	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
+	resolvconf? ( net-dns/openresolv )"
 
 S="${WORKDIR}/${PN}-${MY_PV}"