gentoo auto-resync : 15:04:2024 - 12:04:02

8 files changed, 319 insertions, 40 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index b310a57183a3..40070a8139aa 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 105ce95cde9f..ec86a7d018c4 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -5,7 +5,10 @@ DIST c-ares-1.26.0.tar.gz 1298394 BLAKE2B 9bcbb321b31518fdd3481447e1bba733dbf0ea
 DIST c-ares-1.26.0.tar.gz.asc 488 BLAKE2B 89c420ed235dce86c3d18ce62b58f50b78abf919c178e9a786fce5ee11da2b7a1314f8eb76bef20df0e43d18f636508540d9a9d2dfcd84df0c62691497f3a9a0 SHA512 84cd9918c22346a975400f17bf64e5093aa7b2d8f3377799cde5f6ab508e8f5ab6a004497747b702b7249b2b1369cdd22149519da01a405cf928806007e7a599
 DIST c-ares-1.27.0.tar.gz 1301440 BLAKE2B 112bf16288efc3ca1c69216de6bb42fdfc5348e70879321fb27f9602a8f469a21fa502a1cdd2f935e4ad0505ea7e22bd3a3326ce83bdb2acbe5ff266fc11cc6f SHA512 d0bffeeabdc5f1d4cececd46bd495b8224a64eaaf6d2a91c5475517440effe0e096146a1ebf19ece07367198be576c61b11961d5e4c3f601c5c5529ce4fcb46a
 DIST c-ares-1.27.0.tar.gz.asc 488 BLAKE2B 64798140a1d61e32ba45467034d9da75abd8f48810643947c94b04dcaae1b8c68da7a6d9acb7476808601acfe6a527b2cd855d99912f5ac069a597b9c9c890e3 SHA512 dbaa2e96035283e55c7a3c940255d9cc81d98961f59a10586cd666525a0fddf0e3ada01fd79133a278159f47c344bce70bcc4ad1b5df5c853273941b744357e4
+DIST c-ares-1.28.1.tar.gz 1312102 BLAKE2B 2d0f12aeb4b947f76fe6c45e2bb0a7401c5d3ae5c84a94f2387f05b639587275e12cb0a2798caa381726e37757973b28c543249f9528b60746b8bf543a70be77 SHA512 9a24f40002b661d97c9b49a617d2e6b12bad1c9f22e872611252d051ec650f886c010207939fac6992610b3cd5a87588f802d7dfa1310ced7c6621ea2f99dd90
+DIST c-ares-1.28.1.tar.gz.asc 488 BLAKE2B 90f3aedc3b56f31519a9b2746e528bb952364748b6053ecebaa3edf4269aab6b3badad459a14e8afe623340b294fd072b13c60af540eb59d7f4d82eb5204be83 SHA512 62659e3c41ea7158c7fdaab3246fee6a6a1502dec12d322efd353e5a0fb1b0aa4c1caf7ace37e1d3ea0b2937522814fdf66af2d19a501e9b9995b86e2369410d
 EBUILD c-ares-1.25.0-r1.ebuild 2445 BLAKE2B 33d0339ef5a9ca895d0a6aacc3b2653bbb89065735bdd5c6480a544ceac21b83e3f40c538a72ccb0e742a7587474a28ab259348ac7d0b778178cafc4538e4e94 SHA512 322dc2dea59b7ba3b6bcf4ced4f5073811b8b1e8a4dccc579db20d5fe1b03df666f13c3bb6273c8d1d683b9fec7210a102c7d5b1aba12682d7a66ea7cdc8c7e9
 EBUILD c-ares-1.26.0.ebuild 2389 BLAKE2B ed9b203b552e9baac44396baeb9fb022edd12f0191ede542eb9f3aaef3cef81b9de28363df0a2539a98c4f5620325013419a109d28f3a92cb79dc7f3c967b7ae SHA512 4432e168b3c80f8c012c4d395e4b8a1624049e0c1880eaf17acd4044a62b8e3b51aa801c83b39b2f3e1dd4a6042fe73daadbafc6c838b35a40683a697f7ccf36
 EBUILD c-ares-1.27.0.ebuild 2397 BLAKE2B 3d8b38a4693838cc5a0f9ee4dc582e74146b2daf34114255e558c8f56fc724c4a0e05f45f57773805b36b2565ff1c21fec6304f32fa2621dbc91e0e5fde9d680 SHA512 033bf85b51914ea1f776bc44ad6eb961f32d9dd1bb178337ed8fb29b4e2e8c9d47ba434771b4751d424493c5a6211b5edc4cafeaab07b7566d033ca54c49af86
+EBUILD c-ares-1.28.1.ebuild 2397 BLAKE2B 3d8b38a4693838cc5a0f9ee4dc582e74146b2daf34114255e558c8f56fc724c4a0e05f45f57773805b36b2565ff1c21fec6304f32fa2621dbc91e0e5fde9d680 SHA512 033bf85b51914ea1f776bc44ad6eb961f32d9dd1bb178337ed8fb29b4e2e8c9d47ba434771b4751d424493c5a6211b5edc4cafeaab07b7566d033ca54c49af86
 MISC metadata.xml 402 BLAKE2B ab03bca92ec4073f5a877993558552136f0ae673f98619aa1f30eb94b6d8f2103b1cf77d23a9f2b3d56ee33af23d626ee230e480a3e3e0bc174df879082466bd SHA512 e02d13db5d10b1aaaae5680247a6b47610dda28a13b7754d2b97f08a760ce732957c96fb6e88ce7fd2076bfec275e72bfbb3dec802940f0159122364ab21acda
diff --git a/net-dns/c-ares/c-ares-1.28.1.ebuild b/net-dns/c-ares/c-ares-1.28.1.ebuild
new file mode 100644
index 000000000000..f066b76c4ef8
--- /dev/null
+++ b/net-dns/c-ares/c-ares-1.28.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/danielstenberg.asc
+inherit edo multilib-minimal verify-sig
+
+DESCRIPTION="C library that resolves names asynchronously"
+HOMEPAGE="https://c-ares.org/"
+SRC_URI="
+	https://c-ares.org/download/${P}.tar.gz
+	verify-sig? ( https://c-ares.org/download/${P}.tar.gz.asc )
+"
+
+# ISC for lib/{bitncmp.c,inet_ntop.c,inet_net_pton.c} (bug #912405)
+LICENSE="MIT ISC"
+# Subslot = SONAME of libcares.so.2
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-cpp/gtest )
+	verify-sig? ( sec-keys/openpgp-keys-danielstenberg )
+"
+
+DOCS=( AUTHORS CHANGES NEWS README.md RELEASE-NOTES.md TODO )
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/ares_build.h
+)
+
+A__QA_CONFIG_IMPL_DECL_SKIP=(
+	# Checking for obsolete headers
+	malloc
+	calloc
+	free
+
+	# Non-existent on Linux
+	closesocket
+	CloseSocket
+	ioctlsocket
+	bitncmp
+	ConvertInterfaceIndexToLuid
+	ConvertInterfaceLuidToNameA
+)
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-symbol-hiding
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+	)
+
+	# Needed for running unit tests only
+	# Violates sandbox and tests pass fine without
+	export ax_cv_uts_namespace=no
+	export ax_cv_user_namespace=no
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	cd "${BUILD_DIR}"/test || die
+
+	# We're skipping the "real" network tests with the filter
+	# see https://github.com/c-ares/c-ares/tree/main/test
+	local network_tests=(
+		# Most live tests have Live in the name
+		*Live*
+		# These don't but are still in ares-test-live.cc => live
+		*GetTCPSock*
+		*TimeoutValue*
+		*GetSock*
+		*GetSock_virtualized*
+		*VerifySocketFunctionCallback*
+		# Seems flaky, even run manually
+		# https://github.com/c-ares/c-ares/commit/9e542a8839f81c990bb0dff14beeaf9aa6bcc18d
+		*MockUDPMaxQueriesTest.GetHostByNameParallelLookups*
+	)
+
+	# The format for disabling test1, test2, and test3 looks like:
+	# -test1:test2:test3
+	edo ./arestest --gtest_filter=-$(echo $(IFS=:; echo "${network_tests[*]}"))
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/net-dns/dnstop/Manifest b/net-dns/dnstop/Manifest
index 2a88f0396286..2f7e102cfa1e 100644
--- a/net-dns/dnstop/Manifest
+++ b/net-dns/dnstop/Manifest
@@ -1,6 +1,5 @@
 AUX dnstop-20140915-musl-fix.patch 397 BLAKE2B 02edc7a2f460b54e7746dd53a2f81fdfdcf8cdaf18d2ff8476927dcebc01c8c99d8a5a111c6458bebca4095e9b11a0af3c624f2b32e08af54e7b9893e38592b3 SHA512 82f1e6295a07fb60054b07d3fe8d2f1c56cbf5272c7596df36e59f9f9d085a18d94996980ffad63efadafea71d13b58db427aba5bcc36f3a7cacf4667acf9c9a
 AUX dnstop-20140915-pkg-config.patch 966 BLAKE2B df7deb0cf71854795135798f7c38337aedcea7b76260ec9519fc2e49d674766b44b61eac6f0119138ee1e6bee7d2688e44e843229544f0f8468179b61b36a3d0 SHA512 53181f734dadf5d5e91a69e626ab1a76b36d4a3c91b7360f66c6ef3375296ba67415ef27bc2af4f440511c126a927ae20838788b9b48061c5ceca9c8c3832cbf
 DIST dnstop-20140915.tar.gz 77917 BLAKE2B afe9cdebc7d71c9bc5ec76ba133170809cdf135d6320ff7e057e6e7d81f3cdc6aed379567c113b34e863d0c39a26e0b6c7ac52a6000f9482fa10917afd000a45 SHA512 902cf96f7366983cae4bf684e44fbe12f6e982cee8ff489329e25e1a13de60870d356906a99fee56c6da2258c4a39074a504389549c6c2e239a4ea94d8b9a65d
-EBUILD dnstop-20140915-r2.ebuild 646 BLAKE2B fffc67cdd6d1c14d6949d09146a5c01dda31a8dc4e5421c4ecb13fc8382129a3fbecc6d846b54c7a1ff12c8cf869088d6ce6f7611b3c535b1e9a21facdb83238 SHA512 8e991162357cf9980f6b47e9a090c80f8024d68aa3d567b1223ab150607ee775e8cfa475cb9529fc6b379bed9263ddac2fcc49f99a4b47589cb96fa69a729cc3
-EBUILD dnstop-20140915-r3.ebuild 738 BLAKE2B 479e86d717f5d36dbd16b84daa8be2f0dadb260f92143fca87b4104bd6ea5d97aed6c1c9b668b036f8e5a1d2b4156ca23523dbd6d8419351af6984bac8cdb92c SHA512 bc89a0fb65bea43f3494d87bff2e271c14f37f99479954b990ff41961962805230b599e81b91451178c9276be0818f76c20e181701575a57a49fe4e52eb33678
+EBUILD dnstop-20140915-r3.ebuild 734 BLAKE2B 622a1e20e7c7813eda4a2cae6c29fd2439524eb8688c58a5e4c8ea08ddd5b2959bf1cf3c58129ec118ba6e73c5efb4f33025e8863d8ec3336d48fca95f861a71 SHA512 4348c47606a7e6aafdb70b822522941043a43b55acaa2a90765d6127e74b3bb44bdad55ea87f363c6c4e06a72a416b846819f1353a67f855fb8b369d3aceb33a
 MISC metadata.xml 504 BLAKE2B 7b6ff3d8a0ca1c8bb655668a1b3233647db5190b7a55264bcb5a9b9178e94dd1bd30a657eab5f0b36a400c1752ca0d4da7c6863d6ae3d931502f5be271d33c7d SHA512 f05cc3871dcd806b36466694370b569c600d643a4cb6c7913d711c37d561876e5e27e695df6bc3f207f7e069f6abeb94ef85c92849a9c9fc0ec167bf387c8332
diff --git a/net-dns/dnstop/dnstop-20140915-r2.ebuild b/net-dns/dnstop/dnstop-20140915-r2.ebuild
deleted file mode 100644
index 78a41f4f5091..000000000000
--- a/net-dns/dnstop/dnstop-20140915-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Displays various tables of DNS traffic on your network"
-HOMEPAGE="http://dnstop.measurement-factory.com/"
-SRC_URI="http://dnstop.measurement-factory.com/src/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm ~hppa ppc x86"
-IUSE=""
-
-RDEPEND="sys-libs/ncurses:0
-	net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}"-pkg-config.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-ipv6
-}
-
-src_install() {
-	dobin dnstop
-	doman dnstop.8
-	dodoc CHANGES
-}
diff --git a/net-dns/dnstop/dnstop-20140915-r3.ebuild b/net-dns/dnstop/dnstop-20140915-r3.ebuild
index fd94f6164029..30758ba27b51 100644
--- a/net-dns/dnstop/dnstop-20140915-r3.ebuild
+++ b/net-dns/dnstop/dnstop-20140915-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="http://dns.measurement-factory.com/tools/dnstop/src/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+KEYWORDS="amd64 arm ~hppa ppc x86"
 
 RDEPEND="sys-libs/ncurses:0
 	net-libs/libpcap"
diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 121ad6b53460..d44344769c90 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -19,10 +19,13 @@ DIST unbound-1.19.0.tar.gz 6336113 BLAKE2B 66ec2b1cd32ac5930c088c73e884bc1fb4d35
 DIST unbound-1.19.0.tar.gz.asc 833 BLAKE2B 5e593223a47afaebd5e595a9520288ca5d8adee720d5e9989e7d8dd28ad1cce3e1850fec29886e0e52af14dd288b5c9c68a3a05f1d835c15e11d5bf01a08ad50 SHA512 63aa94192de7840f7abe43367e2c3f5d3fd42b8d72c08a5645cf28e2c0ad2e11d54f3aa645384fff5d4dfe66bc7ee25d81bd967780a992b54956343974206580
 DIST unbound-1.19.1.tar.gz 6340435 BLAKE2B a48c5b9493eb0a9aa2171956e08677e1cfb7c49b53731c1b05f9192434c4d815eba972aab110ba0ee25fee1e7a57192c8b48e59bb21fb76ad7fd1c7d2d260012 SHA512 c81192b70f14a4e289cf738bf6b647cf25b58b1ab11076dee306ff25a530b6a1bbeca71cfa8820d80f48fd843019beb29a68796a1b1fcec6e561dfeccd62d96a
 DIST unbound-1.19.1.tar.gz.asc 833 BLAKE2B 30721d7bc7b2f5fee8ce090bd06d86f856f2cfb194a26d4cc7b9563944f32f5513305dba2ff482ad1cc10f47e2c58975ac3911c9a4efd72d2f42a28b73dd76ac SHA512 2e4c6b7df844d1fb93d948791a20b9ff201bd1e6de6c89a830ddce06e24e5d770409265005f549757ef3a9c99d11b9860ae21711425d76d42bf2c33240dd3b52
+DIST unbound-1.19.3.tar.gz 6338685 BLAKE2B 5d9cbc26510afc2b92ecce6307cd9924a1b450892f7839f076535177ab35f78059d271e628e2aa995b62f5cf97add2363561a819d6e0181beb6b44421661d8f0 SHA512 f860614f090a5a081cceff8ca7f4b3d416c00a251ae14ceb6b4159dc8cd022f025592074d3d78aee2f86c3eeae9d1a314713e4740aa91062579143199accd159
+DIST unbound-1.19.3.tar.gz.asc 833 BLAKE2B 6eb71dde451a123ffba44c298d83256613c6325b26adffb6f0347b468bf84e63b090655d12b323f8c187ad4782fad06514fe5ab0246087bd129393d1bdb1533c SHA512 1b6437d7ac4394ab7d6eb0d12f22b39538152f9c88175a5368263059950b8e6b093fa5392d1ff37874effef7a422afa9c690f766802208979a99500a4bea5906
 EBUILD unbound-1.16.3.ebuild 6469 BLAKE2B 18cc82de0656a071c1925255ceac577ad0cfe237e7226236585d712a8feb4ad00cacecc2a677dbfafb9db8401dfe2b13d72c8e8e3c20b4aa532531d3d40007dc SHA512 f073e427e88c0f88379a9d427c7ef72269051f1da321a78a606fab9b56c60b2e0da4b7a59a043e9bafe11c7a15e3c9736df1326adbb40c4acfcde0d1be06124f
 EBUILD unbound-1.17.0.ebuild 6475 BLAKE2B 2760f28a760e30319396ee3d14b64a77d3c37c662737b46250026457c86c7f8bea8e6d3c6634753ff65044f189a522b38ea94e92a53a8a1739081b69aa9ccdf8 SHA512 f2be2711f5e3dc0c3cd9a3c6ba16d8ac024e7c6f78928e36570b017a2e648b0a7d4b777d76e088d22cdbecc1d7c0b6525034957538d5a8d8d20aa7b0d906d637
 EBUILD unbound-1.17.1.ebuild 6385 BLAKE2B 740557cc5e299e7b8bd285d8aae60da1e5de7d455066ec21175674a42db5f7062a246b722311c47ec5a17358d691e31dd2c18af2c8f3f1360bc50943be4be182 SHA512 d1cbe97ad9b5d2144303bd5b8acb182c2b51036077e6982c7b7480d780944298322f7b320c4c94d1be23baa17e8ccfbe9a0ef67f5f7aafcca4c176894f8f4660
 EBUILD unbound-1.18.0.ebuild 6426 BLAKE2B cceeb53537a7ee30fb349ce8bac0c288b5513d188d04bcb3b9a810fbd2662fea6d81f9cb7783580039534e3884113cdb6b450e9bd3e4409faba12f4149ce9689 SHA512 9a1082fbf865ba72db83834a8ecc1b6106ac3ca8c5907b3938ec1649fb60971074445295fd5f9d7da1fd24924afd712af8d7078feb936c9d7831c21894d9095d
 EBUILD unbound-1.19.0.ebuild 6505 BLAKE2B 1d292d2b036ba92f7d6abbcd3ec9f3090b675a0a999c056250940887e3dcf761f46c458363933f164f83caa118614a5e3beb5b75261f8915af47444e0a70a118 SHA512 3a9a81daa5d08f4ba6d4ee5228839f1d04b944cca5e6985197522b2357cbd213efc021cd32c7d67de49be43a0a0edb83d3b1cb1c36fd6fdce0460fdbd188a097
 EBUILD unbound-1.19.1.ebuild 6499 BLAKE2B af0b2c77a1a13323791bd72c0f47d924b39febf6e7e248140ca5da9a9b74047c9cffa6f504cb96d047e4902488983da89afbffaa56c3cb4c0c324da3f18d8929 SHA512 b69fefd7c1f4946a88267d7505af742a26c37998b6f63f604093e7892f29916904b7517ff2f6a19a6d8eb98f74370c43d45ad054b14853a95ba7458a3f733feb
+EBUILD unbound-1.19.3.ebuild 6505 BLAKE2B fe2434f5ba333740f3b908048732893fc32c4ac412f7e852bb21e95ffccc4b91ba778ff8a461db651021c2d1e880f993e26326fa3b7d3ecb6adb5b71468a0ad7 SHA512 bb14da8c754cdb83f381c3f58eb3dd6111bc3ee182657699a5e83f7d273e525a5918a1d516ce15f9f36312ce5cf816ecc1b7978cf0a01f930cb2c46eef0daa24
 MISC metadata.xml 1475 BLAKE2B d0e34f4ba056c090af979f2686d5dece53a554c7ea7612fee1991ce6838ce161359bd8405d6358c5e184b6721affeee5d6e1bd93095b92765cd38dba928daa5b SHA512 8fba72eba420d4c06fb3a9119c3f324c5679fe268b65fac23878ef15f3c3d784d372874c7d6428d1c7c2eb3a75380ad2e4d5fc1691e7c2d1b426b8cfa381222b
diff --git a/net-dns/unbound/unbound-1.19.3.ebuild b/net-dns/unbound/unbound-1.19.3.ebuild
new file mode 100644
index 000000000000..67da62c07740
--- /dev/null
+++ b/net-dns/unbound/unbound-1.19.3.ebuild
@@ -0,0 +1,218 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/unbound.net.asc
+inherit autotools flag-o-matic multilib-minimal python-single-r1 systemd verify-sig
+
+MY_P=${PN}-${PV/_/}
+DESCRIPTION="A validating, recursive and caching DNS resolver"
+HOMEPAGE="https://unbound.net/ https://nlnetlabs.nl/projects/unbound/about/"
+SRC_URI="
+	https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz
+	verify-sig? ( https://nlnetlabs.nl/downloads/unbound/${MY_P}.tar.gz.asc )
+"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="BSD GPL-2"
+SLOT="0/8" # ABI version of libunbound.so
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+IUSE="debug dnscrypt dnstap +ecdsa ecs gost +http2 python redis selinux static-libs systemd test +tfo threads"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="!test? ( test )"
+
+# Note: expat is needed by executable only but the Makefile is custom
+# and doesn't make it possible to easily install the library without
+# the executables. MULTILIB_USEDEP may be dropped once build system
+# is fixed.
+DEPEND="
+	acct-group/unbound
+	acct-user/unbound
+	>=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
+	>=dev-libs/libevent-2.0.21:0=[${MULTILIB_USEDEP}]
+	>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
+	dnscrypt? ( dev-libs/libsodium:=[${MULTILIB_USEDEP}] )
+	dnstap? (
+		dev-libs/fstrm[${MULTILIB_USEDEP}]
+		>=dev-libs/protobuf-c-1.0.2-r1:=[${MULTILIB_USEDEP}]
+	)
+	ecdsa? (
+		dev-libs/openssl:0[-bindist(-)]
+	)
+	http2? ( net-libs/nghttp2:=[${MULTILIB_USEDEP}] )
+	python? ( ${PYTHON_DEPS} )
+	redis? ( dev-libs/hiredis:= )
+	systemd? ( sys-apps/systemd )
+"
+BDEPEND="
+	virtual/pkgconfig
+	python? ( dev-lang/swig )
+	test? (
+		net-libs/ldns[examples(-)]
+		dev-util/splint
+		app-text/wdiff
+	)
+	verify-sig? ( sec-keys/openpgp-keys-unbound )
+"
+RDEPEND="
+	${DEPEND}
+	net-dns/dnssec-root
+	selinux? ( sec-policy/selinux-bind )
+"
+
+QA_CONFIG_IMPL_DECL_SKIP=(
+	ioctlsocket # not on Linux (bug #900060)
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.7-trust-anchor-file.patch
+	"${FILESDIR}"/${PN}-1.6.3-pkg-config.patch
+	"${FILESDIR}"/${PN}-1.10.1-find-ar.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# Required for the python part
+	multilib_copy_sources
+}
+
+src_configure() {
+	[[ ${CHOST} == *-darwin* ]] || append-ldflags -Wl,-z,noexecstack
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		$(multilib_native_use_enable debug)
+		$(multilib_native_use_enable gost)
+		$(multilib_native_use_enable dnscrypt)
+		$(multilib_native_use_enable dnstap)
+		$(multilib_native_use_enable ecdsa)
+		$(multilib_native_use_enable ecs subnet)
+		$(multilib_native_use_enable redis cachedb)
+		$(multilib_native_use_enable static-libs static)
+		$(multilib_native_use_enable systemd)
+		$(multilib_native_use_with python pythonmodule)
+		$(multilib_native_use_with python pyunbound)
+		$(multilib_native_use_with threads pthreads)
+		$(multilib_native_use_with http2 libnghttp2)
+		$(multilib_native_use_enable tfo tfo-client)
+		$(multilib_native_use_enable tfo tfo-server)
+
+		--disable-flto
+		--disable-rpath
+		--enable-event-api
+		--enable-ipsecmod
+
+		--with-libevent="${ESYSROOT}"/usr
+		$(multilib_native_usex redis --with-libhiredis="${ESYSROOT}/usr" --without-libhiredis)
+
+		--with-pidfile="${EPREFIX}"/run/unbound.pid
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt
+		--with-ssl="${ESYSROOT}"/usr
+		--with-libexpat="${ESYSROOT}"/usr
+
+		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
+		# $(use_enable debug lock-checks)
+		# $(use_enable debug alloc-checks)
+		# $(use_enable debug alloc-lite)
+		# $(use_enable debug alloc-nonregional)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	systemd_dounit contrib/unbound.service
+	systemd_dounit contrib/unbound.socket
+}
+
+multilib_src_install_all() {
+	use python && python_optimize
+
+	newinitd "${FILESDIR}"/unbound-r1.initd unbound
+	newconfd "${FILESDIR}"/unbound-r1.confd unbound
+
+	systemd_newunit "${FILESDIR}"/unbound_at.service "unbound@.service"
+	systemd_dounit "${FILESDIR}"/unbound-anchor.service
+
+	dodoc doc/{README,CREDITS,TODO,Changelog,FEATURES}
+
+	# bug #315519
+	dodoc contrib/unbound_munin_
+
+	docinto selinux
+	dodoc contrib/selinux/*
+
+	exeinto /usr/share/${PN}
+	doexe contrib/update-anchor.sh
+
+	# Create space for auto-trust-anchor-file...
+	keepdir /etc/unbound/var
+	fowners root:unbound /etc/unbound/var
+	fperms 0770 /etc/unbound/var
+	# ... and point example config to it
+	sed -i \
+		-e '/# auto-trust-anchor-file:/s,/etc/dnssec/root-anchors.txt,/etc/unbound/var/root-anchors.txt,' \
+		"${ED}/etc/unbound/unbound.conf" \
+		|| die
+
+	# Used to store cache data
+	keepdir /var/lib/${PN}
+	fowners root:unbound /var/lib/${PN}
+	fperms 0770 /var/lib/${PN}
+
+	find "${ED}" -name '*.la' -delete || die
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -delete || die
+	fi
+}
+
+pkg_postinst() {
+	if [[ ! -f "${EROOT}/etc/unbound/unbound_control.key" ]]; then
+		einfo "Trying to create unbound control key ..."
+		if ! unbound-control-setup &>/dev/null ; then
+			ewarn "Failed to create unbound control key!"
+		fi
+	fi
+
+	if [[ ! -f "${EROOT}/etc/unbound/var/root-anchors.txt" ]]; then
+		einfo ""
+		einfo "If you want unbound to automatically update the root-anchor file for DNSSEC validation"
+		einfo "set 'auto-trust-anchor-file: ${EROOT}/etc/unbound/var/root-anchors.txt' in ${EROOT}/etc/unbound/unbound.conf"
+		einfo "and run"
+		einfo ""
+		einfo "  su -s /bin/sh -c '${EROOT}/usr/sbin/unbound-anchor -a ${EROOT}/etc/unbound/var/root-anchors.txt' unbound"
+		einfo ""
+		einfo "as root to create it initially before starting unbound for the first time after enabling this."
+		einfo ""
+	fi
+
+	# Our user is not available on prefix
+	use prefix && return
+
+	local _perm_check_testfile=$(mktemp --dry-run "${EPREFIX}"/etc/unbound/var/.pkg_postinst-perm-check.XXXXXXXXX)
+	su -s /bin/sh -c "touch ${_perm_check_testfile}" unbound &>/dev/null
+	if [[ $? -ne 0 ]]; then
+		ewarn "WARNING: unbound user cannot write to \"${EPREFIX}/etc/unbound/var\"!"
+		ewarn "Run the following commands to restore default permission:"
+		ewarn ""
+		ewarn "    chown root:unbound ${EPREFIX}/etc/unbound/var"
+		ewarn "    chmod 0770 ${EPREFIX}/etc/unbound/var"
+	else
+		# Cleanup -- no reason to die here!
+		rm -f "${_perm_check_testfile}"
+	fi
+}