Fix depend on openresolv, since resolvconf-gentoo is masked

Package-Manager: portage-2.1.4.4

4 files changed, 12 insertions, 18 deletions

diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 78552d14339f..399de77d8165 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/dnsmasq
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.151 2008/04/10 21:03:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.152 2008/05/29 19:34:40 armin76 Exp $
+
+  29 May 2008; Raúl Porcel <armin76@gentoo.org> dnsmasq-2.39.ebuild,
+  dnsmasq-2.40.ebuild:
+  Fix depend on openresolv, since resolvconf-gentoo is masked
 
   10 Apr 2008; Mike Frysinger <vapier@gentoo.org> dnsmasq-2.41.ebuild:
   Mark amd64 stable #216099.
diff --git a/net-dns/dnsmasq/Manifest b/net-dns/dnsmasq/Manifest
index b28a7d63284c..e422efc0c698 100644
--- a/net-dns/dnsmasq/Manifest
+++ b/net-dns/dnsmasq/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX dnsmasq-fbsd-config.patch 451 RMD160 c9103d329ff429cdadea346db59678815fe3317d SHA1 28f48fc050c3cc964e717a1c09edb47b4438597a SHA256 8973971c4a161f48815c41045cb350394f330276085e9b8f3c578077abc0f359
 AUX dnsmasq-init 924 RMD160 feb28b270b5656834550e4dcfc1c87eeef88ab77 SHA1 119f112555a19236622637666758ef42d90ad74b SHA256 3803f1b7cb4c9f1c738537d5b5d91b37727572c81056e2fe6546a517ba992f55
 AUX dnsmasq.confd 140 RMD160 33f6370377b38bf33acab72d8de86cba5e197d79 SHA1 83461d2964dc3f0db777fc26141b07f6f3f5a762 SHA256 8bbc2634ab537ed3a17ee98be9c2667013a2b048f6981138017414e54fe90746
@@ -8,16 +5,9 @@ AUX resolvconf.dnsmasq 4078 RMD160 8a290b908cf975e0cbb2b845c5c492d8a3f6e2aa SHA1
 DIST dnsmasq-2.39.tar.gz 288990 RMD160 7bd7e60b825d070eb588319bdb0f2f9a6dc95d23 SHA1 9c6e3b0739e7b3e55aab14acb2bed81c6fb47db9 SHA256 c290f6af5508ecefe83b50a5a063867b05ab024dd2f5ec5ee4d056b2509190c1
 DIST dnsmasq-2.40.tar.gz 307051 RMD160 f86ee3c5e398b3a8eac103c6598f8f3db60d6955 SHA1 4af93b18c262b83e5f6bd24004483aa2ec6f3d20 SHA256 16517856930074fa4bba739f40ca1dd4a11b80a0623a12f2ae7be701083564e0
 DIST dnsmasq-2.41.tar.gz 361517 RMD160 6f8af9934870d359b4155fca671c07c990c256ed SHA1 18ab4f28a3b9300a04f9a4db9cfc3a5d9bc46c55 SHA256 613d712d54ee38ec72d3effc9fe37e404fdbbad43e66f6689a8c509dc9a0d522
-EBUILD dnsmasq-2.39.ebuild 1590 RMD160 d239156b97e657380313a03adb2d2e6f10a117ea SHA1 29488a9c7bbbf870eca43e646bc39a2e041a51ce SHA256 9a56eb4338f66c05018904bbf6db41b311bfe2b436a682bb6705bd11a7ae360e
+EBUILD dnsmasq-2.39.ebuild 1615 RMD160 bed33625fa785f07cc1f658ab76e43691259c93b SHA1 261e1dd3b263a14727b20ea717780be7e514e876 SHA256 57a6102b9e0d746528b9edd1d15d3f0190d2afcfb118c5d42124c14bc5065b60
 EBUILD dnsmasq-2.40-r1.ebuild 1434 RMD160 e2db24b42db190e0d4fb2194e2305d935d9fec9d SHA1 563202ad8f57bf7fb169a70b4d6bdd34ee080336 SHA256 7936b820e44e3acd3ad59d2f9df29ed3c00b8501288e2115fcb615d1d004cd27
-EBUILD dnsmasq-2.40.ebuild 1590 RMD160 e9e377914d29d71cf0930b7cb1fdda1800709db5 SHA1 019dea9a370e83a56e1b347730f1e9b6d4c4e53c SHA256 583cc33f544a5eb81b5b4eee5cbce4e474385b237f6a29b8456860889fe9fcb2
+EBUILD dnsmasq-2.40.ebuild 1615 RMD160 898a98177431fa1cd41e70dbba3874a6284d16ed SHA1 aac578b1c1b80413f7667a8f0be34fcab20409e2 SHA256 b55e63459dbaf1a2724cec25a2446c8c059b912f407257ee7df4de4a7300372e
 EBUILD dnsmasq-2.41.ebuild 1521 RMD160 0dfe63467317d3d7508e82e77894e993c8342727 SHA1 123a9ee5c825440970e6589c44d6a4b412aacb42 SHA256 34d5fb4d62abb4d21b7829033090da6087bc1f75cd873423d585e3991e6dbfcc
-MISC ChangeLog 18710 RMD160 09910e5aed20aad317bad1db3c3a09e937bbdd23 SHA1 d567dd790e993ba3d9901f5dfdba0a252b7c8b54 SHA256 47f7bf5da6690b5725acb6f7635ffc9335c3fc9ad83d256ff1c4a2806e9a9610
+MISC ChangeLog 18867 RMD160 fcffc66eed5fcbc34f38be25c6b973eba4181180 SHA1 8d3c05549000d002e7a14799e820a12b31d4dd56 SHA256 a594348ec846b6e428c5e015379cf9bfe6a690ce4b4bcc71c94a753f2d5e3573
 MISC metadata.xml 251 RMD160 9f6c5022895c245c7b1fdbaa24ae19cab04502c8 SHA1 4f7b27e3a8043f87fea8d4bc308e4b947f0e8675 SHA256 fd85d2faaf1d0c0eab6a4d2ab9eaa493e087a6108aafd0a5db6436bfc181783b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFH/oDCj9hvisErhMIRAtDwAJ0bJY9yg3owPXRmC5okRDTXJTKGPgCgmQQe
-AyejVfG97QCDdTrAfH1fyGw=
-=7HqV
------END PGP SIGNATURE-----
diff --git a/net-dns/dnsmasq/dnsmasq-2.39.ebuild b/net-dns/dnsmasq/dnsmasq-2.39.ebuild
index b9ecc5b8ebb7..d93a76d27639 100644
--- a/net-dns/dnsmasq/dnsmasq-2.39.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.39.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/dnsmasq/dnsmasq-2.39.ebuild,v 1.12 2008/02/21 15:54:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.39.ebuild,v 1.13 2008/05/29 19:34:40 armin76 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -18,7 +18,7 @@ IUSE="dbus isc resolvconf tftp"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dbus? ( sys-apps/dbus )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 
 S=${WORKDIR}/${PN}-${MY_PV}
 
diff --git a/net-dns/dnsmasq/dnsmasq-2.40.ebuild b/net-dns/dnsmasq/dnsmasq-2.40.ebuild
index da758472ce2b..f637736108af 100644
--- a/net-dns/dnsmasq/dnsmasq-2.40.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.40.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/dnsmasq/dnsmasq-2.40.ebuild,v 1.8 2008/02/21 15:54:02 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.40.ebuild,v 1.9 2008/05/29 19:34:40 armin76 Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -18,7 +18,7 @@ IUSE="dbus isc resolvconf tftp"
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dbus? ( sys-apps/dbus )
-	resolvconf? ( net-dns/resolvconf-gentoo )"
+	resolvconf? ( || ( net-dns/openresolv net-dns/resolvconf-gentoo ) )"
 
 S=${WORKDIR}/${PN}-${MY_PV}