gentoo resync 08.09.2018

4 files changed, 34 insertions, 8 deletions

diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 3944ab9ed142..46f9ae4bc7db 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -3,9 +3,9 @@ AUX dnscrypt-proxy.confd 162 BLAKE2B 4547fc4a4ec00a809bac7b55bd7a7c8efb54e526179
 AUX dnscrypt-proxy.initd 632 BLAKE2B 6f82264977f3ca795d4f92919cf7da606c02a0d10ce601b9634caf9ead02fa96e07d90fea83b90422f2affdbb74ce29c37132384c666fc0553b9d7b45d1e7cf8 SHA512 cd1cd5e4d72d5a19c636abab7cce9f6d61c4053653fc2ace4cf241fa518a916b243e4a8c8c1b6678c0d1b2d017953c367e1e28da6aa7c9c33a60bbdf8768a072
 AUX dnscrypt-proxy.service 1198 BLAKE2B 14db1a48f94b07622e0f52d8510e6c1634013e66ab5e5cdd7ddf7c0cde4441fd78b71134e4cfb6f122ba4a191ec032d54e92b1be97e4bd49af61a873431ea002 SHA512 c7dfe482a8ea17cb67681b92ac65a2d2d58d2be364351d131b0b689905d80390c5df794f6c7fb944bd508f69af72af96d36c1b7f7c5c70af7ee636423ab77e11
 AUX dnscrypt-proxy.socket 517 BLAKE2B afa07d5a441b55de46059935a0fa9b7f61bcbfced925b24282be27978a507248303a43f32f2785d585e79c6a9f456a9c3118028014cb78cde5df4ea1be150b6c SHA512 9620307006642cd211b8032939b2e4f592f73d041c6a499f1c74160812853b03543ff84619e8060e064b99a3b7c44b794907722fe485233937e3804b49e29a36
-DIST dnscrypt-proxy-2.0.15.tar.gz 2887764 BLAKE2B 7c4dd36f8305494566cb8548e478d9b89eed799dab124e574c0840c606f6c51cafb73818a07b18928a6457756a122d7bceabc108b1114b2b546d3db707d2ef3a SHA512 4517ab7b7eb1474f8c9e133a289caf6c02f472b51b910f1fbe1e5ffd6d389943626c8878e68f7f27a47b00301a427dfe9c563bc82b67cafab32f4ab3bc4c84b9
 DIST dnscrypt-proxy-2.0.16.tar.gz 3770249 BLAKE2B e6dc40ec503cff11e4deec1a243875fff42ec7ecba8c7c3552b69322d405c762fa152e7e9417baf944e2a476715f00813a305c20db583970520d35acd378f1d4 SHA512 f138df20560dd440a2ed390c1468d630191ae7b0e50521b4dde3fa7ef4377c3ae6409e8c547858bace53216c84aeeea6794305546b9ff87832f704c160c6782f
-EBUILD dnscrypt-proxy-2.0.15.ebuild 2880 BLAKE2B bf0fc37008d0d54f8aeec9b294175e1eefdfedd1ebda02de0f40ca6678a1070fdbc1702359fa0b8474f62b6a94ff6c68ac166eeac0302909d502c31f4298c2cd SHA512 d148bb289b66526eb0600c1817d54acdd702177571215da2a66a88a4ce5ae419b92ff8e8a0ef0a7b9988704e4571fae89b3f29cbe25e2808d168cf4db05ebe74
-EBUILD dnscrypt-proxy-2.0.16.ebuild 2878 BLAKE2B 42284fc77e8809e196a00cf6b24e0f379c6ac3e8f5da17fdd8387788a19e583914ea8ade40e82d039234632eda4e19e501e8f14e4cee7c4c7a9dd18546bdfc45 SHA512 a83ced12c49aceba4452c1db9173f72972aa105aa9344983f96b06b87da7255ba601970dec2546299921af71e20b1ccc3188a99dbb6b1c930cc0b84a5cc1c947
-EBUILD dnscrypt-proxy-9999.ebuild 2973 BLAKE2B ff38c4e6b05d8743d6d91e10569f89cd78e8d29a0ba05e252dd087fa076c922f3711c38bd3109ce69cec721807902e0f070bc1e664b9dc50fec0c6767a85827f SHA512 5510605f1c0b6aa5087a848f2662d93b890d868c2b81ddf6fe714f50eae7b681d90643f458aa8a51938e8dfa4e3aeb7b054ae81555bace5819f6b9c73e1f60ba
+DIST dnscrypt-proxy-da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc.tar.gz 3266257 BLAKE2B bc724b56ef75faf1e2416e81fe3e68947f1581ef1c85575b8c7c5bde721f41f32604835678923dd12654b23a2c97a7e84d598eb8c7a7f553cb59c998141ff19c SHA512 cd23bc4cee7a1d9337ad5a41cf49c5603d9bfb8b7a0458532de68df35f8bd1bb75c39c069dc692506673bdba485e360b23712e997072ed86b541597aa3ea9b12
+EBUILD dnscrypt-proxy-2.0.16-r1.ebuild 2906 BLAKE2B 00c7405d34cbfa51c219ad0e708f9bc93eb3517dbaf6484ad46ad9116a4e489e0c10495c4c10e710a5434bbd26f3bd1f54b61bcafdfec35ebd96ec71f2569aaf SHA512 00e944487ddaafb9b55cf67ebfce3b7d3e13f4a931c21e1770a3beeeb140dc1dc3f65f8308180dfe9fbda1d53aa6a2e04bc3fc87a63fbb1f83c299887e556b35
+EBUILD dnscrypt-proxy-2.0.17_pre20180903.ebuild 3340 BLAKE2B f6041dc3e96600aabbe7f2d4719c810f92e720c1f25a25bafe8ddadc2dc211c0370d764936b67b6b2314870c2dfedf336633b29e12c95ba80e2d00c66f28bdf9 SHA512 a90d21da4eb6bccde4d11bf7bb23e623d0a8dc66a39ec9012e5e82c1c2d2978fb6ff6c6907ac3cfb9624080cdc8dbd5c27b8a1f662cb84d67cb88c2e0f46376f
+EBUILD dnscrypt-proxy-9999.ebuild 3052 BLAKE2B f159a8b16482f32aa5eae337cb425a1800c6bdeb58c503ba0981f5e5cb8184c6d6b749602a113a7fe4b7738ac3dd5b08fe6fb99351d59259e1d91897a8b20d23 SHA512 151ef1a5565e836e2eb0bc4854ef1b89f5c3311ffd49ca760d466692190b819b5dd3742f6905221facd190b2e2d2170c8aa11c5ff7bfdcd8c54b2a0042dbb9bd
 MISC metadata.xml 630 BLAKE2B a20afc1f8db35b9833819322d9845519540f27864a21b743c364a14c70cabb23efca28fe4302a6d995846941ab41a92e3f811898c18281f613f2d44811249d4d SHA512 803fab528ee6776c5c101770a4fb93d021ac8bf4a71e341f99b067df8dceaa413d53604ba616b99cb695fefc25424035a2754fa033a0e62ec5fd7c3e24219d22
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16-r1.ebuild
index 778e3aa9cecb..57dc638fa77f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.16-r1.ebuild
@@ -16,6 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="test"
 
+DEPEND="<dev-lang/go-1.11"
+
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild
index 48aca6233183..c9ee2a53186f 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.15.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.17_pre20180903.ebuild
@@ -3,22 +3,26 @@
 
 EAPI=6
 
+EGIT_COMMIT="da5ee45b8ceb9233f4bc21b2a5f1eb7c875947cc"
 EGO_PN="github.com/jedisct1/${PN}"
+MY_P="${PN}-${EGIT_COMMIT}"
 
 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"
+SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${MY_P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="test"
+IUSE="pie test"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
 
+S="${WORKDIR}/${MY_P}"
+
 pkg_setup() {
 	enewgroup dnscrypt-proxy
 	enewuser dnscrypt-proxy -1 -1 /var/empty dnscrypt-proxy
@@ -32,6 +36,22 @@ src_prepare() {
 	mv "vendor" "src/" || die
 }
 
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
+src_compile() {
+	ego_pn_check
+	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
+	go build -v -work -x ${EGO_BUILD_FLAGS} "${EGO_PN}" || die
+}
+
+src_test() {
+	ego_pn_check
+	GOPATH="${WORKDIR}/${MY_P}:$(get_golibdir_gopath)" \
+	go test -v -work -x "${EGO_PN}"
+}
+
 src_install() {
 	dobin dnscrypt-proxy
 
@@ -40,7 +60,7 @@ src_install() {
 	doins "src/${EGO_PN}"/example-{blacklist.txt,whitelist.txt}
 	doins "src/${EGO_PN}"/example-{cloaking-rules.txt,forwarding-rules.txt}
 
-	insinto "/usr/share/dnscrypt-proxy"
+	insinto /usr/share/dnscrypt-proxy
 	doins -r "utils/generate-domains-blacklists/."
 
 	newinitd "${FILESDIR}"/dnscrypt-proxy.initd dnscrypt-proxy
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
index 98ba6f98e2c6..97e32d347371 100644
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-9999.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/jedisct1/dnscrypt-proxy"
 
 LICENSE="ISC"
 SLOT="0"
-IUSE="test"
+IUSE="pie test"
 
 FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
 PATCHES=( "${FILESDIR}"/config-full-paths-r10.patch )
@@ -38,6 +38,10 @@ src_prepare() {
 	mv "vendor" "src/" || die
 }
 
+src_configure() {
+	EGO_BUILD_FLAGS="-buildmode=$(usex pie pie default)"
+}
+
 src_install() {
 	dobin dnscrypt-proxy