gentoo resync 08.09.2018

5 files changed, 16 insertions, 112 deletions

diff --git a/net-dns/knot/Manifest b/net-dns/knot/Manifest
index 34c698165927..ecb06e746775 100644
--- a/net-dns/knot/Manifest
+++ b/net-dns/knot/Manifest
@@ -1,10 +1,8 @@
 AUX knot-1.service 337 BLAKE2B a6645b2ab92612f3c6640f4e9601cefe087a519d8a40b222e05dbd44c8b8c5c87a01d500d5ac328fdee1cae3f9dd126448a8b82b979e13a4ff5285fa48b983d5 SHA512 58c4186e57ebd00b86dae34d5d208ed8801c0376da40cccb23b3d4542a7ee04a1003a12a4b89347b76a384b50eae4a61f96164bf22ec987ce05b1c65691659e7
 AUX knot.init 861 BLAKE2B 30ffe287f4f83058407ceab00b2113dade3b60b38d76c86f156cc31c33cc4f2ec8cf7f22172823755b71385ca18cc1044605b5479c9de05284f911d500b5dc40 SHA512 e5faa96cbee618e9042bdfd0628f06c4bc4d23c7295521771e16f6eae715835a240799e8425317b03b1ea162966defb5d6b6592139cb1d9d61b47a24961ec9b9
 AUX knot.service 275 BLAKE2B c39b50630a84cb20d33a02ad82c0fc0c994b098766af0cd3e11b4ac6e2f6e6ebc38d6e5b99c358d5e771022fd6ad14fb7e04e95fd77ba677d10950e1fc52e9a9 SHA512 37c4700320a2781aa93ca92bc2634c3e080c87337b7d632d0e2fa23f6e2e8fa1985d1d8e2516fed02b612da4d340472d5f8d0ae37c5b323ac17bbd61ca243a86
-DIST knot-2.5.7.tar.xz 1084656 BLAKE2B c2d583625a19f6a61248b3b42cdf14f5bb2bdbafdb20be6b0813744095a4016a4be2eb5e2dfaff0628238c60153480175a86706db0b88569d76156f86ba33968 SHA512 96e375f556309bb89cea982dda169cef70c23d03c48282110e47a44849c1102cd37d98aa7650781b399f5d932b724b8a935f0b9e55e4920465ae7b74a0d1d55a
-DIST knot-2.6.6.tar.xz 1120340 BLAKE2B 374d9b78f2ef2143d1221fced29184a52ee3773abd7cb08b6b48910f6ffc0f7c4f07c00d17d28344c93d71a709363bdf855d20587f87da622153c44d08d85fd8 SHA512 bd7a36decc74041f12971045cd69b8cc9e7ecce68f8d2b4cddc9b5f23ee96e8ed290d98fe9e6c441d6727ad4395bea615cbd9ec19cc641abce19ef8da6371972
-DIST knot-2.6.8.tar.xz 1121740 BLAKE2B 2da7e20630fec53952c6892ee4002afeee0c36ef5cb271346caf1760389abaacac7f11dd0b24950ff5eedca40564ccf70c25b5c8548564bdd61c78a1bd9cf93e SHA512 3300985bd4fbf88b58fbb5ba06bdd3dcbe7a50885baa89f9db47811c071a93994a2b17a0dbd27d185feade056ed5d65eef712eedb26de5a4101da363a7c24967
-EBUILD knot-2.5.7.ebuild 1913 BLAKE2B df4f8dba2d9cf3b2a2905eee881bd57ec81d3086682c1791ea3c1a3a14df72997346873ff1f4bbaa08a70584123c260d27e4e436e76cf04840e379a58e3a143a SHA512 62e40fe7b3ddd94544cb1435f448ee3e9ed0175a1b68211ee0328c34163a52127d35fec146168a1846c4da44cca3098fe562828b8c62fef7238bfed3713596ed
-EBUILD knot-2.6.6.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
-EBUILD knot-2.6.8.ebuild 1861 BLAKE2B 6aba8244d1e9af4a2da5e2d7ecd0cc2af6ddfdda408d4c57b210ad21478cc0b95f3e7b3dbba08e78d55a54769e90b99010f7230c392c4ffa19f01235150e667b SHA512 fc87b9e3a3561e7cb5b06ea59d38d9ef2dcdeab01fcbaddb0f89861e173ebbb9bfde6ab2c81e4bf2523cc1682f3386f1095a42ee6d010daa6a5dae5773c08c8a
-MISC metadata.xml 1539 BLAKE2B c07704f4bbf249b7953403a33c71d7565ef2219b019dbccdc15d9d459ff57f0aa200ed5ae9ab74b07e352d8dcd12f62f5d7bb392b064dbeedad3257ced653675 SHA512 8b39c687fb8b9fb4bf25e0baa8c851ffb4980c0028bf0f64a3c642146139429e292c6ca3fbd01b7bb311ecbbe7bf1df128885b53971b836f541fe97bedf6f056
+DIST knot-2.6.9.tar.xz 1126872 BLAKE2B c15b7e61ccad5417ce53f3d3895014931a2825835958735bdd9459634d9d9f39d6bb3681036772e6a510570a7f6a8afc8b0de5e77e67778831dc6415378889fe SHA512 80fcbef17c3e6685c09eb57e59001a5f298a083c18ce077dc2f2d1fadbe7c36e543c205c0820bc7971a8ed7547897aec408f51e1a9555a50dae82d047fac471b
+DIST knot-2.7.2.tar.xz 1148880 BLAKE2B bf3042d762d2b66f47dbd27a1c9ecd03d111259c7db82254c1175e660497fd8343c3f1cf1cc14e6068cb3d3618931b659888a7b97d7d6e4ba9d0e74c00540e31 SHA512 e09f8a38e975ff4f90db59db9ae8a6baaca9b0cbc9c2ecd37225febfe718b7c2038ae45481ed830dc66f2b70d8312266e2dc7cb54a0aa0fdc02c87ca42bac96d
+EBUILD knot-2.6.9.ebuild 1863 BLAKE2B 4543b8035b5a1939c6b739ed9edcff94098e56184116a2f4f9408b3a2252fe37cd94264cde36304875e61767ceaf1e1dad77464c4200aa377a645db375091dba SHA512 808cf7f8b0a1e2a4232e8943c7dc02713cb724140e964b23e5a0d9d9201907c5f5ec4a8902d575adf398824757a51e0540b4be7c3b8597026a40c397e5a6e756
+EBUILD knot-2.7.2.ebuild 1908 BLAKE2B 50a876560f36b6c6fdfbef4f7c3ca0b6f15202be8d5d169ada4604ed0b9c5892f8930903b271384061dba154e07ba43ca6b30e67f64a68f184578a711f6ca53b SHA512 43081a407699b81af13382edf983d383ee0dbca2001943b9c8591641a4aade6fc789340f57156eab8494d3f0ea7714ec7c450f202209f1c0a2483ed3f1f96df7
+MISC metadata.xml 1695 BLAKE2B a9a57a1a47be9a439018eeb5e670c057812f8fe8e54fe3f19d95e096a9daf916578a2a8887d5dcba18ad92c2b630cbe01a4122ae8671ee0a44dab01221f69b91 SHA512 373dd428815ebc5b8d0f689ae6e6a3dd3788a63f01e26e51fd01d9174d5692c5a5180ac3b552fd377c1a78e461c4c1d21ce721bc9093d6188f0049634ed48d93
diff --git a/net-dns/knot/knot-2.5.7.ebuild b/net-dns/knot/knot-2.5.7.ebuild
deleted file mode 100644
index 2c5988f91145..000000000000
--- a/net-dns/knot/knot-2.5.7.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="High-performance authoritative-only DNS server"
-HOMEPAGE="https://www.knot-dns.cz/"
-SRC_URI="https://secure.nic.cz/files/knot-dns/${P/_/-}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-KNOT_MODULES=(
-	"+dnsproxy"
-	"dnstap"
-	"+noudp"
-	"+onlinesign"
-	"rosedb"
-	"+rrl"
-	"+stats"
-	"+synthrecord"
-	"+whoami"
-)
-IUSE="doc caps +fastparser idn libidn2 systemd +utils ${KNOT_MODULES[@]}"
-
-RDEPEND="
-	>=dev-db/lmdb-0.9.15
-	dev-libs/libedit
-	>=dev-libs/userspace-rcu-0.5.4
-	dev-python/lmdb
-	>=net-libs/gnutls-3.3:=
-	caps? ( >=sys-libs/libcap-ng-0.6.4 )
-	dnstap? (
-		dev-libs/fstrm
-		dev-libs/protobuf-c
-	)
-	idn? (
-		!libidn2? ( net-dns/libidn )
-		libidn2? ( >=net-dns/libidn2-2.0.0 )
-	)
-	systemd? ( >=sys-apps/systemd-229 )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( dev-python/sphinx )
-"
-
-S="${WORKDIR}/${P/_/-}"
-
-src_configure() {
-	local u
-	local my_conf=()
-	for u in "${KNOT_MODULES[@]#+}"; do
-		my_conf+=("$(use_with $u module-$u)")
-	done
-
-	econf \
-		--with-storage="${EPREFIX}/var/lib/${PN}" \
-		--with-rundir="${EPREFIX}/var/run/${PN}" \
-		$(use_enable fastparser) \
-		$(use_enable dnstap) \
-		$(use_enable doc documentation) \
-		$(use_enable utils utilities) \
-		--enable-systemd=$(usex systemd) \
-		$(use_with idn libidn) \
-		"${my_conf[@]}"
-}
-
-src_compile() {
-	default
-
-	if use doc; then
-		emake -C doc html
-		HTML_DOCS=( doc/_build/html/{*.html,*.js,_sources,_static} )
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	rmdir "${D}var/run/${PN}" "${D}var/run/" || die
-	keepdir /var/lib/${PN}
-
-	newinitd "${FILESDIR}/knot.init" knot
-	if use systemd; then
-		systemd_newunit "${FILESDIR}/knot-1.service" knot
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	enewgroup knot 53
-	enewuser knot 53 -1 /var/lib/knot knot
-}
diff --git a/net-dns/knot/knot-2.6.6.ebuild b/net-dns/knot/knot-2.6.9.ebuild
index 2c624d4be58a..e4afd6cf3d88 100644
--- a/net-dns/knot/knot-2.6.6.ebuild
+++ b/net-dns/knot/knot-2.6.9.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
 		dev-libs/protobuf-c
 	)
 	idn? (
-		!libidn2? ( net-dns/libidn )
+		!libidn2? ( net-dns/libidn:* )
 		libidn2? ( net-dns/libidn2 )
 	)
 	systemd? ( sys-apps/systemd )
diff --git a/net-dns/knot/knot-2.6.8.ebuild b/net-dns/knot/knot-2.7.2.ebuild
index 2c624d4be58a..2da8f50f93a2 100644
--- a/net-dns/knot/knot-2.6.8.ebuild
+++ b/net-dns/knot/knot-2.7.2.ebuild
@@ -14,11 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 KNOT_MODULES=(
+	"+cookies"
 	"+dnsproxy"
 	"dnstap"
+	"geoip"
 	"+noudp"
 	"+onlinesign"
-	"rosedb"
 	"+rrl"
 	"+stats"
 	"+synthrecord"
@@ -37,8 +38,9 @@ RDEPEND="
 		dev-libs/fstrm
 		dev-libs/protobuf-c
 	)
+	geoip? ( dev-libs/libmaxminddb )
 	idn? (
-		!libidn2? ( net-dns/libidn )
+		!libidn2? ( net-dns/libidn:* )
 		libidn2? ( net-dns/libidn2 )
 	)
 	systemd? ( sys-apps/systemd )
diff --git a/net-dns/knot/metadata.xml b/net-dns/knot/metadata.xml
index 9245494df34e..b4c4ececc733 100644
--- a/net-dns/knot/metadata.xml
+++ b/net-dns/knot/metadata.xml
@@ -10,6 +10,9 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="cookies">
+			Enable the DNS cookie module (RFC 7873)
+		</flag>
 		<flag name="dnsproxy">
 			Enable the tiny DNS proxy module
 		</flag>
@@ -21,6 +24,9 @@
 			Use a zone file parser that is faster, but requires
 			more memory and CPU time to compile
 		</flag>
+		<flag name="geoip">
+			Enable the Geography-based responses module
+		</flag>
 		<flag name="libidn2">
 			If IDN support is enabled, use net-dns/libidn2 instead
 			of net-dns/libidn