From 2d446203bcf1a0db08e99abca43513d246dfa73d Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 5 Apr 2018 21:52:00 +0100
Subject: gentoo resync : 05.04.2018
---
net-dns/Manifest.gz | Bin 9729 -> 9725 bytes
net-dns/c-ares/Manifest | 4 +-
net-dns/c-ares/c-ares-1.13.0.ebuild | 6 +-
net-dns/c-ares/c-ares-1.14.0.ebuild | 4 +-
net-dns/dnscrypt-proxy/Manifest | 6 +-
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.7.ebuild | 88 ---------------
net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild | 88 +++++++++++++++
.../files/config-full-paths-r3.patch | 95 ----------------
.../files/config-full-paths-r8.patch | 71 ++++++++++++
net-dns/dnsdist/Manifest | 4 +-
net-dns/dnsdist/dnsdist-1.2.0.ebuild | 4 +-
net-dns/dnsdist/dnsdist-9999.ebuild | 4 +-
net-dns/libidn/Manifest | 3 +-
net-dns/libidn/libidn-1.33-r1.ebuild | 124 ---------------------
net-dns/libidn/libidn-1.34.ebuild | 119 ++++++++++++++++++++
15 files changed, 296 insertions(+), 324 deletions(-)
delete mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.7.ebuild
create mode 100644 net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
delete mode 100644 net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
create mode 100644 net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
delete mode 100644 net-dns/libidn/libidn-1.33-r1.ebuild
create mode 100644 net-dns/libidn/libidn-1.34.ebuild
(limited to 'net-dns')
diff --git a/net-dns/Manifest.gz b/net-dns/Manifest.gz
index 40f2d078f11f..3f4b7cb78277 100644
Binary files a/net-dns/Manifest.gz and b/net-dns/Manifest.gz differ
diff --git a/net-dns/c-ares/Manifest b/net-dns/c-ares/Manifest
index 8d2caffacf79..babb840c7cc0 100644
--- a/net-dns/c-ares/Manifest
+++ b/net-dns/c-ares/Manifest
@@ -1,6 +1,6 @@
AUX c-ares-1.12.0-remove-tests.patch 422 BLAKE2B 37b7a7a85f053d6a2231b46ca244ffb449bb011fb3567bfdd601dd7e598e72bf70ffb209ddaf23cb3a2b06f2bc38ff34e1a6bec7cbfafd2d25516f1a24780ace SHA512 53a9c126183c811b1f68c12014e4123d250447925ded472ff1fb6b57d254730206becd4182692ad5958b14ba0b929a2713df6988c0306872b046aa49bd70e743
DIST c-ares-1.13.0.tar.gz 1446797 BLAKE2B 9d7daaad8e35242f110ee8b4abf20619e46beb3fcf49a1b6d7df596fd4129b56cb92f4aeba10845aeb6ed4f4d789ac11745ddc87803ca5bf27fed1aebdb4286c SHA512 4a7942e754673f5b8d55a7471e31b0f390e8324b14c12077580c956147fad4d165c7fe8a3190199b1add95c710ceeb1a7957706d4f0d6299d39c5dddc719bd9d
DIST c-ares-1.14.0.tar.gz 1335940 BLAKE2B d62a0b6d5ea4a2926ff8f2f719d267f9a0c97fa9756b80fcf7c97822f3dd7a1ce9587d9db0ea5217f052f54f5858c68e71c78c33f32fe60df81f456cd9719ac6 SHA512 30cd3f8c4eea15f994b2ceb44d84e506858f69f624e651e39bb4db523fea9ad5e8906b75abf07131ae364be19172274ed4053059669091f21ce4463cdbb857bf
-EBUILD c-ares-1.13.0.ebuild 989 BLAKE2B 16aba10685811ef10e6c182c31e7bf1f65e2f8b4871236bbff3faf244c00176924eb785282b785c8db5ebff04e7602b3a54290ea8dfc06d5b63206da73cdc8f8 SHA512 095501b4eb92c4863cab287f7caa2c0846a5190facabbba4c5da0402ffb3765487e55eb9d6abaee672f2c60f3a1a28e7effc5a88b8306be0b61ce01cc3afe245
-EBUILD c-ares-1.14.0.ebuild 1002 BLAKE2B 37190ab3adfd0541385f7dc56ab7bc90a860da5d1fbd6baaec3131bccf59ae72c18f7043fea38949a029a965329cd8f1ab66be39c954ece949e26b183a21a6a3 SHA512 3010b8ea2d31509c9fe3e57eaa2da23d7ceed5b88081280f4f092f1a6287b49a14ed1e34c3b6449bff5f1d6b9cb2186bbd22ebeaa97955ba45d5fba369cb912a
+EBUILD c-ares-1.13.0.ebuild 991 BLAKE2B 7280a6be8d366fa4f21d283c7a1a2b36706c6a6003adfba6ec5faee7bbd734e27866bd66e47cc06a66eecd2b0b0cb41c060fdcffe0f159be13e4e2ea625ccf40 SHA512 1906777bbfe4a76e72a870fd3f40fbd4c2c600d8feaffec2072dd5833056fcd2ce334d277d45474ebb8c10c1fab2565105fee4684dc71486e29e7c88a2d3ec98
+EBUILD c-ares-1.14.0.ebuild 1004 BLAKE2B a196f3b114548c95b8cbb3f7bd1adb5eeda613ee1a04d800695ed7600a20ebd2d9507a6ddd157d40a78d74c3210062bac1282a8da5280898aa3e11878eaf8014 SHA512 184e50603133fe1449c77a94f8a159f6f0aa3b964ad4bb62e2c63aeb36977d88edb65a858f9245216fe7a0710e1c62fdf42516f3a4fc1f2fd8d5bc2a79eff30a
MISC metadata.xml 339 BLAKE2B e32a823a5af6c260cfb7ebc58dfa81bcb97ff1792aca66662e8206ad3bfb5304784e2f9ec800fe1230472510f864edcacec07df97493e1b481c157e3e5fc971b SHA512 fb726c9af8f3b9b104f13f5d7f8c1d38659848afdd619fe8c9242e8d2dea24c21a2654baca4bac96a94cadf68a0f649c87346f296e6b5d2aa5d88a4276c41755
diff --git a/net-dns/c-ares/c-ares-1.13.0.ebuild b/net-dns/c-ares/c-ares-1.13.0.ebuild
index 502357224c62..8d4be140c84a 100644
--- a/net-dns/c-ares/c-ares-1.13.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -6,8 +6,8 @@ EAPI=6
inherit autotools eutils multilib-minimal
DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
+HOMEPAGE="https://c-ares.haxx.se/"
+SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
LICENSE="MIT"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
diff --git a/net-dns/c-ares/c-ares-1.14.0.ebuild b/net-dns/c-ares/c-ares-1.14.0.ebuild
index 7358658308ce..0b3b9c3ff1b2 100644
--- a/net-dns/c-ares/c-ares-1.14.0.ebuild
+++ b/net-dns/c-ares/c-ares-1.14.0.ebuild
@@ -6,8 +6,8 @@ EAPI=6
inherit autotools eutils multilib-minimal
DESCRIPTION="C library that resolves names asynchronously"
-HOMEPAGE="http://c-ares.haxx.se/"
-SRC_URI="http://${PN}.haxx.se/download/${P}.tar.gz"
+HOMEPAGE="https://c-ares.haxx.se/"
+SRC_URI="https://${PN}.haxx.se/download/${P}.tar.gz"
LICENSE="MIT"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc64-solaris"
diff --git a/net-dns/dnscrypt-proxy/Manifest b/net-dns/dnscrypt-proxy/Manifest
index 2aca2351e250..eb6a8a9729a1 100644
--- a/net-dns/dnscrypt-proxy/Manifest
+++ b/net-dns/dnscrypt-proxy/Manifest
@@ -1,4 +1,4 @@
-AUX config-full-paths-r3.patch 2896 BLAKE2B 6777ce33d475e5a5fd07f37f4ed7390301114819058b7ca407a0e53f2b5e1c2207eec4860d8c60a6b0b81cc72dd0da864f25d7507ccb13000e347467683fce2f SHA512 1e1672755110233a1629bb762dc637ace4c2719975582742d40eb3831c288294b5561cb2b3b99c5948c43f2a8e142ecba869838b79d4411b33f17413b57f4532
+AUX config-full-paths-r8.patch 2472 BLAKE2B 41861b0b443c1b31031181b9a36194b7ae06711e6c2ab0547c27359066763fcc0ef673663a5309faf4470340a574ed83d3ae3aefe09941996e37a75b84ee24f5 SHA512 d4c275d9299af90c52dbcd416626fa9c0c5af90aa782d4df38afde7db15abd77ab3dce7dbdc0f2082f9b83624adedb6288e917bf64b082bb1295c301b92be919
AUX dnscrypt-proxy.conf 8912 BLAKE2B ea1b196528dae0c9536c12e3ed6b9839830ae4f89203ea19332d8238cbeba599a202557c75de1d77e2e4f306db1d2a1dd2bc352891bbc2f8a3595c8aa253fa6d SHA512 1e45f38a46383af14695cd44531335801ae315d819e9593e931be0fd513059c87ddfc9128158a532c6bc26cf113635c9630d8694764dff5a46a6a98c5ea8b42a
AUX dnscrypt-proxy.confd-r1 41 BLAKE2B e73624ac07b382c9dd66970e12da3e00a669d548a32b16aec6e4227a0af73980f294444507c86fa0ae26e8f9f19c6d533f83ecdcbdcf9d8c28a8c47439844d77 SHA512 2f381c21e92a8f74d47f6c5d3d18bcc32a2713d3b7d82f260d8e2770bfb6aea0a46f8d957796c64d02e6a0445f92c31b83b29724b8004ba9fcc7f6fcc93afaf3
AUX dnscrypt-proxy.confd-r2 119 BLAKE2B 00c216f87133aaf606c9c753ba5eb3d400363406abb4c25bd8f203aec8b8fe3e5c621deb4dea4f2db801c26ec92b3af609cc5a7bb954181641c1deeefa3aafcb SHA512 b144cd8f67b6ff06156841cf619ab4cd94855104f00fb1877c83308b6bf4d8addfd59ab1134c51855465a6daabbcd445550976c9d956d0795fa09f3b0482ac80
@@ -8,7 +8,7 @@ AUX dnscrypt-proxy.service-r1 445 BLAKE2B f6e6af96d6b11892aa8d7aa111ca42dfe6589a
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.5.tar.bz2 1290573 BLAKE2B 8f16fdb58012e00a8b58d36364377c3bc25158b9484a8df2bd6bc98d1c9cbf5ac758997e31f95ecaeb9da2f6b7272316c5a4a1c069a39549fbc1c1b136857da0 SHA512 84c0f7587521b3a198292cf20dd71cb592ccf8a9e003abbc62c5ca112f6c5ed27c49b1642cf91f403d52b4147e25f24af540b65cecfcf93814338329097df836
-DIST dnscrypt-proxy-2.0.7.tar.gz 746018 BLAKE2B f6ede938d3a49a972510614f07831530aa2cdceccecaa9bc91e4c6c85bf809400ae7d451a538bc0ba63e9031091fae04cd83fd5d82bebccc33b482535eeeb76c SHA512 42d14e3aad5b38f6de8cafb0774c572807632f6464b0abf1ab7e33837d90e348e4ff8540ced02245531e1423fadfc5f7f6366ac15a56b10049ac46fb0fbc49ea
+DIST dnscrypt-proxy-2.0.8.tar.gz 750606 BLAKE2B 83a9201389061c250e0c6bf535ff2e718aa9f67202887dcad33847160325225ccc1197b98343a8012bc84f5f42f049131b01b78febd7a418d47db946c9f58779 SHA512 c7e7d5d72fa6874b2b6b4deaaf6c80e4a2e812670b71bf7a308535a5773e84e249263bbb66d18fb844d8e440703facb0902f3872b117433582696695cb5a7265
EBUILD dnscrypt-proxy-1.9.5-r1.ebuild 1817 BLAKE2B bb0c48cadf271b942beeaee69c49dbb2582c41f86176b84c6e929ad5dd5b55deacfa03d15143b2180d05ab03913a93702315712afc73bbbea53b152e43ab30f8 SHA512 87a35841daf4da9b666bae888f9b73fa7205f9e7054afe5bdc47d1112525e2eb1237416fa7702c38bc63ce0878fc61d752f6851af1cc07a0f9b5a3591b8f0704
-EBUILD dnscrypt-proxy-2.0.7.ebuild 2448 BLAKE2B 93a03421e1a7784e719be54230187fbc674e685c700191d4bdf3a46975adc2dc1511ec42eb271f6cfd78255c5619a8edce9adba9e21da3967508c20e4b455cd3 SHA512 3aef6aff6d40f978f2a4798e26958cd371d033ccc54f6c2d2eafe786412a31f39b1500d79566eb3109896ff14cb2a0d626bc16b54d72036f1feff4ca8aeabeca
+EBUILD dnscrypt-proxy-2.0.8.ebuild 2448 BLAKE2B e520cea047806e87cc1db8f108d515bbf7ed97c9aaeba303a8790d15708dce69e88c477bcc1a336dba3b1fe067eadd8e35b5325cefd7fc1f9d2cbe30a87ea629 SHA512 a42228d24b808b3f531be5801671fe41d71bafbd885a1ad4805c9753f8d0786336c3b908403388a30b3be000bec001b7ef3be70d4cd21a8e043557ecc8f6ea3a
MISC metadata.xml 941 BLAKE2B 234421b342985e6980a870bc0f7e4dc96e2867d89aa589ac23723a7a7cc4767109de7f046c817c3a21ea1bab23d352210941dc092b002dd3a7374be6c459877c SHA512 6bad822978132f7467756a88695e9e87a3ec2c007af04b423496f7befc1fc4de781a78bac17167b6de6682688e3ef445e5dce7f6f3f3e9c25a632e6222268918
diff --git a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.7.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.7.ebuild
deleted file mode 100644
index d5b792bf7d31..000000000000
--- a/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# 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 ~arm ~x86"
-
-FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
-PATCHES=( "${FILESDIR}"/config-full-paths-r3.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/dnscrypt-proxy-2.0.8.ebuild b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.ebuild
new file mode 100644
index 000000000000..b162076d23a3
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/dnscrypt-proxy-2.0.8.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 ~arm ~x86"
+
+FILECAPS=( cap_net_bind_service+ep usr/bin/dnscrypt-proxy )
+PATCHES=( "${FILESDIR}"/config-full-paths-r8.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-r3.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
deleted file mode 100644
index c7fd7705d9ee..000000000000
--- a/net-dns/dnscrypt-proxy/files/config-full-paths-r3.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- dnscrypt-proxy-2.0.6/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-03-03 13:43:28.733466923 -0800
-+++ dnscrypt-proxy-2.0.6/dnscrypt-proxy/dnscrypt-proxy.toml 2018-03-03 13:46:19.666853492 -0800
-@@ -86,7 +86,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)
-@@ -153,7 +153,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'
-
-
-
-@@ -169,7 +169,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'
-
-
-
-@@ -213,7 +213,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)
-@@ -239,7 +239,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)
-@@ -268,12 +268,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)
-@@ -296,12 +296,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)
-@@ -371,7 +371,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 = ''
-@@ -381,7 +381,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/config-full-paths-r8.patch b/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
new file mode 100644
index 000000000000..a5e9a7c21171
--- /dev/null
+++ b/net-dns/dnscrypt-proxy/files/config-full-paths-r8.patch
@@ -0,0 +1,71 @@
+--- dnscrypt-proxy-2.0.8/dnscrypt-proxy/example-dnscrypt-proxy.toml 2018-04-04 17:23:33.607326639 -0700
++++ dnscrypt-proxy-2.0.8/dnscrypt-proxy/dnscrypt-proxy.toml 2018-04-04 17:26:18.174044063 -0700
+@@ -86,7 +86,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)
+@@ -215,7 +215,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)
+@@ -241,7 +241,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)
+@@ -270,12 +270,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)
+@@ -303,7 +303,7 @@
+
+ ## 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)
+@@ -373,7 +373,7 @@
+
+ [sources.'public-resolvers']
+ urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/public-resolvers.md', '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 = ''
+@@ -383,7 +383,7 @@
+
+ # [sources.'parental-control']
+ # urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v2/parental-control.md', '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/dnsdist/Manifest b/net-dns/dnsdist/Manifest
index 99e3d0ee80e1..2c942a59331d 100644
--- a/net-dns/dnsdist/Manifest
+++ b/net-dns/dnsdist/Manifest
@@ -2,6 +2,6 @@ AUX dnsdist.conf.example 524 BLAKE2B e9d140129dfbd276d1fb927d73bee4e4c29920ae70d
AUX dnsdist.confd 266 BLAKE2B c201b0aa3599ea7606e998348d777796ff391f3d4b0e46744160298456c86a9d9bbf65d1a339c0c13db4c796efb7c3adba01110882542fe501c735c9dd190f92 SHA512 935afc768ae56d017f6dee8bed7a3e92615055a0d4d2ae9980afef1b8f353da0e8bd6e20b914602e50b116ad33ef17ba05535b225af8b8da9ad005694edc071f
AUX dnsdist.initd 1340 BLAKE2B 390aa44bdfdaee12a92297a8a6b7d90503446a91eafb631b570c3cb72d5f175028f9eec7d7cfd72d3d9994bca0f0594bbce95a81ad96280663e57bda860ba0fd SHA512 79b7c06adc469fed15b659aec4d674a50b64c80679c3474c87c03ae9b5b8ea63a493397822b8f4cb9e360745f38cc9f742aaa09c856618dd9f6c0f8978fa9616
DIST dnsdist-1.2.0.tar.bz2 876104 BLAKE2B 6e9d0f871c63a0aae539ae074648edcd6b9d626434c343b28c45cf16ffb6b088300d5327e04c45dbb1c9a0b9ad6077d539dc36ae0424d1ec0a240932e8b34223 SHA512 93f8c5f18462d3291c973a690f6ac2b3c5791d9947bee83d9250b503b7526de365bdcb530f3b082e51ae168a9129e77d5558af7cc3b9d2e98a585af53783c237
-EBUILD dnsdist-1.2.0.ebuild 1963 BLAKE2B b376eb233b35346cc8c82f887d0393fe9bf162304158a1f0bfec5a886af1a29d36d121378495726595b16de3be120d8ad4f53b4280c57ea5929d59c6ed87db97 SHA512 578263147111bb441842fe31fcd58b1cc92af228e8c86040bc28390a862dd3f083f4781dbcf8117b141f146ed36c0bc5f0bbf884270fc5116c436310c68cf006
-EBUILD dnsdist-9999.ebuild 1963 BLAKE2B b376eb233b35346cc8c82f887d0393fe9bf162304158a1f0bfec5a886af1a29d36d121378495726595b16de3be120d8ad4f53b4280c57ea5929d59c6ed87db97 SHA512 578263147111bb441842fe31fcd58b1cc92af228e8c86040bc28390a862dd3f083f4781dbcf8117b141f146ed36c0bc5f0bbf884270fc5116c436310c68cf006
+EBUILD dnsdist-1.2.0.ebuild 1964 BLAKE2B 05cfd39ef997cf5c1c2ea2edfea5d7d1bfabd0b50f5c51c5c22c809dd2880a22d7fdf228c032fee0d87533a65d186c3f26a2b60ed7300a60b4b2475deda4eef3 SHA512 5359b698228a584620b0e7f54618a21d4cbc097fd466482028c8045fb64034e9080242fe53fb590ce4e0d1901fa5b19c322cd06a7f591faa5e9f666d91e37ca2
+EBUILD dnsdist-9999.ebuild 1964 BLAKE2B 05cfd39ef997cf5c1c2ea2edfea5d7d1bfabd0b50f5c51c5c22c809dd2880a22d7fdf228c032fee0d87533a65d186c3f26a2b60ed7300a60b4b2475deda4eef3 SHA512 5359b698228a584620b0e7f54618a21d4cbc097fd466482028c8045fb64034e9080242fe53fb590ce4e0d1901fa5b19c322cd06a7f591faa5e9f666d91e37ca2
MISC metadata.xml 1043 BLAKE2B 0db07c220caf8ed8523414bfd354f0551cbab7004924239809dca1bfe20dfdeb199cccb5e11531c684ae0bd6ee6940b75f83c3b95693485fa44c59c2a61f542a SHA512 7055c0c05bb6b179bd0095b9c6c9d9392bfda343aa2a380db680e134b60ef074680c1aadcae7d4a3cae95ca21566c9c2f60482e0ca41425c372a575c2f7d3a9d
diff --git a/net-dns/dnsdist/dnsdist-1.2.0.ebuild b/net-dns/dnsdist/dnsdist-1.2.0.ebuild
index 75b3d1113da0..81f8dbfc0f87 100644
--- a/net-dns/dnsdist/dnsdist-1.2.0.ebuild
+++ b/net-dns/dnsdist/dnsdist-1.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ fi
inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="http://dnsdist.org"
+HOMEPAGE="https://dnsdist.org"
if [[ ${PV} == 9999 ]]; then
SRC_URI=""
diff --git a/net-dns/dnsdist/dnsdist-9999.ebuild b/net-dns/dnsdist/dnsdist-9999.ebuild
index 75b3d1113da0..81f8dbfc0f87 100644
--- a/net-dns/dnsdist/dnsdist-9999.ebuild
+++ b/net-dns/dnsdist/dnsdist-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ fi
inherit eutils flag-o-matic user ${ADDITIONAL_ECLASSES}
DESCRIPTION="A highly DNS-, DoS- and abuse-aware loadbalancer"
-HOMEPAGE="http://dnsdist.org"
+HOMEPAGE="https://dnsdist.org"
if [[ ${PV} == 9999 ]]; then
SRC_URI=""
diff --git a/net-dns/libidn/Manifest b/net-dns/libidn/Manifest
index 237d7be881eb..a188a388fae9 100644
--- a/net-dns/libidn/Manifest
+++ b/net-dns/libidn/Manifest
@@ -2,7 +2,8 @@ AUX 50libidn-gentoo.el 455 BLAKE2B d6d3a0576c1d0b5030ae32ed5c99e198f06faa897864d
AUX libidn-1.33-CVE-2017-14062.patch 2348 BLAKE2B 4f9606d25405d950f23444886e423008d928991b23c5a05a8de794eea18f236aa8f4b53b7945f4340aa3b2f4f7aa9c63d5dadaf3bc0513ee3f5e27ecb9040a7a SHA512 25e6ff17d2d6886fec51db7e9584bbb7aff9b717c23accf7c956611f1bf4c965cc5f51837367c410b7c8c29c58170e94e2e0146e9e2921b3a0c5bc411bcddfbb
AUX libidn-1.33-parallel-make.patch 3584 BLAKE2B fbd1f372b11bc1da38bdeb3a8c0f01708339e0a7c23da7f22b450985a2b69c31887a5f686430e5014d1a5c116ae7e03b922c0350f3926e5a43e5cbc6cdbbfb83 SHA512 de98b4122c272bcd38a673beab8da56fac5b4c877d4bc0930505979addf4cc4e85fcf065ee9044d1196e83b1d2d5389ee8dceac4ffe7bf623a3f3c7bc7aca4f1
DIST libidn-1.33.tar.gz 3501056 BLAKE2B ce6319dc61dd825cf7ddb33f4279c178709e16ce2815c3d1a464bba6b5c6cc493107a10a686f349247a0d6023b1b834a650046e68da9f2f559870dba13a59384 SHA512 38dd459eaeda0c9e3cc2d24d967113515a499747550a2a9157f32357def90d71a3a3b52398e96a44a28cd5948dc353b0473c4ff0453a69720191c4cb49cac2c6
-EBUILD libidn-1.33-r1.ebuild 2973 BLAKE2B c34576f6c0104090b1c2a1602028d60ef6199973e13209b28e434fc69fa2a47980ba2132a2ab0265b0a96f40044ee4b0a9d3fb577534485ab8c9ff7ee1dc5f03 SHA512 b77bb63c075538a59ccdbefd9ccdbd4059ada9efc899482d9b793a10f81ef6f582f9aada266cc4537f3c403b0b3dcacd50f7896a271a283f0c90b3729e0bc9ef
+DIST libidn-1.34.tar.gz 3691634 BLAKE2B 4a121c7152543ffd2237e66e69a2bf31042837684cd864fdabb7d9e60700f05c8b909bb8bd5ca7d13449939f3989ef5c88dccb303854b8a540b93e8f2979aae0 SHA512 1a9b5f2554d3953591b92010fa0fdedc438ca8bc31d2bc06c621eb5d423e81656607f09ac75bb02e1a5420459f69e82b5fb82987afa50db69793f9cd7a08365a
EBUILD libidn-1.33-r2.ebuild 3012 BLAKE2B c450d564fcd9cbf91120ec52cd5f39cfa1e8efd79c27c09401a8a6b55190c63b303db67d643756a0e4901502fdfb087083af0683bdb3d42076bc007e2dd381ee SHA512 7ff90ce5292cb43dca7e14e2c7e169893f9593dc748c6123f810c24639996eb8b48adabb63ad2249106fcd814fe203b5a5b334a27a2427689ef501c4a721c414
EBUILD libidn-1.33.ebuild 2793 BLAKE2B 0d451ba20b772d3343503a122c92a5de5f98a67e3e95246adb2220f03ec9a96b887704c0bfd40fab0eecec3839f43705e00c19949fe7760a187b4d0a49b7b71f SHA512 56ea6fce689533f562410a2a3e15328873c76c6b1e231a3272162ea7c786369fec86e0332785d0170b81632126c75c2adbf880da7e9ee9152eb4548eb3b0ca5d
+EBUILD libidn-1.34.ebuild 2791 BLAKE2B 485846b7b12cc43baba0c4cda00802050b03d45ec87748036770214ff81c181b8062bdba803bd44e5e143d99cb935337dc98afea8e671d1ba7c26701146273e0 SHA512 123442737e1f3458e3bb61301fc5bd06c11332b1df43d8d387abdda1b69331447f44686a606103425ffc14b101d0877132eb23b37b140be3e238616738714e81
MISC metadata.xml 244 BLAKE2B 9c6750147c240d7416fad33e04b53730dc89cbb615648a7f3defeed3ec058aeee6dbed55a1f81241417b42ca9f7daec177c725692166a5ba08765b5dcf5a6bc5 SHA512 1da71f4fae0251c97a8fcfa1e13b0a3f8b95a856fa919ebd30bf4f2f1b8fa900841db09ebc2a0ae9fe0d91f786ac40b63290382668412fcb05bca15b0746f1db
diff --git a/net-dns/libidn/libidn-1.33-r1.ebuild b/net-dns/libidn/libidn-1.33-r1.ebuild
deleted file mode 100644
index cfefa3741eee..000000000000
--- a/net-dns/libidn/libidn-1.33-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool
-
-DESCRIPTION="Internationalized Domain Names (IDN) implementation"
-HOMEPAGE="https://www.gnu.org/software/libidn/"
-SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
-
-LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc emacs java mono nls static-libs"
-
-DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
-COMMON_DEPEND="
- emacs? ( virtual/emacs )
- mono? ( >=dev-lang/mono-0.95 )
-"
-DEPEND="${COMMON_DEPEND}
- nls? (
- >=sys-devel/gettext-0.17
- )
- java? (
- >=virtual/jdk-1.5
- )
-"
-RDEPEND="${COMMON_DEPEND}
- nls? (
- >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
- )
- java? (
- >=virtual/jre-1.5
- )
- abi_x86_32? (
- !<=app-emulation/emul-linux-x86-baselibs-20140508-r5
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
- )
-"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.33-CVE-2017-14062.patch
-)
-
-pkg_setup() {
- mono-env_pkg_setup
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- default
-
- # bundled, with wrong bytecode
- rm "${S}/java/${P}.jar" || die
-
- # prevent triggering doc updates after punycode.c patch
- touch doc/texi/punycode* doc/man/punycode* doc/libidn.info || die
-
- elibtoolize # for Solaris shared objects
-}
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} GJDOC=javadoc \
- econf \
- $(multilib_native_use_enable java) \
- $(multilib_native_use_enable mono csharp mono) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- --disable-silent-rules \
- --disable-valgrind-tests \
- --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
- --with-packager-bug-reports="https://bugs.gentoo.org" \
- --with-packager-version="r${PR}" \
- --with-packager="Gentoo"
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi; then
- use emacs && elisp-compile "${S}"/src/*.el
- use java && use doc && emake -C java/src/main/java javadoc
- fi
-}
-
-multilib_src_test() {
- # only run libidn specific tests and not gnulib tests (bug #539356)
- emake -C tests check
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use java; then
- java-pkg_newjar java/${P}.jar ${PN}.jar
- rm -r "${ED}"/usr/share/java || die
- use doc && java-pkg_dojavadoc "${S}"/doc/java
- fi
-}
-
-multilib_src_install_all() {
- if use emacs; then
- # *.el are installed by the build system
- elisp-install ${PN} "${S}"/src/*.elc
- elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
- else
- rm -r "${ED}/usr/share/emacs" || die
- fi
-
- einstalldocs
- if use doc ; then
- dohtml -r doc/reference/html/.
- fi
-
- prune_libtool_files
-}
-
-pkg_postinst() {
- use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
- use emacs && elisp-site-regen
-}
diff --git a/net-dns/libidn/libidn-1.34.ebuild b/net-dns/libidn/libidn-1.34.ebuild
new file mode 100644
index 000000000000..5ab3e8e681d3
--- /dev/null
+++ b/net-dns/libidn/libidn-1.34.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit elisp-common java-pkg-opt-2 mono-env multilib-minimal libtool
+
+DESCRIPTION="Internationalized Domain Names (IDN) implementation"
+HOMEPAGE="https://www.gnu.org/software/libidn/"
+SRC_URI="mirror://gnu/libidn/${P}.tar.gz"
+
+LICENSE="GPL-2 GPL-3 LGPL-3 java? ( Apache-2.0 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc emacs java mono nls static-libs"
+
+DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS TODO )
+COMMON_DEPEND="
+ emacs? ( virtual/emacs )
+ mono? ( >=dev-lang/mono-0.95 )
+"
+DEPEND="${COMMON_DEPEND}
+ nls? (
+ >=sys-devel/gettext-0.17
+ )
+ java? (
+ >=virtual/jdk-1.5
+ )
+"
+RDEPEND="${COMMON_DEPEND}
+ nls? (
+ >=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
+ )
+ java? (
+ >=virtual/jre-1.5
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20140508-r5
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )
+"
+
+pkg_setup() {
+ mono-env_pkg_setup
+ java-pkg-opt-2_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # bundled, with wrong bytecode
+ rm "${S}/java/${P}.jar" || die
+
+ elibtoolize # for Solaris shared objects
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} GJDOC=javadoc \
+ econf \
+ $(multilib_native_use_enable java) \
+ $(multilib_native_use_enable mono csharp mono) \
+ $(use_enable nls) \
+ $(use_enable static-libs static) \
+ --disable-silent-rules \
+ --disable-valgrind-tests \
+ --with-lispdir="${EPREFIX}${SITELISP}/${PN}" \
+ --with-packager-bug-reports="https://bugs.gentoo.org" \
+ --with-packager-version="r${PR}" \
+ --with-packager="Gentoo"
+}
+
+multilib_src_compile() {
+ default
+
+ if multilib_is_native_abi; then
+ use emacs && elisp-compile "${S}"/src/*.el
+ use java && use doc && emake -C java/src/main/java javadoc
+ fi
+}
+
+multilib_src_test() {
+ # only run libidn specific tests and not gnulib tests (bug #539356)
+ emake -C tests check
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi && use java; then
+ java-pkg_newjar java/${P}.jar ${PN}.jar
+ rm -r "${ED}"/usr/share/java || die
+ use doc && java-pkg_dojavadoc "${S}"/doc/java
+ fi
+}
+
+multilib_src_install_all() {
+ if use emacs; then
+ # *.el are installed by the build system
+ elisp-install ${PN} "${S}"/src/*.elc
+ elisp-site-file-install "${FILESDIR}/50${PN}-gentoo.el"
+ else
+ rm -r "${ED}/usr/share/emacs" || die
+ fi
+
+ einstalldocs
+
+ if use doc ; then
+ dodoc -r doc/reference/html/
+ fi
+
+ prune_libtool_files
+}
+
+pkg_postinst() {
+ use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+ use emacs && elisp-site-regen
+}
--
cgit v1.2.3