gentoo resync : 02.04.2018

29 files changed, 470 insertions, 50 deletions

diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d05077845fb2..1e6915de0592 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/apr-util/Manifest b/dev-libs/apr-util/Manifest
index ebdf34eed360..bc26f83aabe7 100644
--- a/dev-libs/apr-util/Manifest
+++ b/dev-libs/apr-util/Manifest
@@ -3,5 +3,6 @@ DIST apr-util-1.5.4.tar.bz2 694427 BLAKE2B 6de337fa48f0ca3775ba5b054b3a59726e25a
 DIST apr-util-1.6.1.tar.bz2 428595 BLAKE2B ab6eaf1594aaa1c7aae151319b630b83bdb8b68ec04f0e2b429b7c7789bdf274873270200ba43701359e2502d2be8624d8e42a56a5f399ec95a841e7c73ce706 SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 EBUILD apr-util-1.5.4-r3.ebuild 3696 BLAKE2B 740a3c17f34c719f7b3d977a6866eb45061504d31c93d5fc59189bb3161ef8dd9b641308e17999789f6c547c4a56ce765fb4cbff8052d6e48f5e54ad279708b4 SHA512 024b8b03d382a0e50f6eac0a6e48d72b5e0852d60824df671e5f7b793c06f323b89037507eb131d05b785c3c03bb42862f133f054d89720dee25ab5b67d2f432
 EBUILD apr-util-1.5.4.ebuild 3226 BLAKE2B af898360f8c4bf407d32c728b947e81caa11fad30ed3c7ee78e8c376a53b404708bd2f9b66b21d206e4628ff697aa2302ae51e56c5b591995aeafee9f4cf1316 SHA512 0240c037252088a9c1317b4092384730b041ff024e456a2f7c86860545447510be4614e97bf9845d4ef93a251aed346f4700159310611af08f67b74248bf45e6
+EBUILD apr-util-1.6.1-r1.ebuild 3603 BLAKE2B 0fc6012bf57e8ad9eb2f64ec9b00572d85da07889094a2eee7b93d79050153bd0f0dbef6c90591d1425e459c1489cf87b87f9415f1e41baa4e4f6e67443bbb28 SHA512 fdbffe248164f9f5a4cf7949058db79195e3883f05f639e4ea42d5eeefcf640263a75e1010db03bfc56e028b11366929958024b3e74b1ee4071b1892567be042
 EBUILD apr-util-1.6.1.ebuild 3602 BLAKE2B 429e1d93762ee3c4ed62b32acd739972f5e389201a63692e2eaa10e62d708c57a595369ed066b65269bad86a5e188ab5e4ad1e57dfc8250c1c019ef734c34a44 SHA512 6045a8af31e1fe8cdbf0e1210ae856badea9b1a80ffbd095fcbd2a3bc9e9e7b94eef8094f670eeb17c26f143e450b986620fdf250bbe74b90772f30ebfa24fdd
 MISC metadata.xml 515 BLAKE2B d300be91135a6a7dcc55a61b484b5dd1785663b9f3b51d621dcacffd9ec5747b69bb227f60dce1bf30a57fe93629de3c82fa7138a5f056e4f349ce6909453020 SHA512 af8e2bbded13ef475d1577eb4faa27e17a045804f1de3e79c4c3d736871db304872fc65db0d606c243292392fb4ac773711ad9e153369714689138249d469158
diff --git a/dev-libs/apr-util/apr-util-1.6.1-r1.ebuild b/dev-libs/apr-util/apr-util-1.6.1-r1.ebuild
new file mode 100644
index 000000000000..55ba63acefc3
--- /dev/null
+++ b/dev-libs/apr-util/apr-util-1.6.1-r1.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Usually apr-util has the same PV as apr, but in case of security fixes, this may change.
+# APR_PV="${PV}"
+APR_PV="1.6.2"
+
+inherit autotools db-use eutils libtool multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Utility Library"
+HOMEPAGE="http://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="berkdb doc gdbm ldap libressl mysql nss odbc openssl postgres sqlite static-libs"
+#RESTRICT="test"
+
+RDEPEND="
+	dev-libs/expat
+	>=dev-libs/apr-${APR_PV}:1=
+	berkdb? ( >=sys-libs/db-4:= )
+	gdbm? ( sys-libs/gdbm:= )
+	ldap? ( =net-nds/openldap-2* )
+	mysql? ( =virtual/mysql-5* )
+	nss? ( dev-libs/nss )
+	odbc? ( dev-db/unixODBC )
+	openssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl )
+	)
+	postgres? ( dev-db/postgresql:= )
+	sqlite? ( dev-db/sqlite:3 )
+"
+DEPEND="
+	${RDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )
+"
+
+DOCS=(CHANGES NOTICE README)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.3-sysroot.patch #385775
+)
+
+src_prepare() {
+	default
+
+	# Fix usage of libmysqlclient (bug #620230)
+	grep -lrF "libmysqlclient_r" "${S}" \
+		| xargs sed 's@libmysqlclient_r@libmysqlclient@g' -i \
+		|| die
+
+	mv configure.{in,ac} || die
+	eautoreconf
+	elibtoolize
+}
+
+src_configure() {
+	local myconf=(
+		--datadir="${EPREFIX}"/usr/share/apr-util-1
+		--with-apr="${SYSROOT}${EPREFIX}"/usr
+		--with-expat="${EPREFIX}"/usr
+		--without-sqlite2
+		$(use_with gdbm)
+		$(use_with ldap)
+		$(use_with mysql)
+		$(use_with nss)
+		$(use_with odbc)
+		$(use_with openssl)
+		$(use_with postgres pgsql)
+		$(use_with sqlite sqlite3)
+	)
+
+	tc-is-static-only && myconf+=( --disable-util-dso )
+
+	if use berkdb; then
+		local db_version
+		db_version="$(db_findver sys-libs/db)" || die "Unable to find Berkeley DB version"
+		db_version="$(db_ver_to_slot "${db_version}")"
+		db_version="${db_version/\./}"
+		myconf+=(
+			--with-dbm=db${db_version}
+			# We use $T for the libdir because otherwise it'd simply be the normal
+			# system libdir.  That's pointless as the compiler will search it for
+			# us already.  This makes cross-compiling and such easier.
+			--with-berkeley-db="${SYSROOT}$(db_includedir 2>/dev/null):${T}"
+		)
+	else
+		myconf+=( --without-berkeley-db )
+	fi
+
+	if use nss || use openssl ; then
+		myconf+=( --with-crypto ) # 518708
+	fi
+
+	econf "${myconf[@]}"
+	# Use the current env build settings rather than whatever apr was built with.
+	sed -i -r \
+		-e "/^(apr_builddir|apr_builders|top_builddir)=/s:=:=${SYSROOT}:" \
+		-e "/^CC=/s:=.*:=$(tc-getCC):" \
+		-e '/^(C|CPP|CXX|LD)FLAGS=/d' \
+		-e '/^LTFLAGS/s:--silent::' \
+		build/rules.mk || die
+}
+
+src_compile() {
+	emake
+	use doc && emake dox
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name "*.la" -delete || die
+	if [[ -d "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" ]] ; then
+		find "${ED%/}/usr/$(get_libdir)/apr-util-${SLOT}" -name "*.a" -delete || die
+	fi
+	if ! use static-libs ; then
+		find "${ED}" -name "*.a" -not -name "*$(get_libname)" -delete || die
+	fi
+
+	if use doc ; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	rm "${ED%/}/usr/$(get_libdir)/aprutil.exp" || die
+}
diff --git a/dev-libs/apr/Manifest b/dev-libs/apr/Manifest
index 818a1706c2ce..e60296adf0fa 100644
--- a/dev-libs/apr/Manifest
+++ b/dev-libs/apr/Manifest
@@ -8,5 +8,6 @@ DIST apr-1.6.2.tar.bz2 853363 BLAKE2B 99ff559a5a974c1cd116dbaa65a03c731ed8cdb439
 DIST apr-1.6.3.tar.bz2 854100 BLAKE2B ac3d38ef201d92bb2e50a35b6f41de6120e6196f1412377eae56f013dfebbe7fe8461fcd4e5e82be275bde51253a7f1c5f708e780203382b64fe61637d97226c SHA512 f6b8679ae7fafff793c825c78775c84a646267c441710a50664589850e13148719b4eab48ab6e7c95b7aed085cff831115687434a7b160dcc2faa0eae63ac996
 EBUILD apr-1.5.2.ebuild 4088 BLAKE2B 42d181fe7480bffff9577aff115731ac62e70513ee49fe459db6d82ac62431ac2323c698d139285449defe377c7fd90c586342773fb05722003cd4075807f165 SHA512 1675f275f3c37a3141f73434ec17ba6841f153c6a12edc20997f9cf5da462126cdc77d5ff7a625b0a3c9ef8e08480163c6b004ccd374d8e96f6a2a19df1fc775
 EBUILD apr-1.6.2.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
+EBUILD apr-1.6.3-r1.ebuild 4125 BLAKE2B 554bcdbfb44ade141ca48850d4c62bda067feb802b03f38d1a8b6d46a8f20fed1cf9e3498c54dee16e18bee1ad62df6687ef4839b1c6f5f92fea783a6d2b63a9 SHA512 8b53c6e0b587f63b75cd31099fdadeb4e410a1d825dd681ad0e3f9553a58c02dd1eb3dca47cacd580a925a46e9273c294d1e40f6a5b748d420b38f3e19e53fda
 EBUILD apr-1.6.3.ebuild 4079 BLAKE2B 0760c6a464e2ba6006a815d335aeb37a8319b6513252d113c65713417cbad361a892d1da65d63eeff7341881724f5790273b326116927e1c70acac8aa054c0e0 SHA512 b0d0cd2ae97fb8d3622d891385f17a2b2098b55278563880d4062f0014ea1831478cbd9363c898431a3073d7340332c3406e55c08eb075752865b021b63d29c6
 MISC metadata.xml 433 BLAKE2B 5c4d90e1cdc1424b0be48c81e249e5c3fa6740998cc37c52a164c25238bc7c20ca6a2c4a4924ccd076aaaa74c7655d95d5526a3d110fc0a10b931d9c41de4060 SHA512 7a1b6a73160b108816332f90e4e540f555e748584925ac3c7bb303ce5b6328abf255fc3f1c2b0e13f3c5d763841e847e400e781764083e3e96bc3809871a0df6
diff --git a/dev-libs/apr/apr-1.6.3-r1.ebuild b/dev-libs/apr/apr-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..ba7eb74e48bf
--- /dev/null
+++ b/dev-libs/apr/apr-1.6.3-r1.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools libtool ltprune multilib toolchain-funcs
+
+DESCRIPTION="Apache Portable Runtime Library"
+HOMEPAGE="https://apr.apache.org/"
+SRC_URI="mirror://apache/apr/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="1/${PV%.*}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc elibc_FreeBSD older-kernels-compatibility selinux static-libs +urandom"
+
+CDEPEND="elibc_glibc? ( >=sys-apps/util-linux-2.16 )
+	elibc_mintlib? ( >=sys-apps/util-linux-2.18 )"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-apache )"
+DEPEND="${CDEPEND}
+	>=sys-devel/libtool-2.4.2
+	doc? ( app-doc/doxygen )"
+
+DOCS=( CHANGES NOTICE README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.5.0-mint.patch
+	"${FILESDIR}"/${PN}-1.5.0-libtool.patch
+	"${FILESDIR}"/${PN}-1.5.0-cross-types.patch
+	"${FILESDIR}"/${PN}-1.5.0-sysroot.patch #385775
+)
+
+src_prepare() {
+	default
+
+	mv configure.in configure.ac || die
+	AT_M4DIR="build" eautoreconf
+	elibtoolize
+
+	eapply "${FILESDIR}/config.layout.patch"
+}
+
+src_configure() {
+	local myconf=(
+		--enable-layout=gentoo
+		--enable-nonportable-atomics
+		--enable-posix-shm
+		--enable-threads
+		$(use_enable static-libs static)
+	)
+
+	[[ ${CHOST} == *-mint* ]] && export ac_cv_func_poll=no
+
+	if use older-kernels-compatibility; then
+		local apr_cv_accept4 apr_cv_dup3 apr_cv_epoll_create1 apr_cv_sock_cloexec
+		export apr_cv_accept4="no"
+		export apr_cv_dup3="no"
+		export apr_cv_epoll_create1="no"
+		export apr_cv_sock_cloexec="no"
+	fi
+	if tc-is-cross-compiler; then
+		# The apache project relies heavily on AC_TRY_RUN and doesn't
+		# have any sane cross-compiling fallback logic.
+		export \
+			ac_cv_file__dev_zero="yes" \
+			ac_cv_func_sem_open="yes" \
+			ac_cv_negative_eai="yes" \
+			ac_cv_o_nonblock_inherited="no" \
+			ac_cv_struct_rlimit="yes" \
+			ap_cv_atomic_builtins="yes" \
+			apr_cv_accept4="yes" \
+			apr_cv_dup3="yes" \
+			apr_cv_epoll="yes" \
+			apr_cv_epoll_create1="yes" \
+			apr_cv_gai_addrconfig="yes" \
+			apr_cv_mutex_recursive="yes" \
+			apr_cv_mutex_robust_shared="yes" \
+			apr_cv_process_shared_works="yes" \
+			apr_cv_pthreads_lib="-pthread" \
+			apr_cv_sock_cloexec="yes" \
+			apr_cv_tcp_nodelay_with_cork="yes"
+	fi
+
+	if use urandom; then
+		myconf+=( --with-devrandom=/dev/urandom )
+	elif (( ${CHOST#*-hpux11.} <= 11 )); then
+		: # no /dev/*random on hpux11.11 and before, $PN detects this.
+	else
+		myconf+=( --with-devrandom=/dev/random )
+	fi
+
+	tc-is-static-only && myconf+=( --disable-dso )
+
+	# shl_load does not search runpath, but hpux11 supports dlopen
+	[[ ${CHOST} == *-hpux11* ]] && myconf+=( --enable-dso=dlfcn )
+
+	if [[ ${CHOST} == *-solaris2.10 ]]; then
+		case $(<$([[ ${CHOST} != ${CBUILD} ]] && echo "${EPREFIX}/usr/${CHOST}")/usr/include/atomic.h) in
+		*atomic_cas_ptr*) ;;
+		*)
+			elog "You do not have Solaris Patch ID "$(
+				[[ ${CHOST} == sparc* ]] && echo 118884 || echo 118885
+			)" (Problem 4954703) installed on your host ($(hostname)),"
+			elog "using generic atomic operations instead."
+			myconf+=( --disable-nonportable-atomics )
+			;;
+		esac
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	if tc-is-cross-compiler; then
+		# This header is the same across targets, so use the build compiler.
+		emake tools/gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			tools/gen_test_char.c -o tools/gen_test_char || die
+	fi
+
+	emake
+
+	if use doc; then
+		emake dox
+	fi
+}
+
+src_install() {
+	default
+
+	# Prallel install breaks since apr-1.5.1
+	#make -j1 DESTDIR="${D}" install || die
+
+	prune_libtool_files --all
+
+	if use doc; then
+		docinto html
+		dodoc -r docs/dox/html/*
+	fi
+
+	# This file is only used on AIX systems, which Gentoo is not,
+	# and causes collisions between the SLOTs, so remove it.
+	# Even in Prefix, we don't need this on AIX.
+	rm -f "${ED%/}/usr/$(get_libdir)/apr.exp"
+}
diff --git a/dev-libs/cyrus-sasl/Manifest b/dev-libs/cyrus-sasl/Manifest
index 229394fe93b3..952a47690324 100644
--- a/dev-libs/cyrus-sasl/Manifest
+++ b/dev-libs/cyrus-sasl/Manifest
@@ -22,7 +22,7 @@ AUX saslauthd.pam-include 160 BLAKE2B a715cd6e780fd6db773920231f6010c35f8998d563
 AUX saslauthd.service 277 BLAKE2B cf80eaa1e3f7ef854978a458e4b026f3f47891620ac63e7fd1b76d7ba6c9d2eeb3690542c416f1c316f4342f0c7316cce8992f46b32bc984ea2baaa43301185d SHA512 fa318aefec6f802badd72a4baf33875bc0021fc4889578877880971470d84bf645ad3c34dd10c582d8cc06ea512e3d56984902efaf09e2806a27feade5fc971c
 AUX saslauthd2.rc7 411 BLAKE2B 7cda36ea03aeea5f8e32c2fd0319a483dae78080fa213fb423bd1545e9d29193ebe077ebe5d15ab5940b2d805cb46a25ad2629757f55d2c40c4acc3f0adfa355 SHA512 1d5942a94ffbc15774443d60a88d4c89c7c3c6ea68b041d304f0110f6ec3aa2a812f59021cddc78de6f51a25bb00955e4e56d769e766a9d856f13774dd37ce83
 DIST cyrus-sasl-2.1.26.tar.gz 5220231 BLAKE2B 08fe5c1624e7cccb4b5e562f6987fddd047e1221b671cedbbb684d5a2f39e09a438ad14ffcedb5f398c203ca0b6e23574106c87f43a632028d50a69619c54970 SHA512 78819cb9bb38bea4537d6770d309deeeef09ff44a67526177609d3e1257ff4334d2b5e5131d5a1e4dea7430d8db1918ea9d171f0dee38b5e8337f4b72ed068f0
-EBUILD cyrus-sasl-2.1.26-r10.ebuild 7748 BLAKE2B 8abc8b39e91b5365a8600a9a816cef1bd672cc8bff6d5ac323eaab4b5ee8224f42e7fa0dd73c5db04377c8353035796a0813089006e643fccdbdc4059774a759 SHA512 0f6b65a025f71284512d26f6b690e593ede4c3b9b2ef4ddd8e3aa0ec6f509797ab27079c3ea8be37a2c8f9ecf7f5d3bc2ecc190e8820d1985e92afd4bfe56ecf
+EBUILD cyrus-sasl-2.1.26-r10.ebuild 7747 BLAKE2B 3591c10be1c22ca801706932806c47a2c37e665844407db370a65a646711dc8ab3065db0e72cb7466845317a7f4e7c3257d9c3d3f4b9d7818a47532520bdf9a7 SHA512 be1bb58cb9356345819c395cdbacbdde0e0a0e6c16b7ec608853ea22106097054280022832edb1b6a615f67870294098aeb8bdef5cda1e0be1c93a3fe345577b
 EBUILD cyrus-sasl-2.1.26-r11.ebuild 8396 BLAKE2B 65825008f1e4716dd5ba1326368460d9140413cd49fe4686f897e81dd95f071146dacf337a68f0e6fb85378c7a8ef59a30dd9e905b08b0abd82bb30a7d3e1e93 SHA512 844c7b5dd20fb1784bbce69daeb8c795e6e13195afd944cf10a795457cf2d2b7482ad53b4e54d7a0cad19d9eef73ca12e855a263d0392a1da26b7474b27dba08
 EBUILD cyrus-sasl-2.1.26-r9.ebuild 7655 BLAKE2B 1a5e6fc14b7b983d78d91f2846cc38bef0ad6e37dbd2f5659a3a3f1fc8b321024454a6e0de6dd2f4e5a0fcdc9ca18eff9b7fedd663c15da08cb293ee571caa23 SHA512 8026e9e7b2d58892a4405b1965a7080cbef7eb95e4fd57642197a625dc27bc04b9c41f01145f89c0fb82e999cef49897596cacc52194f1ff27dbc02987b9e5d3
 MISC metadata.xml 706 BLAKE2B a5682e5daac9c1a7a3a021989ae9ca856bb08c9eb0ba3a71070b7150cccc7ddfcd1d3d0fe1df33e688d0223ab7fb760ae028e4753523b28a4cedcb625c899d73 SHA512 1e7495deff4727296d29b25b7af535c0b36054b9172763ca8634b40f324dbc33697424a7e5565791c3131def3708c9ffb7e3e2362cbd8b334d650921fc2291ce
diff --git a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
index 187a24db1055..ded388d80e01 100644
--- a/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
+++ b/dev-libs/cyrus-sasl/cyrus-sasl-2.1.26-r10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.cyrusimap.org/cyrus-sasl/${P}.tar.gz"
 
 LICENSE="BSD-with-attribution"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
 IUSE="authdaemond berkdb gdbm kerberos ldapdb libressl openldap mysql pam postgres sample selinux sqlite
 srp ssl static-libs urandom"
 
diff --git a/dev-libs/http-fetcher/Manifest b/dev-libs/http-fetcher/Manifest
index 89d3548226ba..1b264d3eede8 100644
--- a/dev-libs/http-fetcher/Manifest
+++ b/dev-libs/http-fetcher/Manifest
@@ -1,4 +1,4 @@
 DIST http_fetcher-1.1.0.tar.gz 382470 BLAKE2B 6d2c7139d3e9435ff993fd5cd097c1b85b8900e048e6f93fc5e4f61f44f1eb47e0b9cd04c90985c15391ce862356a47acb56bfd8ff16050ca562095c80cb3f12 SHA512 136eceabc317bc4bf9956272ebbdae735ff589012ed0b17210fdb70051389bb7b3c1b43cdfc322a340e5538e9fd60b7b5216d3d46c439ac9df6af29e621bb1fa
-EBUILD http-fetcher-1.1.0-r1.ebuild 643 BLAKE2B 71d28369546d4ee8b1658ccdff854277881bcf83e6a487aac7a5e1f3fd3348a07f0c8b4e664b5d3d96302134e206d489cf71d34e86802c5d96c7935a5dab2a00 SHA512 fb0938ca79ca107313288213954ab62b20584a7f0ca3599fbffb99adb0bbdeb7768ea7ab3e0953d4dd9c496311e5e86e88b12d734a07a5c3f95d4ab20e4ef963
+EBUILD http-fetcher-1.1.0-r1.ebuild 642 BLAKE2B d0578513f3916e29d481152f0e3457392f3fc961299a26cba15811f16960db7ae325e34ea4b939599c82e8d2581aa2ffa13ededc18f098ea403ab98930b57f11 SHA512 6aa9890ad269f9a9cfb30042735eb36e2e55fae1abe4d101ae829196ae42652c9f9ba5770f3db0d6761aefb8b253a076668ef24b69577c753fc3ef264ae53b02
 EBUILD http-fetcher-1.1.0.ebuild 772 BLAKE2B 03a7679f460549f6cfb140eae2f09995bbb639efdf6f287f10166ce372fcd762549fcb63b09b6197c1312878387ebd8cbfe5c6536e4d65301092629a3440281e SHA512 8c0649790c8b0e67cb6148afe37a37d936de675e6d3df4bb2de5b7c04a8351855bbc7760d80a3721a7e526b3ccdba0902fe0b56cedd8cf93920434906d772f8c
 MISC metadata.xml 333 BLAKE2B af3916f84f1e47250b8a4abac78cd72b5b9deb2212a94de92030c1d5b6f754501e35e267112a51c907d3b97c4484fd5b1a952610dda668aa39ad84be042b99d0 SHA512 0be8b9414e23971abba7606c7332511588a0abadd68cf6f7026bd4a5b729e7bc9c7123af103c3dffa0c6cb04517a5302cbb015c4b6f20916eec87808bb8145f8
diff --git a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
index a9927cccc898..b55698fa999d 100644
--- a/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
+++ b/dev-libs/http-fetcher/http-fetcher-1.1.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2.1"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ppc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~x86"
 IUSE="debug"
 
 S="${WORKDIR}/${MY_P}"
diff --git a/dev-libs/jsoncpp/Manifest b/dev-libs/jsoncpp/Manifest
index a16e3d4477f4..570c77a090eb 100644
--- a/dev-libs/jsoncpp/Manifest
+++ b/dev-libs/jsoncpp/Manifest
@@ -1,5 +1,5 @@
 DIST jsoncpp-1.8.1.tar.gz 210629 BLAKE2B 5f9a7f51b463784c5a74a78b7189800a37797f233b1d5a66d34edc0689c77a2b96b230c0ed4dfc749401087c551dd5659a6d152e09342ca92250ce9ea91a293e SHA512 4203826fca4c366b51d28ffc928399c914ffaba8be1cada64ff118b5742e6b469d3fc3e59344587d851447857b479794c5697d4fd11a9a55b32a3a7a801b745b
 DIST jsoncpp-1.8.4.tar.gz 200226 BLAKE2B bbfa8cf7b6cfa6af34762b54de2da0e919849c65b1093b29f7a7ac437524d8b3cf07b42926b250489e9a289105df971fad798f3e73f908fac3e2f52a4e5467b3 SHA512 f70361a3263dd8b9441374a9a409462be1426c0d6587c865171a80448ab73b3f69de2b4d70d2f0c541764e1e6cccc727dd53178347901f625ec6fb54fb94f4f1
 EBUILD jsoncpp-1.8.1.ebuild 1353 BLAKE2B a561f153e32b1b81043fc02b64020a51235fb6557626aeceb49ddb58be7a424f8da93c2c8db7bb16a24a4d6cd86e01f8c7290f22926d983794fa2969ce4cbd1f SHA512 1479c2d2c5069ff392f158dc7f0e8320b1414d15ebb941a62a3e1359baf482e3e07093b828e38796180f5b08866e081fe3cd9f62efdca5104e9c583a1ec24a82
-EBUILD jsoncpp-1.8.4.ebuild 1373 BLAKE2B a32c6c4e50328118c8776423b6dda658be963edee2d95e49bdc6ae4b1b03783635edad81a6ca17a072a549edac7bc3ee040137d9ada594380093aa15d2595f5e SHA512 a4c52740211468a4f6711820f1c149e3e320e6fe2bc307801f9b3750b563f6ec7561df5e86624fd979581d41a06f9146fd9f242016f91a98b43f26c13eb404ca
+EBUILD jsoncpp-1.8.4.ebuild 1371 BLAKE2B c4eb8408e0151f36d504c95a4acd758e94c5a281b6aeef2ff0dae2ff69dd9d40a75a1bf2285943ceff34e4cdbed03d149cdad5ad69c826e0e1895387faa3b70a SHA512 4c41a98e1e35c593e11232635f3780c473e99b90848dd14d79b00dcab6738aa0af673cec3065e68faccbb6ba9c1cbff939fcb567289b3982d5602ac3c411c3b1
 MISC metadata.xml 522 BLAKE2B 6f34ae666bd7ccce5ccb075abfed8c32b8b5b3b32ac9fde277871ab735626fef6af12bf6b9da75f081726af7846bbe55cb8fe0663f107d6adb4f3bdf2db2dd26 SHA512 95270a54162bd5940602765fc238d7f30fdd0f42b8523774464a3f2e124b586dc0b03913a7b2db4bbb90f83b6384b97d8b8af8bcfabe7ce50dc93e2c87058530
diff --git a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
index dcc05896de96..cdce6d23b442 100644
--- a/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
+++ b/dev-libs/jsoncpp/jsoncpp-1.8.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-source-parsers/${PN}/archive/${PV}.tar.gz -> ${
 
 LICENSE="|| ( public-domain MIT )"
 SLOT="0/19"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd"
 IUSE="doc test"
 
 DEPEND="
diff --git a/dev-libs/jthread/Manifest b/dev-libs/jthread/Manifest
index e1d265a10405..86358f65739e 100644
--- a/dev-libs/jthread/Manifest
+++ b/dev-libs/jthread/Manifest
@@ -1,5 +1,3 @@
-DIST jthread-1.3.1.tar.bz2 8130 BLAKE2B 38929704e2d8308e3c9094d7627ef0f807af26f647aa0269bc726dfa42f541b6cf4cd21596687071e975e6e13b447b39a2c78a4c9b42131a991fc36183fa3bd5 SHA512 ea369ed8028266d67d2a7aeadbc6dd4859191f563dc2f328ad3622af3cc010e366c446a9d325fd689dd35473e6547e552dd0715a4ab308207f46260382f1603f
 DIST jthread-1.3.3.tar.bz2 8514 BLAKE2B ba24fb73f5b02e64af81f889401cc81acaf8c6d60fcfa0316b92e9356b36f8ec65a9cbf0fb999867ef2b590fe15a46136f165739279b14805d26dce8d55b1b0e SHA512 87c57db51014cd1af87cb4a7f6ac1ccfdff699cf72ff91ecbdb30702c844aad360768261d7bf6391b96639cc17f2fae29f3f3506a333b4ce6ed8a9ba64239e6f
-EBUILD jthread-1.3.1.ebuild 689 BLAKE2B 8e091bea5a215015413209fee5ea6ccd6a8a56b91afb6da7f6f79c90d61a0e1ddf779c69902daadec7e82b59c8b68c922815075d893999ac265379ca961e2f2b SHA512 44ac1c3e064896782da3fae3a522985adbfe6d6290608dbafe99cad4f0b9ec3180602ab5d5f79863201e83114b4e5970cd835329a785b732add6bf026d1acce2
 EBUILD jthread-1.3.3.ebuild 710 BLAKE2B 4780ef5cfe6bdec75d37b3721a1c5a1f9d750442bc585bc2fc94ff06535599963cd7bb5677aa0b6b322fd8df5a258e49c1b28829792520fcdb17136fcd8f96a8 SHA512 f2234e8f774c51761191fa8039a155539457fd6761479f0e86440f58670c69cab14c1188c0525a89037200cdbda8df53ece37e7a8ed9ace8915538e74fac170f
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/dev-libs/jthread/jthread-1.3.1.ebuild b/dev-libs/jthread/jthread-1.3.1.ebuild
deleted file mode 100644
index c958d0b306c6..000000000000
--- a/dev-libs/jthread/jthread-1.3.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="JThread provides some classes to make use of threads easy on different platforms"
-HOMEPAGE="http://research.edm.uhasselt.be/~jori/page/index.php?n=CS.Jthread"
-SRC_URI="http://research.edm.uhasselt.be/jori/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="static-libs"
-
-DOCS=( ChangeLog README.TXT TODO doc/manual.tex )
-
-src_prepare() {
-	# do not build static library, if it is not requested
-	if ! use static-libs; then
-		sed -i -e '/jthread-static/d' src/CMakeLists.txt || die 'sed on src/CMakeLists.txt failed'
-	fi
-}
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 087884f95f48..6e9f03bbab2e 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,4 +1,6 @@
+AUX 0.14-man-page-typo-fix.patch 1562 BLAKE2B 3e0bc53ca9cbe959ba6360c6226ee99a822bdd78918791bdcf367775d9f80a9bfcf7e82dcd3b4f45c4f10af31be1bacf4ecdbe119482ac6ee705d99967cf9826 SHA512 19aafe2b9d39484ad01544ad3c7937d98b0e8216de1ed8cd331106004f565a6c094888f1a0fd1f540c790728274079343d5db060a0e1a9647d600cea675994d1
 DIST libdaemon-0.14.tar.gz 340474 BLAKE2B 1dd6ac48e7b9a31f58688c7a59814435059287a30db80dd7c9cf69f9eaba27245424ecdbfd8719a4cf30d9686f4b61bb5e394821f66c05e770c244a0208e8f3f SHA512 a96b25c09bd63cc192c1c5f8b5bf34cc6ad0c32d42ac14b520add611423b6ad3d64091a47e0c7ab9a94476a5e645529abccea3ed6b23596567163fba88131ff2
 EBUILD libdaemon-0.14-r1.ebuild 1199 BLAKE2B 5dfa0749f2f582edc5003f4c1d9bf4f00d4100ad62d5ff058ea4a996d5e6f23d5f4bd74e18be8b9afebf23bdd45a825c2de0b488652b047c38bbf0c81763e806 SHA512 a4f0679b5702353f0dc05cc959dbe1cacba004093a69430fa71a85e2d0be0a80c07603d3e62152ebc203e8dc0fca412b764614cf9ccabb291e0fbcbd3d0d2070
 EBUILD libdaemon-0.14-r2.ebuild 1446 BLAKE2B 4e43ad8358555b319685431f1f7f3b2598116060cfe0d3dac1f923f06bcfcd84438036dd17fb2e174df5ff8397332ce557d81541b8fe7455cfa2ab1abe3027e1 SHA512 dffc3b0c3bedd18a109b5831009aaa309023645d4b419cf9f3d718cfc6629b2e0de5c738b681a093a3f7207b8076d88abbca880a002c2e7c5e8f1256446ff892
+EBUILD libdaemon-0.14-r3.ebuild 1405 BLAKE2B db375332157d9832bc58c6b08bfafce9828204c49e2eb480efc29137775eed2dc637ce4eace5ad2b81a732da69ab02c36c0c15c86c008c1095e2d1a7456a21a7 SHA512 e81315591386de77253f58ff3dad0310caccadf80f40c5aa2e3fd2573cc984babbb4f31329a7608454d3f7f23c157b457b2cad80cb55289ea9c636f9761259fd
 MISC metadata.xml 214 BLAKE2B 33eeb62dd1e0788ebdae4c98136c1c6a3b94a197683d1056a2e0c08566d14cde6469852038c1c8a574141f422d7ed3559332415f8ae79ab0fc223bc5fb55a1b8 SHA512 9b8ba52023f39252d9fc270607a4b928d4c961c893ef4f722d7e2ac567c66a3de509849ef754e3c8fef73923144251e5ebcc19b0d2ec93b94ab79ffb5c17cb83
diff --git a/dev-libs/libdaemon/files/0.14-man-page-typo-fix.patch b/dev-libs/libdaemon/files/0.14-man-page-typo-fix.patch
new file mode 100644
index 000000000000..70a6a0eb931f
--- /dev/null
+++ b/dev-libs/libdaemon/files/0.14-man-page-typo-fix.patch
@@ -0,0 +1,38 @@
+Patch from Debian fixing typo that appears in man page.
+
+
+diff --git a/examples/testd.c b/examples/testd.c
+index 6557dff..f734173 100644
+--- a/examples/testd.c
++++ b/examples/testd.c
+@@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
+ 
+         /* Wait for 20 seconds for the return value passed from the daemon process */
+         if ((ret = daemon_retval_wait(20)) < 0) {
+-            daemon_log(LOG_ERR, "Could not recieve return value from daemon process: %s", strerror(errno));
++            daemon_log(LOG_ERR, "Could not receive return value from daemon process: %s", strerror(errno));
+             return 255;
+         }
+ 
+diff --git a/libdaemon/dsignal.h b/libdaemon/dsignal.h
+index 1719784..4030e41 100644
+--- a/libdaemon/dsignal.h
++++ b/libdaemon/dsignal.h
+@@ -34,7 +34,7 @@ extern "C" {
+  * wish to handle with select() in your main loop with
+  * daemon_signal_init() or daemon_signal_install(). After that you
+  * should sleep on the file descriptor returned by daemon_signal_fd()
+- * and get the next signal recieved with daemon_signal_next(). You
++ * and get the next signal received with daemon_signal_next(). You
+  * should call daemon_signal_done() before exiting.
+  */
+ 
+@@ -54,7 +54,7 @@ int daemon_signal_install(int s);
+  */
+ void daemon_signal_done(void);
+ 
+-/** Return the next signal recieved. This function will not
++/** Return the next signal received. This function will not
+  * block. Instead it returns 0 if no signal is queued.
+  * @return The next queued signal if one is queued, zero if none is
+  * queued, negative on failure.
diff --git a/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
new file mode 100644
index 000000000000..a0be14f76444
--- /dev/null
+++ b/dev-libs/libdaemon/libdaemon-0.14-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="Simple library for creating daemon processes in C"
+HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
+SRC_URI="http://0pointer.de/lennart/projects/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc examples static-libs"
+
+RDEPEND=""
+DEPEND="doc? ( app-doc/doxygen )"
+
+PATCHES=(
+	"${FILESDIR}"/${PV}-man-page-typo-fix.patch
+)
+
+src_prepare() {
+	default
+
+	# doxygen is broken with out-of-source builds
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	econf \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--localstatedir=/var \
+		--disable-examples \
+		--disable-lynx \
+		$(use_enable static-libs static)
+}
+
+multilib_src_compile() {
+	emake
+
+	if multilib_is_native_abi && use doc; then
+		einfo "Building documentation"
+		emake doxygen
+	fi
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/README.html doc/style.css doc/reference/html/*
+		doman doc/reference/man/man3/*.h.3
+	fi
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+
+	if use examples; then
+		docinto examples
+		dodoc examples/testd.c
+	fi
+}
diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index de96bbec9d30..dfb35e50868f 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -10,6 +10,7 @@ DIST libressl-2.6.3.tar.gz 3228661 BLAKE2B 01d1e09a5c4541e1d6b35d0a1cd9246671a7c
 DIST libressl-2.6.4.tar.gz 3227935 BLAKE2B 48e865448a9e5b0b604b06060091073276aebd376506de73773a5eb9cb0bb4c5b93aa16353b4892abaee97ec933ad77e89775c3f52263d77bb17c68e481b4f70 SHA512 181761da573ff392aaee17dd3dde416d7cbb299ab3e07b49c97e279ceb3f619e78d1dc9ec4c59b0af024f0a8270ff31fe37f8282d0392be34c3143c9647cd246
 DIST libressl-2.7.0.tar.gz 3286436 BLAKE2B 883f24f70dc39c0547d63b852274ce12e03910d5b8eced70dbcffb062d236ad03b3e7dc0c265277f33666616f682b454130be18fb2f8112d42aabcaab8882a69 SHA512 d0e51fa7143f71266e9193fbda151c6e65ba403fa93b4030edcfd4909f5905b03586cc5605e58a62a190d46e9caf7191b6572106b8e92bc5400b2e1b6b7e025e
 DIST libressl-2.7.1.tar.gz 3362461 BLAKE2B 48b62160298ea7628c6671271b7ae9249cc3355cf6e504b504f7fef4ce62337f07e0a8117eef88fee7ae2a0517859f83e8540003dfd2c577f10841088d9eb180 SHA512 b7adc4250ba3fa5a3db20890aacb6b40dc9fbc29cc470c55dc9742430b9ba10ec122e6edf6f1671d77dea6347be1a23dc3d81b3b70f9b6e722212f356c36dfbc
+DIST libressl-2.7.2.tar.gz 3364227 BLAKE2B 49da6903a63425ac246c574b4c842706eaff184ba4a1768f61b2007296cb915f944f80f79edbad12b1a28a5552282522aa2b037195e2f917c06cf6917f1642e6 SHA512 12d00d057d449eb4119fc2f07034ebc0f1bbcb1602c0e07ef03b50440045eafd70594ddee352946cd9409aed8aceeb6988ba1643f582566fe3498499d94ece49
 EBUILD libressl-2.3.10.ebuild 1288 BLAKE2B 2fb26bb56c7a74b209df032d421e1ee8f47a3817878b145bbb3bf9c11a1630bed51d9203b4af28af83a2d59a92d0997cfdddb9de065537198b9e555b81a21ad5 SHA512 11102214e13ba952be7d85b3dc46b98e2330ad4139f9205bb5992e955092d647865bd2a3c31e3d9ac60404d5ed19aade4e322169c896cade2d5ae0164f9d52c2
 EBUILD libressl-2.4.5.ebuild 1288 BLAKE2B b0b15886c79d4711057dce71dd0bd087740a07799c9ecc529ff46572cbf4471cfd555ef3b95d9266a4c087bfc5f1b992e6112914500f7e4f04b0e67b2c66ce3c SHA512 52803ee1f7f98e2dbb84eccd2cdf69336572d90becee991f3b8866661c9473c01a102ea286396f9909f0ca69b4551356d3d64188f9a8b0c1c3fe2f2aa8b4f865
 EBUILD libressl-2.5.0.ebuild 1295 BLAKE2B 5a596e4f2129eed334a02e4bee41c703a7199d6c8398414d0660dc388ac69c3b566a0a4a7c36f3d8f57e30a48d69fe6f73a98fe6d06cb90a199c481841a4762d SHA512 2855b421ead68be0c5337fec2d4e4dbe957c6040e0dd731db73b20a5133b855b10e39891cc4eb7f78a29b92a4084c7e5c7fbf0cd86c0c2e39456f6786d0b53ba
@@ -22,4 +23,5 @@ EBUILD libressl-2.6.3-r2.ebuild 1315 BLAKE2B 27557c431220c36ead74810a6bec36f8c50
 EBUILD libressl-2.6.4.ebuild 1313 BLAKE2B 6e9c7908dc7d757ce44897c72dac0b9ea92503d650c6df46eda5dbf65efd9e89a92ab52203c91a3e40c9f1f23c1a99851ef2fd54ffeba81fa80872f0cd2a2445 SHA512 587f95f4fe9824fe09a2654f5a0d16a2bc9de9fc4d40e3e263259067f6dd3bbe8d1a4ef89cf90952a602acbfe2171dc16bee030350956d87864437905fafd6ac
 EBUILD libressl-2.7.0.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
 EBUILD libressl-2.7.1.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
+EBUILD libressl-2.7.2.ebuild 1328 BLAKE2B 5336c18471c6bf59da562fcac0b531d6e698dd51ebe0278c3289c4f4cdbb55842d1f8a5df6d9c7b1d4156fa85f3629904e33b551803d2e909bfe90508e79523a SHA512 52e36b6f5ca5a65e4ec331f141c77c1effa072db202d9668735301f2f704e9aa4e347f4f0a4d2f1b53f90c6aa5b6abbbe6bdfef4ed5a55b4c4b9f0bd19f2f730
 MISC metadata.xml 986 BLAKE2B 1c3f46d2694b17352ec02e1f2c331aae79c677ea638ed6290c51076961ac81f1b472576000fc162115f0ea1f037ac1c6ed0ea80c4603ef6a283e0ac4915fadad SHA512 bd38bf852aebe8dbac58fa324524f2fbbc0da5d22a673f5fa83dafeeee599f4022a46687d10f3d159b0953a0d4b0f1ea88156f7d04c2f1db864569dd29f3e4fe
diff --git a/dev-libs/libressl/libressl-2.7.2.ebuild b/dev-libs/libressl/libressl-2.7.2.ebuild
new file mode 100644
index 000000000000..af207c40014f
--- /dev/null
+++ b/dev-libs/libressl/libressl-2.7.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib-minimal
+
+DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
+HOMEPAGE="https://www.libressl.org/"
+SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz"
+
+LICENSE="ISC openssl"
+# Reflects ABI of libcrypto.so and libssl.so.  Since these can differ,
+# we'll try to use the max of either.  However, if either change between
+# versions, we have to change the subslot to trigger rebuild of consumers.
+SLOT="0/45"
+#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS=""
+IUSE="+asm static-libs"
+
+RDEPEND="!dev-libs/openssl:0"
+DEPEND="${RDEPEND}"
+PDEPEND="app-misc/ca-certificates"
+
+src_prepare() {
+	touch crypto/Makefile.in
+
+	sed -i \
+		-e '/^[ \t]*CFLAGS=/s#-g ##' \
+		-e '/^[ \t]*CFLAGS=/s#-g"#"#' \
+		-e '/^[ \t]*CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*CFLAGS=/s#-O2"#"#' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2 ##' \
+		-e '/^[ \t]*USER_CFLAGS=/s#-O2"#"#' \
+		configure || die "fixing CFLAGS failed"
+
+	eapply_user
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable asm) \
+		$(use_enable static-libs static)
+}
+
+multilib_src_test() {
+	emake check
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	prune_libtool_files
+}
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index bb5229447a69..2b5b967d989f 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -2,5 +2,5 @@ AUX libtasn1-4.12-CVE-2017-10790.patch 2268 BLAKE2B d3261e687f14596ae091951de1b7
 DIST libtasn1-4.12.tar.gz 1888450 BLAKE2B ccd3d5c7bbc9d00fd5be125a60b1705833bee4dff8bd0147cc6a7ed67ed679210984dedcf5d76f701ab53b8d7c127580ddb3162876aea9e1142f518271d12252 SHA512 6c551670949881193e39122f72948e4999ff1ba377f9ee5963d0a4ad1b84256e4fe42e9f6d6a2aa9f7d4ef7acc0e5174fb5cc3df5298524cdeda92f4b8c104f7
 DIST libtasn1-4.13.tar.gz 1891703 BLAKE2B 5a8bfefe1a3701505c8a1a4920412a6dd15fe771fb848fbd00f0a332388795dc6108a0fa5a282b4212abe0b0642f205bda53c2c39a4a2d65fa71e082fc76a6d2 SHA512 bf5b60a296795e0a8a4a658c0106492393aa7ce698e785256b3427c17215c2a5b6178a61a2043c93ea4334f754eabece20221ac8fef0fd5644086a3891d98a9f
 EBUILD libtasn1-4.12-r1.ebuild 1361 BLAKE2B 242d6f13825143cd912cc33e684c4026c56fbb534631463e6f9f125920e21cc1f1769d392bb3e9b33158c0111c66bcbf2851cdf8e08543ac486bb53d5314fa40 SHA512 be735c1c8b9b4113adfbe133ebe90d191bd11f32e3b108e55876b48252c5b83a2b0503bfe08b818edc5fa47bc63ffafd60dd40453ce03fa52fc23229155361bd
-EBUILD libtasn1-4.13.ebuild 1313 BLAKE2B ce2ae7644e2941613f4d72035f1e4231658845cd9886ee16bec8b776e7ba1a086420e83f209d11c2ba85d4dce09fc07f8910d222f5c8492c2148814c04d5168e SHA512 f97e040edf063e489d6a3261f0b7ae54f616d80600f95ac9659dfc277a403aa63937afb7433f10f444126c5e23be41be21d8bb9117aa9f6745d124cc45b63aeb
+EBUILD libtasn1-4.13.ebuild 1311 BLAKE2B cfd6eadb39484adc5ddfb15b11275a5308aa17e5c05126ca6d655835feacf4620c3bd9a0275ed55c6f55dfd8837a6a3c5e144b3b0957460ad8ca2582e9f6a83f SHA512 4759c6450eac07233c31548ec39934c43c26257c169048677a0cf4fdc6b80fdbc09077b31c40acf9a5a5c01ec938dd3a70cdae4496685203ea9d14993d1cd06e
 MISC metadata.xml 347 BLAKE2B d1cb59aca28df43f3b322b98daf2cefd4c91d45120bd47c5cb883dde59ae0ac9b8fcb092e0bd4b51e1f09aff48b97a6e1880568ae6796025a989b67902b01a7c SHA512 2f70d06c9e91e2d9305cce180c302b6b04b4831fd93c1897fd2027a1bf5855700c5531ba3f9c3fe93748df1db923d6ad4ea78bbe3cfd2458c0006457ed43a450
diff --git a/dev-libs/libtasn1/libtasn1-4.13.ebuild b/dev-libs/libtasn1/libtasn1-4.13.ebuild
index fcbde296e535..51d99a5e1960 100644
--- a/dev-libs/libtasn1/libtasn1-4.13.ebuild
+++ b/dev-libs/libtasn1/libtasn1-4.13.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-2.1"
 SLOT="0/6" # subslot = libtasn1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc static-libs valgrind"
 
 DEPEND=">=dev-lang/perl-5.6
diff --git a/dev-libs/lzo/Manifest b/dev-libs/lzo/Manifest
index 1a3d733285bb..c57c8a2d0490 100644
--- a/dev-libs/lzo/Manifest
+++ b/dev-libs/lzo/Manifest
@@ -1,5 +1,5 @@
 DIST lzo-2.09.tar.gz 594855 BLAKE2B e2a3f3582ce8290f4c66e80e5703af7074a4f097f8b8dd953d8ebcfeea42bad13bbc724c268ef09f5344ff9857ed60cb5092085b225a1b33f0d1252369516cd4 SHA512 7c64e5e7d2050d75ac8c59d613f6f7230b74746b1d207666755b07450053c8b73980f12f8a1ec59d2af0bada02beec126aaacb675b8088b5fe65e97ff7e6bfc7
 DIST lzo-2.10.tar.gz 600622 BLAKE2B 124b6645a2cb7f01f153c9fa6e1976378bdfb224841a7b45ab19c584c6ef704c20719ae87640b8d83f3f9269a57d9cc2e870a914124dac03a2ef1336e9feb9c9 SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4
 EBUILD lzo-2.09.ebuild 1264 BLAKE2B 7c75a964bdebeea828ece72bfe7c57f45eb12f53f8df7334dfcd977c96b6b56cc10849667fcc1483e9955e4e7fd61cc0c44a29e5ef3a2ac60b3eb501a7414660 SHA512 09ef14f13313574994a9c2386eb3cbead83f9ac807394a0138dac0c507b7f1dafa00a97f0997351b52d4d84507b7022d697de03c96b0e5ff3ae98950e03ff29d
-EBUILD lzo-2.10.ebuild 1049 BLAKE2B df787e1180b17342df4c86534593a94c149d6d836381a89cf2a941cdf7cad3a4991c881d4731d7dee8675a6a4af2c8d2bb43804e5d065a32de8ed3feb7bded15 SHA512 f935d19927a75d00bd882be7fc64ed6365025b7696359acb8e27f8a3ae6a6f9e6789d7d50a644acf76aaab22611047f677d8e1a11aef011d45d2d78ee8ffccda
+EBUILD lzo-2.10.ebuild 1048 BLAKE2B 9afa3325e09fcd29817af2ba68231ed5f53330c2be314a993e8610cc7e61d24afda69ffe59a402aa88dab7b8ed7d068afb49efb42d34a7c863cd7dcc3db4044a SHA512 76a1c74dc5dd42db124a6701315fd9a0916b293003429aa4c7059f226b482a50bb558a17db6f976406bdb951e5e93080344be7c108ea49bb5414495f42077be0
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/dev-libs/lzo/lzo-2.10.ebuild b/dev-libs/lzo/lzo-2.10.ebuild
index 0c6c87cabf36..7a1999d9443f 100644
--- a/dev-libs/lzo/lzo-2.10.ebuild
+++ b/dev-libs/lzo/lzo-2.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples static-libs"
 
 multilib_src_configure() {
diff --git a/dev-libs/qtkeychain/Manifest b/dev-libs/qtkeychain/Manifest
index e98f0eed2f74..2f682669ecb9 100644
--- a/dev-libs/qtkeychain/Manifest
+++ b/dev-libs/qtkeychain/Manifest
@@ -1,3 +1,3 @@
 DIST qtkeychain-0.8.0.tar.gz 34686 BLAKE2B bb20ace4393e04a8c8167ce112499fed75615ed165824bfcbba6a243e374523ff397aa85eb324ee8d742295a1bd4618a363fae6f92aae74caf09b9ca18d76c1e SHA512 be83ebc665a7916e96a2fd9990c72cd29373196591cf557fa6f9691f332ab67cc5475cab240c3e50e76cb37e0b7f189f0a1f2c3a70a6f655918e1d2465ed2f33
-EBUILD qtkeychain-0.8.0.ebuild 764 BLAKE2B 923f91cba8264889ad97a19fe3521708421609d9b984e04dfdffd54ff483d17bb77d706b3b49e22b92f2acb2bd0b6315bc7d2005ad3fafc3c0d84d22fbdb31b2 SHA512 236b96bc7cbfecd005eba28d430f0ad172b01a2616e2766cbb924673a1c0ba3201274fe8c78e45653644e09344f380dac0c63d95fc7db11fb5dc9e77a6ab040f
+EBUILD qtkeychain-0.8.0.ebuild 771 BLAKE2B 0cce7f8a6e103b0a982454fe6d6c3faf82d0b2bc69060a59a80e1cd2e766eb80d87329614e04e441b7471741bee23c67d6b463c13d24df8493b3fef4ec7fbbc5 SHA512 41a537d69f072adf00720c891382795d6c4cd38fc7936cf91517f5ee56005defddda4d51d16dd8317bad2d8afa23ee0bfc4a7e47689b3ee315efd1bc5fa04e8e
 MISC metadata.xml 335 BLAKE2B 676879e385fb11722b2c2d90478178b06223e401992e5c55b88081e513fc11904e4766f4525eba3349a0e9f2fdc81b08cbeb2d973f9b77cf70e9985afd63e40a SHA512 72e060f41c90aa2a177af6c32b35109f0489fd277f5864cae4f6be7e2577f0920ba75f811081b058a210d54415dfc7e8aed35ca233748e35dcd1233b59d47342
diff --git a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
index 162b6fb21bc7..3c29800f75b1 100644
--- a/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
+++ b/dev-libs/qtkeychain/qtkeychain-0.8.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/frankosterfeld/${PN}/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD"
 SLOT="0/1"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="gnome-keyring"
 
 RDEPEND="
diff --git a/dev-libs/ustr/Manifest b/dev-libs/ustr/Manifest
index 3e7b1fe9bdb5..94666685a250 100644
--- a/dev-libs/ustr/Manifest
+++ b/dev-libs/ustr/Manifest
@@ -1,7 +1,7 @@
 AUX ustr-1.0.4-build-libs.patch 2058 BLAKE2B 93162c8a35b892dd55a5334bbbfc718be959d597f969fdf1a712b49e490d04510268dad927ecdd2c9333eeb39c9091240887bb59b9b69a7e6e7887654c4676dc SHA512 122c38e4779526ae821341b10757454b28c35d59d99aee919d23f691fc06b019983467c5bdd0b8ca8d3e939e357e9bb588f61d4dd2ebb33235d720d637f20f86
 AUX ustr-1.0.4-gcc_5-check.patch 1087 BLAKE2B bd0414477fa789f5f6c3ef5292bd5b58f7fa8c396a739752c3fc5c4e8b456912273c5ab5fce6cc4a71830c003ac5c8e43d371177f2ed07abe3e614cff8bffb69 SHA512 b669a40929cf45cb83aa5c738cb58676cc9c08ee6c84dd7c79352c6aaa7aa36526a0878e98d78b45cfe3c7f62e9b014fe9eaf01fb1b4b460658cfcb1e77d7dab
 DIST ustr-1.0.4.tar.bz2 233723 BLAKE2B 47fd489cadda1487eb131b9a21148d4b21ad46320f5177a0f3c2b2e156a5756918e269053363d47608661a47d8969b8c505192edea316edbd9fc17649d8dbc91 SHA512 b7df6ca3a9f25ee6f5c9ab4325732d348de27c5e02ebff36a7d5706f56b2df994df35bd652825a28e27bbde731c6a5933248d99c670d192b1952e7534eec1510
-EBUILD ustr-1.0.4-r5.ebuild 1254 BLAKE2B c5ad37fdb8cc7673f9f661b57f32aab918555f8b62fc3b7dd4099ac32e56199715060a6942f6e1b229301211214da6a91acba3b4d2ed74d195e239a14058db78 SHA512 bd22aba048979830d93cc53d4fa8ebfcd025b83a14a3269fb36346d548f91d41e1610cca40fc92c30bbeaa17b6af1b3a014d1ec79e32da0b3f73bf4a8bfa1a2f
-EBUILD ustr-1.0.4-r7.ebuild 1779 BLAKE2B 98346c8e1d8727f89814cd38240b2bdb661f8391f861485f7f814913bfe00ed539d6ea23bd4d6023f4dd127bc4cced1ce1880d5385f33d8345340ace4bf51169 SHA512 88d4c68ee8c20f25d41235ab1aee8ce30511f0a9b8b545d1ccfcbedfb1aed42821f534fa71e1f21b54dd5238421ef09facc4d91806e9c338a106f07d38ed4814
-EBUILD ustr-1.0.4-r8.ebuild 2059 BLAKE2B 917633a67bf12b1c7b9a58be52de58771a409524be1f0fa7c3b4416fed8de372d79a672c67282157903caad5faff8571a28835c40ea78231835775a1db146eb6 SHA512 4df9541b465d75818149fb6fe1df0d5aa07874295c1f8bb548db819d8efe8e3d9e3378793d45b3f4b6792384e671946de61b8db1e423353cf883158c319989b2
-MISC metadata.xml 466 BLAKE2B 3cdef61a550b3dae2d25f9397b2bbc4bfd0cbbaaed18536d64aa4c0b16fb5bf30fd026a7f28c412539a0dab1ba7969df09fa5de6c5ab808fc21d8d760410bc25 SHA512 afdcaa3c444c74fa23b0865f058fdaec39f9854dc897d80a08b0c34004ba9f3f8425b3f5ebd3b0c129886928828be8bb339391fece5190f47c8e4dd0d2f435e5
+EBUILD ustr-1.0.4-r5.ebuild 1255 BLAKE2B 8920416abdc8636b05b95573dba65bc88f7fc22d30c6deac8b3916a7f2fc59be42e0d437a8c81ba8af393a645d3ea6a01d7f060f1025a1aeede3c64fd60f1aaf SHA512 5275fb21937faafd1c03a4fddb9c568ba44d8db15ff6faa56293f0a38df42ba9412c444bef4da57700a76c6992592addb4ec1e87a8bbfa71476bc5bd9202faeb
+EBUILD ustr-1.0.4-r7.ebuild 1780 BLAKE2B 1ca34aca9a83d64f43729eb1c1eb5f85e640dd861d71c0b83e771067cfea7c39e2885fdb802b67a31618c00e7835baa6cb3ec21c8820b3909591a55b239f15d1 SHA512 68ae97b187d6a67e4ac54f0493f1e957d26a4fda38214c4ad34b1111b8936d09a953911d03ce058e8877133a1206195a4506c92bcb89d61ce7c7f3097d764ec6
+EBUILD ustr-1.0.4-r8.ebuild 2058 BLAKE2B 9e59a44c3468d4ca5da7bcf1bfc7dfaf8c4e4ddadd71a4a2a1fb527a2ab24b4d1e74cab0ecf8c08404c417ea66d86e7b345553150797063eea0748a7b1169eae SHA512 42d520b0307873fb899eb237a66c8f04a126cd067b501ac948b22743b80808272e84b7a9c6d04c0979d0032b02efb0326a999c85609e971e41a052392992dfe6
+MISC metadata.xml 466 BLAKE2B 3c10f26ba9da9a631117b49d33763b8b4a4c137e25a388e49a0bfb3d4c4f53a69dc2fd230a76c9d82065f9b5990628789ff8433ac604a8d9e8dd50b3dd0b77a9 SHA512 cc4ceffec16d6ab3a009059bfa704477860f34e0124c2ec9edbcf306edd28aad431f0eaa67d74f57d2a5654db345beb5150116863d80037c96360a3414c505e2
diff --git a/dev-libs/ustr/metadata.xml b/dev-libs/ustr/metadata.xml
index b4a7d9f661c9..36a48162dc54 100644
--- a/dev-libs/ustr/metadata.xml
+++ b/dev-libs/ustr/metadata.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="person">
-	<email>Yamakuzure@gmx.net</email>
+	<email>yamakuzure@gmx.net</email>
 	<name>Sven Eden</name>
 </maintainer>
 <maintainer type="project">
diff --git a/dev-libs/ustr/ustr-1.0.4-r5.ebuild b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
index 65f80d287502..dc3c5bb1983d 100644
--- a/dev-libs/ustr/ustr-1.0.4-r5.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
+HOMEPAGE="http://www.and.org/ustr/"
 SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
diff --git a/dev-libs/ustr/ustr-1.0.4-r7.ebuild b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
index 2219f8892293..0d4f3ece9d89 100644
--- a/dev-libs/ustr/ustr-1.0.4-r7.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -6,7 +6,7 @@ EAPI=5
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
+HOMEPAGE="http://www.and.org/ustr/"
 SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"
diff --git a/dev-libs/ustr/ustr-1.0.4-r8.ebuild b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
index 0a00eb5d697d..6fb52670f3b5 100644
--- a/dev-libs/ustr/ustr-1.0.4-r8.ebuild
+++ b/dev-libs/ustr/ustr-1.0.4-r8.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=5
 
 inherit toolchain-funcs multilib-minimal
 
 DESCRIPTION="Low-overhead managed string library for C"
-HOMEPAGE="http://www.and.org/ustr"
+HOMEPAGE="http://www.and.org/ustr/"
 SRC_URI="ftp://ftp.and.org/pub/james/ustr/${PV}/${P}.tar.bz2"
 
 LICENSE="|| ( BSD-2 MIT LGPL-2 )"