gentoo resync : 29.05.2018

21 files changed, 88 insertions, 70 deletions

diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index a09aab977471..b5d340287704 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/grpc/Manifest b/net-libs/grpc/Manifest
index 29c48e162398..bdf10dc09aa7 100644
--- a/net-libs/grpc/Manifest
+++ b/net-libs/grpc/Manifest
@@ -2,6 +2,7 @@ AUX 0001-grpc-1.11.0-Fix-cross-compiling.patch 2178 BLAKE2B 2f3cb67581ccc276c170
 AUX 0002-grpc-1.3.0-Fix-unsecure-.pc-files.patch 1227 BLAKE2B 2791f596cc2e9feb633807171647be1785fd62243b323b6412d85eb8c6a3e964118fecadf93dabb6e9f41d6c778b970445737fc9176fa7631d3b875ca094f227 SHA512 377708ee7385b5c00a3b71f89b482c7488efbcad42854f255df9e20206c2940a9c3b6ff934a95ffe683d6eb605eb30d99782ec3a93d85e5240c08f1ef5729ca2
 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
 DIST grpc-1.11.0.tar.gz 13431990 BLAKE2B d7aabd86fdaba8f8fc6fa17b411b496bbd51ef0a759d4bd77c0391e472c88f4252270ceddc19fb59a2b725d612236e1aef959f4b313551cb38204c51d1ca216b SHA512 3127cf0e66cd0712d905e6008adf6f80d787ad97eae2fba38fa3f4d343849a3dc3ca8f2ccbc82020e812fdb272e9577584c298a5b623fbdcac40c1efd7877855
-EBUILD grpc-1.11.0.ebuild 1442 BLAKE2B 64db426711d49515b28c74bf05b07f9efe04e1636075a921193cdeba138a25b54dcacbc738443357527e54ce37245838f34be51e812826c658dc0f1a744ec408 SHA512 75371eb733f70ac25aca7780c9ec99538055f1b3cc3a0a96e5247dcf6290a1e40411b97c4927a64ef75c03d052186af0c16d05b10f93c87c9cd0d3a48e1a7f63
+EBUILD grpc-1.11.0-r1.ebuild 1532 BLAKE2B 1e41ce56b3a191269ba9bece06304399fe8abff72333545d204cf664af140372336111ec8ba5390b6a8e6d671d6e85be5f0845f7d6bbd33d08fab0e3baab254a SHA512 c7600d243d3f36567792fec8810538084b935a83523cb400c8cd26fa185fd48d65b165c9801943d96f3f4567aecbdeefe57f2e794e255a16b2bf39cf17355282
 MISC metadata.xml 327 BLAKE2B e99ce0019fedc9b171e83503cbc1fde434fdc24d9de08ab8b26487391a5ef93ff207a2196c0f9e08b7cffbf4770fc67f1fbaeb886e7f95a02cdc3a67432494d6 SHA512 e8fa242a316ef93660b3b7601e1a6c2bbf356a77f4c0f678c34e299c3cdc051b77a79167a47a81d2a7d2b3b85c9059c3918a02e3df1c63b07c3f3812de47bd63
diff --git a/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch b/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
new file mode 100644
index 000000000000..257bef8aa140
--- /dev/null
+++ b/net-libs/grpc/files/0005-grpc-1.11.0-pkgconfig-libdir.patch
@@ -0,0 +1,17 @@
+--- a/Makefile	2018-05-28 17:59:34.631540261 +0800
++++ b/Makefile	2018-05-28 18:01:31.266936000 +0800
+@@ -460,11 +460,11 @@
+ CACHE_MK += HAS_PKG_CONFIG = true,
+ endif
+ 
+-CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CORE_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CORE_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CPP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CPP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+-CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/lib,,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
++CSHARP_PC_TEMPLATE = prefix=$(prefix),exec_prefix=\$${prefix},includedir=\$${prefix}/include,libdir=\$${exec_prefix}/$(INSTALL_LIBDIR),,Name: $(PC_NAME),Description: $(PC_DESCRIPTION),Version: $(CSHARP_VERSION),Cflags: -I\$${includedir} $(PC_CFLAGS),Requires.private: $(PC_REQUIRES_PRIVATE),Libs: -L\$${libdir} $(PC_LIB),Libs.private: $(PC_LIBS_PRIVATE)
+ 
+ ifeq ($(SYSTEM),MINGW32)
+ EXECUTABLE_SUFFIX = .exe
diff --git a/net-libs/grpc/grpc-1.11.0.ebuild b/net-libs/grpc/grpc-1.11.0-r1.ebuild
index 1a6156e46259..a232297d5cfc 100644
--- a/net-libs/grpc/grpc-1.11.0.ebuild
+++ b/net-libs/grpc/grpc-1.11.0-r1.ebuild
@@ -30,6 +30,7 @@ PATCHES=(
 	"${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"
 )
 
 src_prepare() {
@@ -42,6 +43,7 @@ src_compile() {
 	emake \
 		V=1 \
 		prefix=/usr \
+		INSTALL_LIBDIR="$(get_libdir)" \
 		AR="$(tc-getAR)" \
 		AROPTS="rcs" \
 		CFLAGS="${CFLAGS}" \
diff --git a/net-libs/iax/Manifest b/net-libs/iax/Manifest
index 666f819594ec..662ec49336a1 100644
--- a/net-libs/iax/Manifest
+++ b/net-libs/iax/Manifest
@@ -2,7 +2,7 @@ AUX 0.2.2-debug.patch 684 BLAKE2B 6a3ef9e2fab7723bf4397f734753ae8d3abdc091b5df5f
 AUX 0.2.2-memset.patch 482 BLAKE2B 534d38f9553dcfed0da0eae77e517f4faf5a18546f357364fa5e3cbbfc512cc2f708bdb7dac05cfc1ecb4944512dbed0f4e8f99702807713b466b10ffd8f6812 SHA512 70f98b10b5899326d5480ea72e785038320b22ec3c7ff42015a716de425313c42b79184063ef7fbdf29c1164d0ecf316d2621685065a84fe7f305c7aab2d0a87
 AUX 0.2.2-sandbox.patch 753 BLAKE2B 1bf2433fd6258dbd778bc073b33e07bbae9aa70e33ae9663fa41f573564ed2b74092daaf11df5ac61d9ea491b5a718f8126e7b1017d68a61ab696518d9e25e2e SHA512 b6d726272c62ffdd2c6f8bdc484990ef8ab6a0b9bf4909c896d6d7e41f2df027b6eb37f0c077b39fa05f849e6d5c40a341af2239dc312285e6ef3d3084a1c5bf
 DIST iax-0.2.2.tar.gz 139379 BLAKE2B 6fd4ac85774851605162ad9845c1e847aae7c2e0504f06a302d223ec51d1963cbb1e309b98d5a41ef70e4bf3de88be60a65ad7e8c08e23d73096b43efa7a2a0c SHA512 f86fc56c9f31665e849e8528d2852e06abd803e8d02fa6098d68eefecccc263ded97d1870e9ee157ec1610fefc92b8f14f2d858fbce115c5da83a6dec1eea210
-EBUILD iax-0.2.2-r1.ebuild 1110 BLAKE2B 3c6bb394d06a0046d89c6e53b4cbd36369b243d122c6f7f7e2e5311046e6319c5e4fb1a4b104f5e19f71525947fbb6c9cf908ea269b593224fb2ae1ade55213f SHA512 d0416db04ea7fe0f674c476bcab031e7b99596cea948dce526bde31b0bdeb4b0076dc4068d0a13b404622ae3d41a75f23ccb4751e81fe2392d342d6ca7799d99
-EBUILD iax-0.2.2-r3.ebuild 718 BLAKE2B bc5f66c7bec69a760cdb689f7c5fd562180ba4ee21671d0c4406bfc724f46a35f2927133fda3e83d6c72c15a2afbdf24d87c289663434eb127b32a2d5ecd797a SHA512 b42e54f48e515c6bb195a0168d576b22b1c0f500798e38ed369dae1b24c70b75f29a96aaa6d1a0b1574b338131949ab8d04872ef45bc480645fa8dda50d26fa7
+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
 MISC metadata.xml 294 BLAKE2B c338dd8584a092a04570848494079ea52fdfe31db40ca185256ef99832c827a856c43b7b0f46abe4ef23c00ecd2e9e38cc258285c1043773494f4007e69b914b SHA512 d2a7e75b1cd19f4218697e94518b8b6a225437924352c200fb3ba180197ace527752e1b12f490c3a265e8f9952976ad1078743985d83b19239447d658230a42a
diff --git a/net-libs/iax/iax-0.2.2-r1.ebuild b/net-libs/iax/iax-0.2.2-r1.ebuild
index 5bdaf96a5ee8..46813b978f01 100644
--- a/net-libs/iax/iax-0.2.2-r1.ebuild
+++ b/net-libs/iax/iax-0.2.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
 DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
@@ -13,6 +13,7 @@ KEYWORDS="~amd64 ~ppc x86"
 IUSE="debug snomhack"
 
 src_prepare() {
+	default
 	if ! use debug; then
 		sed -i -e "s:-DDEBUG_SUPPORT -DDEBUG_DEFAULT ::" src/Makefile.in \
 			|| die "sed failed"
@@ -34,8 +35,3 @@ src_configure() {
 		$(use_enable debug extreme-debug) \
 		$(use_enable snomhack)
 }
-
-src_install () {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-libs/iax/iax-0.2.2-r3.ebuild b/net-libs/iax/iax-0.2.2-r3.ebuild
index 8f8fb31fe582..42757477e346 100644
--- a/net-libs/iax/iax-0.2.2-r3.ebuild
+++ b/net-libs/iax/iax-0.2.2-r3.ebuild
@@ -1,23 +1,27 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="IAX (Inter Asterisk eXchange) Library"
-HOMEPAGE="http://www.asterisk.org/"
-SRC_URI="http://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
+HOMEPAGE="https://www.asterisk.org/"
+SRC_URI="https://downloads.asterisk.org/pub/telephony/libiax/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug snomhack"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-debug.patch"
+	"${FILESDIR}/${PV}-memset.patch"
+	"${FILESDIR}/${PV}-sandbox.patch"
+)
+
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-debug.patch"
-	epatch "${FILESDIR}/${PV}-memset.patch"
-	epatch "${FILESDIR}/${PV}-sandbox.patch"
+	default
 	eautoreconf
 }
 
@@ -26,8 +30,3 @@ src_configure() {
 		$(use_enable debug extreme-debug) \
 		$(use_enable snomhack)
 }
-
-src_install () {
-	default
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}
diff --git a/net-libs/libeXosip/Manifest b/net-libs/libeXosip/Manifest
index e6507a958717..4b72b63eaaea 100644
--- a/net-libs/libeXosip/Manifest
+++ b/net-libs/libeXosip/Manifest
@@ -1,5 +1,5 @@
 DIST libeXosip2-3.5.0.tar.gz 472081 BLAKE2B 8c50896ef448730538eddd1473d07562503620ee0ad71a4ad6d67ad6395d40f270fcb7b9e4535941ae4f4638209584ff865356b1ecddd7825c4dadde683e3681 SHA512 67e04cd53aedaa25f7fd9b79923e075ecc4773dff0b5fd0ce0db01ebf22c09da62c6a686bf9afd6c90e6f086ee24301736c1e0d95c8b98e062ff414ad8a20016
 DIST libeXosip2-4.0.0.tar.gz 526339 BLAKE2B d6edea14fc93ff7565eee33f50f56a4d0ff02d2a625828ec61f6187c1913bec48a1667df6e01e7abd0e28764e9b442b13ee34595d3ac89c50a1e44696beaaa26 SHA512 8e286e1e533c12bce26a164e42286c3239556860863a877438f63a694e47055f17fb98eb0f2ed91cac72f0645e8bf4dd9b922b5065357f16c0bacafc99406f51
-EBUILD libeXosip-3.5.0.ebuild 813 BLAKE2B 27733baf354ac2db7ad66959b0e13d01ec2bd680a96bb99b41551ebc95534eb92f56a03618b8ea19479c875c71c05f4b26c768bb3a1c7535340550c11afeac09 SHA512 a0bd69ca9aaa7d08739ad4199dc89df1e73bed0bddf6a6cb3cce59e813911bb2ce7b49fdfecc6e4d667364d9225c76a0a686a963fc5731aac653d3cecd4adc82
-EBUILD libeXosip-4.0.0.ebuild 814 BLAKE2B bd6a220fbc1fc479268a92c6f489188911166e4261c149ab4e7d5db3f2a9ec8b74180a9a0b7da6dfbacdc2e5afb7ad605bd9ed92b12b54533c7be4926d308d35 SHA512 1ea89be192724874489399527e135dff066e1b69eb5a9f56a6d64c6c4f1489f8f50ced23c8baf3f86564b21f5c2d20915754ae02bd13fad3aaae0b7e9cf39d14
+EBUILD libeXosip-3.5.0.ebuild 748 BLAKE2B a79af3ff77f8014c62c7e6aab36fd7f549480b9ea48b9e9aa6e76feaba566349b6c6014cca7ca7070a67dd6010023c4a71681652d3d7a08fe974f27951868578 SHA512 b108aa9ea43215c73b6a37d66f1cc069a654901fb410bc206fb6bdc704c1bc417385dd6dce00ef769173101b072d992e764ca05a3a3ac9adf368b19071de50fa
+EBUILD libeXosip-4.0.0.ebuild 788 BLAKE2B 42c43e1f1d42e2d8c1e2ccb3cb6f0cd30a5f4463f92d10c78f3c664e6d0972238638849a720941f42b769f00c0f1eaea438633c270e6bd859ae2618dae01b7fd SHA512 caeb33bd60cf8710d656fdcfd1ed3fbdd82ddd63fbed0e51aa55f9c0f874cff7819dc0ea717fdbcf78903f0a9bed7f248c8726653df1f7dcb4bb62b6a0606c01
 MISC metadata.xml 248 BLAKE2B c8ba4d540d2d9b361f88e13daea01277cf4a9ab9d71677cde8239242889abf5a2faafe67be62b0b7fc8412cc0b4eaebdba34f585f8a9f121fd21d406209cee1c SHA512 7f794e2ea42e0db5ef80003a8981af42fb6a85acb3b3d1b9f003821e0085ea958eac3d60b6cd35bb5148702015455c6bb58fddea93009fa2302c11db142bdba1
diff --git a/net-libs/libeXosip/libeXosip-3.5.0.ebuild b/net-libs/libeXosip/libeXosip-3.5.0.ebuild
index 322a25facbbe..3f2fed0aaf0a 100644
--- a/net-libs/libeXosip/libeXosip-3.5.0.ebuild
+++ b/net-libs/libeXosip/libeXosip-3.5.0.ebuild
@@ -1,13 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
-
-inherit eutils
+EAPI=6
 
 MY_PV=${PV%.?}-${PV##*.}
 MY_PV=${PV}
 MY_P=${PN}2-${MY_PV}
+
 DESCRIPTION="library to use the SIP protocol for multimedia session establishement"
 HOMEPAGE="https://savannah.nongnu.org/projects/exosip/"
 SRC_URI="mirror://nongnu/exosip/${MY_P}.tar.gz"
@@ -15,11 +14,15 @@ SRC_URI="mirror://nongnu/exosip/${MY_P}.tar.gz"
 KEYWORDS="amd64 ppc x86 ~ppc-macos ~x86-macos"
 SLOT="0"
 LICENSE="GPL-2"
-IUSE="+srv ssl"
+IUSE="libressl +srv ssl"
 
 DEPEND=">=net-libs/libosip-3.2.0
 	<net-libs/libosip-4
-	ssl? ( dev-libs/openssl )"
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -30,8 +33,3 @@ src_configure() {
 		$(use_enable ssl openssl) \
 		$(use_enable srv srvrec)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/net-libs/libeXosip/libeXosip-4.0.0.ebuild b/net-libs/libeXosip/libeXosip-4.0.0.ebuild
index 384ed3cee6ce..c068cc5a6b31 100644
--- a/net-libs/libeXosip/libeXosip-4.0.0.ebuild
+++ b/net-libs/libeXosip/libeXosip-4.0.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils versionator
+inherit versionator
 
 MY_PV=${PV%.?}-${PV##*.}
 MY_PV=${PV}
 MY_P=${PN}2-${MY_PV}
+
 DESCRIPTION="library to use the SIP protocol for multimedia session establishement"
 HOMEPAGE="https://savannah.nongnu.org/projects/exosip/"
 SRC_URI="mirror://nongnu/exosip/${MY_P}.tar.gz"
@@ -15,10 +16,14 @@ SRC_URI="mirror://nongnu/exosip/${MY_P}.tar.gz"
 KEYWORDS="~amd64 ~ppc ~x86 ~ppc-macos ~x86-macos"
 SLOT="0/$(get_version_component_range 1-2)"
 LICENSE="GPL-2"
-IUSE="+srv ssl"
+IUSE="libressl +srv ssl"
 
 DEPEND=">=net-libs/libosip-4.0.0:=
-	ssl? ( dev-libs/openssl )"
+	ssl? (
+		libressl? ( dev-libs/libressl:0= )
+		!libressl? ( dev-libs/openssl:0= )
+	)
+"
 RDEPEND="${DEPEND}"
 
 S=${WORKDIR}/${MY_P}
@@ -29,8 +34,3 @@ src_configure() {
 		$(use_enable ssl openssl) \
 		$(use_enable srv srvrec)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-}
diff --git a/net-libs/libosip/Manifest b/net-libs/libosip/Manifest
index 3d3c38406fd1..d7c4af1bc71a 100644
--- a/net-libs/libosip/Manifest
+++ b/net-libs/libosip/Manifest
@@ -1,6 +1,6 @@
 AUX libosip-3.3.0-out-source-build.patch 522 BLAKE2B f4b7b002a4f606b2531cfbda557d33da249ef822de23062a06a699676de58176fe1706a603c70ce41fc4fdbd8a73f6aeabe959838059d9111d0f6cb29d5e788b SHA512 ca4911303c290f635befa93c465ed25cef85c182c6645c1a3700ed6c68da9f268c52fdf07473e116f1a06daa477c4c1aa8803cec3cb151b45cdc1b504f705f4e
 DIST libosip2-3.6.0.tar.gz 598496 BLAKE2B 734242e556306eebbd1ca7f1c9dec3db5be9bc97453a71c3803ae4ee6e02e6426b1ff3a00caa8244369ac61857433b7a6976fc76908543429ef5a3bb3386f191 SHA512 58109fdc643673e811ce576374194d6d33b930ecec3221f31834471f52f5f2b2b30e5e331e245e33b2aafbff1aaa411d3a7657c25f3bb0b9d6cda0ae766fd538
 DIST libosip2-4.0.0.tar.gz 644958 BLAKE2B 78dc5477b3f7ea8a750478804d0486a16dcf99101f1c38c4532f18f2dfd3b7c844728115973f8afcd42e384547c38de28660970b020b3df6dbcf854928573057 SHA512 995fc67c9a7536628ebaec9f4500bafa8a2f88081531bbae5194372b51102d556de28aea7d121e20cfda82b302a8a4ceb6488dbad61676930fdc13accb12b961
-EBUILD libosip-3.6.0.ebuild 789 BLAKE2B 341d1b3cfcf6802e5ddb0015a55f66a4044f2e56ffdb3236e473f1c60d9c810172928ed0f7e19101054fcbbf94cc6ac2234e8e9678b63fe10a363f4eb3b9041e SHA512 1201c959dded3ab03a1b11a5353755aaa7a6de1aabe051e2a3a28d4efbabe7cdfdcd638cfe961dda61142063b3192f61767fc3252d7950bba590e825f729d160
+EBUILD libosip-3.6.0.ebuild 653 BLAKE2B 9b125b674bf8cb53545a9f4937c810d6069733952f70b56963988736da52423c9e5136e01b8a37029b9d3e8c8d89400334d577dc990161d87d840f1cabfc57bf SHA512 1ed7156a84235c329a296dbbf785934157d83171ca2a0a9090ec17ff14507f1104bacd2e12bc717ee08ac2102baaefb8175e3fbb8d378c765d34262062545dd1
 EBUILD libosip-4.0.0.ebuild 802 BLAKE2B d1c9a8bd0b9ffd25904a9527201d258caee652d6ad09f9bd70a5ddd8a5a74eb41dbf41de8d5ce5d95b9b8e3213914fa79738c313a81e7c1dc7bb5368cb3eb3c0 SHA512 c766065e2997a35b4d898ce69a0f6238ac5f02528f1c4d36cafa27dc385c35b1b4590ea1ce6418bfc9e68f83bee33fd6178bcb1a3a30ab48cb71bfe3195e385e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/libosip/libosip-3.6.0.ebuild b/net-libs/libosip/libosip-3.6.0.ebuild
index 54f60c8218a2..814555da67d5 100644
--- a/net-libs/libosip/libosip-3.6.0.ebuild
+++ b/net-libs/libosip/libosip-3.6.0.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="2"
+EAPI=6
 
-inherit eutils autotools
+inherit autotools
 
 MY_PV=${PV%.?}-${PV##*.}
 MY_PV=${PV}
 MY_P=${PN}2-${MY_PV}
+
 DESCRIPTION="a simple way to support the Session Initiation Protocol"
 HOMEPAGE="https://www.gnu.org/software/osip/"
 SRC_URI="mirror://gnu/osip/${MY_P}.tar.gz"
@@ -19,8 +20,10 @@ IUSE="test"
 
 S=${WORKDIR}/${MY_P}
 
+PATCHES=( "${FILESDIR}/${PN}-3.3.0-out-source-build.patch" )
+
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.3.0-out-source-build.patch"
+	default
 	AT_M4DIR="scripts" eautoreconf
 }
 
@@ -28,8 +31,3 @@ src_configure() {
 	econf --enable-mt \
 		$(use_enable test)
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to install"
-	dodoc AUTHORS ChangeLog FEATURES HISTORY README NEWS TODO || die
-}
diff --git a/net-libs/libssh2/Manifest b/net-libs/libssh2/Manifest
index 4a58bb263e26..336a3e5e89b8 100644
--- a/net-libs/libssh2/Manifest
+++ b/net-libs/libssh2/Manifest
@@ -3,6 +3,6 @@ AUX libssh2-1.8.0-mansyntax_sh.patch 770 BLAKE2B 743bb8032baab056fb578429bf540c8
 DIST libssh2-1.7.0.tar.gz 811714 BLAKE2B 488f6b9ea2bf072aba17e8d70136e9bf64b38a4cb6cb572fcdf0253ec5d9afa479c75858b42299e2be39589b9454ccfdd5f7c4a2e355e8e8b5037b2b637a8a4c SHA512 0f9dfd83196129568c00383e2e4fea29b3d8c4f3b1690f550a6748d1db68cc437b4ed083f5d3d4646365fdc839819619aea96eeaef5ab072c7023d13f08b5153
 DIST libssh2-1.8.0.tar.gz 854916 BLAKE2B 618c4a19789f2e5eda85852760dffff5672d420d2fa50393b05b7398a1913f74e5f6695f078628050ac9851965d6e45cf410b7c4590a8f18d67c718c829ab352 SHA512 289aa45c4f99653bebf5f99565fe9c519abc204feb2084b47b7cc3badc8bf4ecdedd49ea6acdce8eb902b3c00995d5f92a3ca77b2508b92f04ae0e7de7287558
 EBUILD libssh2-1.7.0.ebuild 1208 BLAKE2B c6031ef07a5e4692fed353bc0db362a77287b6834fdd4ed52743ef41a7cf2975097f1d854e8722df19dbd27b6982e99c57f461edaed1f64d1c708a9f737348ec SHA512 717aa9d9a636a099e7a6f63a1713414ab1055f6eb3691587bb4be6f80a8eb224fc702bcbf369c8b6252d7e0990f75584c379f2a9db7640c616874f13bc94e1d3
-EBUILD libssh2-1.8.0-r1.ebuild 1289 BLAKE2B dba4a8c7b5f6073139dc9069a29992b71a72089ea7384793d53966c23d35fb46d3135706eef1a331fe6ac56ec680b44472dcfbc92d9a93661267f9de690ff083 SHA512 c1cf948dc7769c85c3a1db0fa27f870363bc1c08038d6b5c67f13f72e026ecd9105de6edbfe5465ce81a4502c00c2c29ab84181f47410823512a0e6d2c50f42f
+EBUILD libssh2-1.8.0-r1.ebuild 1288 BLAKE2B d706a0f770a56807a21853d103bca18a0e95d671966ba4555aef6cf764b008e4fee17b2bfca2e06765b80ae0dc235aecd0578b10f0d7ae36f9e0e14269d1cf46 SHA512 91a07698c53b45a38928ce387c192a04bb3104d57e012bd7892f6d0fa6e5a96215c7dd4b866f7e8058347533d54f093cf309b45e99b0748cc1ddd2d3194e1b9a
 EBUILD libssh2-9999.ebuild 1131 BLAKE2B d4413bf097b892cb8fa1747614e0194ea0db57c91b00dad158da1b88405e3d1d6d9372efd5c39447f4a7c87b2e3d215f66df8bcc212e1fc599b839e8275ff6f2 SHA512 a9ed6e5e56b005f8c46f957befa279360e127f30b95a33f98e0f3dcd73fa3e921f45e5577f4d2632b841ee1ae002011b1042e1f67ac55bab2e56bbc19ef532c5
 MISC metadata.xml 432 BLAKE2B b528bab0bd90699af37096d4b6a4e06767e39011b4ef299600c8d35987768693224869ef5e05255ff28edb0ae8e14c38a04e20df953391a3df527d8609700a8f SHA512 c0fd5dce9a697c02886aeea4e001695bf51c6cec82a1c32d58a839dbd63f0085f9005c3504d40bd858bcca80ec2018bbf44bca64dd7692029e158612da39cabd
diff --git a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
index 5d3a9421cfdd..1b296bd8dfbc 100644
--- a/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
+++ b/net-libs/libssh2/libssh2-1.8.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://www.${PN}.org/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="gcrypt libressl static-libs test zlib"
 
 DEPEND="
diff --git a/net-libs/loudmouth/Manifest b/net-libs/loudmouth/Manifest
index a751b03c4762..6da192b15231 100644
--- a/net-libs/loudmouth/Manifest
+++ b/net-libs/loudmouth/Manifest
@@ -2,6 +2,6 @@ AUX loudmouth-1.5.3-gcc7.patch 919 BLAKE2B 085cc7bd0c1eabe91f45c8f1fce8f52518a58
 DIST loudmouth-1.5.2.tar.gz 115940 BLAKE2B cf9134fb68e09c4f03e605227a42b9fc092d5f4f5524a39e044f6bd573e7b9a0e7ba1161cda2655cdc513a05673dfa3600d0548209230314a9455c7a912123b7 SHA512 54c3eb7ef99604d7e2d5560dc6e5be176a188e6a0d82ae6c2f488e30f06553039aa03d6f818cec25f354479a2624f60f2233d7e63b54f331e934d554de9bfc87
 DIST loudmouth-1.5.3.tar.gz 114676 BLAKE2B 7a73e4e65046608fc8ec571b5448ab8344a8aed554fee1ecf7badd2ca5ed382ddb27e6ba7bd5d0a76d978d3079415b307f1b4ca77da450003ae936191cdbd33e SHA512 afae8b4ad1e9e5558cffa8f6b9f25331b01cfa09ea0b3defb74cac7d39477744e6d9181d3adefe242038020759df43558de0e61305fbc8e12a3b293b82856bf7
 EBUILD loudmouth-1.5.2-r1.ebuild 1159 BLAKE2B e36ed32efdf19275bc74694a814c814e92f0533da216d8a8a80cf731b40fa51f63377db99bbebf5900810be0b4d69d4dbb81c6d18c18ba5932fb5b59be35a68f SHA512 e53ddf6fa0c513671fddca1996c51f70b7cb4d83910ee9754b70d040872f38d63b54a054350e3b542869ba87140243a29af8e7e724c2102b75873b7004887b8e
-EBUILD loudmouth-1.5.3-r1.ebuild 1157 BLAKE2B ca5ff3d2eaeacf823355a74ad2bb50aa8e7c1c3d0e50b6e988d834f03e238e0127b91ee1a1527dde7bffd1a828b9ec09952606babc752fbabe103daa8da2f09a SHA512 d1c4dcba6ebfd4a54119e69063ba45bfd66f906aff39aabc7bdc93c0efccc3b9d5be1c213464d18a163e806ee572a38a79b08c461c21fb0da8709817fedbc14c
+EBUILD loudmouth-1.5.3-r1.ebuild 1154 BLAKE2B e66e0ec9c5afaa0486720b4182dcaf47231efad7d53a9e31c3b7b4e77b63fad51ccaccc1723319583f7e842839a1004d35694e9f5767c4d7480cd64e42640f6e SHA512 ddabb983f55c8265fa1572edfe2a5b06fb8879d721f84aafcecd0a8c8d837ae66f086749f521d22c2abf2b9b74edf1900532174103fc1a8227e8f3d3e72b3f14
 EBUILD loudmouth-1.5.3.ebuild 1204 BLAKE2B 3e5c33e9408cc1f1ecc93dcb7c05c4e6e407b79661f18d9e6c2cb3f5ef00c1d4363d5411e78669e868947e8aab1dd0675b98ee7c4a69f81402da0574f908b8b1 SHA512 3a8814478be13d64ef265ad92f5400638299d9497391bf36e40424b079dcf963e69dae6e08fee83adb9a6df196025daa6ad23bf232fb6490774d2aeb5a2a0d96
 MISC metadata.xml 561 BLAKE2B 25fe241cbe49f3c8a85c331659dde548dc8dc3dd4e7f904921ee7cf75ad3ef4f794823b937ff5d32c11260fdab1ec0f6162a9f90707e7d6abcfe7e0c7e004383 SHA512 69e89d7b5ffc2045a760a8b094bdc6fd230c10539550f9c0efb657a480bdee487f3e6cd5c87b2e037a1b1078274ebaa25efde6535aed4dfe57876a60a2faf4aa
diff --git a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
index 76ee3d614710..4235c6622029 100644
--- a/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
+++ b/net-libs/loudmouth/loudmouth-1.5.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/mcabber/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 sparc x86 ~ppc-macos"
 
 IUSE="asyncns ssl openssl static-libs test"
 
diff --git a/net-libs/zeromq/Manifest b/net-libs/zeromq/Manifest
index 2fc08dbff110..f29ddca62bb2 100644
--- a/net-libs/zeromq/Manifest
+++ b/net-libs/zeromq/Manifest
@@ -20,8 +20,8 @@ EBUILD zeromq-4.1.6.ebuild 1154 BLAKE2B ffd8644f36d38741f6b26d833a22424c0b1d24b5
 EBUILD zeromq-4.2.0-r1.ebuild 1268 BLAKE2B 0d2da48e27b0c84c45772307e24502f0a66eafe75e384b4977d28e5dfb500ba07a32179b48b0795dcbc76227892849bcc2d571e1f97e0a4f8dca6bf120dd13f8 SHA512 e899d165a43f8d07a1f653e046483219f1dc1827e946c48490af8ce7a156e229a7041a4051076a3584d3768fbc80f8220d8453e7f5e8c0129abf86f411c098a1
 EBUILD zeromq-4.2.1.ebuild 1209 BLAKE2B 88a85bc62cedded0176d93e46d231cea694faf27efce8f8d30912937418e0cec4e8faff3d5150d5f6edd8c57d61be2d07cb76eefcccd269c4f9fd64dd77920d5 SHA512 d748d27548088f9121f1b3143fed334f5d69527a2868f46d6a1cc74daf0e6164801573d2c4065b9383245ec686680245dc46a036e1e6432d7f138f7a39136154
 EBUILD zeromq-4.2.2-r1.ebuild 1380 BLAKE2B 30394e0c22a77aeae94d990f688ab2fc13663be68bcd8ae10e48ceb7316a75a5b1fa15528f5e92f02e9315e8ca536ae591d08671754b0bc6577fdf8bddb4082e SHA512 5ce25d3196c4be51420af99b4590d54c79b687d74a3b64ee44b1322bbce829e3e04b99ea5cb840f1f991f36cc12f9080806aa91666ba183372dee6963442b7d9
-EBUILD zeromq-4.2.2-r2.ebuild 1522 BLAKE2B 38be914e98448d712a2c1248b4621fd8c76ad6fc5162fae47462191421e1c841d8d0466ce5745933c0138f7afe8487cc7180a0bf9731e69f6017be6521165d10 SHA512 8430b88fe9f59db7a857828916a37fae2538577e8008c2d2e46c02a23da4fc4b677b8bb3929cae5eb5a5ce0deca7378ee8146c75d211a75dd6a64b242b54291a
+EBUILD zeromq-4.2.2-r2.ebuild 1552 BLAKE2B d1191b9f59fa5aafd1a0520d5a342db4241c937805212ff3fa8b6362192bf9359bbec45eab998138ec736614ca05a105c4170f9efcf24725771970196ffb2e9e SHA512 54b30057196c0231e7979ffbf5862be9a78d95cba0a2d860a0bd2e2120d538694d5e960a622968fb7cb994fdfe8c948222299e13c9997fe9012ecd3bb43b62ec
 EBUILD zeromq-4.2.2.ebuild 1217 BLAKE2B 9de51f8af0843322ca7aead2aca32e7b6b862b0299e62ab2678d2893740ccc964db6e1be93554469af84f9f97502b9bdfb36f61c4075d32d2fa2c5f571b5b350 SHA512 097c10c8db5d2526d8eb5b0958d92be09c842373aad9b22dfa4c8d26cc6fa982440d28b8ac1ddabf1bce0e4a8f5e71ba16ebeecd7de02304ccdf2e5509da655c
-EBUILD zeromq-4.2.3.ebuild 1394 BLAKE2B a653ff89292e2fec534a5c98dd2d5c1d47f9bcc686dbc02a9ecfb8ce897a6686331cdd1f0cda531eb274e139a6dca7573154bec3e6da520dca02a317e1ac75fa SHA512 8a6a134f28df471fbc625eabedf217abbc2176e8954aceb68d09cf85fc76a286803740eab445f3494d5ccb039d8504e34525f0d3e20d53bccbbe57d8b6b9c6e9
-EBUILD zeromq-4.2.5.ebuild 1394 BLAKE2B 6110fcdfe43070e1ac772014a6ac0020f7ea4f23674e87921cf1cc215d6fdc807d396a334057852fbea1f4292c922d86963ddf16e48c828fea365082b31d9db9 SHA512 9f2e9d026c826f1e89724a6e2a94c22e82389c788461f687d5f9bc811581a5191642fb860eb391b2aee68633be9d3d6e7d23b8a26cb240582db907c75710fa74
-MISC metadata.xml 1349 BLAKE2B 18a6db436dc83ddf5fbd62fedd61cbf98893970d536f176d61fad63aa2c04030b3d6f8fe2cae1edaff8bc918be07aad7370bd87ff6df0a838d7a4b94618dd1c8 SHA512 420989e7e605b7bcd1ee608d7e0ac06c563d3e37d01629963d7b6182eb3c187ca9667676ec73f267e15e35809d9552bc0d4407958d74d790381a3e45e1814296
+EBUILD zeromq-4.2.3.ebuild 1424 BLAKE2B 54e88a28c33f082e5bf06ec2e09ee13bd4a90569b50e6e30924a923d9b0f2ca511f566431c029dd891abe3d361823454deafe8f3e387b8d2e58044c315dc4859 SHA512 1dbe5809ffd456465d44ec2d2cd24aa3ac0a1f3874ac1ba412626dcea13a041bed003bf569b85d4a1b3a802f04e40cf3b3e0984962a1e032532e0ff5f7b209bf
+EBUILD zeromq-4.2.5.ebuild 1424 BLAKE2B 54e88a28c33f082e5bf06ec2e09ee13bd4a90569b50e6e30924a923d9b0f2ca511f566431c029dd891abe3d361823454deafe8f3e387b8d2e58044c315dc4859 SHA512 1dbe5809ffd456465d44ec2d2cd24aa3ac0a1f3874ac1ba412626dcea13a041bed003bf569b85d4a1b3a802f04e40cf3b3e0984962a1e032532e0ff5f7b209bf
+MISC metadata.xml 1503 BLAKE2B ce5679ad6407da1acaf9d260dd7afcebc9ca03b8df118df2848e7592ca7bb681f6dd649f05b18a467ab3ebeb099a51016faf6bdc96ed249f852c328ae2dfddca SHA512 879a3b484d68ac7dc82f82c24284d353f3c730f1ffc2f1badf3fbb0de42a2cd2223686578b91843ca244f8d7b75986c3edf9428f2620a1d4d19747edb3693f7b
diff --git a/net-libs/zeromq/metadata.xml b/net-libs/zeromq/metadata.xml
index 981328e740da..8d747a412580 100644
--- a/net-libs/zeromq/metadata.xml
+++ b/net-libs/zeromq/metadata.xml
@@ -28,6 +28,10 @@
 		<subslots>Reflect ABI of libzmq.so.</subslots>
 	</slots>
 	<use>
+		<flag name="drafts">
+			Build draft API, which may change at any time without any notice, and
+			is therefore not recommended for normal use.
+		</flag>
 		<flag name="pgm">
 			Build PGM (Pragmatic General Multicast)extention, a protocol for reliable 
 			multicast transport of data over IP networks.
diff --git a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
index 9afe36287c87..8c2ee822f163 100644
--- a/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
@@ -40,6 +40,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-shared
+		$(use_enable drafts)
 		$(use_enable static-libs static)
 		$(use_enable unwind libunwind)
 		$(use_with sodium libsodium)
diff --git a/net-libs/zeromq/zeromq-4.2.3.ebuild b/net-libs/zeromq/zeromq-4.2.3.ebuild
index cdef847f86e4..da4a8da09188 100644
--- a/net-libs/zeromq/zeromq-4.2.3.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.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="6"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
@@ -39,6 +39,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-shared
+		$(use_enable drafts)
 		$(use_enable static-libs static)
 		$(use_enable unwind libunwind)
 		$(use_with sodium libsodium)
diff --git a/net-libs/zeromq/zeromq-4.2.5.ebuild b/net-libs/zeromq/zeromq-4.2.5.ebuild
index 5d8ebac8b7fe..da4a8da09188 100644
--- a/net-libs/zeromq/zeromq-4.2.5.ebuild
+++ b/net-libs/zeromq/zeromq-4.2.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/zeromq/libzmq/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="LGPL-3"
 SLOT="0/5"
 KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="doc pgm +sodium static-libs test unwind elibc_Darwin"
+IUSE="doc drafts pgm +sodium static-libs test unwind elibc_Darwin"
 
 RDEPEND="
 	!elibc_Darwin? ( unwind? ( sys-libs/libunwind ) )
@@ -39,6 +39,7 @@ src_prepare() {
 src_configure() {
 	local myeconfargs=(
 		--enable-shared
+		$(use_enable drafts)
 		$(use_enable static-libs static)
 		$(use_enable unwind libunwind)
 		$(use_with sodium libsodium)