gentoo resync : 04.05.2018

9 files changed, 71 insertions, 8 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 0509f0d7585f..864fb72f1a27 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 2732e69f38cc..1ae4a01e6247 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -2,6 +2,6 @@ DIST gnutls-3.5.15.tar.xz 7238928 BLAKE2B d9a081ec0f956cabe0e0a240c6f20bd2f2855c
 DIST gnutls-3.5.18.tar.xz 7261980 BLAKE2B 1c7df33aa331634885426196d1e39cf7c5748ba467323d7a48c4e865efcea03e3a59a7bb21cebb4cfe9d11a83a532bb785ae9a5824703c759e573de0f347004d SHA512 434cf33a4221fe2edce1b531cb53690d14a0991cb2056006021f625fb018987351f8ec917c3a7803e5e64179cf1647a3002ae783736ffca3188d2d294b76df52
 DIST gnutls-3.6.2.tar.xz 8093304 BLAKE2B a5e40cadb184eb960e51cc0d94d441e50378f33582eeda1382e9ee3a9a4b2d26f6b44948921d8983de3e1b8fbc0199e0d894ce8b8da1fddeb84dbe304b2f9222 SHA512 6a574d355226bdff6198ab3f70633ff2a3cff4b5d06793bdaf19d007063bd4dd515d1bd3f331a9eb1a9ad01f83007801cfa55e5fd16c1cd3461ac33d1813fb06
 EBUILD gnutls-3.5.15.ebuild 4109 BLAKE2B 04b4e2f396c7a9648c5515822e4899228adba373a3b51cf8e17174418c6de99384a40e2e1f255541f5bb0a0ab1c96d4556c52438ef7cb3ac7038adedec43a094 SHA512 e1f4936c0222c38a0f280bfbb86e8cdb2e4e9e4f22baddd5a8ab9c163fc0afd6f9ddb7924a42a398650bf77f7ae8d230b9e8d2713a01e53986b02d7545725547
-EBUILD gnutls-3.5.18.ebuild 4116 BLAKE2B f0dfc74fbc7aa23315917790195e15222d7cbb63c07d1c6d8b21a9f0feb7624d26cab53963195c91ddcc9c3b2cf85c8ad391cc84d6b845c3931e853992f2549e SHA512 e5d54f7db4d73f914e6543b673c726a0786f2fb53a4ee4e4910eb2fd3c472f4861abbf597c69d480755e0c67a0edc3f493257cd9cf1cdfa962d3b112322db369
+EBUILD gnutls-3.5.18.ebuild 4115 BLAKE2B 7f83ffb50f1aec508154e9823076e9ccef115c4a6cf3a2f36b9b3036b6e6e79720381b7c6f13ac8e1fed09d601523856dcece91932fbf9384dbb36dd1f320859 SHA512 5cde5dc117f5644e020751632d38d9eb2ea81afbb46ea805274c43913263ad36965ff63165cde4db4a9386d618e217658de157131dbebb5374d2da15290ccaaa
 EBUILD gnutls-3.6.2.ebuild 3751 BLAKE2B 9777ce3562714525ea3442a8ede4a654e4fa80d67418a9eae8ddde910c934593b3f6c5ff33042cdefbb2d403ba4e403cd51998e2167a5b38c7ba4e367bdeea60 SHA512 d64c7e65868e2aac58ed783a415a8756c1b225bda0a4082798d52c8eb332ddd03ba5f07a9fa34c7831d975a17e0def85faa0b6f5ba9046b3ac49472d5756f96a
 MISC metadata.xml 1261 BLAKE2B 28e1e92d76bd15212f59e5a118b8fb891e2dd6225dc78353188b90a20f776a0da23d2ee6368a61dd034f8cff0522e4aa0dbaa7ff43919c3c36f396cb9a13bb15 SHA512 80a2e2d7a81cd6f19d361d31b3f7356a3664aa637531943fdb8d0876b13eddbc5a72aeac60506ae751105c35004de8fe5149ce149dd4b56b10c3522428885992
diff --git a/net-libs/gnutls/gnutls-3.5.18.ebuild b/net-libs/gnutls/gnutls-3.5.18.ebuild
index b07e2c22b747..b0ae57cb5899 100644
--- a/net-libs/gnutls/gnutls-3.5.18.ebuild
+++ b/net-libs/gnutls/gnutls-3.5.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnupg/gnutls/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/30" # libgnutls.so number
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+cxx dane doc examples guile +idn nls openpgp +openssl pkcs11 seccomp sslv2 sslv3 static-libs test test-full +tls-heartbeat tools valgrind zlib"
 
 REQUIRED_USE="
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 970c3cb3c7e7..29c48e162398 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -3,5 +3,5 @@ AUX 0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch 1227 BLAKE2B 2791f596cc2e9feb63
 AUX 0003-grpc-1.3.0-Don-t-run-ldconfig.patch 1957 BLAKE2B 945ca98ffe0a55bd6e277d3c6d967014d77df8fdf7c708fa275e003df6fda5ce32206069a9a173c41f1d77d8eec38444190bdf15cdd5891142ec5d632bf9af8b SHA512 8e691f56cf6ac348d2516ffe022216fe92132c4266bdc55989238fca37ef3e4cb8c08f261ea41a3c4cd36b5e6dbd20122d75cff77a3924959b5e2e9302a494be
 AUX 0004-grpc-1.11.0-fix-cpp-so-version.patch 3700 BLAKE2B 4d198daaff28d5a69b52594fb3d430e7013c15623e4becd1f0fe402a30d48da191b2920b650da5d84a09a16b136049b66678b5a6aad3963bb6bd2d4f2866b900 SHA512 484e535bcf3d18b780e0ae7b3ab82c23cac3d296af215876f73a07b869fad68e484a3de1a006cbdf4ee302582970b47c08aa4a0b34f59442509134316b6b3f82
 DIST grpc-1.11.0.tar.gz 13431990 BLAKE2B d7aabd86fdaba8f8fc6fa17b411b496bbd51ef0a759d4bd77c0391e472c88f4252270ceddc19fb59a2b725d612236e1aef959f4b313551cb38204c51d1ca216b SHA512 3127cf0e66cd0712d905e6008adf6f80d787ad97eae2fba38fa3f4d343849a3dc3ca8f2ccbc82020e812fdb272e9577584c298a5b623fbdcac40c1efd7877855
-EBUILD grpc-1.11.0.ebuild 1425 BLAKE2B 5f9fc410a9cfb1a19327dbfe57bb440ddc35077a237885977eae0ef4129d521f5c408a39d525fb6b3747423839f5555d69629de7e0aac342b6a08015cc622d89 SHA512 097bd4f327479be095ed394ffbd64758ee66b830dd9be21c9c4451235e9f32f8ab0a58f994885e24892e92d3c6645f756b642a468f435faf1fe79402ebdefa92
+EBUILD grpc-1.11.0.ebuild 1442 BLAKE2B 64db426711d49515b28c74bf05b07f9efe04e1636075a921193cdeba138a25b54dcacbc738443357527e54ce37245838f34be51e812826c658dc0f1a744ec408 SHA512 75371eb733f70ac25aca7780c9ec99538055f1b3cc3a0a96e5247dcf6290a1e40411b97c4927a64ef75c03d052186af0c16d05b10f93c87c9cd0d3a48e1a7f63
 MISC metadata.xml 327 BLAKE2B e99ce0019fedc9b171e83503cbc1fde434fdc24d9de08ab8b26487391a5ef93ff207a2196c0f9e08b7cffbf4770fc67f1fbaeb886e7f95a02cdc3a67432494d6 SHA512 e8fa242a316ef93660b3b7601e1a6c2bbf356a77f4c0f678c34e299c3cdc051b77a79167a47a81d2a7d2b3b85c9059c3918a02e3df1c63b07c3f3812de47bd63
diff --git a/net-libs/grpc/grpc-1.11.0.ebuild b/net-libs/grpc/grpc-1.11.0.ebuild
index f5f64eea4e7d..1a6156e46259 100644
--- a/net-libs/grpc/grpc-1.11.0.ebuild
+++ b/net-libs/grpc/grpc-1.11.0.ebuild
@@ -18,10 +18,10 @@ IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
-	>=dev-libs/openssl-1.0.2
+	>=dev-libs/openssl-1.0.2:0=[-bindist]
 	>=dev-libs/protobuf-3:=
-	net-dns/c-ares
-	sys-libs/zlib"
+	net-dns/c-ares:=
+	sys-libs/zlib:="
 
 DEPEND="${RDEPEND}"
 
diff --git a/net-libs/libnfsidmap/Manifest b/net-libs/libnfsidmap/Manifest
index cf254d58715c..36ea3df445d9 100644
--- a/net-libs/libnfsidmap/Manifest
+++ b/net-libs/libnfsidmap/Manifest
@@ -5,6 +5,6 @@ DIST libnfsidmap-0.24.tar.gz 328720 BLAKE2B 4b33a589b9d4b47530d2044a0912481dfda7
 DIST libnfsidmap-0.25.tar.gz 346587 BLAKE2B dbf31779371ba29737ed7a5901cf46f17e4a1b2ac444c2959d3ae76f41815e9a15a2ee892e417c5b7f97cf5f8396024071430fed028a8cd583aeed1a95e350df SHA512 8acf30790cdd19341c75cb8a4f7ee4dbc9f688c8514258046e55c8f4245df213709ccb7d5327a11b146b0e3b7266d3d4da018699c6be47fbedcc4cd384b54557
 DIST libnfsidmap-0.27.tar.bz2 303900 BLAKE2B c6cb8d81042426552fd3cde9dfd26f805d3c92281a65c3ca2d12671477eb697f3cd51a6d8313a658eb70232136e5615e0cb9ad090a92e747e245f49e60cfcf8a SHA512 0698079abb4bb9ebeaccbcabca725b022c1daaa3d287944d9c4c2a2134489b649b44fcbcd9916e91dd6d91cdc67d267adf5741c5404150c66cc8243b9f15970d
 EBUILD libnfsidmap-0.24.ebuild 1072 BLAKE2B cbc056d0eaa632b3692b21d6062f5538ffda57035d2683c49808b4922f14da1e8673dd0301fe9452a70341046aa6d2a513d04947827f9b9d49a2313aa13e3687 SHA512 1de6d7598472c57587b95c46c0b2093438227efdc85800d340c85f32f05b2f4fe91b30c46c04fa735c8a222c47f2a0f0342624a296fad0f0abccdaaaf3d0432e
-EBUILD libnfsidmap-0.25-r1.ebuild 1227 BLAKE2B 2009eb8c747c54078ba619afce1b53fd3325c521b76b7823019654323921ef54f56cd27d320c84aab14d2f258d41cedc92d607d54c344fdb170f78a9365709d3 SHA512 e4ece41400c4e94ea614c5e1fb6b4385dcc08902167890e7f3ea64ca1ae57994f33885c681d8a667adf1ebcca58c951ef85a3e9aed451d1775ad1f00e159f921
+EBUILD libnfsidmap-0.25-r1.ebuild 1226 BLAKE2B 41cd41db66786ab6f39d78ecb31520b965c63993db3dda43a8c3602cf8de2241e7b229a2ce341f7a69a2a007d5e3d870bcf6bc6e10914602ba1b0ce09e067156 SHA512 87af244b1bb1d2d83a13cdfb7c9cd0b0eff322a4490562f51037eb39ab4b91e06137265985567a3c3fd343092de68fe8494c0554b070bccac292b2f8a37e0d0b
 EBUILD libnfsidmap-0.27.ebuild 1357 BLAKE2B 5e976922f305b8549331aff8d74a48dc5546d20deba68c7196e3773c8272b3964e72f31fcfd358def163ddaca53eac6cbb9d28ad137dadf4c33f2e5bc4b423aa SHA512 192121cc99c8240f1a9e66d5d4ed6bb2bac743a324c58c115d5b7ee2aeb610f488d105c27055d072b4268bdea43be00c94d8dadf71a7af7ba9cb8776772fb239
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
index c87adfee89a9..e4e6136dd054 100644
--- a/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
+++ b/net-libs/libnfsidmap/libnfsidmap-0.25-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ldap static-libs"
 
 DEPEND="ldap? ( net-nds/openldap )"
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 42cd57728c07..9242801ae260 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,5 +1,7 @@
 DIST libnftnl-1.0.8.tar.bz2 400496 BLAKE2B d2563f707ceb40b8cd7c4b4fdede64943fabcc8a639eb61c844f7b941786a49b1c029e375977759717e5cb8f8dc2019ddcbf48223347f868713d1a077d51d8a8 SHA512 df9f5967908ce5e6a6a85fe4328bdf6e7501ce6b0e42239b750782aeb76c30b1aae80dd07f73a06fb077d072b1269c4e0c5fd525feed1055400201567d215ef9
 DIST libnftnl-1.0.9.tar.bz2 402296 BLAKE2B 87d1fe9543c1451bf90bd8b2dd442d783649940f38cf10081acac46cd985bd0826f5d2eaab2af65b80ebd4b0a9bfd7dba53ff420fa0f6b901296aa02c746e3ca SHA512 ca4a9402fba8b1354314aed45637026afa4faf880991baf93b2b7e01ca7f44e75ffedc624728bd5a7aa1b30bcbb83b849d2f9aea55be7a18f49036653c08151b
+DIST libnftnl-1.1.0.tar.bz2 370642 BLAKE2B 3dbc0116027e863a656c55c0d65449bf3905378e84c907f0d94582c608a793952fbb83f90565304af05978b08675a6edf13ee997fd5ce0d4374a2143746691c1 SHA512 3216afbd62f5dbd78b26c2ab3acb467bca5d6a7f5fd5bb15356b9d80ffca64f9afa1d8f374701e00f1ae9e5ec282fd55c970502121330c1446032e70bb593d23
 EBUILD libnftnl-1.0.8-r1.ebuild 1365 BLAKE2B 046da914776aca38da8611648efe1872ecbdc6c0351101611b13b5d8a029fca03714a672d5fa116f07bd996e3fd21df20c1d09904a9c7b83cea115bfc3fe2711 SHA512 d2ac4672af568225d9871c5fde07a61183f8eaf48fe40e978bda018810d1c9934813242b0eaf21baee3463dfdfdcc8304138a657d08bf468c4933bf1ca28b534
 EBUILD libnftnl-1.0.9.ebuild 1375 BLAKE2B 8176c16368b5af09f74326a79beecd990be14274cf1e643d4a71d87a260cb5513d828df70ccfb2dad2b936a0e5312be1700a4db0c6132ffdc677c80a1e391717 SHA512 bee525dc84832e27a6b80faeded252d4f5bc373bec65bb160cd1402210b1123e99d7df0e670104bc9e73f7b2e7a80a5cee5770908ca15aad3e026dc273e44549
+EBUILD libnftnl-1.1.0.ebuild 1375 BLAKE2B 8176c16368b5af09f74326a79beecd990be14274cf1e643d4a71d87a260cb5513d828df70ccfb2dad2b936a0e5312be1700a4db0c6132ffdc677c80a1e391717 SHA512 bee525dc84832e27a6b80faeded252d4f5bc373bec65bb160cd1402210b1123e99d7df0e670104bc9e73f7b2e7a80a5cee5770908ca15aad3e026dc273e44549
 MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
diff --git a/net-libs/libnftnl/libnftnl-1.1.0.ebuild b/net-libs/libnftnl/libnftnl-1.1.0.ebuild
new file mode 100644
index 000000000000..f9ff5b2f238f
--- /dev/null
+++ b/net-libs/libnftnl/libnftnl-1.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools linux-info toolchain-funcs
+
+DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
+HOMEPAGE="https://netfilter.org/projects/nftables/"
+SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0/7" # libnftnl.so version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86"
+IUSE="examples json static-libs test threads"
+
+RDEPEND=">=net-libs/libmnl-1.0.0
+	json? ( >=dev-libs/jansson-2.3 )"
+DEPEND="virtual/pkgconfig
+	${RDEPEND}"
+
+REQUIRED_USE="test? ( json )"
+
+pkg_setup() {
+	if kernel_is ge 3 13; then
+		CONFIG_CHECK="~NF_TABLES"
+		linux-info_pkg_setup
+	else
+		eerror "This package requires kernel version 3.13 or newer to work properly."
+	fi
+}
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_with json json-parsing)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	default
+	cd tests || die
+	./test-script.sh || die
+}
+
+src_install() {
+	default
+	gen_usr_ldscript -a nftnl
+	find "${D}" -name '*.la' -delete || die "Could not rm libtool files"
+
+	if use examples; then
+		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}