summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-dns/dnsmasq/ChangeLog6
-rw-r--r--net-dns/dnsmasq/dnsmasq-2.45.ebuild6
-rw-r--r--net-dns/dnsmasq/dnsmasq-2.50.ebuild4
3 files changed, 10 insertions, 6 deletions
diff --git a/net-dns/dnsmasq/ChangeLog b/net-dns/dnsmasq/ChangeLog
index 13d4be129460..4bef2418cd4f 100644
--- a/net-dns/dnsmasq/ChangeLog
+++ b/net-dns/dnsmasq/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dns/dnsmasq
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.182 2009/09/05 00:06:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/ChangeLog,v 1.183 2009/09/10 15:38:54 ssuominen Exp $
+
+ 10 Sep 2009; Samuli Suominen <ssuominen@gentoo.org> dnsmasq-2.45.ebuild,
+ dnsmasq-2.50.ebuild:
+ Fix xz-utils vs. lzma-utils deps.
05 Sep 2009; Brent Baude <ranger@gentoo.org> dnsmasq-2.50.ebuild:
Marking dnsmasq-2.50 ppc64 for bug 280613
diff --git a/net-dns/dnsmasq/dnsmasq-2.45.ebuild b/net-dns/dnsmasq/dnsmasq-2.45.ebuild
index 13fafa8b4f0a..9783a64eb602 100644
--- a/net-dns/dnsmasq/dnsmasq-2.45.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.45.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.45.ebuild,v 1.8 2008/11/05 00:37:25 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.45.ebuild,v 1.9 2009/09/10 15:38:54 ssuominen Exp $
inherit eutils toolchain-funcs flag-o-matic
@@ -20,7 +20,7 @@ RDEPEND="dbus? ( sys-apps/dbus )
nls? ( sys-devel/gettext )"
DEPEND="${RDEPEND}
- app-arch/lzma-utils"
+ || ( app-arch/xz-utils app-arch/lzma-utils )"
S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/net-dns/dnsmasq/dnsmasq-2.50.ebuild b/net-dns/dnsmasq/dnsmasq-2.50.ebuild
index 159a3baf9514..6bdfb0e2c743 100644
--- a/net-dns/dnsmasq/dnsmasq-2.50.ebuild
+++ b/net-dns/dnsmasq/dnsmasq-2.50.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.50.ebuild,v 1.5 2009/09/05 00:06:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/dnsmasq/dnsmasq-2.50.ebuild,v 1.6 2009/09/10 15:38:54 ssuominen Exp $
EAPI=2
@@ -21,7 +21,7 @@ RDEPEND="dbus? ( sys-apps/dbus )
nls? ( sys-devel/gettext )"
DEPEND="${RDEPEND}
- app-arch/lzma-utils"
+ || ( app-arch/xz-utils app-arch/lzma-utils )"
S="${WORKDIR}/${PN}-${MY_PV}"