gentoo resync : 28.04.2018

38 files changed, 211 insertions, 414 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f7936858dd6a..091098009ede 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/asciinema/Manifest b/app-misc/asciinema/Manifest
index d29bc462a305..7173a22e99c7 100644
--- a/app-misc/asciinema/Manifest
+++ b/app-misc/asciinema/Manifest
@@ -1,5 +1,5 @@
 DIST asciinema-1.4.0.tar.gz 35264 BLAKE2B 7a6eb179206afdcbe8d1a68cc7bdd7246cbb8d5ace870da40db2a1159a71f7cb18133c0bf286f0b0c1a4d2b7779fec9d1af602ca8b14d2fce478b84fe0e8adf4 SHA512 23c67a462acdbbbed495e6cc3e0e22ed028effcc945af30b5925854e216c6f74bb1b416d9b0001726732ae8be510796e996bbca69b225c20422143e5ed1aca5c
 DIST asciinema-2.0.0.tar.gz 47724 BLAKE2B 28ee2f19bdd7ca27720713af86492d2ac2d3acd53cadfdc82c613e187bcdb4d349c0a7629b7c48630b80c2f62bd20db25ebea43471bd04f205c2afca15b8b9c3 SHA512 af11134af1e69eabbf5a177000026830d418ed5d91e381f27c0631692bbaae04afc3f1086ea2065c54f49f227f7e575938c69d6d3bc8b5f9f06eca3fe084598e
-EBUILD asciinema-1.4.0.ebuild 709 BLAKE2B 27a91d956f34292775f821894d0f3912aa95266bdb0b9ba9c0891ffed2ad0170b2a05fd6d111921ccccdbfc92f65a6b31e844295fccba08937beba7a50fd01a3 SHA512 15b6fd8a75c3cea4e1edd7b7dc45b4b432ef2db23b65e0f61d12f8483ebbb0781553bad0797d6cd015faa1643a6d4936acfc2f4d530981ba4c60f9399de9b1c2
-EBUILD asciinema-2.0.0.ebuild 710 BLAKE2B 10ffee0f13368563be70554a9ef000d55e544ceab67750bb16124b1c79ade52e2312c50457c9739e3bf6b0bc4d298c8f15dad75a011aed151fc9bbfe1e00f4cd SHA512 10813195f0f5a896e82f28a29d2d70d37e773e36a19655d4e228b7b1e4a5c343a434978bc9b404328f72fa672f44f9869200049ea13923815b8f42086c72f464
+EBUILD asciinema-1.4.0.ebuild 710 BLAKE2B 9333b08023c830c78a921651761f62e7acfabb6c9a25e211a5f218f2cfc1462628b620ef2fe8299951882bbec125f9a179dba2c79b28606eedfe3ac50dfe3822 SHA512 196172138ad03c7a61cc789c991e8f89c9044e3596137d9f2a32158235246f559ad073159add9ea4120cf150925b6c922e7fd267f07db63226d2c640d082d259
+EBUILD asciinema-2.0.0.ebuild 711 BLAKE2B fa76d0aa5e0af569451920c6768c8664673bf31fbf2afef5b998ef2faefa189de3006cc0e05b0e36bc1364bfcc80415bccf5b1f0fcba3874015cdd68d80258ea SHA512 31ae7fe85c553e54e6e7c03ff4b16c536f57949cd5a843f6d08f34c1dfab9e8dd1b3f87ff27d65d885aefacb03d17213e8fce3e81ccad9b22bd5c3da7a6d5208
 MISC metadata.xml 352 BLAKE2B a3fc1910fe080d3617e64abfa1d758ac162556451fbdf1500b5b7b5ae0ecc703004483f2e0a322bccabe2857319faf3ad011f75ddf676c950b5fe59a5feeda1e SHA512 382168389e0950d78c6df79b6ad6dcf8bdf54fc9f877b23dd1e69c3983e931590c82a26694279b83834121af33a4aa8915a9c1907da2bd617b895a2cb4c31d74
diff --git a/app-misc/asciinema/asciinema-1.4.0.ebuild b/app-misc/asciinema/asciinema-1.4.0.ebuild
index 8abaa2657620..ee47c74f60ec 100644
--- a/app-misc/asciinema/asciinema-1.4.0.ebuild
+++ b/app-misc/asciinema/asciinema-1.4.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-misc/asciinema/asciinema-2.0.0.ebuild b/app-misc/asciinema/asciinema-2.0.0.ebuild
index 8e58e5137833..f3de7eca9d53 100644
--- a/app-misc/asciinema/asciinema-2.0.0.ebuild
+++ b/app-misc/asciinema/asciinema-2.0.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{3_4,3_5} )
 inherit distutils-r1
 
 DESCRIPTION="Command line recorder for asciinema.org service"
-HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema"
+HOMEPAGE="https://asciinema.org/ https://pypi.org/project/asciinema/"
 SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index 94a019495aef..28fd0f97d930 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -1,13 +1,8 @@
 AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d4fc6a8b59b9931db387e9045167973a0bb98ee11164ccbc13c7ea7fb545fab45a8112df5806a5a13d2b77abf682eec1390a15 SHA512 4e68e6068921e9ed54bda68af422a491cb530b60ffbb85fe1986a403cd9023522c179b5afcf65e22c223a665163d1c2d1993322d652053b72e3fe07efe692d59
-DIST ca-certificates_20161130.tar.xz 298656 BLAKE2B 8574745d8ef62262b339035ca11d6c09110bfcdb8b74865bf5335236cfb48d26cbca0ab3be6544bd047655e09178edce18ae9f4367f075bffd216382ad7020b3 SHA512 8395f27d2369d694b069e1bb250b06df05f732bd9f4a4dc8652091e9c96ad1a84003e28f59cb9e13fdfd22ca5818f495d80149692e74b2d63e34db4f6a95ee9f
 DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020fca9bcd5ef7066ae3cef195cbf9755f8b8e800a8e4076662fa1b7da600c2235e49048eb6e1166b0618fc7685221ab790fed3 SHA512 dfeb5a19bb33bcb127a159b73fcc63b41c99827d77eb4a6069def0cffc7ae8dd10dab97c1ddfdd5b70d0c93e650a51ed5dcd03908516e7ca8b3022bf46eeb7e6
 DIST ca-certificates_20180409.tar.xz 246908 BLAKE2B b553d4347f1a5b88fe59c7269dee617f61cde54d4df1a3aa4b3a7e9aa4b2ee81415e5c421352505ca4b2e0e480b053ccb04024bddfb51450d298d8fdd0567c36 SHA512 e0742da19416d367618547107cc0f1cc045d5ba62c30fb7238e0e36ec0d19ea48e2ffdee2c68a9f06954025c58db9a5376f149e221ede95a3a029cda39d86a53
-DIST nss-3.30.2.tar.gz 9499119 BLAKE2B 720ebe79c791f80f1717548cc9a8afea455ee8d74c1489bcecf0229b6f19f5bbcc66e9625ac74b655c55897450400090c19eac92c035276c8815fcf98bac945c SHA512 02f14bc000cbde42268c4b6f42df80680b010d1491643ef9b11e0bac31a286a2e7fa251c40cb4ac70b64883a1b90efc64440ef9d797357f8a47cd37195fc5500
-DIST nss-3.30.tar.gz 9500552 BLAKE2B 634734400562db5b35f170c5d138fbad45cfdc972a4154db8e2ce7f810d66ef9bad972c1204bc88bae7374d03f4d5c7845d85eb340b387189c258d09b3d7b699 SHA512 c21e9b5e4b689ea8cbc6f4d7913df43e2a78c4435e0ce092f2ce00e46079ce2268e17ec8527b283ac69eff3d96ff0165a5b42b6579bfe0a720115ff2938260d3
 DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20161130.3.30-r1.ebuild 5945 BLAKE2B 5b6b9a89b0c9d22f6199d0e57e257c96f3420b33a457554b8fa146fe7c291fe3117c2e2eedca4029d848c6068b1e6a5572c0785db455a795ca552dc13f022632 SHA512 58c4adc50e9dd6057ebf59cb87e545297aeef88444150edc88f0485be60cf00022c9f31196c10db52426a9a62249f0b87eb92b0dcf900c1a22f0a81ce575dfe7
-EBUILD ca-certificates-20161130.3.30.2.ebuild 6236 BLAKE2B 4c03bde354f763bdb5eec9a1301073d722958f4a43a70ffd44d838725a5cd40fcd165d19690298d0452df05e65e278581454b6b4d1a8467d8d9c8cb0f33643c8 SHA512 444a9cc25ce4e6d250c152d8b324548240bc759c08d6f230a3b6c274b34d65aa2e2ea9b15e87dbbb74dbe62739a345b21fb4c8c365ee2695f31d99ede256ea55
-EBUILD ca-certificates-20170717.3.36.1.ebuild 6262 BLAKE2B bd41872750beac402cc36432be0e0192946b3b481341a38bb608a28a8bc8d3d2249b7008ad54ee30f75bc930b236acd96d96a0d116a0a123b674e8cad9d2622f SHA512 f21cd3c4449441f7c386e328078cf9e5313940f5e5bf583ab4bbc7c4ec2d7d57cc7b1c07b427f3510292ee7bc01dc489962bb7fa6fa3dcd14bde9825715b4b85
+EBUILD ca-certificates-20170717.3.36.1.ebuild 6253 BLAKE2B 6bfae7c926cac36f7bb5358dd1113a6f8bb30bf0c12518ddbe9e0bd771dbf119bbb9e9592c026fde71910552cfd7864dc04b7e9e1686a316019d1bc7de1509b7 SHA512 d233304edde3acf2f0c9732debaa00641d1caa678e91c6fbd7b8ab40d9792fb8acba2468f54dcb34c9e5431aad969b57ce47afbe46bda1a7d5fa62041bfa8bf2
 EBUILD ca-certificates-20180409.3.36.1-r1.ebuild 5740 BLAKE2B c621da402c252de355a9b4bc3b9be63458444a490013e404fd9488a0ed653ee141311b28bacd8f0d0a791e9b985620adc6e50d824ba2d01f3156af42c6534496 SHA512 e16491771037d7c3e47be526a97f1ed10a13dd14992336258ea7b5ff8885f50efbb8ba9a2bfa799c4157e123e93a858090dbc3e1f736852337d8df12bac6df9b
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
diff --git a/app-misc/ca-certificates/ca-certificates-20161130.3.30-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.30-r1.ebuild
deleted file mode 100644
index 78bc30b3301f..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20161130.3.30-r1.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit versionator
-
-	DEB_VER=$(get_version_component_range 1)
-	NSS_VER=$(get_version_component_range 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~x86-winnt"
-IUSE="insecure_certs"
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}"
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin
-		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null
-			epatch "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null
-		fi
-	fi
-
-	epatch "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org
-			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	if ! use insecure_certs ; then
-		# Remove untrusted certs from StartCom and WoSign (bug #598072)
-		rm "${c}"/mozilla/StartCom* || die
-		rm "${c}"/mozilla/WoSign* || die
-		# and from Symantec (bug #613714)
-		rm "${c}"/mozilla/Symantec* || die
-	fi
-
-	(
-	echo "# Automatically generated by ${CATEGORY}/${PF}"
-	echo "# $(date -u)"
-	echo "# Do not edit."
-	cd "${c}"
-	find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ca-certificates
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild b/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
deleted file mode 100644
index 7b73e5336387..000000000000
--- a/app-misc/ca-certificates/ca-certificates-20161130.3.30.2.ebuild
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# The Debian ca-certificates package merely takes the CA database as it exists
-# in the nss package and repackages it for use by openssl.
-#
-# The issue with using the compiled debs directly is two fold:
-# - they do not update frequently enough for us to rely on them
-# - they pull the CA database from nss tip of tree rather than the release
-#
-# So we take the Debian source tools and combine them with the latest nss
-# release to produce (largely) the same end result.  The difference is that
-# now we know our cert database is kept in sync with nss and, if need be,
-# can be sync with nss tip of tree more frequently to respond to bugs.
-
-# When triaging bugs from users, here's some handy tips:
-# - To see what cert is hitting errors, use openssl:
-#   openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME
-#   Focus on the errors written to stderr.
-#
-# - Look at the upstream log as to why certs were added/removed:
-#   https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt
-#
-# - If people want to add/remove certs, tell them to file w/mozilla:
-#   https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit eutils python-any-r1
-
-if [[ ${PV} == *.* ]] ; then
-	# Compile from source ourselves.
-	PRECOMPILED=false
-	inherit versionator
-
-	DEB_VER=$(get_version_component_range 1)
-	NSS_VER=$(get_version_component_range 2-)
-	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
-else
-	# Debian precompiled version.
-	PRECOMPILED=true
-	inherit unpacker
-fi
-
-DESCRIPTION="Common CA Certificates PEM files"
-HOMEPAGE="http://packages.debian.org/sid/ca-certificates"
-NMU_PR=""
-if ${PRECOMPILED} ; then
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
-else
-	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
-		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
-		cacert? (
-			https://dev.gentoo.org/~axs/distfiles/nss-cacert-class1-class3.patch
-		)"
-fi
-
-LICENSE="MPL-1.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~x86-winnt"
-IUSE="insecure_certs"
-${PRECOMPILED} || IUSE+=" cacert"
-
-DEPEND=""
-if ${PRECOMPILED} ; then
-	DEPEND+=" !<sys-apps/portage-2.1.10.41"
-fi
-# c_rehash: we run `c_rehash`
-# debianutils: we run `run-parts`
-RDEPEND="${DEPEND}
-	app-misc/c_rehash
-	sys-apps/debianutils"
-
-if ! ${PRECOMPILED}; then
-	DEPEND+=" ${PYTHON_DEPS}"
-fi
-
-S=${WORKDIR}
-
-pkg_setup() {
-	# For the conversion to having it in CONFIG_PROTECT_MASK,
-	# we need to tell users about it once manually first.
-	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
-		|| ewarn "You should run update-ca-certificates manually after etc-update"
-}
-
-src_unpack() {
-	${PRECOMPILED} || default
-
-	# Do all the work in the image subdir to avoid conflicting with source
-	# dirs in $WORKDIR.  Need to perform everything in the offset #381937
-	mkdir -p "image/${EPREFIX}"
-	cd "image/${EPREFIX}" || die
-
-	${PRECOMPILED} && unpacker_src_unpack
-}
-
-src_prepare() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		mkdir -p usr/sbin
-		cp -p "${S}"/${PN}/sbin/update-ca-certificates usr/sbin/ || die
-
-		if use cacert ; then
-			pushd "${S}"/nss-${NSS_VER} >/dev/null
-			epatch "${DISTDIR}"/nss-cacert-class1-class3.patch
-			popd >/dev/null
-		fi
-	fi
-
-	epatch "${FILESDIR}"/${PN}-20150426-root.patch
-	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
-	sed -i \
-		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
-		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
-		usr/sbin/update-ca-certificates || die
-}
-
-src_compile() {
-	cd "image/${EPREFIX}" || die
-	if ! ${PRECOMPILED} ; then
-		python_setup
-		local d="${S}/${PN}/mozilla" c="usr/share/${PN}"
-		# Grab the database from the nss sources.
-		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
-		emake -C "${d}"
-
-		# Now move the files to the same places that the precompiled would.
-		mkdir -p etc/ssl/certs etc/ca-certificates/update.d "${c}"/mozilla
-		if use cacert ; then
-			mkdir -p "${c}"/cacert.org
-			mv "${d}"/CAcert_Inc..crt "${c}"/cacert.org/cacert.org_root.crt || die
-		fi
-		mv "${d}"/*.crt "${c}"/mozilla/ || die
-	else
-		mv usr/share/doc/{ca-certificates,${PF}} || die
-	fi
-
-	if ! use insecure_certs ; then
-		elog "To prevent applications relying on system's trusted root certificate store"
-		elog "from using CAs where at least one major browser vendor Gentoo is following"
-		elog "has decided to apply trust level restrictions, the following"
-		elog "certificate(s) were removed:"
-		# Remove untrusted certs from StartCom and WoSign (bug #598072)
-		elog "$(find "${c}" -type f \( \
-			-iname '*startcom*' \
-			-o -iname '*wosign*' \
-			\) -printf '%P removed; see https://bugs.gentoo.org/598072 for details\n' -delete)"
-	fi
-
-	(
-	echo "# Automatically generated by ${CATEGORY}/${PF}"
-	echo "# $(date -u)"
-	echo "# Do not edit."
-	cd "${c}"
-	find * -name '*.crt' | LC_ALL=C sort
-	) > etc/ca-certificates.conf
-
-	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
-}
-
-src_install() {
-	cp -pPR image/* "${D}"/ || die
-	if ! ${PRECOMPILED} ; then
-		cd ca-certificates
-		doman sbin/*.8
-		dodoc debian/README.* examples/ca-certificates-local/README
-	fi
-
-	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates
-	doenvd 98ca-certificates
-}
-
-pkg_postinst() {
-	if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then
-		# if the user has local certs, we need to rebuild again
-		# to include their stuff in the db.
-		# However it's too overzealous when the user has custom certs in place.
-		# --fresh is to clean up dangling symlinks
-		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
-	fi
-
-	if [ -n "$(find -L "${EROOT}"etc/ssl/certs/ -type l)" ] ; then
-		ewarn "Removing the following broken symlinks:"
-		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
-	fi
-}
diff --git a/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
index dc3945a60875..a3ffec2423cc 100644
--- a/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~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 ~x86-winnt"
 IUSE="insecure_certs"
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/faq/Manifest b/app-misc/faq/Manifest
new file mode 100644
index 000000000000..64013ec3ce07
--- /dev/null
+++ b/app-misc/faq/Manifest
@@ -0,0 +1,18 @@
+DIST faq-0.0.1.tar.gz 9916 BLAKE2B 1a585f56e72818978f5a79e0df3d59533a422127e8eacc79a05bb8704c0321b85c85e8cc9fd6eb633a1d5c39ea0b03d546d8da39462a94f369495ca0279a516d SHA512 38d5789dcf83042cc909424864e37d7adaf49bd3f2ab3da851005d528d3deb1e13ea37f68ba9245cf05e1fd1e45d1ab80c5d6d027ed785983d279cb8de05f718
+DIST github.com-Azure-draft-53924464463d2474f410415f1310d2b95fb8965f.tar.gz 1417651 BLAKE2B 3d8743ac35e813116ca7c093878669b721a1af052e2a8e48daa48736132bbf85326a363638dc4f253f825a730e4325c6bd6f83fccb319c507cdfc82c2ba978a4 SHA512 464b6cb5250bf35b505c6c40c509c357a46b32b96cee4c06917b35fb66cb5f21841fd5c812079356565d5ca2045c5e51eec74106f0d4731e9096e8224286f68e
+DIST github.com-BurntSushi-toml-b26d9c308763d68093482582cea63d69be07a0f0.tar.gz 41564 BLAKE2B 267579e3e2135626bfdce4524db2baf26a6dae14135421368c0f3cb21c41ec844cf42e127c4e0af7845b8caab4abd35c50ed5b0642fd713708e753ea54ee3100 SHA512 0a1ac02221645e06c60fdb5d162d1422fef791d101409c237a048a3d94708e3f1cf1e8e40bc390dc7cd6340f28514c2ae2d9c99a9ec2c3f969c7a8fbd5d0d232
+DIST github.com-ashb-jqrepl-70de3caa122cf7c7a737f28b666ab0d541560598.tar.gz 14761 BLAKE2B fe636cf5425d2b717647404a012ff297d3c792e6ac11998004c3813e30768ba9dbee7b12aefbfd8793db398c7e24dad805e54207f689399bf9ce7f5632cfa7bc SHA512 f0f6529ad9561919fe5ffecb2acb2a432560a01b24292eb3b2746ba45491455f5e7bb023ceee0de1fdc147471e9733f3946a3bde599d2bf8122177626ea54424
+DIST github.com-clbanning-mxj-eb2e8a1ed220896d2b16890436447a0eae496fae.tar.gz 1071238 BLAKE2B 34a7cfe6e46fd80ee49c05c4efa6ba615ca516af34828dc291029d3f8efc83548204930a2487ed0fc86590f1443c8ca2b5574071189872ac9578739c1ecb6445 SHA512 742f9ff55eda7785cc733189018f487c2a7debcbc2d4446f8631b1e66457aa433319d9b5e81ed405ca54581a300d6e979367422eb7729d2cd9edde36717414b9
+DIST github.com-ghodss-yaml-0ca9ea5df5451ffdf184b4428c902747c2c11cd7.tar.gz 11776 BLAKE2B bef19eeb755e2711ca293fa759ff98e39e17ef5679bef7b73592da7d44f1212dbe4812aafdfd63e585337623161074464a42f255873901e26091fd56f100b454 SHA512 a6848eeda7a6066b3df7582f681aa3382dc4e6d3c4579b4a13d8b31af317be56529a8ebf5c396b85490c0cddcfbe08872db8d747fedd212ff035678b9dfa9e0e
+DIST github.com-globalsign-mgo-baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2.tar.gz 409146 BLAKE2B 4fe1d3812f0f695febbb42809cfffbce50a8602ed89b58d1dca53255520b4945f30aee0a97141e28ce554f97edbaea3121020aee66db1a29cecd59c463755bc2 SHA512 7caac9d229c9cdd9a32a2f3f3117790bf67391c2b25c1ff88cd4ad6f5b0157f68affc90f86733919f961b5551e6732eab307309ddcf25f517dc8023ce6c96e0f
+DIST github.com-go-yaml-yaml-86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb.tar.gz 70230 BLAKE2B 0d6d56ae3ab1a46a2b8cb7cd89141825358d33b76d8bdf7a18bd42bea42321c2d294cabc1fcaee3b3761a56654da261f83cfd54db0f734b1471ab29df985197a SHA512 ab1f058e9702238b968e21d03c2d5effb606f6446e2f0a3f6fbd71dcfd90bf1a390bde6d3097f5e9b087e79645138e21a792862cc83d119ce4e0da2510be775c
+DIST github.com-golang-crypto-88942b9c40a4c9d203b82b3731787b672d6e809b.tar.gz 1455583 BLAKE2B ceb0dbb22869d4e5a43a8674138f725de7514af12131da26152bfc723d8981356f056547c63b81193da2b0b9d4587a2941b05dcd921d27ed9cb5d9db3abdd971 SHA512 2c81f213f5d934af9b449d0bcb4b6ee2078b4db842933aa84b6dcaf893029f2bba3657fd3cab14749cff8d4cca6ee64dc7478d4c790f314bb12ebb8fed88d179
+DIST github.com-golang-sys-13d03a9a82fba647c21a0ef8fba44a795d0f0835.tar.gz 802725 BLAKE2B f826bcb2230bbeba10b138d3fae0191ee0dda49ade37dc3462adcf16ea890dd87d86aa9793ada59b86ee427da4f2b336fee1a2cda7f079bf50a6f7b70360cc48 SHA512 d4f82bd401b6a805c7d369fac26edb5153f0f9654a6d9fc9809a545c8a3de546329a36f4fe8aa5506bd2d3b4da27dcd56cc2bd5ea18f2c5a033d7fa5f3820251
+DIST github.com-inconshreveable-mousetrap-76626ae9c91c4f2a10f34cad8ce83ea42c93bb75.tar.gz 2292 BLAKE2B 5220adf6cf740368b1b3a238795791b422d600b0293e350bcb5cae4f3ea452865e14e6271ae5d475c717da2c96cea7e0b12a5d71228f7679f67868de50852f17 SHA512 287a52df6a3ac88a95aed19ea2c76524f9916d6c6713365f56d86e08bd4ac686d3e231aefd3361ccfbf8c9ff702c94b3cc9d200640f05149f1d885ff61164b55
+DIST github.com-jbrukh-bayesian-bf3f261f9a9c61145c60d47665b0518cc32c774f.tar.gz 9353 BLAKE2B df1e8457587b5d27f0cbfe5707da54a38c3ca4311586674d9e4bc85ad55dc222e570002a2388fbbbf239e559e4438aa063971665e436e234ffecb7888a7aff3a SHA512 e3ba5ce1e2a8e3b61e70b4c9f31c4215ec8ffb4a558e51f74efcace20b6bcf958f675ffc1125623e79da616aba2518a6e4623596e3a47abf3d841ca9d9833cf3
+DIST github.com-sirupsen-logrus-c155da19408a8799da419ed3eeb0cb5db0ad5dbc.tar.gz 28758 BLAKE2B e34b383cbbddcadd99692609c9c20f94182735fc9879c0391947d0bc540df05cae7570230103a75a1e031fe8e30d1a4796eb17c80b4fba4a6d79bb999932205f SHA512 8f4f0bc4f4cd02f26f1ab39857e0e8120feab8ae3bb44b570e5d269b0c716d4028b824b04ad3923dc3e5a82b64c757e462ff74c71875677fd4fd276bd5b40926
+DIST github.com-spf13-cobra-a1f051bc3eba734da4772d60e2d677f47cf93ef4.tar.gz 100895 BLAKE2B a4534b0ce3689db04d2f1fc4bdd982576f62e1f4622b81f305b9651bb455b14d4b4b145cc4da49a52289b2b7f32cd9e1406e950020fc7b3f87bb0fdba98db12f SHA512 b33bc0c32d25d099f44b3c7cf653ebbcdbec00d45aade37d38e9c5e0f15bcff36ea736b13583d5ba88e7728815ffa986c4dc01b082df5ac2bfbd8db2c7f7d333
+DIST github.com-spf13-pflag-e57e3eeb33f795204c1ca35f56c44f83227c6e66.tar.gz 39045 BLAKE2B a933e0ae64f3bb344a7dffdf8f7ed73e4fba329a81794442ac3a8fa8904f29958bcc6b0f2af9848bc6c715b27abc5908d5ff16d23ea790899f71d2f5ff0ce6cb SHA512 c05ef1bc05cba471a55a11a2209fe4bdaaba491434a28b7f08d23528f4074b82a656b62972efdd49384dd49bde429d2d2c0e6ba311cae0d23f55b229b768dae8
+DIST github.com-zeebo-bencode-d522839ac797fc43269dae6a04a1f8be475a915d.tar.gz 13253 BLAKE2B 043d6824c2d0aeb69403610dc64b890d77a555483e92d54d0f70f630bc1b1326202118a8d2285335dea0605b582d640962a763eb4fe9cfee257a742a6da2141e SHA512 488aa86cbb20e0c1c0f22d053dd6e793f0d1e6faaa84c3e5da299e3714d493df2284ed74009002dfe8e33d06291d06791f74c257443ee6dc3ba84b871d59fec3
+EBUILD faq-0.0.1.ebuild 1768 BLAKE2B bf175e390eb6cf4d0a125b1623dac6c8513085a82c55559c56710eddec75a139a1d68cbaccb74469acf69bf0af038344dd30e53705b7bd6d32f5ff534de2ff74 SHA512 2bbc7f2b9752397c5861b16bc053d09a46a2bf7a0ebf23f367620eed404d0a19ada0711f50fbb71d742127f260779594a60d07a7aa675459b47f73a55562bba9
+MISC metadata.xml 324 BLAKE2B 4e3f348285a9ba513382c20b245bcaf32529fa44a7b9152f3f3ee99e4e730d056ea06a808d0797ff02fe0a1a38a39959ca364bf85dba177d9a6bb70575f92488 SHA512 19ca8fa72afdebb725d33ff7f0faacf4e643c4c13af81980bf96beef3f2d29614d2ea5de4a347a7b83006078ae6d23f92fe58ed25b690699478abb743670a654
diff --git a/app-misc/faq/faq-0.0.1.ebuild b/app-misc/faq/faq-0.0.1.ebuild
new file mode 100644
index 000000000000..ddd31a08b0a2
--- /dev/null
+++ b/app-misc/faq/faq-0.0.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="github.com/jzelinskie/faq"
+
+EGO_VENDOR=(
+	"github.com/Azure/draft 53924464463d2474f410415f1310d2b95fb8965f"
+	"github.com/BurntSushi/toml b26d9c308763d68093482582cea63d69be07a0f0"
+	"github.com/ashb/jqrepl 70de3caa122cf7c7a737f28b666ab0d541560598"
+	"github.com/clbanning/mxj eb2e8a1ed220896d2b16890436447a0eae496fae"
+	"github.com/ghodss/yaml 0ca9ea5df5451ffdf184b4428c902747c2c11cd7"
+	"github.com/globalsign/mgo baa28fcb8e7d5dfab92026c0920cb6c9ae72faa2"
+	"github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75"
+	"github.com/jbrukh/bayesian bf3f261f9a9c61145c60d47665b0518cc32c774f"
+	"github.com/sirupsen/logrus c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+	"github.com/spf13/cobra a1f051bc3eba734da4772d60e2d677f47cf93ef4"
+	"github.com/spf13/pflag e57e3eeb33f795204c1ca35f56c44f83227c6e66"
+	"github.com/zeebo/bencode d522839ac797fc43269dae6a04a1f8be475a915d"
+	"golang.org/x/crypto 88942b9c40a4c9d203b82b3731787b672d6e809b github.com/golang/crypto"
+	"golang.org/x/sys 13d03a9a82fba647c21a0ef8fba44a795d0f0835 github.com/golang/sys"
+	"gopkg.in/yaml.v2 86f5ed62f8a0ee96bd888d2efdfd6d4fb100a4eb github.com/go-yaml/yaml"
+)
+
+inherit golang-build golang-vcs-snapshot
+
+DESCRIPTION="Format agnostic jQ"
+HOMEPAGE="https://github.com/jzelinskie/faq"
+SRC_URI="https://github.com/jzelinskie/faq/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="test"
+
+src_compile() {
+	pushd src || die
+	GOPATH="${S}" go install github.com/jzelinskie/faq
+	popd || die
+}
+
+src_install() {
+	dobin bin/${PN}
+	pushd src/${EGO_PN} || die
+	dodoc README.md docs/examples.md
+	popd || die
+}
diff --git a/app-misc/faq/metadata.xml b/app-misc/faq/metadata.xml
new file mode 100644
index 000000000000..9003aa1128ff
--- /dev/null
+++ b/app-misc/faq/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>mrueg@gentoo.org</email>
+		<name>Manuel Rüger</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">jzelinksie/faq</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/app-misc/g15macro/Manifest b/app-misc/g15macro/Manifest
index 34c45c2dfb21..2da7333e12ec 100644
--- a/app-misc/g15macro/Manifest
+++ b/app-misc/g15macro/Manifest
@@ -1,5 +1,5 @@
 AUX g15macro-1.0.3-Makefile.am.patch 345 BLAKE2B d00da6975fd9a25a3ff6fd8272466e0472e9d1f97cf9a4e0c9af2455ed3ce382827a4ddfa7325f04a9351915a08d5b04b1afc98b03de834670ceb003160fe5a5 SHA512 234b05866e993ce4bf486f8e9b57166c481fdb2487a1a026664b9675a79061cf18c6fd2a0b9e68580823fff4c393b1cfb0048ff24a1ced779790f270918aa00c
 AUX g15macro-1.0.3-configure.in.patch 280 BLAKE2B 3b8f6aa6b5562e19c419e722abaad6f831ef410e1a678784f48bc79a73258d06a780fb8984b66421ef5d1ff9685968aeaabeab31c22edc6f571fc6712915996b SHA512 a754e925f6ab35615a768f2869fac784e987785bc42f3be7b7bb32999dbdc1a332118db644867e39e426fcfd6f143e277187b415c8f43dd6861f54c41ce3625e
 DIST g15macro-1.0.3.tar.gz 324859 BLAKE2B 66168090d6daa82c1a9ce3fb8b028316f12691b599fecc683d141a3584bcbf28e5169044d5baa0957c27e51d7634092bf65158da1106059ec87cdfa4f9fa7c36 SHA512 8497aea4a6c8df3b9015ce87c38c8ad20fc66c6b2b04368716a11130e09ef75e32ba9664b57fcda0f5d8a962653ba46e6f851e6e56110d89629765cf77fa751d
-EBUILD g15macro-1.0.3-r1.ebuild 820 BLAKE2B 326fd87f5566237bd939041b963c51ca494489f674b4db7d6cf93c37f677aa177934d88cc9f50fc07c1fa86f767e80a2800518fe6c0a523effa756fcc00154e8 SHA512 81592388ad234c415e89571cbfa57bd437b5deba2479918abf9b587531e723e7a423388f051cbba012904a3d4fb022fbf68cfd1bdb0796aa3d437f8c41b35b33
+EBUILD g15macro-1.0.3-r2.ebuild 781 BLAKE2B 0d475d9a4d347393929833e8dae183f81fd158846b4316400451bb82af5861d52bbd80b9efb0f2de5083f039a6969dd6247fb7de02702565c65dc08539b37221 SHA512 f5175f5dcc2ad71b03492690195a72d561784ec8e34ba6320cc6dbf84f4aa5bc2bf58947b529a3e96f649afca7d932a5efc2e48830270a102e0cdf04fffa4291
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
index f2f9d8cee102..c86e4550bd28 100644
--- a/app-misc/g15macro/g15macro-1.0.3-r1.ebuild
+++ b/app-misc/g15macro/g15macro-1.0.3-r2.ebuild
@@ -17,8 +17,6 @@ DEPEND=">=app-misc/g15daemon-1.9.0
 	dev-libs/libg15
 	dev-libs/libg15render
 	x11-libs/libX11
-	x11-proto/xextproto
-	x11-proto/xproto
 	x11-libs/libXtst
 "
 RDEPEND="${DEPEND}
diff --git a/app-misc/geoclue/Manifest b/app-misc/geoclue/Manifest
index 4b7f23d0b915..105754094817 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -7,5 +7,5 @@ DIST geoclue-2.4.7.tar.xz 368472 BLAKE2B c083f0694a90292b7b0834075e4fe15d29f07cc
 DIST geoclue-2.4.8.tar.xz 368404 BLAKE2B 244aaa01ebbac57839eb8e5a19f543f3940217de9ad076b55c6054ff818e3c2948d3419e7391e05ccc17a5234a76980dee0470ae806d437db95db4a9e128a678 SHA512 1741962b4bdce925af090961bd50f4d0d934f7b81e53968d5d8ea7957e8593c4c9a8084bbd149c454d76f2af35be036748f212c99506b475567384a43f579f3d
 EBUILD geoclue-0.12.99.ebuild 1976 BLAKE2B ed7a3e5561e9437c99fdd802496f8a88e9346bbe4c37cd5c58bb59ccbd9424483bb6faa24ccb15bbd66c7512fd2fe7bc7c9f761f3e7bcbaf674825953a9fefbf SHA512 ded60d1f1045cf6d05963fcb49eba167445526833651c095874c01b5dba837075b0ae4a0e4586f31a3dcaf56dcd4b2ee6019e926608f4e5218d0bea7db9eddc8
 EBUILD geoclue-2.4.7.ebuild 1575 BLAKE2B c11bb62da829bff6334da9dee337b28aa6285268a17f7426ccc92c85cf5bb610140428d110257714ee1dca8c6026e863e626f677cdd8923c1e45aec091d84b05 SHA512 1f7a3dc12b1904cdcbe8dbdd01a4bd66d24e0ff0892351208aac3b6985225c4185a87aae5828a9fb69730add7b3efab7ab6545fa3020e72f383a01454257da38
-EBUILD geoclue-2.4.8.ebuild 1579 BLAKE2B b2649ccfdf168e66a33f77d8d3811e6fa6fbceb61cb8ee9bdad217bb959ac390c076c930a04f94e4fb1e2a54b835ee5c0944ea91f89a93969cad1db40ead6681 SHA512 9770c918e71931bc8416f26d4a94bd583ecedc8bf87749e50250c0ff288a7379c0fad5a8bc13c8a393c8a5f085a8e0416f92b5d026174fb1d645b8be06b1db93
+EBUILD geoclue-2.4.8.ebuild 1577 BLAKE2B 2a1c4e4dbc825798a172a90cc1ed1ecea0b92b130bf03587a3b24564cb514df2289516420d9924def46322041849ef7fc1e6a28f7df3813cf88d7550d9b5f873 SHA512 3ac7765ba17df00d3864eb0c8fab5d21c43a9974d85e238789c461a7f267a2e65757d5469c59cb3f593aaacc6ab4907c92e60d63765e4b73237832d09d990658
 MISC metadata.xml 1252 BLAKE2B 19af081815ecc62a145bd3839b4822498c5f689665adf6cc46b7ff7e1615d5d22ce54d2bc551a2f619f9d7ebc020400e795ec5962295a88288546a7ed24af492 SHA512 809d9b3afe58bf9e00bc826dbc7e2253461426084f8290d2b53ff0785666ec7b3626997b453a36a8eefcbae220f2f273008c3c51a7071a13da54e4e897d5c5ae
diff --git a/app-misc/geoclue/geoclue-2.4.8.ebuild b/app-misc/geoclue/geoclue-2.4.8.ebuild
index 9990c91df100..ba3294f255e4 100644
--- a/app-misc/geoclue/geoclue-2.4.8.ebuild
+++ b/app-misc/geoclue/geoclue-2.4.8.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.x
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd"
 IUSE="+introspection +modemmanager zeroconf"
 
 RDEPEND="
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index 3c5e5aff4a6b..d7cba559f88a 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,5 +1,7 @@
 DIST go-jira-1.0.15.tar.gz 1381623 BLAKE2B 430451fc6f86c72421619433427694f4a7a756c24cbd239c38ddcfb8b35a83215377bb239af43ceff90da1a9122d312190b8185dc5e04032a50491c8f61d9c2f SHA512 e4ceae1577ad8f512a9375775308687e78a50131faa298ba1cddc8397a8a04feca55f132c022d942458e8cab68f28e5610bf4b3334fe2c16f71e924e290ee955
 DIST go-jira-1.0.16.tar.gz 1381917 BLAKE2B 0f46b97b3146c5e04921827278bdcf67736ff015731dac7a2481e0243b7fac081fe368eed5bc696e9ff8973291502c2087655ca518c5dc2f23e96fa63a288f46 SHA512 c5fd28fa33f11a9dca030ee28141e5b09e59cf8777011bc8c02ed4c7604efef1dcd9ac1215351a4d292a4b524998f9b1dcc61df457a05462ca78a8dffa9ad608
+DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
 EBUILD go-jira-1.0.15.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
 EBUILD go-jira-1.0.16.ebuild 705 BLAKE2B 3084d97fbb21bb6b9d02d2111ebd0c4b691b8603a372ac8f64e75da24a43eeb0bdc3492412d6c77c3bf3ad8322c0868dd1488411af368e219146753eeec2ca33 SHA512 b304de839b8e81b6d02ff7113417130c9b7e65d1110dbe52b6d5f262fbe150292635205a8afc78d81cffe457f35f5e32aa2a0b57242d7db4298a98029ebba2eb
+EBUILD go-jira-1.0.17.ebuild 705 BLAKE2B 3084d97fbb21bb6b9d02d2111ebd0c4b691b8603a372ac8f64e75da24a43eeb0bdc3492412d6c77c3bf3ad8322c0868dd1488411af368e219146753eeec2ca33 SHA512 b304de839b8e81b6d02ff7113417130c9b7e65d1110dbe52b6d5f262fbe150292635205a8afc78d81cffe457f35f5e32aa2a0b57242d7db4298a98029ebba2eb
 MISC metadata.xml 336 BLAKE2B e4bdd5129c1bc5e5a26f4ae70fa1528c9a5ee2811fa5df2e5876ea3f1044afa3327a3b9897b199b2f18b451bae57da965371f8184196b299a036843bce3ed494 SHA512 37e0c43ce89345c1e0136e8e1f162abd77def9f295ddd8abc3b49f638847a1c08c41cb1055415aeb5a3ce5d1eab37b9ca2654764255ea6ccf9d76adc0a5f8009
diff --git a/app-misc/go-jira/go-jira-1.0.17.ebuild b/app-misc/go-jira/go-jira-1.0.17.ebuild
new file mode 100644
index 000000000000..80c476f47f72
--- /dev/null
+++ b/app-misc/go-jira/go-jira-1.0.17.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
+
+inherit golang-build golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+
+DESCRIPTION="A simple JIRA commandline client in Go"
+HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
+SRC_URI="https://github.com/Netflix-Skunkworks/go-jira/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_VENDOR_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH="${WORKDIR}/${P}" go build -v -o jira  cmd/jira/main.go || die
+	popd || die
+}
+
+src_install() {
+	dobin src/${EGO_PN}/jira
+	dodoc src/${EGO_PN}/{CHANGELOG,README}.md
+}
diff --git a/app-misc/hachoir-metadata/Manifest b/app-misc/hachoir-metadata/Manifest
index 1cb3c74fedc7..e5e45635a7b6 100644
--- a/app-misc/hachoir-metadata/Manifest
+++ b/app-misc/hachoir-metadata/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-metadata-1.3.3.tar.gz 52304 BLAKE2B 31da89c0ca95c381fef3354a56f45569ca0f69e8e14518e1e83897dccd5be8a77d8636127f3363f9b28998e39dfccf0d008af00f0c1e49257fe95012aa2c738e SHA512 f0958e1bb6fbeca56caa31a8574da2f64df969cdb9de80e733b36dfae0e07c8f0fbecc53f801a359f7d16ac1a3b3e0605b7c6a3bd6da3c09a3cf2c971bf8750a
-EBUILD hachoir-metadata-1.3.3-r1.ebuild 1461 BLAKE2B 936dd8155f2ee470e1a71d397b804b3218c7a1cbdfebdce57fabf26c97b866d15a055e7c92954f12c4cf4e43b04be81572ac04a777fc582b6919c1a641806a14 SHA512 4b183082974a287d1d37cb10e952c10be5e1e807af63eaf96bc6d6eae940fcb7f1bb82a60757ccf0dee50d094a20df90bd9dec5db4edf8be3b892810ee49960e
+EBUILD hachoir-metadata-1.3.3-r1.ebuild 1462 BLAKE2B a73ee92ce3fbf079575f92ba5373083b029baa513709b5407228f43f1930fb7cfeee8f4d6b58e8b2dcfa4cb48bfdb723895b963ddd35f19696d5617e36377ccb SHA512 c5dd6042b374a9850a7875e82b74bbe6a629b6800babd730a00a7017800b4fe80376e1e8ab7edab976b0402f77138ae45a5c5069da42548507ce2633a85d7bb7
 MISC metadata.xml 428 BLAKE2B e53b795402d41bbf42f54ec1745cfa0d238a7e185d8db0fc06fdfb5faec4d6d72c6b395003f365cd8a33750ec35b7b0c62753dcc0fc949934d5de457a6b254a2 SHA512 c76d6bc6b172d7329562c87557d9695e5629a3ceafcc126f663b5af51af7f728a6f64dd875832af4acb2057ac63d23dc71526724a61395c3e34303da4177acd7
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
index 4660f200b5bf..2f0d75855806 100644
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Program to extract metadata using Hachoir library"
-HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata"
+HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.org/project/hachoir-metadata/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/hachoir-subfile/Manifest b/app-misc/hachoir-subfile/Manifest
index ca5fe1b1768f..b108fb2491e9 100644
--- a/app-misc/hachoir-subfile/Manifest
+++ b/app-misc/hachoir-subfile/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-subfile-0.5.3.tar.gz 15499 BLAKE2B a055f19285cdfa5a6d31b9f7a346b7ab54b8eb3c54d78890079bde25bf9660b5cadd18f9418b4dc55a543b329bbf38f274aa78fccddf52f47f9f65f28a0d4375 SHA512 b34cf7d7befc1031ae821dc5124b83d198cbd6d2f95666b8497b23a87c748d574637ed65023c7e1e2532a3a62ca079dfd13d11dbcac31457c6423309208d0ce4
-EBUILD hachoir-subfile-0.5.3-r1.ebuild 769 BLAKE2B 6ae6927ea920738674e41c61a18b4d64f104b006c8f1dd8bcf2d46511589f74309576b3495130a854d4d8f6e9bf90aeecc3defe22008b7f6447b8fbe9aca768e SHA512 7322a64820854ad2737e48b6f7fc3426b501e59d6073c12ce7cd9980c8453eb9ecdfbb387d1043383f613757cbd2cd7f723f6aa3b9fa0d13747ba059dae69c49
+EBUILD hachoir-subfile-0.5.3-r1.ebuild 770 BLAKE2B 26d1ff2aed81b2957a51b8af0101618b81122878cc27d55eeda196238387037703f7bbafb34b355df88a1f7bbef212e3f13da471e0162434ca0dec37b20c96e6 SHA512 2a8f9c56de9d39584ec23cb5204c83454604a6c4e1a2e57f634d2404268e838117125aa8969561476270b0138c3f274689942635376200ab62166496cd18ccc4
 MISC metadata.xml 425 BLAKE2B 6636365b918a8252757c0a69ea4dad61a9ea1eefe45ad2b0864b33a72e41c9af358662550bb9e9bdb42c88d3c627d9c316192f45d78761bfc5ecab7c76e00cb9 SHA512 7c19037ce6003a18113d0ef240041a0ad9501080b5021a018124be678ee86240f6ad3cbb4fa0ece3a8a4994884eb499374f714b2ab2dd1e60ce82e885051af2d
diff --git a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
index 12fd6da2185d..b2b40be21fef 100644
--- a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
+++ b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Find subfile in any binary stream"
-HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile"
+HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.org/project/hachoir-subfile/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/hachoir-urwid/Manifest b/app-misc/hachoir-urwid/Manifest
index 210428da7fe9..cf8ba210fe5d 100644
--- a/app-misc/hachoir-urwid/Manifest
+++ b/app-misc/hachoir-urwid/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-urwid-1.1.tar.gz 17845 BLAKE2B 09262c5faa41e15f160ba30c5813578fcc30fe9f620e287421199345f21c5d912e7d70c00e1753719d011c5cc9d788f1d70cc1bcb45df822da5c175ebb7c1fd7 SHA512 e434756903e4b3885166b825331921fe9c959247a9bf8bad324aa8e3e2b5f4ce22a1546e38df9ce9a8fcfbbb96c6e6ca4bc42e455e66eeec178d85849b1526b2
-EBUILD hachoir-urwid-1.1-r1.ebuild 798 BLAKE2B a85d5fc9ae21c4a9878e68b0d5bba7a604683cf01406cdf2606b2f37d69e6d47085536559b1813d870a6963df2ef67775a070c71d7bd093760bc467a8233d3a0 SHA512 442c4f741efc39508b4fba840f20f8bdf949cbbf07281377e0395b6b82512c18e2767ad9397f2a8c6012393a072719714e3044dd175696ed58c94bad9cd70074
+EBUILD hachoir-urwid-1.1-r1.ebuild 799 BLAKE2B e6b8eb26b4cf1988a49040b6486f298d9932ed70fe30eaa8a95575b52f132623c5c4ad3e2600df71f918aec6e71c08f71df27e08ddc2863fd8b1be0939ca744e SHA512 c0e5ff17304f285206fa1bbe45dedb221321096180f1fbd22caae516223ed3364f8bf52e7ac6e4172e66e41483e6a5066b66e62ca0a3972618fa4b9e7cc161fc
 MISC metadata.xml 418 BLAKE2B 3be1c8cb3fcd1d9c72ba300431ba67483a5ac160ec955619678a723b06ddfe14ff53dd53ce4f3604b3ecaec54ed45b9e163bc072818e9b35aa29912787898985 SHA512 7f3f6a1d6b9239aeae423fa3b8e172283c5cac3f05b738c06a17ce699576078b18649c8fbf41f4006d3bb2de2fca9f4b751a9466710539133d314d1e64527349
diff --git a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
index 55d30fce03b3..4ccb31219c4f 100644
--- a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
+++ b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
-HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid"
+HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.org/project/hachoir-urwid/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/icdiff/Manifest b/app-misc/icdiff/Manifest
index fb835445998b..10cd1e0d0b97 100644
--- a/app-misc/icdiff/Manifest
+++ b/app-misc/icdiff/Manifest
@@ -1,6 +1,6 @@
 AUX icdiff-1.7.3-dont-check-changelog.patch 546 BLAKE2B 28a4ea2becc7f9fb57a6bbcb648b4c61d0c0911e1df463cf1a566cee3e8916f3cc41f57fc912a05f733d0a73010b05e8d4ec6b2d0235edec4982a43ac2689225 SHA512 e3cf4f6238b3d49b6f3b1ce42a340815c535bc7482af22e722d0f5afcb0e3bbb1771b9de4a76fa77f5abe47b7b2f7c4b27e933e9e6a27d48b020975e95a7abc0
 DIST icdiff-1.7.3.tar.gz 20215 BLAKE2B 9946506e91d3d49144f2a997fcd364831b8ecc07a22cb79549a3751d53d682970ad555160959cbd58fdd4984023fe598df10926a6d4c7b72eb4c1eaa36236c41 SHA512 ae8ca394c3fdf820d4795282672bc44eb01f88f9614d6240f035c31f99130b188185a0e241c3c17974d76f604b85ef48aa8296835b5dfb46463a88cb1f68d305
 DIST icdiff-1.9.1.tar.gz 24387 BLAKE2B 482b128f03ac8af7e98db9b32ba7d9cf8bcd1a395eb50653a98ac186da26fea7933ee13f01840bb6c105e0f573a519a3e20ad83fbd8e513bfdd6c8c6d14b90c5 SHA512 f73108f6f3a4a2fc40e041bbe7b5934acd76684bb54a3fa544e9f146fd3c528528928378496f53ad92d649547ccc491a77296b6fa57e4534abb13d61c0df8d58
-EBUILD icdiff-1.7.3.ebuild 623 BLAKE2B 5bd9b0503d07647f21185042217a679e986c0875722d9ef41942ded7172c6bdbc230942ead4aa1d1b71e52f2418898809b0e45c434ddfd684a5f0473bd74c375 SHA512 162251baecd2754230ea9d50793783c595e8f24cc07c20590f3daa789fda3a4252af69358a2197bdc9b385d61a2a5a01f02d6874d8c44a43bc0840219ab6e412
-EBUILD icdiff-1.9.1.ebuild 556 BLAKE2B 79c8c365aa9147c46d1716977c43a6a063c6089fcb5d2fb8841cb891be9b08b486d32f93e79fe97ad5fb1758d0e087c5509882e11eae4059dd010551afdf09e3 SHA512 f9dea5dbff160a7b185ef6cb40c917dda0d33d29e77f1c491090f25e38d99b24be9c663a424d5949113b00cbe8ff6e74adcb15bc0933eb3a4bdbba9045084a1b
+EBUILD icdiff-1.7.3.ebuild 624 BLAKE2B 5c1c29e71507e180ad94d9b9a5eb57efaaddd1d149e847d08e42dec3434ed316b2d91d05119e37187467db934773f0923233334ab93001cd0615601c4a002fb6 SHA512 b128bb425e20d560a9c7fc6d38010dbe1e7cd0eb39b24bc59418684bcfda3b515f2466dfebb809a6c09cd3a9890976ee9c8e73f5f0b5d7e03119c60235129f38
+EBUILD icdiff-1.9.1.ebuild 557 BLAKE2B 668a2eb8a20201fa6f667818a29615bf26526a85fe510a040218558b568dc40bf3b12656873f296344bd06181f9e129aec10265dabb2a74fcd515a1aba9514f3 SHA512 8fab818388823bd6f4e0c7b677c96f52bd44273e1d5059d74310211b8e5ced1a9b896745f7da1e91a5396b1107ad2b4d4763685cf14bd2d1a5735b3a1b327642
 MISC metadata.xml 342 BLAKE2B f87cbd730938f6bdefcadea3d8c3d0635466b3e25597d1a5b8e7c85b6c8855698a19b29049c5b6e596696d15a91481527d16f83adc5c7ffaad39937d7bb9b951 SHA512 a897866e5d709999db69d3b1a4c8d1d1b15328970b27015f7549cf7b4fc6be688063f94fe31b0144227318c252e80bfd189fdf9f34dfdbf4dbfe0412e0b818ed
diff --git a/app-misc/icdiff/icdiff-1.7.3.ebuild b/app-misc/icdiff/icdiff-1.7.3.ebuild
index aab477b10c44..c1f6ccba26d9 100644
--- a/app-misc/icdiff/icdiff-1.7.3.ebuild
+++ b/app-misc/icdiff/icdiff-1.7.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python2_7 python3_4 python3_5)
 inherit distutils-r1
 
 DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="http://www.jefftk.com/icdiff"
+HOMEPAGE="https://www.jefftk.com/icdiff"
 SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/app-misc/icdiff/icdiff-1.9.1.ebuild b/app-misc/icdiff/icdiff-1.9.1.ebuild
index eda476f4a614..190d11b72b67 100644
--- a/app-misc/icdiff/icdiff-1.9.1.ebuild
+++ b/app-misc/icdiff/icdiff-1.9.1.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
@@ -7,7 +7,7 @@ PYTHON_COMPAT=(python2_7 python3_4 python3_5)
 inherit distutils-r1
 
 DESCRIPTION="Colourized diff that supports side-by-side diffing"
-HOMEPAGE="http://www.jefftk.com/icdiff"
+HOMEPAGE="https://www.jefftk.com/icdiff"
 SRC_URI="https://github.com/jeffkaufman/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="PSF-2"
diff --git a/app-misc/screenfetch/Manifest b/app-misc/screenfetch/Manifest
index 7cf905ffeeb4..68731d197652 100644
--- a/app-misc/screenfetch/Manifest
+++ b/app-misc/screenfetch/Manifest
@@ -1,6 +1,6 @@
 DIST screenfetch-3.7.0.tar.gz 60223 BLAKE2B 5b28ec609bdc4019b4b4d13cd70ae7b5d8f31ac5ea22383926752f6e1595e1c8764bff8a65fed4a1089e149edc50126f5bd761069840f012d0b678f95ccba9d3 SHA512 9a6e89ef2cd48f12b22230c7aff356ac2ece8dc7437034a51a66f8026e5ca4a630af43511a60b21e9fc9f89af9e2493b8cfa3a06294e74c3d611ae3bb0db922d
 DIST screenfetch-3.8.0.tar.gz 71970 BLAKE2B 783d14bb30f5858f2f2f8ac81c6c8bca2fa4c1e7c9225d9ba13a7ace05c365459e277bea625b680fc3e3fedd0303507a583190d866627cedcb33e042aa8fdca7 SHA512 903f42e3bfcd719c4d6b91d10e5678063e223c2baa58214c7e8dae9ea925852f9e2c07ad90148e02d87ce5f9af7b989e80e93c2f569cd579e6f4f7d5c49c62f2
 EBUILD screenfetch-3.7.0.ebuild 668 BLAKE2B 80e3117130dce1b38173d77546cc0bc5e9c7730afe454da952b46ac461c43e7ef6dd40f6a83c88b9b56c5806733bb204675ca496530fe568743e64bdde85564c SHA512 f6d2a7847252534025bc28e068c7600334841329d8d52b5d9039a032400c2054c8f62a2e409c232233f121bdb481d6700dd08b70df83a5fa339f9dbab6c7538c
-EBUILD screenfetch-3.8.0.ebuild 694 BLAKE2B b2acfb117ef009586ad39a02eda65e95612c789675addc50c5cc1128f21980687ed259247d88ff7cf66dc705677f96d319b2c8c1fcea0cf71343bddfc1cba638 SHA512 0a1bd9309bf692eddce2ca1683c756a64509ceb22d3b5e10462cc939167af1023ff0b4ba95a4c773ee7cc7ff97cba4c2829f10e008b00ee4bf44d36ea7ebf432
+EBUILD screenfetch-3.8.0.ebuild 693 BLAKE2B ad0cb380e1a3cd16f21e695e178abb984c76d6d696ef36dcd518b683c84ff82ebdbec02c9dd94f28c4b6b77a59f559614b07ef4cdd22a5a13104c9460a14da95 SHA512 99082dbdb51ba4ef62e0acdc41fddc59544644e8bb94dfbabe33bc3cd171e6416d5525c90770fdae8f86792ceb154e0be74373542668675cfff89c2d15074f9f
 EBUILD screenfetch-9999.ebuild 695 BLAKE2B aba8d3df8fcf9c7de4f83eee0fd1823160d1b7099dd22b20a3dd53b187472fb9bbabf0177a39473776fb2c2dc74056057250042188e43ac907aed246c944ecfe SHA512 bac3af4d7023f27284ec87186021d7e55d274675a719ce1785ba10ae6bbf5d52ddc97152f2c6096e6fca4e785c232016ff579ccb9f1eb44704872b7f694dfc24
 MISC metadata.xml 452 BLAKE2B 29589bb06d4930268b6e8e1a2707a9e24d273b9a3bf88945e0aa643960deba4472877366de982f7d857af7c63a90b72edf10fdbfb5833dd71bb0dea0331db6b0 SHA512 f09da25b50fc92fe253cbd2eb32d158e4628fe4d5a62a028fc0437eb2f6e7d6fab7f568c9e165a8f02477dc11ecdec59d764c9d56a779f97d8805ab218741c1c
diff --git a/app-misc/screenfetch/screenfetch-3.8.0.ebuild b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
index 0c5776358981..35f27763226d 100644
--- a/app-misc/screenfetch/screenfetch-3.8.0.ebuild
+++ b/app-misc/screenfetch/screenfetch-3.8.0.ebuild
@@ -24,7 +24,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/KittyKatt/screenFetch.git"
 	inherit git-r3
 else
-	KEYWORDS="amd64 ~x86 ~x64-macos"
+	KEYWORDS="amd64 x86 ~x64-macos"
 	SRC_URI="https://github.com/KittyKatt/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${MY_PN}-${PV}"
 fi
diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest
index 33bc747a88c9..fd5114ce532d 100644
--- a/app-misc/vifm/Manifest
+++ b/app-misc/vifm/Manifest
@@ -1,7 +1,8 @@
+AUX vifm-0.9.1-fix-ncurses-linking.patch 1562 BLAKE2B 415cd5421a7bf74cc48ec77919181e0fb0b101b455dee470ceb8875c861b14a8835b5f912c517efd9f1f1a8b3db93d633b6b4b68462fae66ec7a2ff0ced2521b SHA512 4b6dc0945f5afd2d0395775ceef94c007e604b30184e86653bc8c2f306b7d726d1a1a7273c4601502e6602fdff86b8b3f596409cf2e55f2e4c2691d342e7088a
 DIST vifm-0.7.2.tar.bz2 468086 BLAKE2B a83b1f43eb3f6e47afd5a7c810741468857c602b80cad5c91d2033eea9e1f1efb09e19ca7b02f39e93f8f7186b4cb6fb0627f98a30c054a0d7d71d1b454698d8 SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9
 DIST vifm-0.9.1.tar.bz2 1002758 BLAKE2B 8eb9cc4c299877485bb4a44d95fe2412e196686399a6246bc1b5036dbc34ecbcf1cd43d1d55bdacdcc099a65e03f589f360d39ee38da4e12bff0a4bfcbdd180b SHA512 a30457329bf9501efd7e9e0853107b5ecd653ab70e7081764677d035bd0f61876bc96b35bea5258153d68b7be075091168331be79d7398f94353f73bbf78933d
 DIST vifm-0.9.tar.bz2 971539 BLAKE2B 5d6dd8c399e38886ab3e2d548b93492bf31b464e5661c6f6d54504701bf1eab8338155a9ddc9b220c4cb2a67417d5622094e9ffb717ddf594984fe475214af60 SHA512 5ae2b03e672bd9a7f95a5c59141dabac8bc7946a4e307d6a3df70bdb52e1f7665b960a3d20709c811cbfbcf76f7836d23b5edb191968e5277fb705a291ab3a9a
 EBUILD vifm-0.7.2.ebuild 1471 BLAKE2B 0172539787d0e577b30b4ebfcf260012c3861a2ea0e27821671e981b785ccb0dbc9817e06d8f72164606566efdbcce8082a75627c7a8132f74256abe4dc432e6 SHA512 97f60228c3d17c96913abc074e02f3a67687e82b2b6b961bee0d82d3bebf5079115ebca7cc3bb9d901c0291aeeb91e722f083aac8947fc86947d6259966f18f0
-EBUILD vifm-0.9.1.ebuild 2118 BLAKE2B 84175b7297d3c40ff1cba09b8313b5ababd4de00e2a1359e2c7585ec4d22c9554a2d3fe2c0cf36d7707e02a831798bd34cee0a739f9e166fb21f15486f1c40bd SHA512 7db7685b9d5cad5183c5f62d9bf7370e186ce9c2ec5544e77ef9cdbfee7e840923d7b19c4d91a4474182b8c560af705270592880ae78982469277e5ef263c62b
+EBUILD vifm-0.9.1.ebuild 2173 BLAKE2B 939527bd16cca8e0d9722e7ea7f4492d91554790edb3cea0f3ff4e01ecf4008f51c7a3141d7045c46056cb42ae5cac85c855485540a5fdf58713bf57a4645df8 SHA512 8534dc62784f526eb3f5e99536f983a6f3d15459f8935057905c1e545e4ba81792529771b8bdafa209a704ec814f5a7e2176ff9db729c9fbe4903397445d8a70
 EBUILD vifm-0.9.ebuild 1974 BLAKE2B eb32205afdb5c4dfb84934a6875764549495b38341b719ca01b7cf86c8e7ccbab0b1fd5854e5509e88ba3cb3789d281c887e57fbce4545aa5088b9d5a6551ebf SHA512 7469278aeafedd5ae109fc4062a449c074f8750b23dfc99ffee47a7279e2258825214ba5f67c60ead14e87c49e547ed406e24650acd9962ff0724e2db415c5a0
 MISC metadata.xml 1457 BLAKE2B 0728b3f566cb00a2e3e48d84eff80de83629d026de506863a34a283de41cc80b99021da88b81e4332682b79176526cf65378d6b18142ec026c0dfe23447ecec1 SHA512 ea9d05e36d616a6d9588549317307e28acfe19f66493c870dca9767027124ba1ff45369e5f413dcac5697895f854baf148ef0afc687a801157bba40ce1be5f9a
diff --git a/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
new file mode 100644
index 000000000000..40d41dcc8f17
--- /dev/null
+++ b/app-misc/vifm/files/vifm-0.9.1-fix-ncurses-linking.patch
@@ -0,0 +1,60 @@
+From 8196704a5dafa4c8e194f1643728ed45b4b55df6 Mon Sep 17 00:00:00 2001
+From: xaizek <xaizek@posteo.net>
+Date: Mon, 9 Apr 2018 19:31:06 +0300
+Subject: [PATCH] fix ncurses linking
+
+---
+ THANKS       | 2 ++
+ configure    | 2 +-
+ configure.ac | 2 +-
+ 3 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/THANKS b/THANKS
+index e708f4d3..faab4f8a 100644
+--- a/THANKS
++++ b/THANKS
+@@ -25,6 +25,7 @@ c02y
+ Carl Mueller (carlmuller)
+ Carlos Pita
+ Charles Kauffman
++Chema Alonso Josa (nimiux)
+ Christian Fillion (cfillion)
+ Christian Herdtweck
+ Christoph (informationen)
+@@ -128,6 +129,7 @@ Richard Benson
+ Robert Sarkozi
+ Roger Bongers
+ Ross Hadden (rosshadden)
++Ruslan Osmanov (rosmanov)
+ Russell Urquhart
+ SanLe
+ santhoshr
+diff --git a/configure b/configure
+index 0054dbde..a3c9bd43 100755
+--- a/configure
++++ b/configure
+@@ -8707,7 +8707,7 @@ return curs_set ();
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' tinfo; do
++for ac_lib in '' tinfow; do
+   if test -z "$ac_lib"; then
+     ac_res="none required"
+   else
+diff --git a/configure.ac b/configure.ac
+index 61b3ed5d..65e550a2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -437,7 +437,7 @@ AC_CHECK_LIB(${curses_lib_name}, initscr,
+         CPPFLAGS="$CPPFLAGS -I/usr/include/${curses_lib_name}"
+     fi
+     ncurses_found=yes]
+-    AC_SEARCH_LIBS([curs_set], [tinfo],,
++    AC_SEARCH_LIBS([curs_set], [tinfow],,
+         AC_MSG_ERROR(could not find a library providing curs_set)))
+ dnl If libncursesw is not found on OS X, check for libncurses.  On OS X it has
+ dnl support of wide characters.
+-- 
+2.16.1
+
diff --git a/app-misc/vifm/vifm-0.9.1.ebuild b/app-misc/vifm/vifm-0.9.1.ebuild
index 283cc2139c34..fc8ca7c795a7 100644
--- a/app-misc/vifm/vifm-0.9.1.ebuild
+++ b/app-misc/vifm/vifm-0.9.1.ebuild
@@ -28,14 +28,18 @@ RDEPEND="
 	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-fix-ncurses-linking.patch"
+)
+
 DOCS="AUTHORS FAQ NEWS README TODO"
 
 S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+	default
 	sed -i -e '/stat.h/a#include <sys/sysmacros.h>' "${S}/src/modes/file_info.c" \
 		|| die
-	eapply_user
 	eautoreconf
 }
 
diff --git a/app-misc/workrave/Manifest b/app-misc/workrave/Manifest
index c26ff60ae904..f884052a2f70 100644
--- a/app-misc/workrave/Manifest
+++ b/app-misc/workrave/Manifest
@@ -2,5 +2,5 @@ AUX workrave-1.10.6-automagic-gstreamer.patch 881 BLAKE2B 9d74d1d51d1f351659b6ce
 DIST workrave-1.10.16.tar.gz 6375438 BLAKE2B 35d78a133b275e1c0adc8c21ceb91412f38667b9dde2ed9e08a8b01cde7b4d35780d317057d000bfa39ae0d5da4639f2e2252b1812acd66a3b81f7c1d1995dfb SHA512 f768c46a5b7dfbaca2984fabff92e64d5fd14f3b4e4d018f5a1cf46a87fbf7ec7fbaec9b660e899f7064a93338224d159b75052ed8e532ecaf507d2f249732f2
 DIST workrave-1.10.20.tar.gz 6377941 BLAKE2B 00f573c05ddacd61d50d80a4079d161b18e7e52606cf502f359cf51c4b64407c978fa944e79314146baea62fe77212fa623d54706c62e23fd1ca17cbf25db409 SHA512 fc8d98aa560946f00ee30be0c28648245a425cd3fddeba8fbdd61fb89d107cc8085d5c4d8a326c739b394e6baada2b28cf98ce9ccaf85dca6bfaa1ae78d4ce56
 EBUILD workrave-1.10.16.ebuild 2788 BLAKE2B ec945fe3e90ef1e8d99ff5dd52533ee33b4f2d01c33444ece2fbafc1a1b6cb225bd22c5c8f1f17aa0eabd7a654e7372a6aef42691ee531d4d88279c42d628e93 SHA512 783fd8d7cb0291d0339931c1c9c8227fe681bca4702b77f1f95d34fb4810eedc0c28f76ae1c00267227a9d4fd6b642ecae009b9284257f1b81e01487630f4358
-EBUILD workrave-1.10.20.ebuild 2791 BLAKE2B 2611855f90ca9c0bca255165df386f0f3f4250f71cf1ab325f33ba0d10c0a31706a6e5df511215c4d43ed688349513af1a81b1456fb256542b41d6751fa7a1b2 SHA512 2f84f8f077e8b91a1024f518269c270000d1a2300e3f941008d7b087137262bc53ccfb86fc1ba3b7816d26294c19c45809aecbf462910c3e4e5998370c1158aa
+EBUILD workrave-1.10.20.ebuild 2789 BLAKE2B a43fd847b0075845b3cd44847e02ed02b4e069c4b3b7ddfa662963ba48848ae601fae4cb4d77bc119b1c227e58eb3daf1aebb7d4c9f29ed104621a6b772fb951 SHA512 de4678548aea26e576e2ec82e3a016209210f32897b47250e7ee411f8c32dac2803f1c1958c34501a0bb7e670d0c068f19bf3ff55ecd81ed022968ba071bd9e0
 MISC metadata.xml 766 BLAKE2B 7fdc6a41af2c9048875b633ed213337c255b0449474d9c3052615655a904406ee35e226b652ca5519d3c12be63550da344eeabad3656604a8c5cb8df0b25fc18 SHA512 980b66185f9d02d4c0cfd2fe24700a4bb325741097ecf63e7bcd7e47c183e4693c22a6486c70dfce2b7d80837de7ab7c9c908f3be12ba5d16bba1de5d61f6858
diff --git a/app-misc/workrave/workrave-1.10.20.ebuild b/app-misc/workrave/workrave-1.10.20.ebuild
index 0d3fce130b04..eb0accfb92a4 100644
--- a/app-misc/workrave/workrave-1.10.20.ebuild
+++ b/app-misc/workrave/workrave-1.10.20.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rcaelers/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 # dbus support looks to be used only for trying to use panel applets on gnome3!
 IUSE="ayatana doc gnome gstreamer introspection mate nls pulseaudio test xfce"
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 1f438b8ecbd6..1a7ebcb6a38b 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -2,8 +2,8 @@ DIST yq-2.1.2.tar.gz 4704 BLAKE2B 980f0025ed397d620cf4883b3603411e7d969d641a50b6
 DIST yq-2.3.0.tar.gz 5165 BLAKE2B 5d317d78e4e9e0fbe3064c004b33cb267fe0947d011ea3f12b873a2a31b16695c57bd932b2f2e5145afa22f9cccb43bed0a34847c4975f83bf63651e6b3b5372 SHA512 f256d1766b697f6bcb88bb8129e587bb99929154e13167f179bff1669b08b5444af90d7a17382b4f434092110ddb9e578c1f374b56aba03b4a4406fc25b76d6a
 DIST yq-2.3.3.tar.gz 5486 BLAKE2B fa02b7466d54dbb5ddd4090329e1dd1d3826aa12d647563296236122fa34a85e7ee3e7f06edc227264db8fc18a215f39a5b171c18e498132bf701ef25def7936 SHA512 58461c74f907be241047197967ec316ea6ffe2accd99c8b97a158369d06f32c758c56edaeea30d3e4988e295a58fabeb47d960097b136c6b0bf16c2792b7f75d
 DIST yq-2.3.4.tar.gz 5657 BLAKE2B d7e6a37ed157ff2a23b648a54cf729cda1413a627f1169ba938ae89d4bd175270cdc5fa39ca5ea3c31d55d562439296bcce391cb22cd2faccc5f545f2577a12d SHA512 ea530d3f501a8697474b1b77644fdf439326e49fbae158a862e58fba6f939ee5f3ba50f82cc5e990b1ed05c4e7aa9c205635290e6d2507d46e53b68ee467d5e1
-EBUILD yq-2.1.2.ebuild 636 BLAKE2B cf0c87a1d464f76accfab7ac05240c5be0a7ac4dd8ad41340e666205d3a63c7c12fcc120137b1fb34daef36322cfd0f667366fd912e7b692debe645bbfea0f51 SHA512 983755e620b8b93747f56be4d7ffa407a18efd127f725182fce4ef6b81eab4ce592fa1d86dab4f79c01258e8cf2b95d4cf2c8660c2425b1a6ebb1a2741aaaa7e
-EBUILD yq-2.3.0.ebuild 636 BLAKE2B 0ebd719a2449c46aad162b0000e606ccaa8b21c473eed2aaa004df9f45e0e324323c705af80c0b2718288149ff88ce44dca25f1c7dff22db2518fc46a7f553c3 SHA512 68086be86cb5ed59a5f78a787a3af87ba4fb42ff90de28dda1e8c329869db0cdf6f8bd40b18e753e73c262b7be0fec1e153fc9f1c5fe26bb499bc9a16b8142d3
-EBUILD yq-2.3.3.ebuild 636 BLAKE2B 0ebd719a2449c46aad162b0000e606ccaa8b21c473eed2aaa004df9f45e0e324323c705af80c0b2718288149ff88ce44dca25f1c7dff22db2518fc46a7f553c3 SHA512 68086be86cb5ed59a5f78a787a3af87ba4fb42ff90de28dda1e8c329869db0cdf6f8bd40b18e753e73c262b7be0fec1e153fc9f1c5fe26bb499bc9a16b8142d3
-EBUILD yq-2.3.4.ebuild 636 BLAKE2B cf0c87a1d464f76accfab7ac05240c5be0a7ac4dd8ad41340e666205d3a63c7c12fcc120137b1fb34daef36322cfd0f667366fd912e7b692debe645bbfea0f51 SHA512 983755e620b8b93747f56be4d7ffa407a18efd127f725182fce4ef6b81eab4ce592fa1d86dab4f79c01258e8cf2b95d4cf2c8660c2425b1a6ebb1a2741aaaa7e
+EBUILD yq-2.1.2.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
+EBUILD yq-2.3.0.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
+EBUILD yq-2.3.3.ebuild 637 BLAKE2B a753a36f7570a61081ba41dc225f0e53f62d334d7b5f1bf0564b756578ad3b9ca2810dd22787e7b3300115a95188a07f501740b1b018cfe788381b21d78cb97a SHA512 2cae03018de7e33f0c9b6df32c9808f03b8e2069d906c73797b81be605ea723954d7b745acf5bab45fa1356c2befdacedf0bdf9f314925a62ea5379306fb8095
+EBUILD yq-2.3.4.ebuild 637 BLAKE2B 54ab2b629b25fbdf5fa25187e1ef5589571a248e9b7d0aaff7a3b35a079f1780fe2d07756f615080d1f05580d113f7c072f4c3a9803957c041741ca8ccb4065a SHA512 0aeed2e12c6afea7c5b1f08c054e0ca45fa638e621df3df0ef2be8b38164d7367025027c6e248a744b3effe35648231b636793ca03c0a18ed7ea1681b398462c
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.1.2.ebuild b/app-misc/yq/yq-2.1.2.ebuild
index aa07895a1b25..1508219d3b3b 100644
--- a/app-misc/yq/yq-2.1.2.ebuild
+++ b/app-misc/yq/yq-2.1.2.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-misc/yq/yq-2.3.0.ebuild b/app-misc/yq/yq-2.3.0.ebuild
index b383dbdabe99..ab7d35d6967b 100644
--- a/app-misc/yq/yq-2.3.0.ebuild
+++ b/app-misc/yq/yq-2.3.0.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-misc/yq/yq-2.3.3.ebuild b/app-misc/yq/yq-2.3.3.ebuild
index b383dbdabe99..ab7d35d6967b 100644
--- a/app-misc/yq/yq-2.3.3.ebuild
+++ b/app-misc/yq/yq-2.3.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/app-misc/yq/yq-2.3.4.ebuild b/app-misc/yq/yq-2.3.4.ebuild
index aa07895a1b25..1508219d3b3b 100644
--- a/app-misc/yq/yq-2.3.4.ebuild
+++ b/app-misc/yq/yq-2.3.4.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.org/project/yq/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"