summaryrefslogtreecommitdiff
path: root/net-libs
diff options
context:
space:
mode:
Diffstat (limited to 'net-libs')
-rw-r--r--net-libs/Manifest.gzbin34233 -> 34221 bytes
-rw-r--r--net-libs/biblesync/Manifest1
-rw-r--r--net-libs/biblesync/biblesync-1.1.2.ebuild17
-rw-r--r--net-libs/courier-unicode/Manifest2
-rw-r--r--net-libs/courier-unicode/courier-unicode-1.3.ebuild4
-rw-r--r--net-libs/grpc/Manifest9
-rw-r--r--net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch65
-rw-r--r--net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch52
-rw-r--r--net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch52
-rw-r--r--net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch53
-rw-r--r--net-libs/grpc/grpc-1.12.1.ebuild160
-rw-r--r--net-libs/grpc/metadata.xml11
-rw-r--r--net-libs/iax/Manifest2
-rw-r--r--net-libs/iax/iax-0.2.2.ebuild4
-rw-r--r--net-libs/libnftnl/Manifest4
-rw-r--r--net-libs/libnftnl/libnftnl-1.1.1.ebuild (renamed from net-libs/libnftnl/libnftnl-1.0.9.ebuild)2
-rw-r--r--net-libs/librsync/Manifest4
-rw-r--r--net-libs/librsync/librsync-2.0.1-r1.ebuild2
-rw-r--r--net-libs/librsync/librsync-2.0.2.ebuild27
-rw-r--r--net-libs/libssh/Manifest7
-rw-r--r--net-libs/libssh/libssh-0.7.4.ebuild6
-rw-r--r--net-libs/libssh/libssh-0.7.5-r1.ebuild100
-rw-r--r--net-libs/libssh/libssh-0.7.5-r2.ebuild4
-rw-r--r--net-libs/libssh/libssh-9999.ebuild4
-rw-r--r--net-libs/mbedtls/Manifest2
-rw-r--r--net-libs/mbedtls/mbedtls-2.7.2.ebuild2
-rw-r--r--net-libs/miniupnpc/Manifest2
-rw-r--r--net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild2
-rw-r--r--net-libs/nghttp2/Manifest14
-rw-r--r--net-libs/nghttp2/nghttp2-1.19.0.ebuild62
-rw-r--r--net-libs/nghttp2/nghttp2-1.29.0.ebuild4
-rw-r--r--net-libs/nghttp2/nghttp2-1.30.0.ebuild68
-rw-r--r--net-libs/nghttp2/nghttp2-1.31.0.ebuild68
-rw-r--r--net-libs/nghttp2/nghttp2-1.31.1.ebuild4
-rw-r--r--net-libs/nghttp2/nghttp2-1.32.0.ebuild4
-rw-r--r--net-libs/nghttp2/nghttp2-9999.ebuild6
-rw-r--r--net-libs/openslp/Manifest2
-rw-r--r--net-libs/openslp/openslp-2.0.0-r4.ebuild2
38 files changed, 470 insertions, 364 deletions
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 7bb315aafaf4..8970c0724fce 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
Binary files differ
diff --git a/net-libs/biblesync/Manifest b/net-libs/biblesync/Manifest
index 622efe587ed9..9e857307b7db 100644
--- a/net-libs/biblesync/Manifest
+++ b/net-libs/biblesync/Manifest
@@ -1,4 +1,3 @@
DIST biblesync-1.1.2.tar.gz 86620 BLAKE2B 05ae9aa155a7cfd277e1f1a172ae3551c51a34cf09c7acae0821f08146179f4726173b8a26d4bac1a82aebab89f4ac105a73f7ef2a2d36b7939fe73d4e0749e1 SHA512 7725c8228e2dff79edaf065ff4d4816a6cf214d1d874817345cc4154142144bce479ca1ae871053886bff4f6610715a27bce81c25c2a636444d5873e93bfdc62
EBUILD biblesync-1.1.2-r2.ebuild 584 BLAKE2B 3edb83280b94cd85dd377f53c2ba1a66af5ff84752ecf9abf15e9cffa2d8d61d97a3502fa645ed6d6b22ffadbff7090fecb6cb150afbaa07006e64e89ddff9db SHA512 ee210ca9e0f08ebce37d4b22e6f5018c34852dc451929582a04da1cc654604e0c0bbac8594a4d37f8502822a0f57ebb9d296d436d912a2ca6c8307dce8d08c2d
-EBUILD biblesync-1.1.2.ebuild 418 BLAKE2B cf8febd4e601c9250858936c7e5edf29c4b6f9b3e733ec026979aab30f4b750702bd64daa5e4dfff803f6a82bf4b0a9e05d2102a18ddb71033f44cfb45e7f82b SHA512 7a930e2c8fb83562881a7887381d4310810c2e4efc904aca14b60905dd97f7316f343a52b712a4106cca44c5e602c5fa1d1abaeb1cb405cb49a55cc9e5c4eeee
MISC metadata.xml 300 BLAKE2B 84a7c7a8de67cb50a6c042a07d91b56067bec4e449c2a888d77f9c17ae23f5cf82f59d32237dd649af9b34bcd13df34f0fe19997ac57f7b468db4f50b281829c SHA512 0e8ea5d19ca48a68c4266c8cefb5c29d43d56c2ba61f271460ac35d5d8be18486c84ade898e2a8b647648afa24a19ee04ee60f2fca5a0fe358920deec2418340
diff --git a/net-libs/biblesync/biblesync-1.1.2.ebuild b/net-libs/biblesync/biblesync-1.1.2.ebuild
deleted file mode 100644
index 60cb06895614..000000000000
--- a/net-libs/biblesync/biblesync-1.1.2.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-utils
-
-DESCRIPTION="A multicast protocol to support Bible software shared co-navigation"
-HOMEPAGE="http://www.crosswire.org/wiki/BibleSync"
-SRC_URI="mirror://sourceforge/gnomesword/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE=""
-
-DEPEND="dev-util/cmake"
-RDEPEND=""
diff --git a/net-libs/courier-unicode/Manifest b/net-libs/courier-unicode/Manifest
index 767ecce0dc01..fd4b4c231afd 100644
--- a/net-libs/courier-unicode/Manifest
+++ b/net-libs/courier-unicode/Manifest
@@ -3,7 +3,7 @@ DIST courier-unicode-1.3.tar.bz2 394011 BLAKE2B 5d5c2a9cf04976819f2bf1d01c9193fd
DIST courier-unicode-1.4.tar.bz2 434338 BLAKE2B 6274fe8a73b19e9e3694219aadb192f73d101cd3966d67b1c0e28c0271001a5b263a43385b73a473b6a263bb6ab7ef94faa453fa9a7f0c15bba4691b6ab421f5 SHA512 1d9cc3efbbafa88631e37de0647d2e873a8264a02a0ce588687b90e15dedb60c23058312abbc771ed1ddf824ba7c81b16adebfe9db69da953b9856eb66d31264
DIST courier-unicode-2.0.tar.bz2 446215 BLAKE2B b5e24f47f1714b71aa2fe176b4517eb49a04780a62f025c5a6546353a03defeedef5cd19f69a35a2646edbf88b4774abcf30c718fa4aee8f17feed6d3f947172 SHA512 32fe0aae62d7f7f7ac6832b28515b83642753c6bd881e95494254b7055686dc38d85488aa26a99d82a5b42aa5cce308bccc2b471580603f690ed6e405cc91e8a
EBUILD courier-unicode-1.1.ebuild 440 BLAKE2B 22249cf6ba2a420b508cf69e49373178f275c7859bbc5825414ffdb3f3ef4be761225f698ce0692d16f8641c8e12e346667b710ae9252b5fee83313252d57a3f SHA512 3e2e121bedf09408d04c80666d840fcc6716b26b6adef9089d9c90e0b7f0ad9e61625909136a91491bf5adec8229e5e0548ccc5874cb88aec67c7e5031ef57da
-EBUILD courier-unicode-1.3.ebuild 461 BLAKE2B 2d93e9d442b0cc644f11dab796be554a47624d2bf8715cb44c82070ce9ec996bfa0db747f5084471ad2258925b1cf4e8637f0bbe8de98941d04286a256c233b0 SHA512 4606860d16283dc1476efde6f7671bb2ba7798c0a6f5ee756d0f86f2ade5a61d33fb763c109a6dcac907d6f8b62e9491ac08d181f8dc820333fa9ef7a2d54021
+EBUILD courier-unicode-1.3.ebuild 466 BLAKE2B 79030906832674165da0d1eb6ea9ec739ff5ae7c2d5c327f51ce8a47dbfac89240050c58e2573bb865b4d93f0bf7c1caf64416fdc04ce7bbb174e9841b076815 SHA512 3d2b082b9268aba5bc3630c8620ba563918fb8f77b22182cc2c5084529781848ddfaa9377a2528a290b37970f30af2b1ee69b71cd653267a50e7ffffbb8d9ee8
EBUILD courier-unicode-1.4.ebuild 477 BLAKE2B 2907f16988561ec6d663bcd311ee4b9a2ac34cdefbe4c486d324d3f6f6cf4a9aa8f5146f97ab97f09e6739a48797997814b0ded111c45f747b11d8ebd4724a6f SHA512 478ec4301b74cdbeb76f627dbc6c46605ea27314df686e236a04c290537f22b61f9a17ecf51a7c2641b363f4a2c6a71b41354a1cd13ff1a7f229d0d418d6f0fc
EBUILD courier-unicode-2.0.ebuild 482 BLAKE2B 9fe175a175903d8482aa7e8656e2c86f2eecc404a84559a2b7f9a986fd3481f56ccd69e25704cbf3af19f82d070858efbcd38dfffb3448f3f3eceae7eaf1e826 SHA512 8091fb06b485407bca3119709ac8b71d209ff2dad451c632ec79e66ab72b7c1c6c69e3f7e4b348ab2d5d43b660e502bc0ccbf4f6686624b4bcabeb6909ada654
MISC metadata.xml 398 BLAKE2B 5a29532863617f727864e5a02b31d9170bbe09d5bed8641c94aad759997613832940cdffdaf8ed31c44b41b3c5e769ba220b5e6fa53c9d3540d9646e9c31a492 SHA512 78789db4f9e2b92e56c3833245f64c31bc274f6986b70af9c3bda21e5c6d3c6b3987a6a97e0ec73aa619d71ee814fa6a263ed8d295ec7473481134769414396b
diff --git a/net-libs/courier-unicode/courier-unicode-1.3.ebuild b/net-libs/courier-unicode/courier-unicode-1.3.ebuild
index 5fee21dfd05e..1e48773f7f1e 100644
--- a/net-libs/courier-unicode/courier-unicode-1.3.ebuild
+++ b/net-libs/courier-unicode/courier-unicode-1.3.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=5
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.courier-mta.org/"
SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sparc x86"
IUSE=""
src_install() {
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 3c6ee14c5929..461abd93b3b6 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -3,6 +3,13 @@ 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
AUX 0005-grpc-1.11.0-pkgconfig-libdir.patch 2295 BLAKE2B 9e9cfb9f150c30bf55a5443e387c9d0e8f3507fdaba56c2ab5cc318f51959e45bda8e0cee39487d8116b76c15da1a7ca9da1e02a5e29bdbc7edf85d508e5e857 SHA512 4648fceb8a6b8a364126ba20ef2cc2f5b4baddfb4f622de93f377714eff793e05062f5bb02b39e2699b00f3cce309fb23a9ea35a9fef3a1df4e3682bd707e8d5
+AUX 0006-grpc-1.12.1-allow-system-openssl.patch 2691 BLAKE2B 078ff854f90f5dea0b5866f387b6bb6f6582aba95bc262208229434a245a46a5082ad84290cf93901aa2bdee8169df3d4df52c667d5b670ae4df9a5898f1b31a SHA512 4979bb97325bb8f1179362bb3fcffffd922899dbc2eaa69630de4751ad54e0dc5e5f6b96c3a4aa1e267700bdf25d7a8e59fab3c7ae04d4cdd70e0173c1d9dca9
+AUX 0007-grpc-1.12.1-allow-system-zlib.patch 2069 BLAKE2B 60b70714eca54ba0befffd36409dc4cb3983393f478e54dc1922bf7acbbe8122a2a7b76003842952a9d693a04adf84d1f6b7243a7034d181a0084620fdfec587 SHA512 22c4bcd909ad19989e72f8063b7b44f8f63d58119a19a92661734ba2bf0c4150b2e870fae45c4bf8c6411e1ca32e8bf713536c3f60d98763210231a0ac4fedde
+AUX 0008-grpc-1.12.1-allow-system-cares.patch 2049 BLAKE2B 4f7e352f3efca21cbc918bf0a8510589c1f9a3b0ede344c83223cebfced42a65e5e3f2c5bebd1cf88d96dbc4d7f738f94b4484cfd23d5ebb1ff74a3370584d75 SHA512 3efffca62048d89430720237c8b51e82b2d2f02c067849d3a6506013b9c4fbda92037a70e3ff66e117465653ecb2a1db0d00857b6325c768ee1d2b122a44d26a
+AUX 0009-grpc-1.12.1-gcc8-fixes.patch 2420 BLAKE2B 05a0e92f38e877bfc2160d44aec598a67247dbd064efd03cea660444ecb3afe3095e2b7c1c67b2e83423762ad1580636039e27004fe34c8ff0c3bdc9862a3c54 SHA512 dfdafec8efc8fc0f4bbcdcbb036fb7ee746c917c8dfe18338dbd20be40efe8e1b3fe77c6f66f0b050f6d078aaff81a78477980b63ad81288cae474af8c723420
DIST grpc-1.12.0.tar.gz 13692310 BLAKE2B 86b9063416140453718c51df4f238bb3d5ac8549ece065c95d3c461c069358badec5a9a77aef694cd11a09f53e060f9ea51f3b40d9a2424837605c4899a21c57 SHA512 68a8c261ea570790974769d6c0ca8138cf4242b79e9ff74a11b10d35a27f98ff24c03f3d05932ac46811c0ba7d1a094388ae8dbeb495fc8e723ad74695994d49
+DIST grpc-1.12.1.tar.gz 13692045 BLAKE2B d35706b553917d0f27e4474509f361ec7962b738031f11ca814d7ec33429f848b3b3356cae9a28b9a0cb376df5a6348d312c80ed4eeb51b81e68b317584a2e4a SHA512 9dd6d8c4b4e2713cf27ed55b1e97fdf5ed6d80f43b798b83f08e2f4646387dfd0696b21d4f44dbd99a061d388790dc15da49ac5afb0bb06116cfd6f07b7d6962
+DIST protobuf-3.5.2.tar.gz 4584659 BLAKE2B f582212169d802a5844574eb900c9f8cbb343b7e73f2074e5ff0bfc544ebd13f4bc2b78271fb70f4465d78fdc39972ed68339f453c0d3ffe98d8564fbf520544 SHA512 09d10cf0c07a0ba249428bbf20f5dbed840965fa06b3c09682f286a4dee9d84bb96f3b5b50e993d48ef1f20440531255ce7d0e60a648bf3fe536a5f2b0b74181
EBUILD grpc-1.12.0.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282
-MISC metadata.xml 327 BLAKE2B e99ce0019fedc9b171e83503cbc1fde434fdc24d9de08ab8b26487391a5ef93ff207a2196c0f9e08b7cffbf4770fc67f1fbaeb886e7f95a02cdc3a67432494d6 SHA512 e8fa242a316ef93660b3b7601e1a6c2bbf356a77f4c0f678c34e299c3cdc051b77a79167a47a81d2a7d2b3b85c9059c3918a02e3df1c63b07c3f3812de47bd63
+EBUILD grpc-1.12.1.ebuild 4150 BLAKE2B 211375c9194684d63812417e4701ce54588237d65350d2d8bc956b5106b352f9ba204ffb174d8e7e8609851b282c816a008aa792e28e067d98a30a31db8f8591 SHA512 8531b6975d0f95dcfd8f1231caa2b6135a1f1ede25ee0ec2156719b3f238adaf9a5301e5cc7832e9b7fe62cc668fc2beb84d28e55ba16a8c4f3d099cf98e25d8
+MISC metadata.xml 640 BLAKE2B 8a1e1cd4e74bd63b3a924a93e69a8c91a0aa712c3383147f7fb688e44d1a4975a402187f052708df0b6128141085973673d2dd1129995ce304c1d8634b88b1d5 SHA512 fce033f1d37fc5f89359256e81353f1a6aac2cf34ed6c9186cf7a2207dc535d0b71f6e8657b4275d229db1cf809c3b9751f78af808c92d1f74c9ad19642538e8
diff --git a/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch b/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
new file mode 100644
index 000000000000..61fd830d64d4
--- /dev/null
+++ b/net-libs/grpc/files/0006-grpc-1.12.1-allow-system-openssl.patch
@@ -0,0 +1,65 @@
+From 30ce693621d61efb8596503a0da212077a8c4daa Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <tbechtold@suse.com>
+Date: Thu, 24 May 2018 17:12:13 +0200
+Subject: [PATCH] Allow building the python module with system openssl
+
+When building the python module and using the new
+GRPC_PYTHON_BUILD_SYSTEM_OPENSSL env variable, the third party
+boringssl code is not compiled. Instead, the openssl shared library
+installed on the system is used during runtime.
+This is useful for distributions who don't want to include code copies
+but use shared libraries instead.
+---
+ setup.py | 17 +++++++++++++++--
+ 1 file changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/setup.py b/setup.py
+index 99d1a1c504e..3a5ed56c641 100644
+--- a/setup.py
++++ b/setup.py
+@@ -35,7 +35,7 @@
+ PY3 = sys.version_info.major == 3
+ PYTHON_STEM = os.path.join('src', 'python', 'grpcio')
+ CORE_INCLUDE = ('include', '.',)
+-BORINGSSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
++SSL_INCLUDE = (os.path.join('third_party', 'boringssl', 'include'),)
+ ZLIB_INCLUDE = (os.path.join('third_party', 'zlib'),)
+ CARES_INCLUDE = (
+ os.path.join('third_party', 'cares'),
+@@ -84,6 +84,12 @@
+ # present, then it will still attempt to use Cython.
+ BUILD_WITH_CYTHON = os.environ.get('GRPC_PYTHON_BUILD_WITH_CYTHON', False)
+
++# Export this variable to use the system installation of openssl. You need to
++# have the header files installed (in /usr/include/openssl) and during
++# runtime, the shared libary must be installed
++BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
++ False)
++
+ # Environment variable to determine whether or not to enable coverage analysis
+ # in Cython modules.
+ ENABLE_CYTHON_TRACING = os.environ.get(
+@@ -148,8 +154,13 @@
+ if "win32" in sys.platform:
+ CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
+
++if BUILD_WITH_SYSTEM_OPENSSL:
++ CORE_C_FILES = filter(lambda x: 'third_party/boringssl' not in x, CORE_C_FILES)
++ CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
++ SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = (
+- (PYTHON_STEM,) + CORE_INCLUDE + BORINGSSL_INCLUDE + ZLIB_INCLUDE +
++ (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
+ CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
+
+ EXTENSION_LIBRARIES = ()
+@@ -159,6 +170,8 @@
+ EXTENSION_LIBRARIES += ('m',)
+ if "win32" in sys.platform:
+ EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
++if BUILD_WITH_SYSTEM_OPENSSL:
++ EXTENSION_LIBRARIES += ('ssl', 'crypto',)
+
+ DEFINE_MACROS = (
+ ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch b/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
new file mode 100644
index 000000000000..6964642b119d
--- /dev/null
+++ b/net-libs/grpc/files/0007-grpc-1.12.1-allow-system-zlib.patch
@@ -0,0 +1,52 @@
+From 3823d9048102bce79e165584c62a1a5b91810aeb Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <tbechtold@suse.com>
+Date: Fri, 25 May 2018 06:52:23 +0200
+Subject: [PATCH] Allow building the python module with system zlib
+
+When building the python module and using the new
+GRPC_PYTHON_BUILD_SYSTEM_ZLIB env variable, the third party zlib code
+is not compiled. Instead, the zlib shared library installed on the
+system is used during runtime.
+This is useful for distributions who don't want to include code copies
+but use shared libraries instead.
+---
+ setup.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 3a5ed56c641..483d3ac1682 100644
+--- a/setup.py
++++ b/setup.py
+@@ -90,6 +90,12 @@
+ BUILD_WITH_SYSTEM_OPENSSL = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_OPENSSL',
+ False)
+
++# Export this variable to use the system installation of zlib. You need to
++# have the header files installed (in /usr/include/) and during
++# runtime, the shared libary must be installed
++BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
++ False)
++
+ # Environment variable to determine whether or not to enable coverage analysis
+ # in Cython modules.
+ ENABLE_CYTHON_TRACING = os.environ.get(
+@@ -159,6 +165,10 @@
+ CORE_C_FILES = filter(lambda x: 'src/boringssl' not in x, CORE_C_FILES)
+ SSL_INCLUDE = (os.path.join('/usr', 'include', 'openssl'),)
+
++if BUILD_WITH_SYSTEM_ZLIB:
++ CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
++ ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = (
+ (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
+ CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
+@@ -172,6 +182,8 @@
+ EXTENSION_LIBRARIES += ('advapi32', 'ws2_32',)
+ if BUILD_WITH_SYSTEM_OPENSSL:
+ EXTENSION_LIBRARIES += ('ssl', 'crypto',)
++if BUILD_WITH_SYSTEM_ZLIB:
++ EXTENSION_LIBRARIES += ('z',)
+
+ DEFINE_MACROS = (
+ ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
new file mode 100644
index 000000000000..c2e20f3994f4
--- /dev/null
+++ b/net-libs/grpc/files/0008-grpc-1.12.1-allow-system-cares.patch
@@ -0,0 +1,52 @@
+From 78a6e04ec1efc2dc839f0329dcff732940e27fd9 Mon Sep 17 00:00:00 2001
+From: Thomas Bechtold <tbechtold@suse.com>
+Date: Fri, 25 May 2018 07:08:05 +0200
+Subject: [PATCH] Allow building the python module with system cares
+
+When building the python module and using the new
+GRPC_PYTHON_BUILD_SYSTEM_CARES env variable, the third party cares code
+is not compiled. Instead, the cares shared library installed on the
+system is used during runtime.
+This is useful for distributions who don't want to include code copies
+but use shared libraries instead.
+---
+ setup.py | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 483d3ac1682..43c25aafeb9 100644
+--- a/setup.py
++++ b/setup.py
+@@ -96,6 +96,12 @@
+ BUILD_WITH_SYSTEM_ZLIB = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_ZLIB',
+ False)
+
++# Export this variable to use the system installation of cares. You need to
++# have the header files installed (in /usr/include/) and during
++# runtime, the shared libary must be installed
++BUILD_WITH_SYSTEM_CARES = os.environ.get('GRPC_PYTHON_BUILD_SYSTEM_CARES',
++ False)
++
+ # Environment variable to determine whether or not to enable coverage analysis
+ # in Cython modules.
+ ENABLE_CYTHON_TRACING = os.environ.get(
+@@ -169,6 +175,10 @@
+ CORE_C_FILES = filter(lambda x: 'third_party/zlib' not in x, CORE_C_FILES)
+ ZLIB_INCLUDE = (os.path.join('/usr', 'include'),)
+
++if BUILD_WITH_SYSTEM_CARES:
++ CORE_C_FILES = filter(lambda x: 'third_party/cares' not in x, CORE_C_FILES)
++ CARES_INCLUDE = (os.path.join('/usr', 'include'),)
++
+ EXTENSION_INCLUDE_DIRECTORIES = (
+ (PYTHON_STEM,) + CORE_INCLUDE + SSL_INCLUDE + ZLIB_INCLUDE +
+ CARES_INCLUDE + ADDRESS_SORTING_INCLUDE)
+@@ -184,6 +194,8 @@
+ EXTENSION_LIBRARIES += ('ssl', 'crypto',)
+ if BUILD_WITH_SYSTEM_ZLIB:
+ EXTENSION_LIBRARIES += ('z',)
++if BUILD_WITH_SYSTEM_CARES:
++ EXTENSION_LIBRARIES += ('cares',)
+
+ DEFINE_MACROS = (
+ ('OPENSSL_NO_ASM', 1), ('_WIN32_WINNT', 0x600),
diff --git a/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch b/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
new file mode 100644
index 000000000000..a9168f165e19
--- /dev/null
+++ b/net-libs/grpc/files/0009-grpc-1.12.1-gcc8-fixes.patch
@@ -0,0 +1,53 @@
+--- a/tmp/alts_transport_security.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/tsi/alts_transport_security.cc 2018-05-20 16:54:49.995787548 +0200
+@@ -45,7 +45,7 @@
+ }
+
+ void grpc_tsi_alts_init() {
+- memset(&g_alts_resource, 0, sizeof(alts_shared_resource));
++ memset((void*)&g_alts_resource, 0, sizeof(alts_shared_resource));
+ gpr_mu_init(&g_alts_resource.mu);
+ gpr_cv_init(&g_alts_resource.cv);
+ }
+--- a/tmp/client_channel.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/ext/filters/client_channel/client_channel.cc 2018-05-20 17:07:20.604746186 +0200
+@@ -416,7 +416,7 @@
+ grpc_uri* uri = grpc_uri_parse(server_uri, true);
+ GPR_ASSERT(uri->path[0] != '\0');
+ service_config_parsing_state parsing_state;
+- memset(&parsing_state, 0, sizeof(parsing_state));
++ memset((void*)&parsing_state, 0, sizeof(parsing_state));
+ parsing_state.server_name =
+ uri->path[0] == '/' ? uri->path + 1 : uri->path;
+ service_config->ParseGlobalParams(parse_retry_throttle_params,
+--- a/tmp/channel.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/lib/surface/channel.cc 2018-05-20 16:58:01.632776988 +0200
+@@ -103,7 +103,7 @@
+ return channel;
+ }
+
+- memset(channel, 0, sizeof(*channel));
++ memset((void*)channel, 0, sizeof(*channel));
+ channel->target = target;
+ channel->is_client = grpc_channel_stack_type_is_client(channel_stack_type);
+ size_t channel_tracer_max_nodes = 0; // default to off
+@@ -280,7 +280,7 @@
+ }
+
+ grpc_call_create_args args;
+- memset(&args, 0, sizeof(args));
++ memset((void*)&args, 0, sizeof(args));
+ args.channel = channel;
+ args.parent = parent_call;
+ args.propagation_mask = propagation_mask;
+--- a/tmp/flow_control.cc.ORIG 2018-04-13 20:08:11.000000000 +0200
++++ b/src/core/ext/transport/chttp2/transport/flow_control.cc 2018-05-20 17:09:47.055738116 +0200
+@@ -187,7 +187,7 @@
+ uint32_t TransportFlowControl::MaybeSendUpdate(bool writing_anyway) {
+ FlowControlTrace trace("t updt sent", this, nullptr);
+ const uint32_t target_announced_window =
+- static_cast<const uint32_t>(target_window());
++ static_cast<uint32_t>(target_window());
+ if ((writing_anyway || announced_window_ <= target_announced_window / 2) &&
+ announced_window_ != target_announced_window) {
+ const uint32_t announce = static_cast<uint32_t> GPR_CLAMP(
diff --git a/net-libs/grpc/grpc-1.12.1.ebuild b/net-libs/grpc/grpc-1.12.1.ebuild
new file mode 100644
index 000000000000..e57c672f4837
--- /dev/null
+++ b/net-libs/grpc/grpc-1.12.1.ebuild
@@ -0,0 +1,160 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+DISTUTILS_OPTIONAL=1
+
+inherit distutils-r1 flag-o-matic toolchain-funcs
+
+# should match pinned git submodule version of third_party/protobuf
+# look it up here https://github.com/grpc/grpc/tree/v"${PV}"/third_party
+PROTOBUF_VERSION="3.5.2"
+
+DESCRIPTION="Modern open source high performance RPC framework"
+HOMEPAGE="http://www.grpc.io"
+SRC_URI="
+ https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ tools? ( https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz -> protobuf-${PROTOBUF_VERSION}.tar.gz )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc python systemtap tools"
+
+REQUIRED_USE="
+ python? ( ${PYTHON_REQUIRED_USE} )
+ tools? ( python )
+"
+
+DEPEND="
+ >=dev-libs/openssl-1.0.2:0=[-bindist]
+ >=dev-libs/protobuf-3.5:=
+ dev-util/google-perftools
+ net-dns/c-ares:=
+ sys-libs/zlib:=
+ python? ( ${PYTHON_DEPS}
+ dev-python/coverage[${PYTHON_USEDEP}]
+ dev-python/cython[${PYTHON_USEDEP}]
+ >=dev-python/protobuf-python-3.5.1:=[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ virtual/python-futures[${PYTHON_USEDEP}]
+ doc? (
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx_rtd_theme[${PYTHON_USEDEP}]
+ )
+ )
+ systemtap? ( dev-util/systemtap )
+"
+
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/0001-grpc-1.11.0-Fix-cross-compiling.patch"
+ "${FILESDIR}/0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch"
+ "${FILESDIR}/0003-grpc-1.3.0-Don-t-run-ldconfig.patch"
+ "${FILESDIR}/0004-grpc-1.11.0-fix-cpp-so-version.patch"
+ "${FILESDIR}/0005-grpc-1.11.0-pkgconfig-libdir.patch"
+ "${FILESDIR}/0006-grpc-1.12.1-allow-system-openssl.patch"
+ "${FILESDIR}/0007-grpc-1.12.1-allow-system-zlib.patch"
+ "${FILESDIR}/0008-grpc-1.12.1-allow-system-cares.patch"
+ "${FILESDIR}/0009-grpc-1.12.1-gcc8-fixes.patch"
+)
+
+src_prepare() {
+ sed -i 's@$(prefix)/lib@$(prefix)/$(INSTALL_LIBDIR)@g' Makefile || die "fix libdir"
+ default
+ use python && distutils-r1_src_prepare
+}
+
+python_prepare() {
+ if use tools; then
+ rm -r third_party/protobuf || die "removing empty protobuf dir failed"
+ ln -s "${S}"/../protobuf-"${PROTOBUF_VERSION}" third_party/protobuf || die
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die
+ # absolute symlinks will fail because out-of-source build
+ # ./src -> ${S}/src
+ ln -s ../../../../src ./ || die
+ # ./third_party -> ${S}/third_party
+ ln -s ../../../../third_party ./ || die
+ # ./grpc_root -> ${S}
+ ln -s ../../../../ ./grpc_root || die
+ popd >/dev/null || die
+ fi
+}
+
+src_compile() {
+ tc-export CC CXX PKG_CONFIG
+ emake \
+ V=1 \
+ prefix=/usr \
+ INSTALL_LIBDIR="$(get_libdir)" \
+ AR="$(tc-getAR)" \
+ AROPTS="rcs" \
+ CFLAGS="${CFLAGS}" \
+ LD="${CC}" \
+ LDXX="${CXX}" \
+ STRIP=true \
+ HOST_CC="$(tc-getBUILD_CC)" \
+ HOST_CXX="$(tc-getBUILD_CXX)" \
+ HOST_LD="$(tc-getBUILD_CC)" \
+ HOST_LDXX="$(tc-getBUILD_CXX)" \
+ HOST_AR="$(tc-getBUILD_AR)" \
+ HAS_SYSTEMTAP="$(usex systemtap true false)"
+
+ use python && distutils-r1_src_compile
+}
+
+python_compile() {
+ export GRPC_PYTHON_BUILD_SYSTEM_CARES=1
+ export GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=1
+ export GRPC_PYTHON_BUILD_SYSTEM_ZLIB=1
+ export GRPC_PYTHON_BUILD_WITH_CYTHON=1
+ distutils-r1_python_compile
+
+ if use tools; then
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die
+ distutils-r1_python_compile
+ popd >/dev/null || die
+ fi
+}
+
+python_compile_all() {
+ if use doc; then
+ esetup.py doc
+ mv doc/build doc/html || die
+ fi
+}
+
+src_install() {
+ emake \
+ prefix="${D}"/usr \
+ INSTALL_LIBDIR="$(get_libdir)" \
+ STRIP=true \
+ install
+
+ if use examples; then
+ docinto examples
+ dodoc -r examples/.
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+
+ use doc && local DOCS=( AUTHORS README.md doc/. )
+ einstalldocs
+
+ use python && distutils-r1_src_install
+}
+
+python_install() {
+ distutils-r1_python_install
+
+ if use tools; then
+ pushd tools/distrib/python/grpcio_tools >/dev/null || die
+ distutils-r1_python_install
+ popd >/dev/null || die
+ fi
+}
diff --git a/net-libs/grpc/metadata.xml b/net-libs/grpc/metadata.xml
index 13bfd9fea3dc..ccdf17cc01ec 100644
--- a/net-libs/grpc/metadata.xml
+++ b/net-libs/grpc/metadata.xml
@@ -4,7 +4,18 @@
<maintainer type="person">
<email>perfinion@gentoo.org</email>
</maintainer>
+ <maintainer type="person">
+ <email>ya@sysdump.net</email>
+ <name>Georgy Yakovlev</name>
+ </maintainer>
<longdescription lang="en">
A high performance, open-source universal RPC framework
</longdescription>
+ <use>
+ <flag name="systemtap">Enable SystemTAP/DTrace tracing</flag>
+ <flag name="tools">Install gRPC python tools</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">grpc/grpc</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/net-libs/iax/Manifest b/net-libs/iax/Manifest
index 662ec49336a1..22f2b3f4b572 100644
--- a/net-libs/iax/Manifest
+++ b/net-libs/iax/Manifest
@@ -4,5 +4,5 @@ AUX 0.2.2-sandbox.patch 753 BLAKE2B 1bf2433fd6258dbd778bc073b33e07bbae9aa70e33ae
DIST iax-0.2.2.tar.gz 139379 BLAKE2B 6fd4ac85774851605162ad9845c1e847aae7c2e0504f06a302d223ec51d1963cbb1e309b98d5a41ef70e4bf3de88be60a65ad7e8c08e23d73096b43efa7a2a0c SHA512 f86fc56c9f31665e849e8528d2852e06abd803e8d02fa6098d68eefecccc263ded97d1870e9ee157ec1610fefc92b8f14f2d858fbce115c5da83a6dec1eea210
EBUILD iax-0.2.2-r1.ebuild 980 BLAKE2B 1a896fca35bcd94a49b959a4f95ad332843cf31a1a8a1612f39994930f2fbb3e1511cf6f32feeb3d181dac763ea785d15d5fe6b6f9407212d9431af6cc883205 SHA512 375af86ad23e4f4a8ddfc10327ab1f3900cf0df7c0a424d3757f6c43c5d83ea99d9c004c01415574588a762713df6c4f05ef6747e1c997d29122bf8e75c4dc53
EBUILD iax-0.2.2-r3.ebuild 624 BLAKE2B 25d0274741747217e681a43f688573a11a674aae680122f0c004503bcf99c2f7e0f7e9b3e62f9cc2c6ea16dffc4147e1da3f58200a5a9cdff6a8621793261db4 SHA512 baaac8ee3cbad35ddf3a076e3932cfab5b966faa8e238626f4d6d6802807afad96dbb45dda04a76e20e5509f656e668bed0cad9c2e472bb74216f6eee59ad364
-EBUILD iax-0.2.2.ebuild 552 BLAKE2B 87539eb6ea08f653cbb3eb9a27c0b9dfc69ba21f4dec005165a6a6c6dd828fb668388adbcc65af52d352d6a5c3872bb16e30d46da3caaf96d37ddd273235eead SHA512 4d21973ebb78f6e24532b3bd15bccb64189fd52e7e8b999e182706c48e6bb30cbc3b7ce347f46bfc00466d29659d4421233c487e461c9d59fc12bb136acb7c10
+EBUILD iax-0.2.2.ebuild 554 BLAKE2B c7956adfd8c8d8736be53eba5cff89cfc79fb5e533cfd3d15ba316151a981349c10f3cda3acf661ab2e0e59122f2d30f1e456c0473264f2a24d6e9577881648b SHA512 d0939516c1737f9bd5556e3eb5baff170cf3be51dd25219640d79c87fdb089a77c9021faad2051ee0725880eb7572e95e2d1d20d6c1db9ba1522f39a184edb07
MISC metadata.xml 294 BLAKE2B c338dd8584a092a04570848494079ea52fdfe31db40ca185256ef99832c827a856c43b7b0f46abe4ef23c00ecd2e9e38cc258285c1043773494f4007e69b914b SHA512 d2a7e75b1cd19f4218697e94518b8b6a225437924352c200fb3ba180197ace527752e1b12f490c3a265e8f9952976ad1078743985d83b19239447d658230a42a
diff --git a/net-libs/iax/iax-0.2.2.ebuild b/net-libs/iax/iax-0.2.2.ebuild
index fb399568f11d..cb1e120a2c5a 100644
--- a/net-libs/iax/iax-0.2.2.ebuild
+++ b/net-libs/iax/iax-0.2.2.ebuild
@@ -6,12 +6,12 @@ EAPI=0
IUSE=""
DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="http://www.digium.com/"
+HOMEPAGE="https://www.digium.com/"
LICENSE="LGPL-2"
DEPEND=""
RDEPEND=""
SLOT="0"
-SRC_URI="http://www.digium.com/pub/libiax/${P}.tar.gz"
+SRC_URI="https://www.digium.com/pub/libiax/${P}.tar.gz"
D_PREFIX=/usr
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 9242801ae260..444083daab4d 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,7 +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
+DIST libnftnl-1.1.1.tar.bz2 372562 BLAKE2B 9dee45bb485399c4677f636c8aa065a7e4e80102f17beb4aa066278a6ef753e7c1aaf02c6a853edc70f018ebef5e8389a05ca384116ec06761f0a29e278f4e54 SHA512 87f092e2b6576121538c8ac7ce92d8c918723e36dd02e2fcfcb7dcaf2ae705bbcd62c79c9076574ef73f461f7df5d10e72bcaeda29e4a7e60ea1401d998424a6
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
+EBUILD libnftnl-1.1.1.ebuild 1375 BLAKE2B 896998647d4f4b38aaebab192925ebec10d7afceacfee79dfb5250b175142c8f332ee6c20af203a0b72af9becf2676d21d334d42710146e6131ecfa5edd51c65 SHA512 d2a1f4d3b03ce8d8c44048fa049c556acb74cbc8b53a9198ca687277257452cdb9a477b9ba4e952d466a9e72e8239ce5a49815380f36231dbb837346e4636a5e
MISC metadata.xml 317 BLAKE2B ec8bdc87d1d0694e81566b611db8e455e851b86a2403ca8ac0c36f774f23b89fb9ee4e55dbc818efba807aec0487dd1956f2fb17393b327500dbe69118d5030b SHA512 bfdf498de4ccd1d1a4f78c7e94a90b2bf203e16b8ddec5949bb88c953279026f95da956ef94b39140d44bbcd8cb4008f9f4b777fd895576da8414051c4487beb
diff --git a/net-libs/libnftnl/libnftnl-1.0.9.ebuild b/net-libs/libnftnl/libnftnl-1.1.1.ebuild
index f9ff5b2f238f..1d63f726eff7 100644
--- a/net-libs/libnftnl/libnftnl-1.0.9.ebuild
+++ b/net-libs/libnftnl/libnftnl-1.1.1.ebuild
@@ -14,7 +14,7 @@ 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
+RDEPEND=">=net-libs/libmnl-1.0.3
json? ( >=dev-libs/jansson-2.3 )"
DEPEND="virtual/pkgconfig
${RDEPEND}"
diff --git a/net-libs/librsync/Manifest b/net-libs/librsync/Manifest
index c69b2ebc6611..dc4d8942f747 100644
--- a/net-libs/librsync/Manifest
+++ b/net-libs/librsync/Manifest
@@ -8,8 +8,10 @@ AUX librsync-2.0.1-libdir.patch 500 BLAKE2B f500f461b0a4308d77b53358701d33bbfa31
DIST librsync-0.9.7.tar.gz 453802 BLAKE2B 0f8a7a758d847498876401aa04473946970be0257dc0cc4abce85adc7adb5d480d7a41e03d43f667e44ec646ce74a75dfa6b0c63c7f239338244b67eb432e31f SHA512 339362fd01c94411849d3e4a6e95db1bef6cffa0475b1af49d73f11be0421a12d4c73ecbf1a272af01b2a21cec81b4a801c1f7d735e107d0242707fb4c45f9ef
DIST librsync-2.0.0.tar.gz 155049 BLAKE2B ca1d938cc8a60ffe5b16b804344164c69296738f6d01adb991a7d0f9685544c8be77608cd17aa269f14bd92cf7390896caa94c84e95313f17e6fa36a4c0e2a46 SHA512 1a88dcc3aa60949e058c57eb0df3e0086823c493de40fed927246f5aada6274db57202074456a0ce5d9aa8b81b41836b0d6221ded6a75d43829572584177e8c0
DIST librsync-2.0.1.tar.gz 169765 BLAKE2B 3b3a109307dc03e567338709f1c3958a2ae7887165208848359677305f6a983edc1bc71c721dd3f414f77e0507426ae5bb59b9fde51595a92379227ac316127a SHA512 70c1ed0f3a8ad8c1201ce67b5411c4aabb4c78ba9d60e4ee658d9a8818c6511322abd53b583869b8927a29b0f105e1a5c9b05efa748eb435e8fc3b7be3344e04
+DIST librsync-2.0.2.tar.gz 174480 BLAKE2B e77d554ad08a852459fe2798249f47ca7f26849b4b8622c5b64f7f9b6d23f1fedc443f747c7988679a3548ea1f6fd2902c424717faaf73a5cfd7e19012a2d72d SHA512 5d2bc1d62b37e9ed7416203615d0a0e3c05c4c884b5da63eda10dd5c985845b500331bce226e4d45676729382c85b41528282e25d491afda31ba434ac0fefad7
EBUILD librsync-0.9.7-r3.ebuild 880 BLAKE2B 92da9999000bae998ed7761373ec8d5dca977280cfc713d600de73ba4a9b6c186503cb9c7149d9167bf24b931e4decd2cf87c3bcb3f155ee0196ab0517f3f7ae SHA512 0096c65f111f796ee1ff6ffc26053bcce03c65eeda12fa7bf36c038768fe027587e0666104f66f107784cf1680810da28b2b620c4710a5df2032cd7e5a4c2806
EBUILD librsync-2.0.0-r1.ebuild 821 BLAKE2B 7b5205c78edb58f35f15d286d17d61792bcca6d78cf19b788f8d1713e571e61cfea97054e3a7122d91c2dd864c69ff3dba06f6f1b5d56b437b44ec0aaf376e88 SHA512 17e51cf4bbac0e4b07de4e73a87786b191b87f2ba8b8f2170cb73af8186027dfe5ba95cc37e96a66f206a807f795538634a433a46dbb1dfb33bbb6afc1038574
EBUILD librsync-2.0.0.ebuild 760 BLAKE2B 72253c352dcf02c9fda1e338bc65a5c3964e0e622ec61977e7c91f8121e373a4c2cfc0b250fa73fba400298187d05e18a178a87a4885c4ee3c147d8158fbd68d SHA512 d80266085dbc6282cd0ad1399879db63f42034c5d49e4274581f4f82c6ae25e152fc155e06e42a33c274ae2cbf3ca3d4b67c787e243f2bae84a19cc7807cb562
-EBUILD librsync-2.0.1-r1.ebuild 677 BLAKE2B 92687b7c3fba2087da83cc87103e45f6ef6568a03a5cf1b0b667ca87883675e8908addabe537dab68950a18259e175713ff720ada5dbe2e98e04517b3f0951c2 SHA512 73f83ff85f60b4be04e421525c9a0b77754c42c86219b6d3abab0315b0bc92d39b92e734c1a4777afcb53142b39078f90f29e066841270af16bcc966b5dc13db
+EBUILD librsync-2.0.1-r1.ebuild 675 BLAKE2B 2efdddad1b6e1bcb69dd2a32a7e3c5f31f27a26749b8a3a95d87b9779065bbb7719eefed7a5abdc614dce0343dae6b77717dd8e930ceec36856fcd00797985ba SHA512 6f1d32a4521fbdf9bcbc175871d15a3050c0401dc72456a765fe01149753d1a24419b4a3878730c37365d4f99ee7323ae3bbbe1d8d15e70365dce2ac3571c70f
+EBUILD librsync-2.0.2.ebuild 616 BLAKE2B 40294276211d5afacdc0a528f93d31b3770438b9e536a7c4612f048cd35672a01fca4b3d5e624d6e4df07a4fcc8fac05d9dc2f51d6e9389d1541ffde3729cb47 SHA512 e588e472752032eb3e256fc524ba2beb2c31e24613b2197a0ce9fcf33799aabc083fe5c36013e1f268b5883f23c80f75be680658aaa413ac32dac8f0c5e409aa
MISC metadata.xml 505 BLAKE2B 2a1c9c10d4e5ed0c1182c8451a12f0121177ff262dd49e6d24d91c2b6a11490ac6c4a8f3b97e67243657e09cbae984333a5cb8a2e8fafd197bedcb32d20e9c5a SHA512 409cd6f74af83ea996d184e5f8b7635b784352bf68a353cac14c5d77a5230ac0e2434791985fa8f837ff7de72f7287af43c9bfc7031322a509de8969024d28ef
diff --git a/net-libs/librsync/librsync-2.0.1-r1.ebuild b/net-libs/librsync/librsync-2.0.1-r1.ebuild
index cf5488e0dabc..26cc3b1c569b 100644
--- a/net-libs/librsync/librsync-2.0.1-r1.ebuild
+++ b/net-libs/librsync/librsync-2.0.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="LGPL-2.1"
SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
RDEPEND="dev-libs/popt"
DEPEND="${RDEPEND}"
diff --git a/net-libs/librsync/librsync-2.0.2.ebuild b/net-libs/librsync/librsync-2.0.2.ebuild
new file mode 100644
index 000000000000..5b3da0604c6d
--- /dev/null
+++ b/net-libs/librsync/librsync-2.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Remote delta-compression library"
+HOMEPAGE="https://librsync.github.io/"
+SRC_URI="https://github.com/librsync/librsync/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+RDEPEND="
+ dev-libs/popt
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_LIBB2=OFF
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/net-libs/libssh/Manifest b/net-libs/libssh/Manifest
index 9e6bb7617b91..431bd17fc3c0 100644
--- a/net-libs/libssh/Manifest
+++ b/net-libs/libssh/Manifest
@@ -5,8 +5,7 @@ AUX libssh-0.7.5-fix-config-parsing.patch 1076 BLAKE2B f710d58d36ec529c9390647b1
AUX libssh-0.7.5-fix-internal-algo-selection.patch 4711 BLAKE2B 04d61ee7ab3eba651342ac2b3dba52ef191271de37e741b2cb82da11c2f9cfb19d64a6befe9ebbab8d8525bd75c9213dee56c32023340db92e046827835df7ae SHA512 29bf9b43c8ee2f65c65040163fc9f250f35d5ca77ace5db2782eb8478dc14d9d16c0cf0e991025443a701d3d60124f83134a35e7cde6fae20932e3d2ff4b6732
DIST libssh-0.7.4.tar.xz 351892 BLAKE2B 5427faa04eac7b57f73909f113d933daf667f8311c30364bbf06d4f01121a58f5b560e0a1d9071655ce9b310fa3f3f801e11e880ca3eacde66efa0f49dc51b2b SHA512 94b8183e5c83e339303c1a160c92ccff6159471ac7d189ab66cf6d606d2e803fd616519f079aef1577c947d3a14e315332b05ea08e44d0ab550edbcb768dbea7
DIST libssh-0.7.5.tar.xz 351632 BLAKE2B b41cccb6215c5b7e66742171d91e1081d3c1bf44455b65a5992093d31b28db7a6375e815303e115e02b2458c734d9c61e4b1528ba905bf8a421ca2bbb7221ce6 SHA512 6c7f539899caaedf13d66fa2e0fac1a475ecdfe389131abcbdf908bdebc50a0b9e6b0d43e67e52aea85c32f6aa68e46ca2f50695992f82ded83489f445a8e775
-EBUILD libssh-0.7.4.ebuild 2478 BLAKE2B 86cdd0d7445a37fbff25a82b79cd910645525a668e534abcf96a6e4ca9846d5d20fbe8c4891bd4878f0bfb315a283b3a970565963c59fe6a51d5d56d9382994a SHA512 1c7b902fd9dbd2e4826be08c9d326dd3bf858e8ebedfe489ddcef917c888f225742967b93cdf8d647bb42ff4e5938b463e3e7526afd76986b7561399ffb10079
-EBUILD libssh-0.7.5-r1.ebuild 2584 BLAKE2B 21ee1d5dcb7013d613bc1573ee2a0fd0f56e762cb85e382cfae0e8571fb6bd83d2b9c474245855e70db063644d6e0cf26d33cb32dac543d9ed877f8564208166 SHA512 5d6f02c98c35d7477a230fd9e1612c53deb410bc095e874df73ae2b58f67698cb1e22d8a321c56b3ab55be2fb0a6d993f52e073f27b4aa35dae3f2429d9d5b15
-EBUILD libssh-0.7.5-r2.ebuild 2688 BLAKE2B 24ee9e7b170e2f071bc6c73690ca837c3329be3285865ef11b6c7d080017c8e78df929e048b6cbf83258f945db036278a61c671cf6e062bc7c9b2f9ba24a8540 SHA512 2cd5aaca158fc73d945e6a992d6526097d2e7b6bb8880266d14459ab2bfa681283a1db38b1926252561cbe79842061177c51ab01cf81de7b772a9682ff90a18a
-EBUILD libssh-9999.ebuild 2128 BLAKE2B 394967b5e90dbeddbfa8f2fc9fcf17afc0f2c282bf25c5efc8a0e3786573dd9750bcdc63732610bc87e9b779c29014753acc95d239d6b9c3b67a412f908d09a9 SHA512 49e17db7bce80cc8b70ac3ba51f874007e0f09b8407a7e2af3cde79c5d2ec713aed317d258b4cefb7b753b790219c882931cc06154187683dacc83e2a5ab7cb5
+EBUILD libssh-0.7.4.ebuild 2481 BLAKE2B da53e49934deb1984710a1a10f5955fa25b4b0c953566d287ff11e7a90f1991f4f5d58784cb78dc620fc522b0713be1ded8545898909a19bf18cae79e5f6e569 SHA512 e89b9b43fcef2b218cf099dbdee607fbddec3d25ffb11371029b98492ed151dc84d4f0c53050f10b48330c29066c898c83f233858edb2b19fdfa95acc1f6a369
+EBUILD libssh-0.7.5-r2.ebuild 2691 BLAKE2B bd987e06bd7418f27ddd0bec9917df13958547bde473965ac53928d68802e311c6e26a023c0de0a81c01e8861b9c8acf5553a508538e2ab09da6df826ffd644a SHA512 4c64f74e75efe58acfcb5bd75de8341428c50a837441416719fae63dee449405aeb8df2d4bbd83725aba8df35e1b63715501049f730397a55200fcbc0d83c2ee
+EBUILD libssh-9999.ebuild 2131 BLAKE2B 86c8166af0d50df56a128723a3069e8e0e87f49c0209f967a3b5d926927cdb8c9bfa00bceeb16f8d6166f348c3bc0d79b74bbaaf54eeda6f8a3e44200c5ea945 SHA512 f222add792f72ba6e09e1bac8f82d1fda31623a5c47b9a6a65926a63381c5dc7ecd6d80fb91efe4fb102ae492fccc856b99d71ad681fe48fe9bf064ac6d63bb5
MISC metadata.xml 648 BLAKE2B bd4e4be029fdb3ef1e5ce2e16b6f5b922bf43c32ff4ecd50a67db98f9f7669022caf96d965fc85065b5ea8ac65b5547bc3d62d1da6bebdbc5a9a877be5a23c18 SHA512 4e99644645a43ccf7c479c6808ecb2dfe9f9aba69518ab1e2a1289732b926d853ff5554c69fff71e4bb572d12af298ebe19ecb1086da2e8675153b5c42faf589
diff --git a/net-libs/libssh/libssh-0.7.4.ebuild b/net-libs/libssh/libssh-0.7.4.ebuild
index a11813cc768b..3b45d1fa582c 100644
--- a/net-libs/libssh/libssh-0.7.4.ebuild
+++ b/net-libs/libssh/libssh-0.7.4.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
@@ -19,8 +19,8 @@ IUSE="debug doc examples gcrypt gssapi libressl pcap +sftp ssh1 server static-li
RDEPEND="
zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
!gcrypt? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libssh/libssh-0.7.5-r1.ebuild b/net-libs/libssh/libssh-0.7.5-r1.ebuild
deleted file mode 100644
index f6f7e67c1413..000000000000
--- a/net-libs/libssh/libssh-0.7.5-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${PN}-${PV/_rc/rc}"
-inherit cmake-multilib
-
-DESCRIPTION="Access a working SSH implementation by means of a library"
-HOMEPAGE="https://www.libssh.org/"
-SRC_URI="https://red.libssh.org/attachments/download/218/${MY_P}.tar.xz -> ${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-SLOT="0/4" # subslot = soname major version
-IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-libs test zlib"
-# Maintainer: check IUSE-defaults at DefineOptions.cmake
-
-RDEPEND="
- !gcrypt? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- )
- gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
- gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )
- test? ( >=dev-util/cmocka-0.3.1[${MULTILIB_USEDEP}] )
-"
-
-DOCS=( AUTHORS README ChangeLog )
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.5.0-tests.patch
- "${FILESDIR}"/${P}-fix-config-parsing.patch
- "${FILESDIR}"/${P}-fix-config-buffer-underflow.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # just install the examples do not compile them
- sed -i \
- -e '/add_subdirectory(examples)/s/^/#DONOTWANT/' \
- CMakeLists.txt || die
-
- # keyfile torture test is currently broken
- sed -i \
- -e '/torture_keyfiles/d' \
- tests/unittests/CMakeLists.txt || die
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DWITH_DEBUG_CALLTRACE="$(usex debug)"
- -DWITH_DEBUG_CRYPTO="$(usex debug)"
- -DWITH_GCRYPT="$(usex gcrypt)"
- -DWITH_GSSAPI="$(usex gssapi)"
- -DWITH_NACL=no
- -DWITH_PCAP="$(usex pcap)"
- -DWITH_SERVER="$(usex server)"
- -DWITH_SFTP="$(usex sftp)"
- -DWITH_SSH1="$(usex ssh1)"
- -DWITH_STATIC_LIB="$(usex static-libs)"
- -DWITH_STATIC_LIB="$(usex test)"
- -DWITH_TESTING="$(usex test)"
- -DWITH_ZLIB="$(usex zlib)"
- )
-
- cmake-utils_src_configure
-}
-
-multilib_src_compile() {
- cmake-utils_src_compile
- multilib_is_native_abi && use doc && cmake-utils_src_compile doc
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- if multilib_is_native_abi && use doc ; then
- docinto html
- dodoc -r doc/html/.
- fi
-
- use static-libs || rm -f "${D}"/usr/$(get_libdir)/libssh{,_threads}.a
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use examples; then
- docinto examples
- dodoc examples/*.{c,h,cpp}
- fi
-}
diff --git a/net-libs/libssh/libssh-0.7.5-r2.ebuild b/net-libs/libssh/libssh-0.7.5-r2.ebuild
index f35df2773082..ea3291593f7f 100644
--- a/net-libs/libssh/libssh-0.7.5-r2.ebuild
+++ b/net-libs/libssh/libssh-0.7.5-r2.ebuild
@@ -18,8 +18,8 @@ IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-li
RDEPEND="
!gcrypt? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
diff --git a/net-libs/libssh/libssh-9999.ebuild b/net-libs/libssh/libssh-9999.ebuild
index 2e283ca1245c..7c520c85c87c 100644
--- a/net-libs/libssh/libssh-9999.ebuild
+++ b/net-libs/libssh/libssh-9999.ebuild
@@ -17,8 +17,8 @@ IUSE="debug doc examples gcrypt gssapi libressl pcap server +sftp ssh1 static-li
RDEPEND="
!gcrypt? (
- !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
)
gcrypt? ( >=dev-libs/libgcrypt-1.5.3:0[${MULTILIB_USEDEP}] )
gssapi? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
diff --git a/net-libs/mbedtls/Manifest b/net-libs/mbedtls/Manifest
index 2599004b382e..e57502147523 100644
--- a/net-libs/mbedtls/Manifest
+++ b/net-libs/mbedtls/Manifest
@@ -4,7 +4,7 @@ DIST mbedtls-2.7.3.tar.gz 2145554 BLAKE2B 442d840f7046ae63508528fe76e9a12d438f14
DIST mbedtls-2.8.0.tar.gz 2132562 BLAKE2B ac0a67c51e4aeb59e947d16039b20de680ccd7daf372652c0a7d1a6694ce8fe213f959b47a4335cda236575d8f491c84a413ae2f408e86600519ac66a31f8c1a SHA512 baa2024e26cb1d772a525348cdcc84e2b5eabf58642d8c792fe88cf6c539b36f14e80d592e85bc474f6be036513ed4b8bc86f5808ad4f5b08f25ca7e43dc3921
DIST mbedtls-2.9.0.tar.gz 2163543 BLAKE2B b47e6242b5bad4f571bd900960e20ec0266e6f9f25c96df85c7d983dfa3d71f8b842b90f112eb69a09bf99ed3ef7c059c2c2d522ba66e92f4c9097754985323a SHA512 5490822aae18dfb3eb2cc94e673a575daf0cdaf9a4867ff84f0df9749376ea5c54a3f67902b4b86e2a853508af0585684618f9edac8bd92352cd3ca4461bda1c
EBUILD mbedtls-2.10.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
-EBUILD mbedtls-2.7.2.ebuild 2416 BLAKE2B e9f164316f072fe0648fc77391f78b14bd25fca8aac75172f086678592be85266236ae28e252d0595b52165016153f363f0b5af2ab799c544b9531070136031e SHA512 3ea0c78f51c759d556e68c51a5006d09004c98e04c7fe331b01b586dea921e39079cf00e7a6399a175c0b51bf07dec05c6a08ee54e622c35602fe5aed1f7f1cc
+EBUILD mbedtls-2.7.2.ebuild 2415 BLAKE2B 124241763616413f50d6180e83489a5d215236c7498a21ebe6915cdb193fb822e2b9bd39ec9226a97bce55ead0e4b43d029dee755d1b596a1657c4ccda9a7b75 SHA512 1dc5dcc839abca03ef4fb2d997498987ddc14ff6a1dd7fd51dd8922793f8398d2483d58956d6f459a844c4dfc18ba0c444f885c0fbf1dbf45ea6cc3dc8a836e5
EBUILD mbedtls-2.7.3.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
EBUILD mbedtls-2.8.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
EBUILD mbedtls-2.9.0.ebuild 2426 BLAKE2B 3876ca38f5c8df3b858f4430bcf45fa5453876378fadfae9b06e0af1418c7dfdc853b9b781c0f12af47a6c2bc518c48203ba0f1bcf5fd05209dd831a33e82688 SHA512 d47bd79f91aa75bac1c15d945a01bcb1fd1df02641831b5579d52185c92419b3fb4a438be0968c4995a53ae360fd04e425b1ecc700cae42f6b92b4bb258face8
diff --git a/net-libs/mbedtls/mbedtls-2.7.2.ebuild b/net-libs/mbedtls/mbedtls-2.7.2.ebuild
index d12d9efae7d7..92a6856edbb5 100644
--- a/net-libs/mbedtls/mbedtls-2.7.2.ebuild
+++ b/net-libs/mbedtls/mbedtls-2.7.2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${P}
LICENSE="Apache-2.0"
SLOT="0/10" # slot for libmbedtls.so
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="cpu_flags_x86_sse2 doc havege libressl programs test threads zlib"
RDEPEND="
diff --git a/net-libs/miniupnpc/Manifest b/net-libs/miniupnpc/Manifest
index d5ec956f8f36..dd562ea4a635 100644
--- a/net-libs/miniupnpc/Manifest
+++ b/net-libs/miniupnpc/Manifest
@@ -6,6 +6,6 @@ DIST miniupnpc-2.0.20180503.tar.gz 88207 BLAKE2B 1d6c6396e805eae3c53263a6856cc11
EBUILD miniupnpc-2.0.20170509.ebuild 1266 BLAKE2B 275a77b2813007c8055df57d2e8d74c05c02e7f81af1b1ad766a4c9f274f955c7d56779184983a1e45962bbc38e9ff58f15f4bfc076ed86cc1400eabac4f2dcb SHA512 aeeaba172f38162342256afc17223e1efce42f149561ca0e19bcd8336d32dd74d51a55951f4df79663d1999702930eb4dcd6ceebeea9afe82d9f376432dd7271
EBUILD miniupnpc-2.0.20171212.ebuild 1266 BLAKE2B 0fec3f1639a678ca9a119713e62dfde5b8d3b361a6887a85a16d4f202376423a3fbe8910400467e3da91cf368b3628d001a1c5450d4c624471202a56d57d5139 SHA512 5f46f5b41a88c39d560eb8db872b8e3266142dbce18024fd05761f4be8c144475d8b444eef0848db1ad51934f39924b71950b39f660bc47d523d7186f05b158d
EBUILD miniupnpc-2.0.20180203.ebuild 1339 BLAKE2B be0965e64f83087fffb495b3c3de74d691b2575fd8d14b36c56284404e912b623baea93027c61d58d354ef00c8fb31f4581b01959606683e1d23563e75b72891 SHA512 af3b05b0af780f4b8707209b7d1bbd26c8952c0f9314f613569f6da6e03a5bac9961d19e16e6c0876abee7006401c909b02e5c058daba7e2dbd6922aba98110e
-EBUILD miniupnpc-2.0.20180222.ebuild 1332 BLAKE2B b4ff98efe5a1e52ac0e10cfb0b4b46df1e3ac2d5916054de4a83737232e29cd548d2a873338379b88eb353122133688c2cb76c039af0cd34d1b257575f3c5498 SHA512 e19fb20718123716197a8a857759cd8dfc791662289e55a1014e9fd647a3384c3bcb78912375bf3176ed844d666c5947a8385581053c270c2c320a081de8ba44
+EBUILD miniupnpc-2.0.20180222.ebuild 1337 BLAKE2B 12e0b065bb728b59c80a5604b34ec47916ed4b678ec3d774809a27420ed8c10c0f533b315978de8c50b1ea6070729bea941a45580f633816c8d02583953ffadb SHA512 e5c7a6a99f8881dfa57212b0765478a93d70e35cb9a0bb0503a9dd5fc06052ad5c4c05205674b8d09c8464d61ed690dbfc77c2ce4c391b690580e318ce8828c8
EBUILD miniupnpc-2.0.20180503.ebuild 1339 BLAKE2B 697f1d38525ead8b41b0b5ad8b88b59bcb5281ebb1e5685e1caa94b9b0d350c2b2d9c3f2e46b37a4a2b74214079fe8d9c4c52c3dc81d1072f2d603f1f4d2e9f3 SHA512 93714f9e816f487b4d130c81e5149af4126245b8901a4e669026956e00510e465a098d92bc85b574c8b576f6b81bc42616fe1e220aa58256dcd7ffb93dd092b2
MISC metadata.xml 243 BLAKE2B 997913e51bb9c2ba601c78673246d3845d1078f5be11ff209532c5afc9f433d4cfe7a0066ba23677d23ffe368d7ee718df71d28301d45c0473f50e931f674165 SHA512 ded2bb7e056d9081e11b0470aa2874fbe9b5e63f0178bec611291f639763a9bd85a076dbc526e01df1403dea4d0eb28913addb346b676084e690e063b68eca28
diff --git a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
index 93cbb63e9b2e..3547f9b9507a 100644
--- a/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
+++ b/net-libs/miniupnpc/miniupnpc-2.0.20180222.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://miniupnp.free.fr/files/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/16"
-KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips ppc ppc64 s390 sparc x86 ~x86-fbsd"
IUSE="ipv6 kernel_linux static-libs"
RDEPEND=""
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index 5458a37008d6..6f054a04cb57 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -1,14 +1,8 @@
-DIST nghttp2-1.19.0.tar.gz 2159530 BLAKE2B 09e71408e527f5cd42ed224377042d4b68ff869e86c8727f63f2a4777253da9d03bd2cadfafd655b9984c7b71a52f928906db7b73d3adf74f36e69e28dba5618 SHA512 50f45082f725c237a0e1d25af57992b9cded6c9b68f0aa95c44c16eb4448e05b14e06c853032924d03034115286163de0ad684827cfa5d70896656868fdb4e01
DIST nghttp2-1.29.0.tar.xz 1544736 BLAKE2B 1708d2c787e27d722aec27890a21e752a9fe66cdcff481615ac0bd9dcc92099946d9e5563a70137029dec54f8cc4244ef22813e0c2010572cd070ff272120bdb SHA512 a518ff1dcc9ae93f8228f4fa9110b9cbc460260a794d455530218c66317c6b96a5b14971aff25428e37326b5ce9f4d8480eefe6fcba17af23efa4ebceb56f23e
-DIST nghttp2-1.30.0.tar.xz 1545352 BLAKE2B 0d52f973a63632dc1ad235f1b535c24053a8dde52dfbda957c3e40548b4de5db5975639140f207cd9ffe564b6151ed6d97de45ff070eb2cfa3d6b41f52254430 SHA512 4b79f46947777627f0a9e1384ec51ac70e273aef6d46d322aa448731726b8ca606e73dcb171170bbe91fce93c28170ff04e11da56ee90fa28d642e7bc37b50be
-DIST nghttp2-1.31.0.tar.xz 1545800 BLAKE2B c0b8130abe7eb16e977cb8d480505d74c41986f15733da2005b1772b4030082c1c0c2e9a0576aae3e88922fc7b17ad9658e916641c3ddb816b45cc0e202b5bf4 SHA512 00342b0517eb9e1044eced4649488d7ad35694e0a1303c4cba2d2be897fb86c5c70f1a5a157799d5c0cf448a6b983f2a2a57ee2bdb5ec762876647f9303446ca
DIST nghttp2-1.31.1.tar.xz 1545400 BLAKE2B 1d1a0982dc36928fe031c26d7adeca3364e0efbef43a7a2e01701614e128c3ab307321fc3e3166f09e71f002bd14d1ad5caaf3242502cbe4e71285591d8f2977 SHA512 e0f5b345b6d794b21fa04bc0c7125f24a877074538ad746451d4a293eb22f1afb9e0e619c69b84f0fc2142a925044a19976af4cffb8426358e95e7d9715d5a4f
DIST nghttp2-1.32.0.tar.xz 1548528 BLAKE2B 1a1d031fc23ac14236c58a84aa94ee255646d36c9c631000b5d48e39c9fbc16e1b28d82e40bfc96d0fb9e2aa6982ed6bff77bcecdacf220ba8dea0b86d92bcab SHA512 ec7e417fbc5497861d2b6dde5145da1640b36441882824e85940e5ca6ac52ec444aa7123846960f7211dd96462eab421d39f9cc49454f3f52e0dcdb36402044e
-EBUILD nghttp2-1.19.0.ebuild 1811 BLAKE2B 7931aa1b1477275b7efb6f174bbcd5a7c18ef6df4d69d4097d4b199d9debe43a9de9a4ef3ffee66d7bd7b7895289fddb69707a69e6eb3da49210109b5d87ea39 SHA512 5ed6ebd9d727a4803878bade7f3abd7fdf61b53ce7e04259e3c07290fd48f8a26a4b61d64aa533afa9eaaf37d4c7a7376e9f37b6bbc04637e61d6d07f603857b
-EBUILD nghttp2-1.29.0.ebuild 1852 BLAKE2B d1b38bd11741cd70e153c933b961b049eec102edc439d3c5c40425458878cbad8cc2e3e64f55019fe5694ac1229cec52de99e3e2f599b27dbef08e7e61f1db78 SHA512 b15473ec7490b351612a14d2593e92a3d17322e7e8c8dbda7064c4da055326a2c5b68de17ae0da85d91d937a3d8942ea0c46cb7d95224c19bd9a322b802405fc
-EBUILD nghttp2-1.30.0.ebuild 1860 BLAKE2B 1921255023f5cf1ed11003ff073094c50427849fe965440ad361a86515f75d11825b04097d4c4728a7f3158f60b94a3cdf086297c2c54f68ba25699be7dca7d7 SHA512 b3a7e529a1c7d303e47d8440a673f5ec9a72f111c5473f3a7c5cb22610ca007d260d626a6f480ae1d9cbffece42cb7ecdb21535714ef74dd1f8d087e829026c1
-EBUILD nghttp2-1.31.0.ebuild 1872 BLAKE2B 775c3fabc17662def41332741827e2a67c1729c04fe6d8eb2752c1ac744066279103ac9b8dc7bfc95654004e72dfa159b2e005f99bbdbf8bcb75f87c1b0a7fc6 SHA512 995c72a6396a1620736db53995c56875f6b4a6370246a04a3b04caa0ed670343274909e8bd091f30ff3ba0a556f96f9db8054084308b2d150994b755bc6a5f74
-EBUILD nghttp2-1.31.1.ebuild 1863 BLAKE2B 2dfb87ec844b8b0f602c67d858deda47866529c195c39b5f8fbea0215909631aece8a1ceacf04dae253452e131e608a6a4f08a3e044d16c297a35dd30243f714 SHA512 35605330d04f31ac993907b837e8cd4f1e1f87a858629faf9bed7ed27d955666660d0875cf2e43b576d76d685259b9d3e10b82bf8bf285323205f3504332de97
-EBUILD nghttp2-1.32.0.ebuild 1872 BLAKE2B 775c3fabc17662def41332741827e2a67c1729c04fe6d8eb2752c1ac744066279103ac9b8dc7bfc95654004e72dfa159b2e005f99bbdbf8bcb75f87c1b0a7fc6 SHA512 995c72a6396a1620736db53995c56875f6b4a6370246a04a3b04caa0ed670343274909e8bd091f30ff3ba0a556f96f9db8054084308b2d150994b755bc6a5f74
-EBUILD nghttp2-9999.ebuild 1934 BLAKE2B 091fa366b740f254c371d075bf24dc126f8d86f66315816b16b3c4c0177c9d2fff66d4ba916adbc203bb2d92ca6a070e80d58d6a4f30cea6bc8fa71eb3718616 SHA512 7e157bcc44e80ca78a85fe1b0e97b293646a30aedbfe7d918f5e16b96d061e9303636053675021af5ca97f84f38fabe0e54c63348f40fe9a52b00e20b0717c4d
+EBUILD nghttp2-1.29.0.ebuild 1855 BLAKE2B 0793576995532dc0626a55ded3a58a9c821a8f982f7cf02457145893cd953f1d369454830f7882fd971cac20b7bfda05fea27e9012367433dedfec0b3e302022 SHA512 e52fce760a93bbc0dcaa3f1625bb7a3cd9abccd969881ed17e4e33d5f4a0bdd3f4ec805667c1f4dd98fdcbc3427fb3f0e60083543c80a0864733f4c358ce19fd
+EBUILD nghttp2-1.31.1.ebuild 1866 BLAKE2B 97d14bfb03da423f418a58260ede9672c256547c4ad13f9bccc310574b1efceef6b4f01478e07816b537b6c98295b67bcc93208327f93c254082bd649d3360a2 SHA512 720e505ba8fa5756abdc1b75785addd6545e7557a81954d3df6efc8414b7a7deb27ead2fbedf9efaf90cddb28b52450f437e5ad39d4536db12e3831fb7fa432a
+EBUILD nghttp2-1.32.0.ebuild 1875 BLAKE2B 37ebd7c136d37837014690c8bd31022f3a289895d4ee85ec6654e0ef894b8e49a8d5777fd0cb3546a1918b30934a68ee63f4841c5b866696f12c42bd12611db4 SHA512 e57d14993874cbe2804ea7f78846fc03a975eca5474f143fc7497800fc0c2abcf94d2b636be4f55ba2d58f516dfccb880ad4342b8be245d4439104387d1dffbc
+EBUILD nghttp2-9999.ebuild 1937 BLAKE2B a3fbca3092493aa311acca430b3c741f3e5b7f2b573463a2f90c10c12c6e83a6a18c53ad993c5333895596862da9112ac8c8eac8ac63def6876dce426abb0de4 SHA512 5f978d788a709eff86996a1a6a080162d7c6d762c09fda34138001bdf32ae203cbe69556658271e1c7462f9c2405dc35e4619d41b5ebecedb0088f82d5611289
MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/nghttp2-1.19.0.ebuild b/net-libs/nghttp2/nghttp2-1.19.0.ebuild
deleted file mode 100644
index a2fbf516d125..000000000000
--- a/net-libs/nghttp2/nghttp2-1.19.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/tatsuhiro-t/nghttp2.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/tatsuhiro-t/nghttp2/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-RDEPEND="
- cxx? ( dev-libs/boost:=[${MULTILIB_USEDEP},threads] )
- hpack-tools? ( >=dev-libs/jansson-2.5 )
- jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
- utils? (
- >=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
- !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
- >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
- net-dns/c-ares:=[${MULTILIB_USEDEP}]
- )
- xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
- ECONF_SOURCE=${S} \
- econf \
- --disable-examples \
- --disable-failmalloc \
- --disable-werror \
- --without-cython \
- --disable-python-bindings \
- --without-spdylay \
- $(use_enable cxx asio-lib) \
- $(use_enable debug) \
- $(multilib_native_use_enable hpack-tools) \
- $(use_enable static-libs static) \
- $(use_enable threads) \
- $(multilib_native_use_enable utils app) \
- $(multilib_native_use_with jemalloc) \
- $(multilib_native_use_with xml libxml2)
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.29.0.ebuild b/net-libs/nghttp2/nghttp2-1.29.0.ebuild
index 93d8d64e41f5..69ed1d8404fa 100644
--- a/net-libs/nghttp2/nghttp2-1.29.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.29.0.ebuild
@@ -23,8 +23,8 @@ SLOT="0/1.14" # <C++>.<C> SONAMEs
IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
SSL_DEPEND="
- !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
"
RDEPEND="
cxx? (
diff --git a/net-libs/nghttp2/nghttp2-1.30.0.ebuild b/net-libs/nghttp2/nghttp2-1.30.0.ebuild
deleted file mode 100644
index e578deb7b24b..000000000000
--- a/net-libs/nghttp2/nghttp2-1.30.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
- !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- cxx? (
- ${SSL_DEPEND}
- dev-libs/boost:=[${MULTILIB_USEDEP},threads]
- )
- hpack-tools? ( >=dev-libs/jansson-2.5 )
- jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
- utils? (
- ${SSL_DEPEND}
- >=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
- net-dns/c-ares:=[${MULTILIB_USEDEP}]
- )
- xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-examples
- --disable-failmalloc
- --disable-werror
- --without-cython
- --disable-python-bindings
- $(use_enable cxx asio-lib)
- $(use_enable debug)
- $(multilib_native_use_enable hpack-tools)
- $(use_enable static-libs static)
- $(use_enable threads)
- $(multilib_native_use_enable utils app)
- $(multilib_native_use_with jemalloc)
- $(multilib_native_use_with xml libxml2)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.31.0.ebuild b/net-libs/nghttp2/nghttp2-1.31.0.ebuild
deleted file mode 100644
index ffeb54eded23..000000000000
--- a/net-libs/nghttp2/nghttp2-1.31.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: Add python support.
-
-EAPI=6
-
-inherit multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/nghttp2/nghttp2.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/nghttp2/nghttp2/releases/download/v${PV}/${P}.tar.xz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
-fi
-
-DESCRIPTION="HTTP/2 C Library"
-HOMEPAGE="https://nghttp2.org/"
-
-LICENSE="MIT"
-SLOT="0/1.14" # <C++>.<C> SONAMEs
-IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
-
-SSL_DEPEND="
- !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
-"
-RDEPEND="
- cxx? (
- ${SSL_DEPEND}
- dev-libs/boost:=[${MULTILIB_USEDEP},threads]
- )
- hpack-tools? ( >=dev-libs/jansson-2.5 )
- jemalloc? ( dev-libs/jemalloc[${MULTILIB_USEDEP}] )
- utils? (
- ${SSL_DEPEND}
- >=dev-libs/libev-4.15[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.3[${MULTILIB_USEDEP}]
- net-dns/c-ares:=[${MULTILIB_USEDEP}]
- )
- xml? ( >=dev-libs/libxml2-2.7.7:2[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-examples
- --disable-failmalloc
- --disable-werror
- --without-cython
- --disable-python-bindings
- $(use_enable cxx asio-lib)
- $(use_enable debug)
- $(multilib_native_use_enable hpack-tools)
- $(use_enable static-libs static)
- $(use_enable threads)
- $(multilib_native_use_enable utils app)
- $(multilib_native_use_with jemalloc)
- $(multilib_native_use_with xml libxml2)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- use static-libs || find "${ED%/}"/usr -name '*.la' -delete
-}
diff --git a/net-libs/nghttp2/nghttp2-1.31.1.ebuild b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
index 1ae84fd36963..ac0d0710a826 100644
--- a/net-libs/nghttp2/nghttp2-1.31.1.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.31.1.ebuild
@@ -23,8 +23,8 @@ SLOT="0/1.14" # <C++>.<C> SONAMEs
IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
SSL_DEPEND="
- !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
"
RDEPEND="
cxx? (
diff --git a/net-libs/nghttp2/nghttp2-1.32.0.ebuild b/net-libs/nghttp2/nghttp2-1.32.0.ebuild
index ffeb54eded23..f472f1d77c9e 100644
--- a/net-libs/nghttp2/nghttp2-1.32.0.ebuild
+++ b/net-libs/nghttp2/nghttp2-1.32.0.ebuild
@@ -23,8 +23,8 @@ SLOT="0/1.14" # <C++>.<C> SONAMEs
IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
SSL_DEPEND="
- !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
"
RDEPEND="
cxx? (
diff --git a/net-libs/nghttp2/nghttp2-9999.ebuild b/net-libs/nghttp2/nghttp2-9999.ebuild
index 7df2072eee13..31d1de9f15bf 100644
--- a/net-libs/nghttp2/nghttp2-9999.ebuild
+++ b/net-libs/nghttp2/nghttp2-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
# TODO: Add python support.
@@ -23,8 +23,8 @@ SLOT="0/1.14" # <C++>.<C> SONAMEs
IUSE="cxx debug hpack-tools jemalloc libressl static-libs test +threads utils xml"
SSL_DEPEND="
- !libressl? ( >=dev-libs/openssl-1.0.2:0[-bindist,${MULTILIB_USEDEP}] )
- libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+ !libressl? ( >=dev-libs/openssl-1.0.2:0=[-bindist,${MULTILIB_USEDEP}] )
+ libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
"
RDEPEND="
cxx? (
diff --git a/net-libs/openslp/Manifest b/net-libs/openslp/Manifest
index c11b7cb2f34d..d9d252a88827 100644
--- a/net-libs/openslp/Manifest
+++ b/net-libs/openslp/Manifest
@@ -11,6 +11,6 @@ AUX slpd.service 203 BLAKE2B 9cb80f3eecf7fe569ec37ae7730668fd232b7803fb1e66a4d38
DIST openslp-1.2.1.tar.gz 886195 BLAKE2B f4ccdf37028d41b6e405768f1b3982b1eaa89e85a7e0f3b24c2a29195d39465807f967845958baaa567a7dd2d2bc8cff55eb1d910f43a6e54276673719596c9e SHA512 34742d88e772d7dba5c6fab1ccb7bf27d6174c5ca429aec406472994bcd806bfaf16dd86fce2ae4c51659587e99cced2436cf36772f6e086f7b87275fb1b19b6
DIST openslp-2.0.0.tar.gz 5424646 BLAKE2B f63560742cb3f679d052fb48b0afdd7cc7995806d77ef93f01da3cd80a884a840d0b678927685d4f4138358dfcf10e93269217643e399d7721571251c31fcbe5 SHA512 e7627417d45d5d0cc83d6e13d62fe192702ce7b763f1b4fb51aa5da8285405b16a34c3ac4f0a1ecffdf59557b29ec7d24925941e56ddee277c8897162f597ade
EBUILD openslp-1.2.1-r3.ebuild 1023 BLAKE2B 9129caf5bbae1f3c6021d089f87f2b91f763acd0deae8927103aa4878f3590043345c2ab171de10cbde4fd1552c5a13efe4f75ea60e5846b84ce048d80f95781 SHA512 f9e0e8dd843444a33c38f711fada3f576db0bf25b6bad4165ae1b019fb1e70f9f7d96445975afabc5d31ed233a7fc35524969bd6c93e6a9ea2df87af00624675
-EBUILD openslp-2.0.0-r4.ebuild 1073 BLAKE2B b4c3e06926bd6da36e520819e5ff2e052bc8102be9e967119305ac3b9bffceaf1128e5504fa2b3a9793c24ed675bdae7223ce64855c97b43f42cf844b03d53f6 SHA512 7dc1e67c956bc3699a2205980388097816906ba4ff4a7f91861894016bb223fed85510c6600793e4670a62c09e7e5b466af4f202cccf5f52a2ec87648846b299
+EBUILD openslp-2.0.0-r4.ebuild 1072 BLAKE2B fe26811ff5d4ee7334d1f53741955f757d3a9f26977038b63599a1d3898b6da67d3129aee1d6ac281164a3c16dc4b15688d5850dc15c8374f9e469c5e7f00097 SHA512 c22179f59218873aa99fed9100e456d5e33229c4b51436dc457b0589ad179ff65317400b2a92dafcf4ebb90295f5b9e41c1a92981978a13ccfe236574b64c9e3
EBUILD openslp-2.0.0-r5.ebuild 1132 BLAKE2B 303f2eb68810f74d92fcd8141c05137c93452efcc8a12a09808748a361a48bdda4764c76c338449667cbc54ce7b573c4318f88e2c73b69b55797d06e0f0714be SHA512 cd160030d9f88f52513b94144252b63b868a787517d2ac54fcf5ad0d5e6f557315096ed28a8ee856fd93f397caf1981d78ff1822c03fb2d3b22395e1b440e2d1
MISC metadata.xml 336 BLAKE2B 8af4358f9a3d06983df228c81b3add5373b04fe7a322d0e5045d3b1224b4311ccfb27b7ab3f19bb6ecc4a12e8e061b7ba4435e70a7371b9018990748aa036e44 SHA512 2aab4978f409d1ceb235b846e06bae2c750c68c69f54f6d5a3f96b30be24c6262cd085b741cc193d8d60a4486581817347ab5b3bcc84d43da48dcc2c215df84f
diff --git a/net-libs/openslp/openslp-2.0.0-r4.ebuild b/net-libs/openslp/openslp-2.0.0-r4.ebuild
index d8524e0c0196..44b330d8ce9c 100644
--- a/net-libs/openslp/openslp-2.0.0-r4.ebuild
+++ b/net-libs/openslp/openslp-2.0.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/openslp/${P}.tar.gz"
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="libressl"
RESTRICT="test"