summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/net-dns/dnsmasq-2.80-r1')
-rw-r--r--metadata/md5-cache/net-dns/dnsmasq-2.80-r19
1 files changed, 9 insertions, 0 deletions
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
index f0c270a04810..ceb45ab4aedc 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
@@ -5,11 +5,20 @@ DESCRIPTION=Small forwarding DNS server
EAPI=7
HOMEPAGE=http://www.thekelleys.org.uk/dnsmasq/doc.html
IUSE=auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2 +inotify ipv6 lua nls script selinux static tftp
+<<<<<<< HEAD
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+=======
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
+>>>>>>> next
LICENSE=|| ( GPL-2 GPL-3 )
RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2? ( >=net-dns/libidn2-2.0:= ) ) lua? ( dev-lang/lua:* ) conntrack? ( net-libs/libnetfilter_conntrack:= ) nls? ( sys-devel/gettext ) dnssec? ( !static? ( >=dev-libs/nettle-3.4:=[gmp] ) ) selinux? ( sec-policy/selinux-dnsmasq )
REQUIRED_USE=dhcp-tools? ( dhcp ) lua? ( script ) libidn2? ( idn )
SLOT=0
SRC_URI=http://www.thekelleys.org.uk/dnsmasq/dnsmasq-2.80.tar.xz
+<<<<<<< HEAD
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
_md5_=0149050596013c63e8f529809bc7ceb7
+=======
+_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+_md5_=2fa8206e50d8c38f14c2361017cd2b7a
+>>>>>>> next