diff options
Diffstat (limited to 'net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild')
| -rw-r--r-- | net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild index 2319ec5f277b..6e3d80b6e8ca 100644 --- a/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild +++ b/net-dns/dnsmasq/dnsmasq-2.80-r1.ebuild @@ -11,7 +11,11 @@ SRC_URI="http://www.thekelleys.org.uk/dnsmasq/${P}.tar.xz" LICENSE="|| ( GPL-2 GPL-3 )" SLOT="0" +<<<<<<< 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 IUSE="auth-dns conntrack dbus +dhcp dhcp-tools dnssec +dumpfile id idn libidn2" IUSE+=" +inotify ipv6 lua nls script selinux static tftp" |