From 71deace00d1a2b091313fe137ab7092418c6f87c Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Mon, 10 Feb 2020 21:05:55 +0000
Subject: gentoo resync : 10.02.2020

---
 net-dns/unbound/Manifest             |  2 +-
 net-dns/unbound/unbound-1.9.4.ebuild | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'net-dns/unbound')

diff --git a/net-dns/unbound/Manifest b/net-dns/unbound/Manifest
index 9fd0ca5c4e89..fef331d8fabe 100644
--- a/net-dns/unbound/Manifest
+++ b/net-dns/unbound/Manifest
@@ -9,7 +9,7 @@ AUX unbound_at.service 304 BLAKE2B 0762200390475ff6a3ca4dc282b3eca3e55cb339528a7
 DIST unbound-1.9.4.tar.gz 5686242 BLAKE2B de9e553ba6e8c3839b41776052c3b0f83890b5bd9cbdb895fbf1e413169dd4740a9dc354ccc787fa018755acb73e831f1cb2742db65e151d1e01367b35a7b9e5 SHA512 44021014c944fc01a1f5f9afd77145f5554a3282cc2bfd54526fc4f88346f497c847ddb72bafa155d7e6e5dd02b6bb031836ead4408977d4e4b5b3290dffea9c
 DIST unbound-1.9.5.tar.gz 5686689 BLAKE2B a685d7f74bff5d76907694877a988346f233c202121b76f7fbd0d86edc200abe06d345e77fdca41e97d2a22329e6bbc1600fefeaac2abc1784f34367413593e3 SHA512 0b198b49165b25c93899ca41fead67c479e5b6fd255f7e2af6930f4b9898c73d8a72caf376fce9a2a33199d0764db58388371c3fdbd442999ddfdb0b8b5394ea
 DIST unbound-1.9.6.tar.gz 5680145 BLAKE2B 9aa047270694babed36395100bbfc4287c74e173abfbb6f33939a7bf1362f765b16a8d016d84d426a5c0014d244063b4c028d5b5dddb05f09ad4287d8a63f098 SHA512 39a60f51da912ed25d247bc1e882b1242d80a63b0c2b3f753d38ed558f3a24691267375136ff6d85e5945a98ca0c4ac87e43e131c97737a355374dde64259951
-EBUILD unbound-1.9.4.ebuild 5426 BLAKE2B a252b262ecf27479c65f2402c7b8f1521d3dc74276f11e9bb580fda54e35bff976b1b2f67b1dabaa684a8f1f1960f417ac3e2275ac76434b54b55630ee7f568f SHA512 84a52d942381bec1757cf995ade916753d4df520e52a6263e89206d656b39d93116d2e811ca575b16683c381bb9b2c22ebc7c0b99e1bfb37ab3a864fce1be91d
+EBUILD unbound-1.9.4.ebuild 5400 BLAKE2B 05b5b0711338d69f328e4cc5d76c59c8abc0ba18fd4e38751fcd2fef6649042d9b503590ef2a7daf8d078a05089f6d2825b2aa5add7939ff6389288a071b325c SHA512 22b28d955dead434f71ccb5a442dc54a130d17aa4bb94ac461f7f473ea361ba5d331d03d251da3a6981e5a11d93bb12b8f057e51f730fd634d22665ee1b598e8
 EBUILD unbound-1.9.5.ebuild 5400 BLAKE2B e7ff3b4b75d812085ab79c1101dcbec1f4d0a845c28254940b5990e087b9441bb91806dafc11e3a4e6d7ef83065fbd7e83818e5706b60a7bcf8523d18685febe SHA512 7d3a1751cf5387b0723d4727faf11ad4b5d9f92fc203754152e069168ed2857b750c8e647af5d28154635a82358deca355f04a5ef3129c069b2859b3cb6b958b
 EBUILD unbound-1.9.6.ebuild 5400 BLAKE2B e7ff3b4b75d812085ab79c1101dcbec1f4d0a845c28254940b5990e087b9441bb91806dafc11e3a4e6d7ef83065fbd7e83818e5706b60a7bcf8523d18685febe SHA512 7d3a1751cf5387b0723d4727faf11ad4b5d9f92fc203754152e069168ed2857b750c8e647af5d28154635a82358deca355f04a5ef3129c069b2859b3cb6b958b
 MISC metadata.xml 1357 BLAKE2B 3fccac00ddfac90bb692169a01f19402fd5534f05a88a8981e6e276f535800f50e4ee138f2b815db176e426422e54a2d107219f214cfaeda979ce1b03710f71a SHA512 13ffc57b5a7ddd1a2ab76a4f29d7a5dc2926ed07ae74f74444ecda949aae2a611a1e194d9b482fe145a00021f603b22c7b8a44f1b7901600da261b0bc1f51525
diff --git a/net-dns/unbound/unbound-1.9.4.ebuild b/net-dns/unbound/unbound-1.9.4.ebuild
index 840b23595d5c..e1f4177a4b64 100644
--- a/net-dns/unbound/unbound-1.9.4.ebuild
+++ b/net-dns/unbound/unbound-1.9.4.ebuild
@@ -110,12 +110,12 @@ multilib_src_configure() {
 		--enable-ipsecmod \
 		--enable-tfo-client \
 		--enable-tfo-server \
-		--with-libevent="${EPREFIX%/}"/usr \
-		$(multilib_native_usex redis --with-libhiredis="${EPREFIX%/}/usr" --without-libhiredis) \
-		--with-pidfile="${EPREFIX%/}"/run/unbound.pid \
-		--with-rootkey-file="${EPREFIX%/}"/etc/dnssec/root-anchors.txt \
-		--with-ssl="${EPREFIX%/}"/usr \
-		--with-libexpat="${EPREFIX%/}"/usr
+		--with-libevent="${EPREFIX}"/usr \
+		$(multilib_native_usex redis --with-libhiredis="${EPREFIX}/usr" --without-libhiredis) \
+		--with-pidfile="${EPREFIX}"/run/unbound.pid \
+		--with-rootkey-file="${EPREFIX}"/etc/dnssec/root-anchors.txt \
+		--with-ssl="${EPREFIX}"/usr \
+		--with-libexpat="${EPREFIX}"/usr
 
 		# http://unbound.nlnetlabs.nl/pipermail/unbound-users/2011-April/001801.html
 		# $(use_enable debug lock-checks) \
@@ -151,7 +151,7 @@ multilib_src_install_all() {
 	# ... 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" || \
+		"${ED}/etc/unbound/unbound.conf" || \
 		die
 
 	# Used to store cache data
@@ -167,16 +167,16 @@ multilib_src_install_all() {
 
 pkg_postinst() {
 	# make var/ writable by unbound
-	if [[ -d "${EROOT%/}/etc/unbound/var" ]]; then
-		chown --no-dereference --from=root unbound: "${EROOT%/}/etc/unbound/var"
+	if [[ -d "${EROOT}/etc/unbound/var" ]]; then
+		chown --no-dereference --from=root unbound: "${EROOT}/etc/unbound/var"
 	fi
 
 	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 "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 "  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 ""
-- 
cgit v1.2.3