gentoo resync : 14.04.2018

33 files changed, 369 insertions, 805 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index fddd1382d791..6493d8a6da3b 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index a6d208fd330d..51fd7bb0e973 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -4,10 +4,12 @@ DIST ca-certificates_20170717.tar.xz 293028 BLAKE2B 85076cd980841f32e2544c7be020
 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.35.tar.gz 9620041 BLAKE2B a4115117ff017ce36f030d9f69c75111177166651968739353d112cc5d2c4732b33b8c684c5957a66bb969ecab1a15fb2cd6bb237d959d307cdee43ec638cd73 SHA512 8d466f4602427d278b6aa28af0e6bdb99326fc40c94ac6d517d1cbe7ce6b9332dadba52ea092762fac2fd6e72f17cb880cf81e1cf86bf6b4f7913a755419626d
+DIST nss-3.36.1.tar.gz 23026430 BLAKE2B 76eaf5b24f8954a4e14cf556912250a3ddb7b333054a2ea4ee3d218493a8f12c77a37455aae354ef6ddd9bd55c33a269dad515806d70ef38727fa8a382d47fd4 SHA512 096fe4360b6d584a746ac6156830f8cff821fd173bd889d7a396238919328a227fa4ebb46f738970a4001773046f3dd4f4675b85ff6de8420a4a7657b3ba0c65
 DIST nss-3.36.tar.gz 23025578 BLAKE2B c8dd8a4c2bcda15bfeab4e7b49e790aaa2ecc3021ab014ca4e7b9253cad2ce140bf719cc336ce74d5074722c63d5a73d4a4e75792aa779b008d635a765e0c5b8 SHA512 e4d5cc475f1fcca9a42a139a890b70dbc3fadf5ed8a626c8d6bf929a97bb91ca9a42fe967df95784e5d997a3ec5c5a87684256ddf91b8dafa827103a98ad39ae
 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.35.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
+EBUILD ca-certificates-20170717.3.36.1.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
 EBUILD ca-certificates-20170717.3.36.ebuild 6266 BLAKE2B 8f07707c53e433729c098b978072ef4a5a89d21fc2f35480406668adf331e17c669e0d41e86d215b5acf49ff0fde2c5f14e5d14e63f7f6aa11318acd272c72ed SHA512 1bcaebdfacff61b3fb618f060cf15b050bc896ac6330082a834f31ba52c89bb924e194a7a347ced9321d05ee86e59b8c64900559e89d495f490c47b005405582
 MISC metadata.xml 538 BLAKE2B 20dd319e6f583b4b6b93fdfc7fb965c54c7b92426715cf287611ea58ed5040ffac4afa77df2e6464a387c120a8d80d508c6e997c820eae9395ba859b13c5702e SHA512 f2779da4ea4b24e196b64d6e4c94d47e426d431508db58355a08ca420498cbbe2f322c5f8dc6e132b612baf03ee6bb1561beade226bd2f71d6afa160064d7a7c
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
new file mode 100644
index 000000000000..198af98ddbf4
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20170717.3.36.1.ebuild
@@ -0,0 +1,190 @@
+# 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=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+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="https://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
+
+	default
+	eapply -p2 "${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/geoclue/Manifest b/app-misc/geoclue/Manifest
index 6a856339de82..4b7f23d0b915 100644
--- a/app-misc/geoclue/Manifest
+++ b/app-misc/geoclue/Manifest
@@ -4,6 +4,8 @@ AUX geoclue-0.12.99-gpsd.patch 2073 BLAKE2B 499774d91864ada9ef29a2154e17bed7e143
 AUX geoclue-2.4.1-fix-GLIBC-features.patch 1449 BLAKE2B d3411ef1d35b7dc902d2d18aefce2f72144cdb779ae11bdfe7370fcb9b14a9e53e9314d69c7e35e8eb541c5db3b61ae7a94fc99bf1c2aa2a0beeff1584928f05 SHA512 27d2d750d2cc52714276d5b4431444c31e0ff59fc1fabf659efe77d427dad67de376e6bf4aa55882ced21c56ef1d4dff05aeac62372a5174acf7e5f40d5f061b
 DIST geoclue-0.12.99.tar.gz 608074 BLAKE2B af0c8141ade57791159f87ee7725134f18ba07cfdf9207c26c1ce77fd46a41aabfec4ba37882816bd70341964db2a89c2bc327292c097ea2e413dcb4bd7385c8 SHA512 32f946c9ee66cff2a6564b275d5f7bdf0d42832166c9fbeccb0aa55f3c3370fd8de114ad26477df6a2ee9d22250a5b104ec384032b28c3a62c356baea05d1bc2
 DIST geoclue-2.4.7.tar.xz 368472 BLAKE2B c083f0694a90292b7b0834075e4fe15d29f07cc04157ad339bb2c93e0ca17a04916713c9284bf35e9dccbd8b3d66de1d0d88fb378aa5f33dd59ab57bfc72f570 SHA512 472cf923abfd40dee296eee2e6888c47f273ad709e1bdcce534bd794cf9f7073ceabd6addf918277e10498e094af5a6e9539b5cf24171577e78bc3b0b2d17b72
+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
 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
new file mode 100644
index 000000000000..9990c91df100
--- /dev/null
+++ b/app-misc/geoclue/geoclue-2.4.8.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit gnome2 systemd user versionator
+
+MY_PV=$(get_version_component_range 1-2)
+DESCRIPTION="A geoinformation D-Bus service"
+HOMEPAGE="https://freedesktop.org/wiki/Software/GeoClue"
+SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${MY_PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="+introspection +modemmanager zeroconf"
+
+RDEPEND="
+	>=dev-libs/glib-2.34:2
+	>=dev-libs/json-glib-0.14
+	>=net-libs/libsoup-2.42:2.4
+	sys-apps/dbus
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+	modemmanager? ( >=net-misc/modemmanager-1.6 )
+	zeroconf? ( >=net-dns/avahi-0.6.10[dbus] )
+	!<sci-geosciences/geocode-glib-3.10.0
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.4.1-fix-GLIBC-features.patch
+
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# debug only affects CFLAGS
+	gnome2_src_configure \
+		--enable-backend \
+		--with-dbus-service-user=geoclue \
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+		$(use_enable introspection) \
+		$(use_enable modemmanager 3g-source) \
+		$(use_enable modemmanager cdma-source) \
+		$(use_enable modemmanager modem-gps-source) \
+		$(use_enable zeroconf nmea-source)
+}
+
+pkg_preinst() {
+	enewgroup geoclue
+	enewuser geoclue -1 -1 /var/lib/geoclue geoclue
+	gnome2_pkg_preinst
+}
diff --git a/app-misc/notary/Manifest b/app-misc/notary/Manifest
new file mode 100644
index 000000000000..00a11d7b1f27
--- /dev/null
+++ b/app-misc/notary/Manifest
@@ -0,0 +1,7 @@
+AUX notary-server.confd 103 BLAKE2B 1f1a9f0e006bfd172218c40980a34314dffc1d06bc2a672d206fdc5f7b79ee918eeb35c79594ed954b045a28e49dfac2881fb4bfcde4db541ad94cd9c0078237 SHA512 2882af398f78011c5fce816adfc223833b808ba88dd334b85bbd97caa296cf2ca0b5e92f369307ad0066f98502367c62c1fed4e792d2f7074769f99c02a3c826
+AUX notary-server.initd 568 BLAKE2B a38ceeadc4d3bd663dced340da3040b352081dce6d27f44afead3fb05a55e9c271fbcb75746201c494cbc6218feea9bca666831443e9fd765bfa6ba6f3f81f9c SHA512 97a4666a5bbb5345103a0b1a2a2f04e5f1e3546b253bcb23d1170ce3ee056ea0baf328d40db67b18116c5cc81a1dd03489cef2edfe94044f08366833e0262c5f
+AUX notary-signer.confd 103 BLAKE2B 461b38b6c8d97e7c8cedb88e48eca0342174434a819d99883496a9622fd04c19d097a498195c9e37246420f4f01fef07219bd4c9e76dc26cf8b70d9ce43ab1c7 SHA512 088bbd2eabf1e9be673b35a4a481c270ba2ccea479ef1164804ecead730a61465862888e7cbff53976056826d4ff066e1e2ab253cd6e3287109d03873c11777b
+AUX notary-signer.initd 568 BLAKE2B a0041a57049a1709ffb0906e4cef2e6cad32172c52bddc77917e7f6293a4deba79ae0d965db53fb537d66d91dc6b06230f91d14971c408f60182b350b6a672af SHA512 325614982f75f33a9fd59a6183255fa61158c4b2288f2d06e4d88c8f1f43dc5df83c85e8ecdf40cf19f9a00b51ba641fc024d863f220b6aac8e530e17e7eb3a2
+DIST notary-0.6.1.tar.gz 5741924 BLAKE2B 125e1e09178f090de9d73bb97170737d03c8f43927cf070a2c78e0c5eff3cd56a58aaf703a4ba60aa3e1bd7e22d2ceb0921abaa98e6f871ed1131249e44c622d SHA512 76e223c0c5c59796db924f0e52ea59d2bdbb101a9a059cd70d336928dcac616943d75fc9b8d7703de8609b2f694d2fc5627deb341971dc9401c00974261d57c3
+EBUILD notary-0.6.1.ebuild 1422 BLAKE2B a824bb0a87981eb09efe3af14a1c8729174e525cf1049f659f74d6e53e1d1dd8017b9b4b9638247b611e6fe97527495ed040ed9a2a4d5022ef9125520fdc24bd SHA512 d1b94bf279eadebe172ac7f22079d230b244ee3718f75274f2054a4d0d65bb150148eb8c0b10c14ebede61013499fb0ef3a5fbbb90666c53699ea9d423534614
+MISC metadata.xml 345 BLAKE2B d1f59c5babe626b5a04645c4ef693cad477fc053d0730464e4b48bee515555ded5a583ca2ae246b80af310e096c334e99717af8e1be3adf692a4c9cf8f97c430 SHA512 6a57f443fe0f4e857d41a7af2658e9eac580750e7eeeab5ea6ebd5cea154c3baf74c838095c0c97493c344525d3377e3559b7c05ca5d141bdb5efda85a13eb22
diff --git a/app-misc/notary/files/notary-server.confd b/app-misc/notary/files/notary-server.confd
new file mode 100644
index 000000000000..eb47b978cbe3
--- /dev/null
+++ b/app-misc/notary/files/notary-server.confd
@@ -0,0 +1,2 @@
+# arguments for notary server
+command_args="-config=/var/lib/notary/fixtures/server-config-local.json"
diff --git a/app-misc/notary/files/notary-server.initd b/app-misc/notary/files/notary-server.initd
new file mode 100644
index 000000000000..6d2bd22fc613
--- /dev/null
+++ b/app-misc/notary/files/notary-server.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Notary server"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-notary}
+group=${group:-notary}
+
+command="/usr/bin/notary-server"
+command_args="${command_args:--config=/var/lib/notary/fixtures/server-config-local.json}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/notary/${RC_SVCNAME}.log \
+	--stderr /var/log/notary/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/app-misc/notary/files/notary-signer.confd b/app-misc/notary/files/notary-signer.confd
new file mode 100644
index 000000000000..5ead0d85b2c9
--- /dev/null
+++ b/app-misc/notary/files/notary-signer.confd
@@ -0,0 +1,2 @@
+# arguments for notary signer
+command_args="-config=/var/lib/notary/fixtures/signer-config-local.json"
diff --git a/app-misc/notary/files/notary-signer.initd b/app-misc/notary/files/notary-signer.initd
new file mode 100644
index 000000000000..5238b31b5b46
--- /dev/null
+++ b/app-misc/notary/files/notary-signer.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 2016-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Notary signer"
+pidfile=${pidfile:-"/run/${RC_SVCNAME}.pid"}
+user=${user:-notary}
+group=${group:-notary}
+
+command="/usr/bin/notary-signer"
+command_args="${command_args:--config=/var/lib/notary/fixtures/signer-config-local.json}"
+command_background="true"
+start_stop_daemon_args="--user ${user} --group ${group} \
+	--stdout /var/log/notary/${RC_SVCNAME}.log \
+	--stderr /var/log/notary/${RC_SVCNAME}.log"
+
+depend() {
+	after net
+}
diff --git a/app-misc/notary/metadata.xml b/app-misc/notary/metadata.xml
new file mode 100644
index 000000000000..0f3553a0a4cc
--- /dev/null
+++ b/app-misc/notary/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">theupdateframework/notary</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-misc/notary/notary-0.6.1.ebuild b/app-misc/notary/notary-0.6.1.ebuild
new file mode 100644
index 000000000000..f0ee76af2337
--- /dev/null
+++ b/app-misc/notary/notary-0.6.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit golang-vcs-snapshot golang-build user
+
+KEYWORDS="~amd64"
+DESCRIPTION="A project that allows anyone to have trust over arbitrary collections of data"
+EGO_PN="github.com/theupdateframework/notary"
+GIT_COMMIT="d6e1431feb32348e0650bf7551ac5cffd01d857b"
+
+HOMEPAGE="https://github.com/theupdateframework/notary"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
+    ${EGO_PN}/cmd/notary-server || die
+	GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
+    ${EGO_PN}/cmd/notary-signer || die
+	GOPATH=${S} go install -v -tags pkcs11 -ldflags "-w -X ${EGO_PN}/version.GitCommit=${GIT_COMMIT} -X ${EGO_PN}/version.NotaryVersion=${PV}" \
+    ${EGO_PN}/cmd/notary || die
+	popd || die
+}
+
+src_install() {
+	dobin bin/${PN}{,-server,-signer}
+	pushd src/${EGO_PN} || die
+	insinto /var/lib/notary
+	doins -r migrations fixtures
+	fowners -R ${PN}:${PN} /var/lib/notary
+	fperms -R 0600 /var/lib/notary/fixtures/database/
+}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 75708299ff53..fd8a95402a6f 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,6 +1,3 @@
-AUX pax-utils-1.2.2-linux-2.6.32.patch 2152 BLAKE2B d068e7fbcab2ca3c61dc186f28132e9efa063db05a4a6df1c04aef6f978a6ead67d11a867e99ddab1ca78dd024097cf5e805c3dd95ca6320a0617f4ac607a676 SHA512 3a39e08e327e5389fb4a249dc27049a716695bd310197eafc54b62458e167eba53848e9fa3b0aa05e224a8f468fc130b979d0d314ca1dc8cbb0c5c494d67b352
-AUX pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch 2032 BLAKE2B 29af365d08618cc85ad57dce8a041857f1d04164a4b26c6184a2009b02f09b3ed9977c90031d359492dfd947ba09033d76211f310169207171639a5a189567b1 SHA512 b0e0679c726acc56686b23b6d4720cd5b7e4dff3f007e0443e3ec37a434ffb2def2c351c81ef960bf8e1008769662851017ef9aaedc9b52890578db4d313a54e
-AUX pax-utils-1.2.2-solaris.patch 5673 BLAKE2B af1fe089d469029922b09be19fe2e9d9271f9ee7ceac9826282d2eb3461a656f21c96720cdbc8b9c91661ac23327a8e5053ed7675afd47d7d8a037525a6d992d SHA512 df5cecdafe796fa7616767b93def2cd51d82a8911f7b195ca25048fb93a067a819cd362d3f5b4b02308ce67a688938a40aa2ecb04570d7bf3db83cb9847f62f1
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
 EBUILD pax-utils-1.2.3.ebuild 1478 BLAKE2B 1b90514bcc6d3a87fff7d23e8b92373ca9ffc9dad879701856fa1de6da23305458d707832ec526060cd490aa43511052c6b2bbc38d4d2d505226acc4be3baaca SHA512 d588e020da343b5dd28303069216ef824e4e562de23786cc0c77062cc9aff82a217910df7e2627d7dc0ea084e079cf9ba2ebcaa834bfe1a1c247041aafdf6b5b
diff --git a/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch b/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch
deleted file mode 100644
index 8139310b2e0b..000000000000
--- a/app-misc/pax-utils/files/pax-utils-1.2.2-linux-2.6.32.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-This is the diff for generated sources after applying:
-https://github.com/gentoo/pax-utils/pull/2
-
-diff -ru pax-utils-HEAD.orig/config.h.in pax-utils-HEAD/config.h.in
---- pax-utils-HEAD.orig/config.h.in	2017-04-18 16:26:42.000000000 +0200
-+++ pax-utils-HEAD/config.h.in	2017-04-18 16:28:05.000000000 +0200
-@@ -526,6 +526,9 @@
- /* Define to 1 if you have the `link' function. */
- #undef HAVE_LINK
- 
-+/* Define to 1 if you have the <linux/securebits.h> header file. */
-+#undef HAVE_LINUX_SECUREBITS_H
-+
- /* Define to 1 if the system has the type 'long long int'. */
- #undef HAVE_LONG_LONG_INT
- 
-diff -ru pax-utils-HEAD.orig/configure pax-utils-HEAD/configure
---- pax-utils-HEAD.orig/configure	2017-04-18 16:26:41.000000000 +0200
-+++ pax-utils-HEAD/configure	2017-04-18 16:28:03.000000000 +0200
-@@ -34537,6 +34537,19 @@
- 
- 
- 
-+for ac_header in linux/securebits.h
-+do :
-+  ac_fn_c_check_header_mongrel "$LINENO" "linux/securebits.h" "ac_cv_header_linux_securebits_h" "$ac_includes_default"
-+if test "x$ac_cv_header_linux_securebits_h" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LINUX_SECUREBITS_H 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+
- ac_config_files="$ac_config_files Makefile autotools/gnulib/Makefile"
- 
- cat >confcache <<\_ACEOF
-diff -ru pax-utils-HEAD.orig/configure.ac pax-utils-HEAD/configure.ac
---- pax-utils-HEAD.orig/configure.ac	2017-04-18 16:25:48.000000000 +0200
-+++ pax-utils-HEAD/configure.ac	2017-04-18 16:27:11.000000000 +0200
-#@@ -62,6 +62,8 @@
- 	AX_CHECK_COMPILE_FLAG(flag, AS_VAR_APPEND([CFLAGS], " flag"))
- ])
- 
-+AC_CHECK_HEADERS([linux/securebits.h])
-+
- AC_CONFIG_FILES([
- 	Makefile
- 	autotools/gnulib/Makefile
-diff -ru pax-utils-HEAD.orig/porting.h pax-utils-HEAD/porting.h
---- pax-utils-HEAD.orig/porting.h	2017-03-03 21:07:15.000000000 +0100
-+++ pax-utils-HEAD/porting.h	2017-04-18 16:18:22.000000000 +0200
-@@ -46,7 +46,9 @@
- #endif
- #if defined(__linux__)
- # include <sys/prctl.h>
--# include <linux/securebits.h>
-+# if !defined(HAVE_CONFIG_H) || defined(HAVE_LINUX_SECUREBITS_H)
-+#  include <linux/securebits.h>
-+# endif
- #endif
- #if defined(__GLIBC__) || defined(__UCLIBC__) || defined(__ANDROID__)
- # include <byteswap.h>
diff --git a/app-misc/pax-utils/files/pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch b/app-misc/pax-utils/files/pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch
deleted file mode 100644
index 1fa5c3187e5a..000000000000
--- a/app-misc/pax-utils/files/pax-utils-1.2.2-scanelf-fix-out-of-bounds-access-in-ia64.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From e95103c40d0541fbcdb4b84b000832d9b1b83b8d Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sat, 19 Aug 2017 10:34:41 +0100
-Subject: [PATCH] scanelf: fix out-of-bounds access in ia64
-
-commit 2eb852129394f97dae89c0ff1f9f48637edcb0e9
-slightly changed decoder and added unchecked
-read from elf header:
-
-```
-       switch (EGET(dpltrel->d_un.d_val)) { \
-       case DT_REL: \
-               rel = REL##B(elf->vdata + EGET(drel->d_un.d_val)); \
-```
-
-On ia64 'EGET(drel->d_un.d_val)' returns absolute address:
-
-```
-    $ dumpelf bug/luatex
-    ...
-    /* Dynamic tag #31 'DT_RELA' 0x97E310 */
-    {
-        .d_tag     = 0x7        ,
-        .d_un      = {
-                .d_val = 0x4000000000031C30 ,
-                .d_ptr = 0x4000000000031C30 ,
-        },
-    },
-```
-
-That causes 'scanelf' crash on binaries like 'luatex'.
-
-This change restores check and loudly skips such sections:
-    scanelf: bug/luatex: DT_RELA is out of file range
-
-Bug: https://bugs.gentoo.org/624356
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- scanelf.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/scanelf.c b/scanelf.c
-index 1ead891..a054408 100644
---- a/scanelf.c
-+++ b/scanelf.c
-@@ -607,11 +607,23 @@ static char *scanelf_file_textrels(elfobj *elf, char *found_textrels, char *foun
- 	} \
- 	switch (EGET(dpltrel->d_un.d_val)) { \
- 	case DT_REL: \
-+		if (EGET(drel->d_un.d_val) >= (uint64_t)elf->len - sizeof (drel->d_un.d_val)) { \
-+			rel = NULL; \
-+			rela = NULL; \
-+			warn("%s: DT_REL is out of file range", elf->filename); \
-+			break; \
-+		} \
- 		rel = REL##B(elf->vdata + EGET(drel->d_un.d_val)); \
- 		rela = NULL; \
- 		pltrel = DT_REL; \
- 		break; \
- 	case DT_RELA: \
-+		if (EGET(drel->d_un.d_val) >= (uint64_t)elf->len - sizeof (drel->d_un.d_val)) { \
-+			rel = NULL; \
-+			rela = NULL; \
-+			warn("%s: DT_RELA is out of file range", elf->filename); \
-+			break; \
-+		} \
- 		rel = NULL; \
- 		rela = RELA##B(elf->vdata + EGET(drel->d_un.d_val)); \
- 		pltrel = DT_RELA; \
--- 
-2.14.1
-
diff --git a/app-misc/pax-utils/files/pax-utils-1.2.2-solaris.patch b/app-misc/pax-utils/files/pax-utils-1.2.2-solaris.patch
deleted file mode 100644
index de1427f99bd7..000000000000
--- a/app-misc/pax-utils/files/pax-utils-1.2.2-solaris.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-This is the diff for generated sources after applying:
-https://github.com/gentoo/pax-utils/pull/1
-
-diff -ruN pax-utils-1.2.2.orig/autotools/gnulib/Makefile.in pax-utils-1.2.2/autotools/gnulib/Makefile.in
---- pax-utils-1.2.2.orig/autotools/gnulib/Makefile.in	2017-01-24 21:30:06.000000000 +0100
-+++ pax-utils-1.2.2/autotools/gnulib/Makefile.in	2017-03-15 10:59:05.616490166 +0100
-@@ -1483,7 +1484,7 @@
- 	$(top_srcdir)/autotools/snippet/c++defs.h \
- 	$(top_srcdir)/autotools/snippet/warn-on-use.h stat.c \
- 	stat-time.h stdbool.in.h stddef.in.h stdint.in.h stdio.in.h \
--	stdlib.in.h strcasecmp.c strncasecmp.c str-two-way.h \
-+	stdlib.in.h stpcpy.c strcasecmp.c strncasecmp.c str-two-way.h \
- 	strcasestr.c strdup.c strerror.c strerror-override.c \
- 	strerror-override.h string.in.h strings.in.h strncat.c \
- 	symlink.c at-func.c symlinkat.c sys_stat.in.h sys_time.in.h \
-@@ -1546,7 +1547,7 @@
- 	msvc-nothrow.c open.c openat.c opendir.c printf-frexp.c \
- 	readlink.c at-func.c readlinkat.c realloc.c rename.c \
- 	at-func2.c renameat.c rmdir.c signbitd.c signbitf.c signbitl.c \
--	stat.c strcasecmp.c strncasecmp.c strcasestr.c strdup.c \
-+	stat.c stpcpy.c strcasecmp.c strncasecmp.c strcasestr.c strdup.c \
- 	strerror.c strerror-override.c strncat.c symlink.c at-func.c \
- 	symlinkat.c unlink.c at-func.c unlinkat.c at-func.c \
- 	utimensat.c asnprintf.c printf-args.c printf-parse.c \
-@@ -1708,6 +1709,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat-time.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/statat.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stpcpy.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasecmp.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strcasestr.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strdup.Po@am__quote@
-diff -ruN pax-utils-1.2.2.orig/autotools/gnulib/stpcpy.c pax-utils-1.2.2/autotools/gnulib/stpcpy.c
---- pax-utils-1.2.2.orig/autotools/gnulib/stpcpy.c	1970-01-01 01:00:00.000000000 +0100
-+++ pax-utils-1.2.2/autotools/gnulib/stpcpy.c	2017-03-15 10:59:24.159820259 +0100
-@@ -0,0 +1,49 @@
-+/* stpcpy.c -- copy a string and return pointer to end of new string
-+   Copyright (C) 1992, 1995, 1997-1998, 2006, 2009-2017 Free Software
-+   Foundation, Inc.
-+
-+   NOTE: The canonical source of this file is maintained with the GNU C Library.
-+   Bugs can be reported to bug-glibc@prep.ai.mit.edu.
-+
-+   This program is free software: you can redistribute it and/or modify it
-+   under the terms of the GNU General Public License as published by the
-+   Free Software Foundation; either version 3 of the License, or any
-+   later version.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-+
-+#include <config.h>
-+
-+#include <string.h>
-+
-+#undef __stpcpy
-+#ifdef _LIBC
-+# undef stpcpy
-+#endif
-+
-+#ifndef weak_alias
-+# define __stpcpy stpcpy
-+#endif
-+
-+/* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
-+char *
-+__stpcpy (char *dest, const char *src)
-+{
-+  register char *d = dest;
-+  register const char *s = src;
-+
-+  do
-+    *d++ = *s;
-+  while (*s++ != '\0');
-+
-+  return d - 1;
-+}
-+#ifdef weak_alias
-+weak_alias (__stpcpy, stpcpy)
-+#endif
-diff -ruN pax-utils-1.2.2.orig/config.h.in pax-utils-1.2.2/config.h.in
---- pax-utils-1.2.2.orig/config.h.in	2017-01-24 21:30:04.000000000 +0100
-+++ pax-utils-1.2.2/config.h.in	2017-03-15 11:01:30.156464381 +0100
-@@ -264,6 +264,9 @@
- /* Define to 1 when the gnulib module stat should be tested. */
- #undef GNULIB_TEST_STAT
- 
-+/* Define to 1 when the gnulib module stpcpy should be tested. */
-+#undef GNULIB_TEST_STPCPY
-+
- /* Define to 1 when the gnulib module strcasestr should be tested. */
- #undef GNULIB_TEST_STRCASESTR
- 
-@@ -1415,6 +1418,9 @@
- /* Define to 1 if you have the <stdlib.h> header file. */
- #undef HAVE_STDLIB_H
- 
-+/* Define to 1 if you have the `stpcpy' function. */
-+#undef HAVE_STPCPY
-+
- /* Define to 1 if you have the `strcasecmp' function. */
- #undef HAVE_STRCASECMP
- 
-diff -ruN pax-utils-1.2.2.orig/configure pax-utils-1.2.2/configure
---- pax-utils-1.2.2.orig/configure	2017-01-24 21:30:03.000000000 +0100
-+++ pax-utils-1.2.2/configure	2017-03-15 11:02:09.889790417 +0100
-@@ -31596,6 +31597,57 @@
- 
- 
- 
-+
-+
-+
-+
-+
-+  for ac_func in stpcpy
-+do :
-+  ac_fn_c_check_func "$LINENO" "stpcpy" "ac_cv_func_stpcpy"
-+if test "x$ac_cv_func_stpcpy" = xyes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_STPCPY 1
-+_ACEOF
-+
-+fi
-+done
-+
-+  if test $ac_cv_func_stpcpy = no; then
-+    HAVE_STPCPY=0
-+  fi
-+
-+  if test $HAVE_STPCPY = 0; then
-+
-+
-+
-+
-+
-+
-+
-+
-+  gl_LIBOBJS="$gl_LIBOBJS stpcpy.$ac_objext"
-+
-+
-+  :
-+
-+  fi
-+
-+
-+
-+
-+
-+          GNULIB_STPCPY=1
-+
-+
-+
-+
-+
-+$as_echo "#define GNULIB_TEST_STPCPY 1" >>confdefs.h
-+
-+
-+
-+
- 
- 
-   for ac_func in strcasecmp
-diff -ruN pax-utils-1.2.2.orig/Makefile.in pax-utils-1.2.2/Makefile.in
---- pax-utils-1.2.2.orig/Makefile.in	2017-01-24 21:30:06.000000000 +0100
-+++ pax-utils-1.2.2/Makefile.in	2017-03-15 11:03:01.856447406 +0100
-@@ -1522,7 +1523,7 @@
- 	security.c \
- 	xfuncs.c
- 
--LDADD = libpaxutils.la $(top_builddir)/autotools/gnulib/libgnu.a
-+LDADD = libpaxutils.la $(top_builddir)/autotools/gnulib/libgnu.a $(LIB_EACCESS)
- bin_SCRIPTS = lddtree symtree
- CLEANFILES = $(bin_SCRIPTS)
- TMAKE = \
diff --git a/app-misc/regionset/Manifest b/app-misc/regionset/Manifest
index 6fd2d19f7e83..fcd33d7458ef 100644
--- a/app-misc/regionset/Manifest
+++ b/app-misc/regionset/Manifest
@@ -1,5 +1,5 @@
 DIST regionset-0.1.tar.gz 17095 BLAKE2B a72d73b921a5f93515462ae287766c75d5019663244569504ab29220c53804919c08a6120e24f6e9c06a01f304f8a4188129d199c1f0f028443f39e074c6c9d3 SHA512 19e1a681f6acc9f7da064432f893cd6736e3b54e5f0187025b9702a7301a982bc2f3948604e3bc9f7f15b20feb0dbc0424ad9727790cddb448b89189c1ce18c3
 DIST regionset-0.2.tar.gz 19063 BLAKE2B e96c014effa78d7c5f636d80edb7d74741107dd11728ca7f52c2d41919960986d37fd4245bb7975928605c6a06e7e2c31d050b847771e60af837e3f2286edb27 SHA512 7d7fa92a2031a1d18032ba0979fe0ee27ff84c02977dc03df394383a2d562925b38eedfd478ee08d60e84de60914278f7880c10a43552345fe36af0c0fee6431
 EBUILD regionset-0.1-r1.ebuild 945 BLAKE2B 6f6d7a8e00d64a19950a4c28c02360a3c70bd68799821479b90019b993101d61785e857f3cd38e493b081f8054e7d59057c1eaf871a9c0c1d590a5a36d65a341 SHA512 b41176ef36842aaa5bbeec7569a0232513c463cbc943f0a14bad7cdc7b0b007e4fa32fe1d8814185013f751ffa7bf77f89390133f58950a7faee2b6e6a08f0dd
-EBUILD regionset-0.2.ebuild 1015 BLAKE2B a3476d927876f46b325327d798c0fa25cb776180866ebb40de7a58b15137c8cd8176c7391eda9b73e93bba854217a07581b604c1e81e13e376b0a9549fa460bf SHA512 3674083eb70c0d6ce2eef9750605a111f6abb9d531195038f241ef22641a2187c5f22ea61b2a89ea3ce11b414078a708e5efeb9829a2fee269409f092c9eb6c6
+EBUILD regionset-0.2.ebuild 1014 BLAKE2B e6f6158da30270605e5cd3dbb695827c2b8d1ddb3446b9d6a7eda2839f1883ed944b95e198782e1de5b33f644f6f22c2abb227bce6d29ca16fce9246c141261b SHA512 f14cda65511f8413ba5c4e49be9b5102439674979ee8ab41548afbbdde097a6b40d2da84904f45b7aa4b28e1e6c34fd5b0b1e11a54a493c9e394f89f1c07d029
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/regionset/regionset-0.2.ebuild b/app-misc/regionset/regionset-0.2.ebuild
index 5099424eb9d6..8c2dd9a2ba37 100644
--- a/app-misc/regionset/regionset-0.2.ebuild
+++ b/app-misc/regionset/regionset-0.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linvdr.org/download/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 src_prepare() {
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 8efcf782635b..bef57c7ba79f 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -2,6 +2,6 @@ AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683f
 AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30b034530cc51fc38e57afbd5b3c0218d50a328cb1a8eac5a75c40f1c24c29afe555db06c96dfb9095e0a7b431666e5f SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
-EBUILD tdfsb-0.0.10-r1.ebuild 916 BLAKE2B 52284c7ec273fca083d239d445be548071ad357fa40c9c0b3c8cdb2031752b46083a4f6112e344f873372fd132be99f43b749bb2a9867e9ca02d770e5088ff6e SHA512 4f98839c3937c71acff90e29fb3779eb2dd3b135b618d821ceca53defaa7ce3206cc672c3d4532240e7c98529476d47349bf7820388691887df9e17a4fcee735
+EBUILD tdfsb-0.0.10-r1.ebuild 915 BLAKE2B 9a8f1aa513bddeffa69738fba5fd2c8319d1d0c5f63b412aab77a51beb3965a6c3ad8e7e66301f86dd18db896b52ebf4f5651a32685532c253f7cc63333b8489 SHA512 daf8f36efdc2e7c4379747ab15a5aa3eb1e29dbdc37eea67c9328fc1a9a42ad4a52cd58f6faeeb19dce4c00d57b0464b48053ac25eabf2924c3912a5b571f6ff
 EBUILD tdfsb-0.0.10.ebuild 869 BLAKE2B 82a15208cf84421bbdb2cf277a1bfd405bbe3a60525f781ab752e2fdc1268dc71963f93bcdfa4f093a1410b9cb1ab8505189b50f8424669451ab70f453600e26 SHA512 55c1b31d3fb421f2f5ddf6655a209eaa37bb5b201c3190bf4cbf7021d15891c8e3e32d14cf4e3d1c618092dcdce586c398abaa2a159cebb7a88ca1f5b9064da1
 MISC metadata.xml 139 BLAKE2B b4a59c22790dfec3fbcfaea41ef363401766736b68a85bedae00e1944d0a848aa97104c2f34244c0fe7b6363029281f965fc1b3545301d341cda371eaa976274 SHA512 8be912ace7468a4396eb1da00a9785030a8ce35da4357a01591876a1056fd45e44da65de2af3e1eb0506ce6551714962c40c3ae5a3aefa2ad231de35af2519be
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
index b6f5b0bd8e45..f85ac67b3cf7 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~ppc ~sparc ~x86"
+KEYWORDS="alpha amd64 ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="media-libs/freeglut
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index ac4e15cdaa30..54f2d9b252b2 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,20 +1,9 @@
-AUX tmux-2.0-flags.patch 584 BLAKE2B 3202e29756f9cc3f7f7538f11ddefdf795af316af71cd2a0b7c043223a424181b929d5cc58c05c31412503fd053cff6fe9a096d49412b6860adb363df4ac0b03 SHA512 029a29182f5998c19883f24eab980d16f2e89c72f4150354e0a1101f9092491e836952fb9442e511508f47fd701c8cc8171f29c6ff097248894b6696d108f6dd
-AUX tmux-2.3-flags.patch 438 BLAKE2B 9f2b67ddfbd13c25830f95272053935d669252f746dabd30db5c4e01b148c22d2e848e09062058c71bc93d1a83f77f8e1bb2fbcb92f61cd35a4ff2305e92edca SHA512 2fed56091a92ba4e4c9e49144099d8a9dbdd2f157562f65b547a5ae864d82e7123acba46dd380bb9d470a5cb5f681702f5b6bdf230f411ed727095c0b9c38bfa
-AUX tmux-2.3-pipe_pane-fix.patch 208 BLAKE2B 08eb18d22eff0bcfc97f0656d5d2c8395ce9d4d61ba140d6b0006ec01c544ec0bbf9018a5b6e08dba5a66085921d5df87eee0b606614f7d810901ff50e99438d SHA512 bd2376434f6e7dd344587363d0d788559e24cfbfed96def3331d79e9830916b8a7882e62ac9838caafb132fb88e56a2587e50a93eaa22444542bb8e381da2d23
-AUX tmux-2.3-screen_write_copy-fix.patch 1955 BLAKE2B bb7796c21165d99fa0348ae8970a548a6fc34966b1b2ea896a8af48631b367e29e5c3ac2b6da45e4bd1c639f072b3390369c98ba47920b234ff9535133fc16eb SHA512 c4ad6ce33dbf7ce47a811da1172a5c29475a7e2479f8e662d263a6206ff73781cce99018c976d151e8dec25e7f1cf07fa0c93bf0634f35484651d2ee17efaea8
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
-AUX tmux.vim 55 BLAKE2B 91b883af5b048d04637a893d11615af24c02671ce45b9d114939cef3b8e76f5f826646e10bc68dd7c92af96ddb9ef0bf7bc25b976e645b9b8bb3eb2c8db47f55 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e
-DIST tmux-2.2.tar.gz 466852 BLAKE2B 78bc503955686a1b8aa80c0686aa2b05c32bb54078c0dd5c3bcf0c3e2ac8ff0383ceb63218974b2da688506bd44e8ebfd48a05a66ba9322b446cc44c11952932 SHA512 4d4fc316c78aab0d13f7f15098d952f01d7da7d74d46251ae2dd90440522f07c785afe984d82de2b4518fb67ea441f5a5a46c357c87ddc6ddbfba4b7f08be7bf
-DIST tmux-2.3.tar.gz 473944 BLAKE2B 348bb0492332d2c52d11be2aa128552ca374feb8ac2cf91d395fe5896d1fd791e62c3a526df7c744ef888eaaa1aa91ffa110dcc5626b72169aac7dc7f7293dd2 SHA512 521e3734104be43837cba95d8b3d050d033708fa7469f7e7db66ae6993b002c4d9f6bafec41f3c9446eda91a4499e571019534dfa2e5a0563085b2d16e1b94af
-DIST tmux-2.5.tar.gz 475717 BLAKE2B c702949c7490b637ca99dc6b98d92af917e437374159153c6b955821d056fcbe676441974f42cb271db4dc69746765bb83e5a86a7d51e35d900a1a4f77e60ead SHA512 c0e8365a553d034e347f2f7a0d64f04e2be4307a75a9f72c8218fc56b72e531f3f37fe4a8f0e8d70801f5f62ee250ab7e9978abd6d101d273f76b4a1a92b08e0
 DIST tmux-2.6.tar.gz 481000 BLAKE2B adbd276261f3f4be9d67c6c0fbad28a90eabbecfa68ebbc104fe56acaa9b7bd005060b854ce0a0e669fdf41dd058bfa8450a85a78f71f7248a44d25458f7d3bc SHA512 20a1ae8b8494c5b42757902322f3877731c2cc330c9c00f097a317785d25252b7ebaa8bbab9fc17843299e80cb2914aaac0a664715a85c50f7ea489d23753832
+DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
-EBUILD tmux-2.2.ebuild 2126 BLAKE2B 08176ade022eab5db71d0e371a8b668dd8565b7f5056ed12ae644e93bdd6f518de0275fd64043221639ee0d4638eeeafd3a1dee7e5c34df007b4bb4ac9c1bec2 SHA512 cd6f0142fefd2f72d92ed12a68f812e8fec73254c1e729edf4fc9326f85e5f8be6b1253b88a5e927d6633dcd1f828385e10b643818f167319cc073276be5dec5
-EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd526bd5121f158af133f382a25fed90ae83cd10c733e3bd120fe899d91cfe5b7a93b89d349d0adf1a6ce4157e SHA512 2dd1c25573817c6ea2bb2667a0f9f3fb63d46ce547e0a3487dd62c7bcdfbd5cb1cc610d9d324e816eeed8ffa5d66212b80a1a5caaa477ee7baa6fa2b629342c0
-EBUILD tmux-2.3-r2.ebuild 2242 BLAKE2B 75da9813dc3ab1ecb854a15c8c06e84b88feb51bf21f876eaf385040ef07071be1dff7f34c6f9b62402a85f042f0088c4da088b1b882fbafbe292c4d7ec01d1f SHA512 ac9454dafba18b5f76c0f77a620ece677b8d195cb6f50fc57116bea4985e7c01e692d758ac42eb3a20d7c2c18f73c8bfcc2460f9535fc2c80180d3efb1462e6e
-EBUILD tmux-2.5-r2.ebuild 2073 BLAKE2B 1c3ee0f7eb1e2a26f5c7a0bc73442dcdd160d1bdd9a7bdad62a2397854b8ad08b4c055b985df9d8ba3d1bcf49033c30ff28443f8f7abbae55b54a622035c13d0 SHA512 fa557f19858c312918d6190cbd029dcbfec05a494236027e3be78bd8be8843823f5112150387986709881577b0bb3fc66bba42a4001729456136dd89739844d5
-EBUILD tmux-2.5.ebuild 2263 BLAKE2B f03e993159487bd92fe3e328d5f79d7bb3bc6b75ab3ecabae51dc64b156db260c7e2242a173e77a32a16dc14ab6276feec77cf7d94f2145c98d6209e9a8fed4d SHA512 d5abbfd108431a47bab4195e9397d0b2748fd59c0036c0c71caa34b741069eb0a5a3d14fe98d0874d312e740a5831a7df3aecc0de2eb3163842663a94638a389
 EBUILD tmux-2.6.ebuild 2139 BLAKE2B 2a1aad8d0517a69544dfd377b515408ce47b47a27f60eefd65d76c66f3eabf40638e99d3c833497c531ccdc40886ec0b902615944aae21cbcaee7f5aee4e59c6 SHA512 2f2dea7908ccb6455599e041e16a2a9aec7c8b4131d5a8f623ba4bddbbf5524ed308a5572ec7baaaac6e4819dbfa7fc87d821c8f0c1681a50bf7eeb48ea572af
+EBUILD tmux-2.7.ebuild 2148 BLAKE2B efbd209b875e90251bfb1aaa961621f48d61c4f9cd21b66db5b6b1f99c197db575591a8a79659b90dc60f8e4824ab58b219499ce3af4247f91891833828f2d88 SHA512 39434193a3fb90dc3efd2565188c2fac105bb136b0a7b889acc3b50632697251a3bd4274ec025b00174e385345a0ba9eba96d970cf0e7cd2e3f5315109e95fd9
 EBUILD tmux-9999.ebuild 2349 BLAKE2B e4f633dc28e278873941f66efb8adfff9735fd04ad98e505b474dfa657303033ba8cf1cc22f64f7e66ef248c2621858461bf133b2aaad9ee817ae80eba4de847 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/files/tmux-2.0-flags.patch b/app-misc/tmux/files/tmux-2.0-flags.patch
deleted file mode 100644
index d2c40e04b788..000000000000
--- a/app-misc/tmux/files/tmux-2.0-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
- Makefile.am | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 63e20b1..a2fec1e 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -25,9 +25,8 @@ endif
- # Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly
- # different flags.
- if IS_GCC
--CFLAGS += -std=gnu99 -O2
-+CFLAGS += -std=gnu99
- if IS_DEBUG
--CFLAGS += -g
- CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
- CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
- CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
diff --git a/app-misc/tmux/files/tmux-2.3-flags.patch b/app-misc/tmux/files/tmux-2.3-flags.patch
deleted file mode 100644
index 6fa66b508333..000000000000
--- a/app-misc/tmux/files/tmux-2.3-flags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
- Makefile.am |    3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
---- tmux-2.3/Makefile.am
-+++ tmux-2.3/Makefile.am
-@@ -23,9 +23,8 @@
- 
- # Set flags for gcc.
- if IS_GCC
--CFLAGS += -std=gnu99 -O2
-+CFLAGS += -std=gnu99
- if IS_DEBUG
--CFLAGS += -g
- CFLAGS += -Wno-long-long -Wall -W -Wformat=2
- CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
- CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
diff --git a/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch b/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
deleted file mode 100644
index 65dd2f3c1bc9..000000000000
--- a/app-misc/tmux/files/tmux-2.3-pipe_pane-fix.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/window.c	2016-09-29 05:31:24.000000000 +0800
-+++ b/window.c	2017-12-22 09:38:43.709617000 +0800
-@@ -981,7 +981,7 @@
-
- 	input_parse(wp);
-
--	wp->pipe_off = size;
-+	wp->pipe_off = EVBUFFER_LENGTH(evb);
- }
diff --git a/app-misc/tmux/files/tmux-2.3-screen_write_copy-fix.patch b/app-misc/tmux/files/tmux-2.3-screen_write_copy-fix.patch
deleted file mode 100644
index b8383274da2a..000000000000
--- a/app-misc/tmux/files/tmux-2.3-screen_write_copy-fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 30086e504c8a5389b96b72b81ac8dbefe19e0cf1 Mon Sep 17 00:00:00 2001
-From: nicm <nicm>
-Date: Wed, 5 Oct 2016 22:00:29 +0000
-Subject: [PATCH] screen_write_copy tried to be clever and clear the line if it
- reached the end of the source, but it was wrong and causes problems that are
- only showing up now we are more aggressive about skipping redundant screen
- updates. Remove the optimization entirely as more trouble than it is worth to
- fix (and it'll have to go when BCE is done anyway).
-
----
- screen-write.c | 34 +++++++---------------------------
- 1 file changed, 7 insertions(+), 27 deletions(-)
-
-diff --git a/screen-write.c b/screen-write.c
-index 3977517..3a1fc8c 100644
---- a/screen-write.c
-+++ b/screen-write.c
-@@ -394,38 +394,18 @@ screen_write_copy(struct screen_write_ctx *ctx, struct screen *src, u_int px,
- {
- 	struct screen		*s = ctx->s;
- 	struct grid		*gd = src->grid;
--	struct grid_line	*gl;
- 	struct grid_cell	 gc;
--	u_int		 	 xx, yy, cx, cy, ax, bx;
-+	u_int		 	 xx, yy, cx, cy;
- 
- 	cx = s->cx;
- 	cy = s->cy;
-+
- 	for (yy = py; yy < py + ny; yy++) {
--		gl = &gd->linedata[yy];
--		if (yy < gd->hsize + gd->sy) {
--			/*
--			 * Find start and end position and copy between
--			 * them. Limit to the real end of the line then use a
--			 * clear EOL only if copying to the end, otherwise
--			 * could overwrite whatever is there already.
--			 */
--			if (px > gl->cellsize)
--				ax = gl->cellsize;
--			else
--				ax = px;
--			if (px + nx == gd->sx && px + nx > gl->cellsize)
--				bx = gl->cellsize;
--			else
--				bx = px + nx;
--
--			for (xx = ax; xx < bx; xx++) {
--				grid_get_cell(gd, xx, yy, &gc);
--				screen_write_cell(ctx, &gc);
--			}
--			if (px + nx == gd->sx && px + nx > gl->cellsize)
--				screen_write_clearendofline(ctx);
--		} else
--			screen_write_clearline(ctx);
-+		for (xx = px; xx < px + nx; xx++) {
-+			grid_get_cell(gd, xx, yy, &gc);
-+			screen_write_cell(ctx, &gc);
-+		}
-+
- 		cy++;
- 		screen_write_cursormove(ctx, cx, cy);
- 	}
diff --git a/app-misc/tmux/files/tmux.vim b/app-misc/tmux/files/tmux.vim
deleted file mode 100644
index baac50adab16..000000000000
--- a/app-misc/tmux/files/tmux.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux
diff --git a/app-misc/tmux/tmux-2.2.ebuild b/app-misc/tmux/tmux-2.2.ebuild
deleted file mode 100644
index fdc80fec9998..000000000000
--- a/app-misc/tmux/tmux-2.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4:=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-	sys-libs/ncurses:0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0-flags.patch )
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug) \
-		$(use_enable utempter)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.3-r1.ebuild b/app-misc/tmux/tmux-2.3-r1.ebuild
deleted file mode 100644
index 1c3c6889b8b4..000000000000
--- a/app-misc/tmux/tmux-2.3-r1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4:=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-	sys-libs/ncurses:0="
-DEPEND="${CDEPEND}
-	virtual/pkgconfig"
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-DOCS=( CHANGES FAQ README TODO )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-flags.patch
-
-	# usptream fixes (can be removed with next version bump)
-	"${FILESDIR}"/${P}-screen_write_copy-fix.patch
-)
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug) \
-		$(use_enable utempter)
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.3-r2.ebuild b/app-misc/tmux/tmux-2.3-r2.ebuild
deleted file mode 100644
index 3bed9128b2f8..000000000000
--- a/app-misc/tmux/tmux-2.3-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4:=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)
-	sys-libs/ncurses:0="
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3-flags.patch
-
-	# usptream fixes (can be removed with next version bump)
-	"${FILESDIR}"/${P}-screen_write_copy-fix.patch
-	"${FILESDIR}"/${P}-pipe_pane-fix.patch
-)
-
-src_prepare() {
-	default
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm aclocal.m4 || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	econf \
-		--sysconfdir="${EPREFIX}"/etc \
-		$(use_enable debug) \
-		$(use_enable utempter)
-}
-
-src_install() {
-	default
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		ewarn
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		ewarn
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.5-r2.ebuild b/app-misc/tmux/tmux-2.5-r2.ebuild
deleted file mode 100644
index 092a05aeac5f..000000000000
--- a/app-misc/tmux/tmux-2.5-r2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic versionator
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
-
-CDEPEND="
-	dev-libs/libevent:0=
-	sys-libs/ncurses:0=
-	utempter? (
-		kernel_linux? ( sys-libs/libutempter )
-		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
-	)"
-
-DEPEND="
-	${CDEPEND}
-	virtual/pkgconfig"
-
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-		app-vim/vim-tmux
-	)"
-
-DOCS=( CHANGES FAQ README TODO example_tmux.conf )
-
-PATCHES=(
-	# usptream fixes (can be removed with next version bump)
-	"${FILESDIR}/${PN}-2.4-flags.patch"
-)
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
-	# bug 438558
-	# 1.7 segfaults when entering copy mode if compiled with -Os
-	replace-flags -Os -O2
-
-	# regenerate aclocal.m4 to support earlier automake versions
-	rm -v aclocal.m4 || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-pkg_postinst() {
-	if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then
-		echo
-		ewarn "Some configuration options changed in this release."
-		ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/"
-		ewarn
-		ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any"
-		ewarn "older, running tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to access them."
-		echo
-	fi
-}
diff --git a/app-misc/tmux/tmux-2.5.ebuild b/app-misc/tmux/tmux-2.7.ebuild
index 021ab3b915f0..33446641593b 100644
--- a/app-misc/tmux/tmux-2.5.ebuild
+++ b/app-misc/tmux/tmux-2.7.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
@@ -15,12 +15,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~spa
 IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux"
 
 CDEPEND="
-	>=dev-libs/libevent-2.1.5-r4
+	dev-libs/libevent:0=
+	sys-libs/ncurses:0=
 	utempter? (
 		kernel_linux? ( sys-libs/libutempter )
 		kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) )
 	)
-	sys-libs/ncurses:0="
+"
 DEPEND="${CDEPEND}
 	virtual/pkgconfig"
 RDEPEND="${CDEPEND}
@@ -32,7 +33,7 @@ RDEPEND="${CDEPEND}
 		)
 	)"
 
-DOCS=( CHANGES FAQ README TODO )
+DOCS=( CHANGES README TODO )
 
 S="${WORKDIR}/${P/_/-}"
 
@@ -71,11 +72,6 @@ src_install() {
 
 	dodoc example_tmux.conf
 	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
 }
 
 pkg_postinst() {
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 9f0d74af94d3..7b8c38d1225b 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -2,7 +2,7 @@ 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 649 BLAKE2B bf14c5872c47badc6fc84bfd7b92ed8652715c6605a45b112332225eee6518fcf04bb2cb4d56b7e71faa5db56e16130fb97d68228e57e1db47553648e22493af SHA512 5a6ec7457d977556b8eec0be0be3aff8160fc656c5de35c0b4a9323a98a020e1a98edc3c9918542e9f4169c4e9f8cc11c44a6882866e43b4eb19fe3126f5ed8e
+EBUILD yq-2.1.2.ebuild 640 BLAKE2B e9b0689dbff64ee1ea2712d8d6bb6dd106fdd5057ea0e9bc7203a98590ec5ee78509e6530769b3994f384bfab1f2bc32ce81e6cac70e5d244aac8ac1dd1d0201 SHA512 4efe79efc5839ee9065d7101aa3829d71af31fe41df80c84f9984a064351d8d723a0b617e2b433756bd8dbed1bfa0cc87fdc7cdafa513eebc5a0133e0023aa5d
 EBUILD yq-2.3.0.ebuild 640 BLAKE2B 3a61bb44cfd3eee185eb2a0a15032173835f3b9dd853af079ef23a74b231d44514b99db2255bfa7eaea7a7ecc89f1b0c4701d03f4a09fca7720af68889be8142 SHA512 bbaa17264984766a01dd3c5548f2853f27626f1cc31ca2e324add90467cc0d8c30a1c018ca64b2a011a4ea4cbb67c40099cbdf3f8b185535c376ba3290e40ef6
 EBUILD yq-2.3.3.ebuild 640 BLAKE2B 3a61bb44cfd3eee185eb2a0a15032173835f3b9dd853af079ef23a74b231d44514b99db2255bfa7eaea7a7ecc89f1b0c4701d03f4a09fca7720af68889be8142 SHA512 bbaa17264984766a01dd3c5548f2853f27626f1cc31ca2e324add90467cc0d8c30a1c018ca64b2a011a4ea4cbb67c40099cbdf3f8b185535c376ba3290e40ef6
 EBUILD yq-2.3.4.ebuild 640 BLAKE2B e9b0689dbff64ee1ea2712d8d6bb6dd106fdd5057ea0e9bc7203a98590ec5ee78509e6530769b3994f384bfab1f2bc32ce81e6cac70e5d244aac8ac1dd1d0201 SHA512 4efe79efc5839ee9065d7101aa3829d71af31fe41df80c84f9984a064351d8d723a0b617e2b433756bd8dbed1bfa0cc87fdc7cdafa513eebc5a0133e0023aa5d
diff --git a/app-misc/yq/yq-2.1.2.ebuild b/app-misc/yq/yq-2.1.2.ebuild
index d8a9cfb27e57..f6430d90a552 100644
--- a/app-misc/yq/yq-2.1.2.ebuild
+++ b/app-misc/yq/yq-2.1.2.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,5,6} )
 inherit distutils-r1
 
 DESCRIPTION="Command-line YAML processor - jq wrapper for YAML documents"
-HOMEPAGE="https://${PN}.readthedocs.io/ https://github.com/kislyuk/${PN}/ https://pypi.python.org/pypi/${PN}"
+HOMEPAGE="https://yq.readthedocs.io/ https://github.com/kislyuk/yq/ https://pypi.python.org/pypi/yq"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"