summaryrefslogtreecommitdiff
path: root/metadata/md5-cache/net-dns
diff options
context:
space:
mode:
Diffstat (limited to 'metadata/md5-cache/net-dns')
-rw-r--r--metadata/md5-cache/net-dns/Manifest.gzbin17748 -> 18064 bytes
-rw-r--r--metadata/md5-cache/net-dns/bind-9.14.44
-rw-r--r--metadata/md5-cache/net-dns/bind-9.14.54
-rw-r--r--metadata/md5-cache/net-dns/bind-9.14.64
-rw-r--r--metadata/md5-cache/net-dns/bind-9.15.215
-rw-r--r--metadata/md5-cache/net-dns/bind-9.15.315
-rw-r--r--metadata/md5-cache/net-dns/bind-tools-9.14.44
-rw-r--r--metadata/md5-cache/net-dns/bind-tools-9.14.54
-rw-r--r--metadata/md5-cache/net-dns/bind-tools-9.14.64
-rw-r--r--metadata/md5-cache/net-dns/bind-tools-9.15.214
-rw-r--r--metadata/md5-cache/net-dns/bind-tools-9.15.314
-rw-r--r--metadata/md5-cache/net-dns/dnsmasq-2.804
-rw-r--r--metadata/md5-cache/net-dns/dnsmasq-2.80-r19
13 files changed, 95 insertions, 0 deletions
diff --git a/metadata/md5-cache/net-dns/Manifest.gz b/metadata/md5-cache/net-dns/Manifest.gz
index cfd04242e4b1..f0a5d5751eae 100644
--- a/metadata/md5-cache/net-dns/Manifest.gz
+++ b/metadata/md5-cache/net-dns/Manifest.gz
Binary files differ
diff --git a/metadata/md5-cache/net-dns/bind-9.14.4 b/metadata/md5-cache/net-dns/bind-9.14.4
index f7d49260bc77..bfb32d9f1253 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.4
+++ b/metadata/md5-cache/net-dns/bind-9.14.4
@@ -12,5 +12,9 @@ REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap
RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.4/bind-9.14.4.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+<<<<<<< HEAD
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=70ce30dcd49c406f0e88ead9a61127ff
diff --git a/metadata/md5-cache/net-dns/bind-9.14.5 b/metadata/md5-cache/net-dns/bind-9.14.5
index f7560b026dbe..55b1cadf6c02 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.5
+++ b/metadata/md5-cache/net-dns/bind-9.14.5
@@ -12,5 +12,9 @@ REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz
RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.5/bind-9.14.5.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+<<<<<<< HEAD
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=690d0dfaca5b73dc2c7c199a7419ba94
diff --git a/metadata/md5-cache/net-dns/bind-9.14.6 b/metadata/md5-cache/net-dns/bind-9.14.6
index d258766fc25e..b2096dea1cf5 100644
--- a/metadata/md5-cache/net-dns/bind-9.14.6
+++ b/metadata/md5-cache/net-dns/bind-9.14.6
@@ -12,5 +12,9 @@ REQUIRED_USE=?? ( geoip geoip2 ) postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz
RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.6/bind-9.14.6.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+<<<<<<< HEAD
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+=======
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=690d0dfaca5b73dc2c7c199a7419ba94
diff --git a/metadata/md5-cache/net-dns/bind-9.15.2 b/metadata/md5-cache/net-dns/bind-9.15.2
new file mode 100644
index 000000000000..e7cf3be8490f
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.15.2
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.15.2/bind-9.15.2.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+_md5_=10d7b24c2da40610e331f747a384bfc1
diff --git a/metadata/md5-cache/net-dns/bind-9.15.3 b/metadata/md5-cache/net-dns/bind-9.15.3
new file mode 100644
index 000000000000..876d421efb6b
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-9.15.3
@@ -0,0 +1,15 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=config configure install postinst prepare setup
+DEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] )
+DESCRIPTION=Berkeley Internet Name Domain - Name Server
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=-berkdb +caps dlz dnstap doc dnsrps fixed-rrset geoip gost gssapi json ldap libressl lmdb mysql odbc postgres python selinux static-libs urandom xml +zlib python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl ) mysql? ( dev-db/mysql-connector-c:0= ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) postgres? ( dev-db/postgresql:= ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) json? ( dev-libs/json-c:= ) lmdb? ( dev-db/lmdb ) zlib? ( sys-libs/zlib ) dnstap? ( dev-libs/fstrm dev-libs/protobuf-c ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) python_targets_python3_7? ( dev-lang/python:3.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,python_targets_python3_7(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-)] ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc >=sys-freebsd/freebsd-ubin-9.0_rc )
+REQUIRED_USE=postgres? ( dlz ) berkdb? ( dlz ) mysql? ( dlz ) odbc? ( dlz ) ldap? ( dlz ) python? ( || ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 python_targets_python3_7 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.15.3/bind-9.15.3.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 )
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 db-use 501a5d0963e0d17f30260023f292ae8e eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 1d91b03d42ab6308b5f4f6b598ed110e python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+_md5_=e1760b565c9ab56be4b5ebd7ccc28ba8
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.4 b/metadata/md5-cache/net-dns/bind-tools-9.14.4
index 36b1b80bae5e..44b7c5c2fc77 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.14.4
+++ b/metadata/md5-cache/net-dns/bind-tools-9.14.4
@@ -11,5 +11,9 @@ RDEPEND=!<net-dns/bind-9.10.2
RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.4/bind-9.14.4.tar.gz
+<<<<<<< HEAD
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=62dcebd6353542346ea68b390a9c5c2e
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.5 b/metadata/md5-cache/net-dns/bind-tools-9.14.5
index 97fc40a34d20..9e56b8c2dcd7 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.14.5
+++ b/metadata/md5-cache/net-dns/bind-tools-9.14.5
@@ -11,5 +11,9 @@ RDEPEND=!<net-dns/bind-9.10.2
RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.5/bind-9.14.5.tar.gz
+<<<<<<< HEAD
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=5d863aafb00dcc12046c3d9c2c1fcc5d
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.14.6 b/metadata/md5-cache/net-dns/bind-tools-9.14.6
index 689f1f2e1360..efa9174cc29c 100644
--- a/metadata/md5-cache/net-dns/bind-tools-9.14.6
+++ b/metadata/md5-cache/net-dns/bind-tools-9.14.6
@@ -11,5 +11,9 @@ RDEPEND=!<net-dns/bind-9.10.2
RESTRICT=test
SLOT=0
SRC_URI=https://downloads.isc.org/isc/bind9/9.14.6/bind-9.14.6.tar.gz
+<<<<<<< HEAD
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+=======
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+>>>>>>> next
_md5_=5d863aafb00dcc12046c3d9c2c1fcc5d
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.15.2 b/metadata/md5-cache/net-dns/bind-tools-9.15.2
new file mode 100644
index 000000000000..1ef62161bbe9
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.15.2
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) !<net-dns/bind-9.10.2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.15.2/bind-9.15.2.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=3d1b0072c369158b4a59a9106185e6f0
diff --git a/metadata/md5-cache/net-dns/bind-tools-9.15.3 b/metadata/md5-cache/net-dns/bind-tools-9.15.3
new file mode 100644
index 000000000000..2ced2aa367a8
--- /dev/null
+++ b/metadata/md5-cache/net-dns/bind-tools-9.15.3
@@ -0,0 +1,14 @@
+BDEPEND=virtual/pkgconfig >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare
+DEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) )
+DESCRIPTION=bind tools: dig, nslookup, host, nsupdate, dnssec-keygen
+EAPI=7
+HOMEPAGE=https://www.isc.org/software/bind
+IUSE=+caps doc gssapi idn ipv6 libedit libressl readline xml
+LICENSE=Apache-2.0 BSD BSD-2 GPL-2 HPND ISC MPL-2.0
+RDEPEND=caps? ( sys-libs/libcap ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/libidn2:= ) gssapi? ( virtual/krb5 ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline:0= ) ) !<net-dns/bind-9.10.2
+RESTRICT=test
+SLOT=0
+SRC_URI=https://downloads.isc.org/isc/bind9/9.15.3/bind-9.15.3.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 7ba73aee7fe4462b3a745e3645ab92ca libtool f143db5a74ccd9ca28c1234deffede96 multilib 1d91b03d42ab6308b5f4f6b598ed110e toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=3d1b0072c369158b4a59a9106185e6f0
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80 b/metadata/md5-cache/net-dns/dnsmasq-2.80
index b86eea2c8a98..75de98381446 100644
--- a/metadata/md5-cache/net-dns/dnsmasq-2.80
+++ b/metadata/md5-cache/net-dns/dnsmasq-2.80
@@ -11,5 +11,9 @@ RDEPEND=dbus? ( sys-apps/dbus:= ) idn? ( !libidn2? ( net-dns/libidn:0= ) libidn2
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
+=======
_eclasses_=eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic 1b4b0d1d972613ecfb7af4c5c53f2051 multilib 1d91b03d42ab6308b5f4f6b598ed110e systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs 2f8b8f320bee13b71a8a54cc6d09e08a user 00484e1be1aac73e24fca1c99557a7d6
+>>>>>>> next
_md5_=3b9bb437795b373cda42fe6fda4b4a4b
diff --git a/metadata/md5-cache/net-dns/dnsmasq-2.80-r1 b/metadata/md5-cache/net-dns/dnsmasq-2.80-r1
index e9f1d270afa2..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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 16:10:00 +0000