gentoo resync : 15.02.2018

15 files changed, 235 insertions, 184 deletions

diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 03cd764416ac..5016a10ace85 100644
--- a/net-dns/Manifest.gz
+++ b/net-dns/Manifest.gz
diff --git a/net-dns/cagibi/Manifest b/net-dns/cagibi/Manifest
deleted file mode 100644
index c1422ec77655..000000000000
--- a/net-dns/cagibi/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cagibi-0.2.0.tar.bz2 28959 BLAKE2B 7d6353e12e2e15831e0667f2eaba17d8dd0eacc41899940ade06b13c00f537c08ed446acb05a1be549e2e5b66d77f42cc69878824e3e5f2309624d7c5af2dbb8 SHA512 e438166b4b09039002d6735c68d73c037727e8a113b0c9118785e9e387b02c1a8d8b97462500f081898ee39d997dcf38e53cf78ad7bd46e259cb5c16c568fd32
-EBUILD cagibi-0.2.0.ebuild 541 BLAKE2B 72ac638fac0b970486ac83535faecb2354a024327a667aa318ac78c58edfe4c40caa1b0e604c0842aab54d08ce4076cf7d118596804f55a1db4ea5901384fc05 SHA512 f709c2e9dc168483827984b529adb81bb503f0317cd2c6b46c93899d9847aa32a0a237646473deecbb6cae3076a0fdcaa1c004ade9d9d69b1a2efa260df5d120
-MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/net-dns/cagibi/cagibi-0.2.0.ebuild b/net-dns/cagibi/cagibi-0.2.0.ebuild
deleted file mode 100644
index 9cf64596af88..000000000000
--- a/net-dns/cagibi/cagibi-0.2.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="Cache/proxy system for the SSDP part of UPnP"
-HOMEPAGE="https://frinring.wordpress.com/2010/08/09/cagibi-0-1-1-released-network-kio-slave-freezes-kded-in-4-5-0/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug"
-
-RDEPEND="
-	dev-qt/qtcore:4
-	dev-qt/qtdbus:4
-"
-DEPEND="${RDEPEND}
-	dev-util/automoc
-"
-
-DOCS=( Changelog README TODO )
diff --git a/net-dns/cagibi/metadata.xml b/net-dns/cagibi/metadata.xml
deleted file mode 100644
index 2fdbf33d963d..000000000000
--- a/net-dns/cagibi/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>kde@gentoo.org</email>
-		<name>Gentoo KDE Project</name>
-	</maintainer>
-</pkgmetadata>
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 0755866aa8da..5fb3af60ed7e 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,13 +1,14 @@
+AUX config-full-paths-r2.patch 2896 BLAKE2B 9a81c08a094e4700c6b1effddcbb80ec98460761c0ffaaacd2053458df0197da7bd59a941c2fbd104ccb577d9e86f7ef8a818bdd6fce4c2fc590755052839ac3 SHA512 1a3cf4b3e6b0cc27ee292a50e56ca6e425277d684885005471a7f04b5f9114a9644ff2fbccea2721afd534582ae96571be93b3b8eae892d2a8e40c1574c144ef
 AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
-AUX dnscrypt-proxy.confd 286 BLAKE2B b89f58c485398176b676d8c4d2dbfadcbff0a58182e26e29c6720860b73412b8960c6a3a89a8f91c7c2288cb111285e8f2abaff6d83e05327186448d3cd34aaf SHA512 7135d5fccf3b61981a1d085460f256d23cc63a28acf327f3b87ffed2ee3eb55ecad7703c9d4e4825bf5639d7469366933ff120ef0e7914cc756db829ce0f3d9d
 AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
-AUX dnscrypt-proxy.initd 1264 BLAKE2B e8a94afb5c643cb69e69bd31cde189b96b2e5ddc0aeaf546a720bdb4bd94814a9fd2e6436c6759bf0423614083bac28d36e9cab13fa72a508304d9bf4bb247b7 SHA512 c0aeb6410679ebd277c9c4788f244c8b0a3a8aa04603fb9ccec506fa324c16489cd9d25d8ebfa0aed7324abb018a19f126d8d57fb798cfedc55035dfc45c5d99
+AUX dnscrypt-proxy.confd-r2 119 BLAKE2B 00c216f87133aaf606c9c753ba5eb3d400363406abb4c25bd8f203aec8b8fe3e5c621deb4dea4f2db801c26ec92b3af609cc5a7bb954181641c1deeefa3aafcb SHA512 b144cd8f67b6ff06156841cf619ab4cd94855104f00fb1877c83308b6bf4d8addfd59ab1134c51855465a6daabbcd445550976c9d956d0795fa09f3b0482ac80
 AUX dnscrypt-proxy.initd-r1 258 BLAKE2B 86ceff0c2affc0508cafa782803498be680f46520a380eb64eb2fde026c65cd349a4a5f995e5a285c35db1514a77e95b5067c96cd41905f253e101bffa453f41 SHA512 700849b9a0b8a3a224d0c149091937f751461bb42c7ac4a4bccecf28d9a7b64dd2f47601bee1f8d5c08bdfad2defdcab0c0bc22c7393873612f56d78cd0edc6a
-AUX dnscrypt-proxy.service 662 BLAKE2B 603af60df828b1967b0857d0e5426ec64f2f91d7775cdb1e7aef02d91199bfe8e2be1de4051ca0cf91c75edae6ceb65bcaa58e31e37bf62cc647f37ccb7105d3 SHA512 4e018ec5f586e60ad1b2c16719ad56dc63184122861032dcccbe599f2090869d7193ebe4e0c1845d6005627902a25bf13ab26b5ad0bdf2c3ef8ae7c57a187798
+AUX dnscrypt-proxy.initd-r2 594 BLAKE2B 633906a42693dc99103eafa2694e9537f1622d757ced10f026b4564f7a3fa20c0c59871870f0e9eb8c1f9e8f1aaf63d073c6d4688da3362dd0b69ba9b00ceedd SHA512 d671c63b461c8e58aea0d4a7903dfd05ad458020f289c12d48140cd10416eb1c0b34f0ebb2833e8f129496e59df166a3014bf92d9b3d8e7c32ddc1030f2bbab6
 AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589abbb6e5e214253fdc4f6d6686484e22dc24f45f05b23223bb8ada91e594bd0d015d35ed4850ce47e90d778a7867 SHA512 ff226e1f6416de04b42828ab89a0df48b4eac1385f489ccad594b5e07cbceb57249006951f25237a55effdd2acaf8ce7e0fb2c36fc17799f963d506696b0cb4f
+AUX dnscrypt-proxy.service-r2 581 BLAKE2B 1d873041005135b5ca01aa2b24f373056a4281604a8e69675912d86ec7de34c318c899a1628bcd758019c8c105179d231630dd6aad520ab5a8e86fe64b8592b7 SHA512 40552beb4f640881bbad0cf0c40406e5c1e4ec236b4e1d89a88af4eef888f91c8170732273990bc4041c39e742516664651cc89f7686fba941697a148b9345d4
 AUX dnscrypt-proxy.socket-r1 152 BLAKE2B e4eb7875f749646f77675b39c7c74f57d5674d825329891b0f128e190ac3625d28f81df8004975828080c6eb9665a8c0825826b5ccf305694c03c2e196da3dd7 SHA512 920014c202344726e645f3bfa5def0f194c215cc0ce6e45750e82cee3434399497b9ad3fb5268afb1823689ced0fa8d177d6411b3153661b97fbd55984752a87
-DIST dnscrypt-proxy-1.9.4.tar.gz 1660333 BLAKE2B 8b6fb85e8fb0784a4bc87f4d4b4af593cc78baa2e0f88e79183890cc62dcdc59755d31da76f4aa75807b6d4ef1491e81251307af01cab9e0d83699a255eb0379 SHA512 b19103dc39655f199c85ec69daab949d07adc12e64411d2323308afb398e6ac6563bbc17f2e317bfe1e6c95c810487d8d62da3f4c7f7257bdcf837cd0390bfb0
 DIST dnscrypt-proxy-1.9.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-EBUILD dnscrypt-proxy-1.9.4-r1.ebuild 1449 BLAKE2B d07fd9711530dea427ee558097ffde3b5446110dcceb347e81c2d9e92a1a4e498240c43a333265ab45c36d4d0b927b0abc6e2bfc6e205bcbe469ec306fab2406 SHA512 c17b1b23bd87deb1d6167ca01920d3cd5f9b804a70606af0dc23060e7e9b568b9539fe6d06a92efbf6665b8d4cbbd485827c2ccc3ba82b93e6e944c26f190aa7
+DIST dnscrypt-proxy-2.0.0.tar.gz 725490 BLAKE2B d4c116f81d304b9b3a883ba6b414e2fef810f50ecea9a9175246d02f2755c3e11c9940fed0dfc221e419820e001abc74e4bf4478abb2222b548461ad09f3f57d SHA512 c87420c09fc45496901b0c21ae972283f05c508b07249450de504ba5e287128c2c5e0f772b181ddb2f6478cb6d66e72617e3b0679f47f3b15dde80c92d2ef7ba
 EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-MISC metadata.xml 1224 BLAKE2B c82d5e6c4144d94350deafde498fba72386e3553d9a54779654485fde7067d9bd44f1305b4793a4347562aa000cd2aec00d7df37a3f620078adedbab696e8edd SHA512 c0f3da90c86a751f65222503131f1ef1185f557946fba95fa52fc2c81777b65a22e1de687309ebab1b57ee12ae8dc91aeb1bce8484ec4d08faaacabf0ec7f9aa
+EBUILD dnscrypt-proxy-2.0.0.ebuild 2443 BLAKE2B feac451a5a8d24cb959a2d354b5cf2176cb34bc8c4ceaf89b060aa693a541fc281f81873018fad3b87fd5a321fdaa5b59d4874ce5b338482fad05d6b925b5cb9 SHA512 9a3d7f347be49204bd2893be27a7ceb558a469b8dd941543a4891b1e70bdbf268fa504cac2e74fa17e61c092b0c1f13a40ee292a5f4c4132d2cec9dcf39baeda
+MISC metadata.xml 967 BLAKE2B f423ce552f42f2f3cdcbe71a711104c34eb90b7cf75b6d60b324b1ce239cc34d13845971b9808b9ad19e3bd76c89d1bb3b2a5c3d53d33afafff7fa7009a01427 SHA512 7c2bab8a27a9bc8d8401867a2ec6e84928cf7520422604282e88db4dcba4003d675a457ce0225f67f7385baede7953b2d531b2ab68d7e6b016f1e7c5e0e5fdfd
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
deleted file mode 100644
index b8069db8ab60..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-1.9.4-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd user
-
-DESCRIPTION="A tool for securing communications between a client and a DNS resolver"
-HOMEPAGE="https://dnscrypt.org"
-SRC_URI="https://download.dnscrypt.org/${PN}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="hardened libressl +plugins ssl systemd"
-
-RDEPEND="
-	dev-libs/libsodium
-	net-libs/ldns
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl:0= )
-	)
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS="AUTHORS ChangeLog NEWS README* THANKS *txt"
-
-pkg_setup() {
-	enewgroup dnscrypt
-	enewuser dnscrypt -1 -1 /var/empty dnscrypt
-}
-
-src_configure() {
-	econf \
-		$(use_enable hardened pie) \
-		$(use_enable plugins) \
-		$(use_enable ssl openssl) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog "After starting the service you will need to update your"
-	elog "/etc/resolv.conf and replace your current set of resolvers"
-	elog "with:"
-	elog
-	elog "nameserver <DNSCRYPT_LOCALIP>"
-	elog
-	elog "where <DNSCRYPT_LOCALIP> is what you supplied in"
-	elog "/etc/conf.d/dnscrypt-proxy, default is \"127.0.0.1\"."
-	elog
-	elog "Also see https://github.com/jedisct1/dnscrypt-proxy#usage."
-}
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
new file mode 100644
index 000000000000..5e497f135323
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.0.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jedisct1/${PN}"
+
+inherit fcaps golang-build systemd user
+
+DESCRIPTION="A flexible DNS proxy, with support for encrypted DNS protocols"
+HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
+SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r2.patch )
+
+pkg_setup() {
+	enewgroup dnscrypt
+	enewuser dnscrypt -1 -1 /var/empty dnscrypt
+}
+
+src_compile() {
+	# Create directory structure suitable for building
+	mkdir -p "src/${EGO_PN%/*}" || die
+	mv "${PN}" "src/${EGO_PN}" || die
+	mv "vendor" "src/" || die
+	golang-build_src_compile
+}
+
+src_install() {
+	dobin dnscrypt-proxy
+
+	insinto /etc/dnscrypt-proxy
+	newins "src/${EGO_PN}"/example-dnscrypt-proxy.toml dnscrypt-proxy.toml
+	doins "src/${EGO_PN}"/example-{blacklist.txt,cloaking-rules.txt,forwarding-rules.txt}
+
+	insinto "/usr/share/dnscrypt-proxy"
+	doins -r "utils/generate-domains-blacklists/."
+
+	newinitd "${FILESDIR}"/dnscrypt-proxy.initd-r2 dnscrypt-proxy
+	newconfd "${FILESDIR}"/dnscrypt-proxy.confd-r2 dnscrypt-proxy
+	systemd_newunit "${FILESDIR}"/${PN}.service-r2 dnscrypt-proxy.service
+	systemd_dounit systemd/dnscrypt-proxy.socket
+
+	keepdir /var/log/dnscrypt-proxy
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	if ! use filecaps; then
+		ewarn "'filecaps' USE flag is disabled"
+		ewarn "${PN} will fail to listen on port 53 if started via OpenRC"
+		ewarn "please either change port to > 1024, configure to run ${PN} as root"
+		ewarn "or re-enable 'filecaps'"
+		ewarn
+	fi
+
+	local v
+	for v in ${REPLACING_VERSIONS}; do
+		if [[ ${v} == 1.* ]] ; then
+			elog "Version 2.x.x is a complete rewrite of ${PN}"
+			elog "please clean up old config/log files"
+			elog
+		fi
+	done
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "To use systemd socket activation with ${PN} you must"
+		elog "set listen_addresses setting to \"[]\" in the config file"
+		elog "Edit ${PN}.socket if you need to change port and address"
+		elog
+	fi
+
+	elog "After starting the service you will need to update your"
+	elog "/etc/resolv.conf and replace your current set of resolvers"
+	elog "with:"
+	elog
+	elog "nameserver 127.0.0.1"
+	elog
+	elog "Also see https://github.com/jedisct1/${PN}/wiki"
+}
diff --git a/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch
new file mode 100644
index 000000000000..b693f1abbb32
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r2.patch
@@ -0,0 +1,95 @@
+--- dnscrypt-proxy-2.0.0/dnscrypt-proxy/example-dnscrypt-proxy.toml	2018-02-06 10:33:58.000000000 -0800
++++ dnscrypt-proxy-2.0.0/dnscrypt-proxy/dnscrypt-proxy.toml	2018-02-09 19:15:00.105927884 -0800
+@@ -85,7 +85,7 @@
+ 
+ ## log file for the application
+ 
+-# log_file = 'dnscrypt-proxy.log'
++# log_file = '/var/log/dnscrypt-proxy/dnscrypt-proxy.log'
+ 
+ 
+ ## Use the system logger (syslog on Unix, Event Log on Windows)
+@@ -140,7 +140,7 @@
+ ## example.com 9.9.9.9
+ ## example.net 9.9.9.9,8.8.8.8
+ 
+-# forwarding_rules = 'forwarding-rules.txt'
++# forwarding_rules = '/etc/dnscrypt-proxy/forwarding-rules.txt'
+ 
+ 
+ 
+@@ -156,7 +156,7 @@
+ ## example.com     10.1.1.1
+ ## www.google.com  forcesafesearch.google.com
+ 
+-# cloaking_rules = 'cloaking-rules.txt'
++# cloaking_rules = '/etc/dnscrypt-proxy/cloaking-rules.txt'
+ 
+ 
+ 
+@@ -200,7 +200,7 @@
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+ 
+-  # file = 'query.log'
++  # file = '/var/log/dnscrypt-proxy/query.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -226,7 +226,7 @@
+ 
+   ## Path to the query log file (absolute, or relative to the same directory as the executable file)
+ 
+-  # file = 'nx.log'
++  # file = '/var/log/dnscrypt-proxy/nx.log'
+ 
+ 
+   ## Query log format (currently supported: tsv and ltsv)
+@@ -255,12 +255,12 @@
+ 
+   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+ 
+-  # blacklist_file = 'blacklist.txt'
++  # blacklist_file = '/etc/dnscrypt-proxy/blacklist.txt'
+ 
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -283,12 +283,12 @@
+ 
+   ## Path to the file of blocking rules (absolute, or relative to the same directory as the executable file)
+ 
+-  # blacklist_file = 'ip-blacklist.txt'
++  # blacklist_file = '/etc/dnscrypt-proxy/ip-blacklist.txt'
+ 
+ 
+   ## Optional path to a file logging blocked queries
+ 
+-  # log_file = 'ip-blocked.log'
++  # log_file = '/var/log/dnscrypt-proxy/ip-blocked.log'
+ 
+ 
+   ## Optional log format: tsv or ltsv (default: tsv)
+@@ -357,7 +357,7 @@
+ 
+   [sources.'public-resolvers']
+   url = 'https://download.dnscrypt.info/resolvers-list/v2/public-resolvers.md'
+-  cache_file = 'public-resolvers.md'
++  cache_file = '/var/cache/dnscrypt-proxy/public-resolvers.md'
+   minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+   refresh_delay = 72
+   prefix = ''
+@@ -367,7 +367,7 @@
+ 
+   #  [sources.'parental-control']
+   #  url = 'https://download.dnscrypt.info/resolvers-list/v2/parental-control.md'
+-  #  cache_file = 'parental-control.md'
++  #  cache_file = '/var/cache/dnscrypt-proxy/parental-control.md'
+   #  minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+ 
+ 
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
deleted file mode 100644
index ceedd454b5fb..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd
+++ /dev/null
@@ -1,7 +0,0 @@
-DNSCRYPT_LOCALIP=127.0.0.1
-DNSCRYPT_LOCALPORT=53
-DNSCRYPT_USER=dnscrypt
-DNSCRYPT_PROVIDER_NAME=2.dnscrypt-cert.opendns.com
-DNSCRYPT_PROVIDER_KEY=B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79
-DNSCRYPT_RESOLVERIP=208.67.220.220
-DNSCRYPT_RESOLVERPORT=443
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
new file mode 100644
index 000000000000..9934e828b82a
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.confd-r2
@@ -0,0 +1,3 @@
+#DNSCRYPT_OPTS="--config /etc/dnscrypt-proxy/dnscrypt-proxy.toml"
+#DNSCRYPT_USER="dnscrypt"
+#DNSCRYPT_GROUP="dnscrypt"
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
deleted file mode 100644
index 9b07d7d47d82..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-DNSCRYPT_LOGFILE=${DNSCRYPT_LOGFILE:-/var/log/dnscrypt-proxy.log}
-
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-pidfile=${pidfile:-${rundir}/dnscrypt-proxy.pid}
-rundir=${rundir:-/var/run/dnscrypt-proxy}
-runas_user=${runas_user:-dnscrypt}
-runas_group=${runas_user:-dnscrypt}
-
-depend() {
-	use net
-	before dns
-	after logger
-}
-
-start() {
-	if [ ! -d "${rundir}" ]; then
-		mkdir "${rundir}"
-		if [ -n "${runas_user}" ]; then
-			touch "${DNSCRYPT_LOGFILE}"
-			chown ${runas_user}:${runas_group} "${DNSCRYPT_LOGFILE}"
-			chown -R ${runas_user}:${runas_group} "${rundir}"
-		fi
-	fi
-
-	ebegin "Starting dnscrypt-proxy"
-	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/dnscrypt-proxy \
-		-- \
-		--pidfile="${pidfile}" \
-		--logfile="${DNSCRYPT_LOGFILE}" \
-		--daemonize --user=${runas_user} \
-		--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
-		--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
-		--provider-name=${DNSCRYPT_PROVIDER_NAME} \
-		--provider-key=${DNSCRYPT_PROVIDER_KEY}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping dnscrypt-proxy"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/dnscrypt-proxy
-	eend $?
-}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
new file mode 100644
index 000000000000..dcccd83dab3d
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.initd-r2
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+command="/usr/bin/dnscrypt-proxy"
+command_args="${DNSCRYPT_OPTS:---config /etc/dnscrypt-proxy/dnscrypt-proxy.toml}"
+command_user="${DNSCRYPT_USER:-dnscrypt}:${DNSCRYPT_GROUP:-dnscrypt}"
+pidfile="/run/${SVCNAME}.pid"
+start_stop_daemon_args="--background --make-pidfile"
+
+depend() {
+	use net logger
+	provide dns
+}
+
+start_pre() {
+	checkpath -q -d -m 0775 -o "${command_user}" /var/cache/"${SVCNAME}"
+	checkpath -q -d -m 0775 -o "${command_user}" /var/log/"${SVCNAME}"
+}
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
deleted file mode 100644
index 4403254280a2..000000000000
--- a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service
+++ /dev/null
@@ -1,20 +0,0 @@
-[Unit]
-Description=A tool for securing communications between a client and a DNS resolver
-
-[Service]
-Type=simple
-PIDFile=/var/run/dnscrypt-proxy.pid
-EnvironmentFile=/etc/conf.d/dnscrypt-proxy
-ExecStartPre=/bin/rm -f /var/run/dnscrypt-proxy.pid
-ExecStart=/usr/sbin/dnscrypt-proxy \
-	--pidfile=/var/run/dnscrypt-proxy.pid \
-	--logfile=/var/log/dnscrypt-proxy.log \
-	--local-address=${DNSCRYPT_LOCALIP}:${DNSCRYPT_LOCALPORT} \
-	--resolver-address=${DNSCRYPT_RESOLVERIP}:${DNSCRYPT_RESOLVERPORT} \
-	--provider-name=${DNSCRYPT_PROVIDER_NAME} \
-	--provider-key=${DNSCRYPT_PROVIDER_KEY} \
-	--user=${DNSCRYPT_USER}
-Restart=on-abort
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2 b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
new file mode 100644
index 000000000000..745b094aaa16
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/dnscrypt-proxy.service-r2
@@ -0,0 +1,23 @@
+[Unit]
+Description=DNSCrypt client proxy
+Documentation=https://github.com/jedisct1/dnscrypt-proxy/wiki
+Requires=dnscrypt-proxy.socket
+After=network.target
+Before=nss-lookup.target
+Wants=nss-lookup.target
+
+[Install]
+Also=dnscrypt-proxy.socket
+WantedBy=multi-user.target
+
+[Service]
+User=dnscrypt
+Group=dnscrypt
+Type=simple
+NonBlocking=true
+ExecStart=/usr/bin/dnscrypt-proxy --config /etc/dnscrypt-proxy/dnscrypt-proxy.toml
+ProtectHome=true
+CacheDirectory=dnscrypt-proxy
+LogsDirectory=dnscrypt-proxy
+CapabilityBoundingSet=CAP_NET_BIND_SERVICE
+AmbientCapabilities=CAP_NET_BIND_SERVICE
diff --git a/net-dns/dnscrypt-proxy/metadata.xml b/net-dns/dnscrypt-proxy/metadata.xml
index ab4b0b748fce..547780397031 100644
--- a/net-dns/dnscrypt-proxy/metadata.xml
+++ b/net-dns/dnscrypt-proxy/metadata.xml
@@ -2,18 +2,12 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>amesists@gmail.com</email>
-		<name>Jiajun Wang</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>ya@sysdump.net</email>
 		<name>Georgy Yakovlev</name>
-		<description>Proxied maintainer. Please assign bugs to him.</description>
 	</maintainer>
 	<maintainer type="person">
 		<email>polynomial-c@gentoo.org</email>
 		<name>Lars Wendler</name>
-	<description>Proxy maintainer of Georgy. Please CC on bugs.</description>
 	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>