gentoo resync : 15.06.2021

5 files changed, 112 insertions, 0 deletions

diff --git a/net-dns/getdns/Manifest b/net-dns/getdns/Manifest
index 14f37b93957d..51c1d764cd29 100644
--- a/net-dns/getdns/Manifest
+++ b/net-dns/getdns/Manifest
@@ -1,4 +1,5 @@
 AUX getdns-1.4.2-stubby.service.patch 568 BLAKE2B f2e605116f924b109bf2cd734c8eb79314aeb02b0e30e2fd8d62117b44a74f20e64b1b527253a09525ad9ab26aa2a64a51940773064de87e295d1831dfe9e51b SHA512 67c88787d48662d5c555cd2cdff5916a2211aaf45a13b41e0a909d703dcbc66cb3de834cc94b7c3d292d16a99d024b07098b4e0bb1c790e48201ca9ffb598bd2
+AUX getdns-1.7.0-docdir.patch 769 BLAKE2B d6eabd639382b1fdaefb344c440dabbdcd5a61e5999a31d8565c994baf80bb9a05efad6cd54dd5dd871c4d6c4b05febb9302a68c8bb36184b5d024c5f6fcfd30 SHA512 7eb0895ca0707f396a326469b3ecf09e43cb52f7d83e2288570f88b13cc884770a2aa634f8f0128ee38c2f4ea43074e80797ae8c07788dcca66706af2cd050b7
 AUX stubby.confd-r1 546 BLAKE2B 2f81b79b290264701ee75029ee61e006e7f6e2425ebd8090e2f07d4aed4903b88e07576893f653a8704f5181b3fb67f51327e41fef909bc56f5022bf124a4183 SHA512 10793c0ab9081c083dd702b57ffd864aa5a6d76f678eeb704b577188c0a00536f39f2dbb960d8333564b99981a5e2d4414802ffa8506b7cb41fc517680e2b78c
 AUX stubby.initd-r1 636 BLAKE2B 1f8e96c0b844837af8d46f12c80750979be3e763bd7ac08b956f69a8fd4fd9cdf018cc666e1fc47a324ee3960e358489e01b8da6d7d09cae8dffe9cff1b38b90 SHA512 556c35dbcdc157668308e502895519e73fa723074bc8cb1d7cbfd762e0831a584be67a9204744dad17ff4ffaaf9b97b67ed60acfc6ef56e44e240c51d2f783b0
 AUX stubby.initd-r2 685 BLAKE2B d079db5129c02d7b4bdbfdd28733426b39f9e094e76f14e5a32b948f40717faa1886f9093059ddca9e4cd58e6621e06ff75ff94ef713338b1e0335785274f954 SHA512 11b9a6d1a60543ed6e897c87b9c78c72a241388486f1d389918f5a11176a208d885e641fe304bd2ca91284861e37422b8c387ebc8aaa820093b3e70d31b28cf1
@@ -6,7 +7,9 @@ AUX stubby.logrotate 76 BLAKE2B f68efa844df0a0b97bcfaa117fa74b0c314df18d4aefd9b9
 DIST getdns-1.5.1.tar.gz 1075728 BLAKE2B fd6ac52a302ecf22cc913d8de6f93f9ab125429d0eb9d6e233f23b84bb2e242573cd93997f88b4d1a2493273691dab897efc8509a0e3f03f6fddcb9d3b53ecb6 SHA512 4013cb4f00cc87164380c22dc6f82a4fd54702769c28eeb7cfcb13fb35ef41e32916c36a1aa2f6ef05f008da97bea5c7ed849aedc6ae7050c285f9589a9817b0
 DIST getdns-1.5.2.tar.gz 1091088 BLAKE2B c5f32af794f3c710c0f84027d38ca393c72a438905c5e2fe49f2d20477e3f90f855d280f43d0ef7d204fa67d95ebdb960ce86d934e26c1ef3030f263f98ec7f4 SHA512 42e56264578f59e94d0a7315cd9cb1720f24c7a9abbaa09e1b42c274d15d1082ad4a036fa3c10573cf4d0ee6d868b6fcedf3a7cd64b53bdabd9d45542e479ca4
 DIST getdns-1.6.0-beta.1.tar.gz 669637 BLAKE2B cab019c38a0e7268a3ffef7ffd6b52ab3565bbf0b4ea4e897d60cfc0885ee7d32d8bd22e58f24b554e03d4297945d4eaa915aff254f43d4e82455f1070923d46 SHA512 b36d05b09b5ab7c384fdb93820bc6ad253e9a44da9c7ea38c735882e56e03eaba1793ea22068d03867ed2ade71682686a359b1b0a821eed4a5f3bebeeaeeb7e2
+DIST getdns-1.7.0.tar.gz 690885 BLAKE2B 25e81c01c5da0a5494dc25077257f8f98210b442b7ca65c895aa2a40af180e840aa53205ae84ed242cbd6c55f8830caf255db9d7f607dde39f118ab7494a7072 SHA512 d09b8bdd0b4a3df2d25b9689166226da83a5a7eb2c7436487dc637539ac6077624a4d66cf684c4e6c4911561872c6bd191af3afd90d275b1662e4c6c47773ef6
 EBUILD getdns-1.5.1.ebuild 1829 BLAKE2B 1b98cf3a49cb0aa8dd24faa08702a7f92e810b1142ce285c07f8ad46db9da383786ccf64822a026231f95a755d0ab28a42a29f7bb014aaa687af21836fff00e4 SHA512 8f883b33c97371fa82b5699ac28beaa6d3fd03c2904ba974b16d352f2561ab5967e7d1c7dadad904b0c121e37384d7f0f48adf5784120ed11adca96680793227
 EBUILD getdns-1.5.2-r2.ebuild 2027 BLAKE2B c538bbd971332f280f1a1ef538d8f7a39fe46ad2cc2c9c8762c3d7e7dbf6224de7534c5a98dd093afa751630ef86f197a1582d1e5a4038cc74a425ba17e0c951 SHA512 97576f96435a75a8e51ae9a600f1329e924124b5d220766168e255a9e944a74a543181c20a27e4cc0f618d2cef47e555eef951b54aede0a536579a88a7acdcd5
 EBUILD getdns-1.6.0_beta1-r2.ebuild 2030 BLAKE2B bb96fe0fa12f242604f63add83ee05ace04d3d7686a51e7daa17c009bd745a8e7c31e070aa0fea88c66cd0321b1b954ef0b665ef5b7b45b9b412539c76e70c36 SHA512 d08b2a2c7b135578e07b08338a2a3a135e82e042b8d02263e4c93f9e42350c4dcb8be1c9a2bea0e9f09d968c1789902cdb425f7f61be7cf1f8620edc678958fa
+EBUILD getdns-1.7.0.ebuild 2205 BLAKE2B 285d36c359549142a8038426220cc5a8b55a536ea92a56ba4982d51e7badfcfa9f738fbb1391d01a3cd940e6be6db1ab38004eef696ece5953f0f5f0d1b110af SHA512 c56e15e027e77f28d99ada24268a581079b75e4998bd76335574345d86d2c27eb93762f2c3d47d596f2f76f58a29ee0f9657ce7ce9e3c20a88967b7158fcc80d
 MISC metadata.xml 823 BLAKE2B 6f036445b01fd8b4c4a0ddac2f04ed45cb980dc31ca5aa5a25b5da8272541ab7b8d6b6d9fcd8b3d122de378a71b2e8f1dffa158da6a0db84d7e61b9e6f8d134b SHA512 2ac45a84c1d38e601cc9a1bb2af25a4843b8b43902736fce9fe8fba7fb6a2f6b98c020e4a76c8443526c51af7f91602daa01e84e69fe29bc838ad79eb147ded2
diff --git a/net-dns/getdns/files/getdns-1.7.0-docdir.patch b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
new file mode 100644
index 000000000000..e674a3b2b81d
--- /dev/null
+++ b/net-dns/getdns/files/getdns-1.7.0-docdir.patch
@@ -0,0 +1,15 @@
+https://github.com/getdnsapi/getdns/pull/509
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1101,9 +1101,8 @@ endif ()
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/getdns DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/man3 DESTINATION share/man)
+ 
+-set(docdir share/doc/getdns)
+-install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${docdir})
+-install(FILES spec/index.html DESTINATION ${docdir}/spec)
++install(FILES AUTHORS ChangeLog COPYING LICENSE NEWS README.md DESTINATION ${CMAKE_INSTALL_DOCDIR})
++install(FILES spec/index.html DESTINATION ${CMAKE_INSTALL_DOCDIR}/spec)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/getdns.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
+ 
+ install(CODE "message(\"\
diff --git a/net-dns/getdns/files/stubby.initd-r1 b/net-dns/getdns/files/stubby.initd-r1
index e6b799919e28..e6b799919e28 100755..100644
--- a/net-dns/getdns/files/stubby.initd-r1
+++ b/net-dns/getdns/files/stubby.initd-r1
diff --git a/net-dns/getdns/files/stubby.initd-r2 b/net-dns/getdns/files/stubby.initd-r2
index 69e76c0acfdf..69e76c0acfdf 100755..100644
--- a/net-dns/getdns/files/stubby.initd-r2
+++ b/net-dns/getdns/files/stubby.initd-r2
diff --git a/net-dns/getdns/getdns-1.7.0.ebuild b/net-dns/getdns/getdns-1.7.0.ebuild
new file mode 100644
index 000000000000..39b9a79e1866
--- /dev/null
+++ b/net-dns/getdns/getdns-1.7.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+_SRCURI_P="${P/%_beta1/-beta.1}"
+
+inherit cmake fcaps systemd tmpfiles
+
+DESCRIPTION="Modern asynchronous DNS API"
+HOMEPAGE="https://getdnsapi.net/"
+SRC_URI="https://getdnsapi.net/releases/${_SRCURI_P//./-}/${_SRCURI_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples +getdns-query +getdns-server-mon gnutls +idn libev libevent libuv static-libs stubby test +unbound"
+
+S="${WORKDIR}/${_SRCURI_P}"
+
+# https://bugs.gentoo.org/661760
+# https://github.com/getdnsapi/getdns/issues/407
+# (As of 1.7.0, seems to need network)
+RESTRICT="test"
+#RESTRICT="!test? ( test )"
+
+DEPEND="
+	dev-libs/libbsd
+	dev-libs/libyaml
+	dev-libs/openssl:=
+	idn? ( net-dns/libidn2:= )
+	gnutls? (
+		net-libs/gnutls:0=[dane,openssl]
+		dev-libs/nettle:0=
+	)
+	libev? ( dev-libs/libev:= )
+	libevent? ( dev-libs/libevent:= )
+	libuv? ( dev-libs/libuv:= )
+	test? ( dev-libs/check )
+	>=net-dns/unbound-1.5.9:=
+"
+RDEPEND="
+	${DEPEND}
+	stubby? (
+		acct-group/stubby
+		acct-user/stubby
+		sys-libs/libcap
+	)
+"
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.4.2-stubby.service.patch"
+	"${FILESDIR}/${PN}-1.7.0-docdir.patch"
+)
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_RUNSTATEDIR=/var/run
+		-DBUILD_DOXYGEN=$(usex doc)
+		-DBUILD_GETDNS_QUERY=$(usex getdns-query)
+		-DBUILD_GETDNS_SERVER_MON=$(usex getdns-server-mon)
+		-DBUILD_STUBBY=$(usex stubby)
+		-DENABLE_STATIC=$(usex static-libs)
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DENABLE_UNBOUND_EVENT_API=$(usex unbound)
+		-DUSE_GNUTLS=$(usex gnutls)
+		-DUSE_LIBEV=$(usex libev)
+		-DUSE_LIBEVENT2=$(usex libevent)
+		-DUSE_LIBIDN2=$(usex idn)
+		-DUSE_LIBUV=$(usex libuv)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if use stubby; then
+		newinitd "${FILESDIR}"/stubby.initd-r2 stubby
+		newconfd "${FILESDIR}"/stubby.confd-r1 stubby
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/stubby.logrotate stubby
+		systemd_dounit "${S}"/stubby/systemd/stubby.service
+		dotmpfiles "${S}"/stubby/systemd/stubby.conf
+	fi
+}
+
+pkg_postinst() {
+	if use stubby; then
+		fcaps cap_net_bind_service=ei /usr/bin/stubby
+	fi
+}