diff options
| author |   Raúl Porcel <armin76@gentoo.org> | 2008-05-29 19:34:40 +0000 |
|---|---|---|
| committer | Raúl Porcel <armin76@gentoo.org> | 2008-05-29 19:34:40 +0000 |
| commit | 6a77d62eb9303db1bb08d935a85cb5427da60f73 (patch) | |
| tree | 56c6cea4ce62bf01f09d61d03040a1544fd49e28 /net-dns/dnsmasq | |
| parent | alpha/ia64/sparc stable wrt #224079 (diff) | |
| download | gentoo-2-6a77d62eb9303db1bb08d935a85cb5427da60f73.tar.gz gentoo-2-6a77d62eb9303db1bb08d935a85cb5427da60f73.tar.bz2 gentoo-2-6a77d62eb9303db1bb08d935a85cb5427da60f73.zip | |
Fix depend on openresolv, since resolvconf-gentoo is masked
(Portage version: 2.1.4.4)
Diffstat (limited to 'net-dns/dnsmasq')
| -rw-r--r-- | net-dns/dnsmasq/ChangeLog | 6 | ||||
| -rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.39.ebuild | 4 | ||||
| -rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.40.ebuild | 4 |
3 files changed, 9 insertions, 5 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/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} |