14 files changed, 160 insertions, 119 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 82cc6d174931..ac03f6511735 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index 2c08573bb65a..3fd844a84e77 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -1,5 +1,6 @@
+AUX gcal-4.1-glibc228.patch 3267 BLAKE2B b754919136da6652ef2f44bfbf9f9b0be839b89a35b23d028a4ca0cbb6101297066c862b2139ac424b276caf59dd12473d0194ca5b49f42c5bfcdfea2b37d3e1 SHA512 e1d54483561ac5b9473bcc42702b015a196fcde100dd2098dfd07642b7a5ee28887ef259296e98d7a46f18781e2b6a9c89424ebfe65b8ce601457b4f75af08af
 DIST gcal-3.6.3.tar.xz 1640172 BLAKE2B 322a3bf34a389ab92daa0262b8b36f99b585c7f76e46e5a921a5e23ced74ae98bf09446e02988c98c29ecadf631b6624cb43e76c8da736a185e52ed34441c334 SHA512 9be7d6e58a55fbb7531f91bd2a6fa51e8d62364636c31d8d65f6ac24415ac2de8af5eaab8496e155c2820b7480ecf926c4395114ff4363deb21bd268dec44963
 DIST gcal-4.1.tar.xz 1658948 BLAKE2B 980b509923d7e3afbd391f1129a77e647f61e09d68aec29490bc16041260e56082097732f015260515036a4560bee18391c8f6aaa5eaff69740f18a37a44d8f2 SHA512 24b9ee87c3dbfd3231b2017fd0a3030cc5b7c7fde032ea1fcf816b0f10dc40d808c646aa8ece86651da4f3928fecf35f84f4c68c0bfdb8cf63e3ecc189d2074d
 EBUILD gcal-3.6.3.ebuild 755 BLAKE2B 587f11c595be77c84acb9d7f9fe14be92b76721205e7e0ca3491440d98f37ddc34d4bd973833b1ee1af32a80a9719773e57291b6375900336973e73665d10057 SHA512 56331663a9c6e1ebee5b6acaf66ce3635c8524e6cbee8604c134ec0df68ef4577b89a7c839885102bed0986e9623cf7a60947e8159e2b6687d3cbc04b3bf07e5
-EBUILD gcal-4.1.ebuild 868 BLAKE2B 09ee0f85e3dc79ad692b952e7f189d525682b57e93c8233bf0d8b14c7a291a46390b9d19421cd4dfcc81e7746f0074162326caafcecaabe5e259b6f10b903304 SHA512 306c9790470d422c09f5536f24ae643f2c2ba8c36817aaae361615d89c559c19d5c6618859539776567e8e2a4833d706cc0765ee616c0cdaf99537fa51a2d14d
+EBUILD gcal-4.1.ebuild 912 BLAKE2B cbcb5a1786ea13eabc235b8d64840be8fb1ff88d63b54dd733e4776a755753f44be1c1e610a1930f49b77006948b91541e7adcb56f7d73da3d91fed15921e33a SHA512 58000cff99fd528fac6755aeaf4d553a6e5bf45fe25d494d7a1214f52c617829cb56f4a0d94a4fea9827c7d8ce3fbef8b8c0aac7df2f684fdefe488465d7ea7c
 MISC metadata.xml 1018 BLAKE2B cb75f985009092bb5b22cc15d4ad11da0f049d6b4fe1ac02479a73d5333102a0abe0a80f7673b408d6991b9c1c862706279a25abbd071f9faf3c1d012d69ecc1 SHA512 44362e0e9926b26bab6a3eef736bb8e6c1d76e33f94ec546a97bde251a5e03d8102d3f17ea48a20f18da957c325b766647e3574bd8e13f0f070a15b105d07ea3
diff --git a/app-misc/gcal/files/gcal-4.1-glibc228.patch b/app-misc/gcal/files/gcal-4.1-glibc228.patch
new file mode 100644
index 000000000000..6e9b7c26eff5
--- /dev/null
+++ b/app-misc/gcal/files/gcal-4.1-glibc228.patch
@@ -0,0 +1,74 @@
+diff -ruN gcal-4.1.orig/lib/fseeko.c gcal-4.1/lib/fseeko.c
+--- gcal-4.1.orig/lib/fseeko.c	2017-01-22 18:09:38.000000000 +0100
++++ gcal-4.1/lib/fseeko.c	2018-10-27 21:56:46.232442299 +0200
+@@ -1,9 +1,9 @@
+ /* An fseeko() function that, together with fflush(), is POSIX compliant.
+-   Copyright (C) 2007-2017 Free Software Foundation, Inc.
++   Copyright (C) 2007-2018 Free Software Foundation, Inc.
+ 
+    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, or (at your option)
++   the Free Software Foundation; either version 2, or (at your option)
+    any later version.
+ 
+    This program is distributed in the hope that it will be useful,
+@@ -12,7 +12,7 @@
+    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/>.  */
++   with this program; if not, see <https://www.gnu.org/licenses/>.  */
+ 
+ #include <config.h>
+ 
+@@ -33,9 +33,9 @@
+ #endif
+ #if _GL_WINDOWS_64_BIT_OFF_T
+ # undef fseeko
+-# if HAVE__FSEEKI64 /* msvc, mingw64 */
++# if HAVE__FSEEKI64 && HAVE_DECL__FSEEKI64 /* msvc, mingw since msvcrt8.0, mingw64 */
+ #  define fseeko _fseeki64
+-# else /* mingw */
++# else /* mingw before msvcrt8.0 */
+ #  define fseeko fseeko64
+ # endif
+ #endif
+@@ -47,7 +47,8 @@
+ #endif
+ 
+   /* These tests are based on fpurge.c.  */
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++  /* GNU libc, BeOS, Haiku, Linux libc5 */
+   if (fp->_IO_read_end == fp->_IO_read_ptr
+       && fp->_IO_write_ptr == fp->_IO_write_base
+       && fp->_IO_save_base == NULL)
+@@ -80,7 +81,7 @@
+ #elif defined __minix               /* Minix */
+   if (fp_->_ptr == fp_->_buf
+       && (fp_->_ptr == NULL || fp_->_count == 0))
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+   if (fp_->_ptr == fp_->_base
+       && (fp_->_ptr == NULL || fp_->_cnt == 0))
+ #elif defined __UCLIBC__            /* uClibc */
+@@ -123,7 +124,8 @@
+           return -1;
+         }
+ 
+-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1
++      /* GNU libc, BeOS, Haiku, Linux libc5 */
+       fp->_flags &= ~_IO_EOF_SEEN;
+       fp->_offset = pos;
+ #elif defined __sferror || defined __DragonFly__ || defined __ANDROID__
+@@ -150,7 +152,7 @@
+       fp_->_flags &= ~__SEOF;
+ #elif defined __EMX__               /* emx+gcc */
+       fp->_flags &= ~_IOEOF;
+-#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel */
++#elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, MSVC, NonStop Kernel, OpenVMS */
+       fp_->_flag &= ~_IOEOF;
+ #elif defined __MINT__              /* Atari FreeMiNT */
+       fp->__offset = pos;
diff --git a/app-misc/gcal/gcal-4.1.ebuild b/app-misc/gcal/gcal-4.1.ebuild
index 7f56acee8cae..cd7e657da4f9 100644
--- a/app-misc/gcal/gcal-4.1.ebuild
+++ b/app-misc/gcal/gcal-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,6 +24,8 @@ RDEPEND="nls? ( virtual/libintl )
 
 DOCS=( BUGS LIMITATIONS NEWS README THANKS TODO )
 
+PATCHES=( "${FILESDIR}/${P}-glibc228.patch" )
+
 src_configure() {
 	tc-export CC
 	append-cppflags -D_GNU_SOURCE
diff --git a/app-misc/pdfpc/Manifest b/app-misc/pdfpc/Manifest
index 302a4e16023e..650863699563 100644
--- a/app-misc/pdfpc/Manifest
+++ b/app-misc/pdfpc/Manifest
@@ -1,3 +1,5 @@
 DIST pdfpc-4.1.1.tar.gz 96995 BLAKE2B f032cf0207cfb116ef98a171376d1cc80ae20f70eb7a63cf29dbd93e73c7bc1b0ef7638f9086d9908470d988830c4b420d9b96e7764af6219267d9ca6aad557a SHA512 51fa8e7743e02ba7e119dc86505f4513c174842a22d5755154775bd9abd945e7bcb9ba3c205cb27de25c38271762307136cb5370443131ea80cc0b9187e531bf
+DIST pdfpc-4.2.1.tar.gz 104515 BLAKE2B 96939731e4881e9dfadb5c00e449adaf8d3b88ca8d726621e9e1ffb1a5afab3e44f2c39a587704427cab53b1e06e7cfc6873e0b9e4ed284a6203f0c5280f8065 SHA512 27674c600c2212035996a8d362432655eb6d5ee12ec34af6f6417fe05a9f5ef051f9f528bac681ab7fafc32deb38b9788256122d43ef47d0fe75d5b8e2863679
 EBUILD pdfpc-4.1.1.ebuild 1047 BLAKE2B 71e94a6c2e63ffaea3046a1426036ff859b2243f7b539a9239585de10a15d60810a1c7537e2f382ee763da14a0b58632a5f70d2bafb46fca772b838e0410891e SHA512 72167e26b6c82d643fb791bc19033d41df196d8f8ce3d5bb03ab5488785c0e3aec8f16c6d5d9e85fa23289bdd60d37e0fa59bf0060ee3c692c8b275c7b8b0002
+EBUILD pdfpc-4.2.1.ebuild 1046 BLAKE2B fece2040846a3c1dcf45a3b20c6e0eb139160e3bdffbb4ef2aa1afcd20f80dfa2e15b6e10aece16eb1170a33adf1a11a1660eaf4b7afee647b090f0f609ccca9 SHA512 4d6bf8fce6f4b8a7446e093832537a9267a9d1078dc30eb20d3c6d6362a9cd539e24004b9036ae3ed9c464cd6ff2a6f059434a4012874b01c3cb8b8c99e8e1dd
 MISC metadata.xml 248 BLAKE2B 654fec0fee7061d757492fb099eaead728da33a2ae9cd4d062f8777b7a154898a212f16ba8432e0e2ebb5578ce57fdd536e715501972db07e906a866f65691f4 SHA512 55030b20a7a78b1738b2421cdb749e17c0704fa5b90109d83a4f81f09c177d2b27686e524935a63c8f1e7bd8f011a3a966d6ce336d335c2361fdd208763c28ef
diff --git a/app-misc/pdfpc/pdfpc-4.2.1.ebuild b/app-misc/pdfpc/pdfpc-4.2.1.ebuild
new file mode 100644
index 000000000000..9b616b11b484
--- /dev/null
+++ b/app-misc/pdfpc/pdfpc-4.2.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VALA_MIN_API_VERSION="0.26"
+VALA_MAX_API_VERSION="0.36" # fix sed line if you increase this
+
+inherit vala cmake-utils
+
+DESCRIPTION="Presenter console with multi-monitor support for PDF files"
+HOMEPAGE="http://pdfpc.github.io"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="gstreamer"
+
+RDEPEND="app-text/poppler[cairo]
+	dev-libs/glib:2
+	dev-libs/libgee:0.8
+	gnome-base/librsvg
+	gstreamer? ( media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0 )
+	sys-apps/dbus
+	x11-libs/gtk+:3"
+DEPEND="${RDEPEND}
+	$(vala_depend)"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	sed -i -e "s/valac-0.20/valac-0.36 valac-0.34 valac-0.32 valac-0.30 valac-0.28 valac-0.26/" cmake/vala/FindVala.cmake || die
+	vala_src_prepare
+}
+
+src_configure(){
+	local mycmakeargs=(
+		-DSYSCONFDIR="${EPREFIX}/etc"
+		-DMOVIES=$(usex gstreamer on off)
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
index 9916cdec6501..fdcefa368acc 100644
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@@ -1,5 +1,5 @@
 AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
 DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
 DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
-EBUILD prog-express-3.7.8.ebuild 1573 BLAKE2B 7ea62d5ac6bdd72135934d7e19c851f0e73e87f7da8a229a6dce05bf965f4be129d3a11ef3e12c7ca44b456430e94b01cbdf4b5275d7ff009bad221db3aea440 SHA512 218576988462e71fb6aa0fb8aedd6894798323b00baf41bf91d21783d3a7a4bf29ceacdf75d7c6bb5adaf547bcbfe48dc28f05f7aec1a6e17df63126c8e5438c
+EBUILD prog-express-3.7.8-r1.ebuild 1506 BLAKE2B d158df25f4fd6527d377efbedf19e12c1a790e115e7bba13c082bc2174d43de34c74256af1785b0c0438c59842bef2fb0a984f39011c4d10bd4ebfa80e77c255 SHA512 2a3aba76274e65bc0b0d21c8a0d327288870b9b6ea866a2f2e05f5c75d2a6a8d396e1ec5859e94776376906b7f1c92ccb94df4cb1dff1a3a1b970d9844dc3510
 MISC metadata.xml 523 BLAKE2B ea6df68f08186fa4b039a199b83452e561480ca24836dea6d96723058c74d8657f0c8dac3404492a4aad660d9d3d10a30702dc0cd90e6712c4a74e6803ee85a9 SHA512 d7e5c947e7f15307c97c5b4940765245a0b4198a32ba896b8c4587f2d6ece0e3631b654c50b3d918716e598c213ad33d7ae636b4bf119149c90d2ba5f70b5aa2
diff --git a/app-misc/prog-express/prog-express-3.7.8.ebuild b/app-misc/prog-express/prog-express-3.7.8-r1.ebuild
index 3cc76c3e2683..8f6bb19e60e4 100644
--- a/app-misc/prog-express/prog-express-3.7.8.ebuild
+++ b/app-misc/prog-express/prog-express-3.7.8-r1.ebuild
@@ -1,35 +1,41 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit desktop udev unpacker
 
 DESCRIPTION="A modern and intuitive control software for the Batronix USB programming devices"
 HOMEPAGE="https://www.batronix.com"
-SRC_URI="amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.amd64.deb )
-	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )"
+SRC_URI="
+	amd64? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.amd64.deb )
+	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )
+"
 
 KEYWORDS="-* ~amd64 ~x86"
 LICENSE="prog-express"
 SLOT="0"
 
-RDEPEND="dev-db/sqlite:3
+RDEPEND="
+	dev-db/sqlite:3
 	dev-dotnet/gtk-sharp:2
 	dev-dotnet/libgdiplus
 	dev-lang/mono
 	dev-lang/mono-basic
 	virtual/libusb:1
-	virtual/udev"
+	virtual/udev
+"
 
 S="${WORKDIR}"
 
 DOCS=( "usr/share/doc/prog-express/changelog" "usr/share/doc/prog-express/manuals" )
 
-QA_PREBUILT="usr/bin/bxusb
+QA_PREBUILT="
+	usr/bin/bxusb
 	usr/bin/bxusb-gui
 	usr/bin/prog-express
-	usr/sbin/bxfxload"
+	usr/sbin/bxfxload
+"
 
 src_unpack() {
 	unpack_deb ${A}
@@ -42,7 +48,7 @@ src_prepare() {
 }
 
 src_install() {
-	dobin usr/bin/bxusb usr/bin/bxusb-gui usr/bin/prog-express
+	dobin usr/bin/{bxusb,bxusb-gui,prog-express}
 
 	dosbin usr/sbin/bxfxload
 
@@ -58,7 +64,7 @@ src_install() {
 
 	doicon usr/share/pixmaps/prog-express.png
 
-	doman usr/share/man/man1/bxfxload.1 usr/share/man/man1/bxusb.1 usr/share/man/man1/bxusb-gui.1 usr/share/man/man1/prog-express.1
+	doman usr/share/man/man1/{bxfxload,bxusb,bxusb-gui,prog-express}.1
 }
 
 pkg_postinst() {
diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest
index a6f790174989..10d002711569 100644
--- a/app-misc/qlcplus/Manifest
+++ b/app-misc/qlcplus/Manifest
@@ -1,4 +1,4 @@
 AUX qlcplus-4.11.1-qt-5.11.patch 7589 BLAKE2B 30aeafe90d1013fabe5d2f059ad483a3ddef64edeb691bf7a21b818b946cdbe028d52e4a13e29b0c0c571504dc0cac215e93584bf5a71f6ccfbdd807a16faf3d SHA512 e9b1b160463356a7a9c7768a55435a50a9c7081b342807bdd83282bc500a186f81420402db321463bb2e2ad29db95c3b8b33a7621aa481e34668420c85213636
 DIST qlcplus-4.11.1.tar.gz 9394093 BLAKE2B 0b91359217b723ed184f6a609ee0ef0a39f5f08aa8933abc7a3c429e4d5a3b2d1dc8ef454c00a172bc0e7b8f7fb0779d7fbba96ed5fafe403853f2a3bb8ce7b8 SHA512 14efdbe5cd53da592a58b48efb1daf7dda2a4e19d7d20792d34674af2aa1b9c287cfd58673db7838885642bb2ebfaf9b462be41d33f8d89497cb61dfab7246df
-EBUILD qlcplus-4.11.1.ebuild 1353 BLAKE2B 2ca629dcbc50ff860abb98ec27146521acafc69621aa1096b10a5e6d95ac1d6b11eaf90cbecb9092e9820d5e743085f82c661676333fb247d855872e214a8334 SHA512 bbbb98982ac9afabf3ed5729b6acd04257a4ac6bfc7c09c19e514f12317a68f4511bc245c0fd26a575e87dd21437e44b3848f2001d33ba01e91acd895b2cd60e
+EBUILD qlcplus-4.11.1.ebuild 1347 BLAKE2B 555ec645507ebf489201fa36bbfefbcc6cf100fc096c7db0d8b958310806c1b98f8621de9793f28a27bcedf68616b896b9da07e290cdbe6390b80faab7507f1c SHA512 84a6cf8545c8b8f2b9c23650fa43aa678e65b7811a6ed7d3359e88bfd19b02807bb1ebced96ea15c41cfcc869c75f0920dd90759278b8917a707a784f1cc758a
 MISC metadata.xml 326 BLAKE2B 8d391e1f300d364a5e985caad82387023c6f9d6081313b571ece49d2f5daf60f25527685bb7567ad18cbe3234202f8fe53b0a786b401477687b5b8ec39dfc1d9 SHA512 5de2dc43ec5ae4d9a2c598cfac00dc124a956040d0721cb867acc5c4ed312e8c9ef415205eaaed8ff5742281251c970a5ade2eae6280b62477f4fda3fedc2504
diff --git a/app-misc/qlcplus/qlcplus-4.11.1.ebuild b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
index de801605d298..3f618215d189 100644
--- a/app-misc/qlcplus/qlcplus-4.11.1.ebuild
+++ b/app-misc/qlcplus/qlcplus-4.11.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 inherit qmake-utils udev vcs-snapshot virtualx xdg
 
-DESCRIPTION="QLC+ - Q Light Controller Plus to control DMX interfaces"
-HOMEPAGE="http://www.qlcplus.org/"
+DESCRIPTION="A software to control DMX or analog lighting systems"
+HOMEPAGE="https://www.qlcplus.org/"
 SRC_URI="https://github.com/mcallegari/${PN}/archive/QLC+_${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Apache-2.0"
diff --git a/app-misc/skim/Manifest b/app-misc/skim/Manifest
index cfa5f2513ff0..31029e8c7287 100644
--- a/app-misc/skim/Manifest
+++ b/app-misc/skim/Manifest
@@ -4,6 +4,7 @@ DIST atty-0.2.3.crate 5486 BLAKE2B 5c1b3bc8cd680ae639302d51fd54a10ad2595ed112d7e
 DIST bitflags-1.0.1.crate 13451 BLAKE2B ee1cdfad0af901176ae435f4a7096cde698de4a6ab6a49330870ddfe5a9f9836a91c9866dba9889163e31a68a009fa14c9cbc355a011bf45468a9773022c33fc SHA512 6ca3a06645534769fb5c5ad91958e9e802db5a4b49a2a11b0be5243d7e92e32e552183a7ba8d7052f8543f642bc0e4799ef0f36013f64e5c60f4e98bbb26e465
 DIST byteorder-1.2.3.crate 18805 BLAKE2B 2d5a74233f17778ee20220f9bafed13185b08fee92279a597d2169225bfd48e087031f2f7350ddc0344c002d97bbf992136d4b98416c70e2bde7e0e502a4d67d SHA512 336c9ac26d897042554d4c7c00a5c47cfdfa2a181511a7247b292c342156450c6cac95a2137d6f6a45f59ff1ef351a18dc73fb75e9e0c5b0b3a90d7026d39dc1
 DIST bytes-0.4.8.crate 46023 BLAKE2B e83cf53fda9c1e9338e644d0f8b4c33565b693b8c39b26ae8ad2f82dc74b9337361354f6ab5f1eae9cfe928955443b094f0f0627d6aee80e8529ebcc44f54ec4 SHA512 f56cae4af641757bfce2d444c235e92e01a9d4db66efa96e39c06b49af53c966a3bfa351130f3a5f13b4ea156b8ae9416065f66188361433cfaba475b8f321b5
+DIST cc-1.0.17.crate 42064 BLAKE2B 1b21666998f1a4746b069f0ac034b35203b52cb1bf712b5cd9bd2414b83121b0b8a6770b97b518843f7b65bd1546fcf448643a56bfc3e5b91a839afaf8f9c15e SHA512 565f93c7b1803e484f3602f9942c8d6f30e117c299dbc603cd187dd15f136d737cf84fb6138b405ec4d6e381f1ba2f3c0acb845fcb39b92f6e24c8f59a098c5a
 DIST cfg-if-0.1.3.crate 7115 BLAKE2B 748cb334312efe8a1410a0dda75db94ea2e6a6915a6293cec35cdfc72f9491a6fde32691c53cbac20f705760725dcc766107a15a4bee41481beb724ea8588a6c SHA512 88537e4b53f5553fdee16c4949de0bb0fdf12576b9a1d197fc7edd00d41c47972d481227bb6311bec774099cde27195fe319f28f4385a4091f06849dceabd34d
 DIST clap-2.28.0.crate 186934 BLAKE2B 6885cb7a74077b1c72feac97471c08a456f5e826e42b95bb1768027fca127696a457cbb8069e624196e1c77e55608b8ec6b157bfa3e8a661dc0c9b67af903c9c SHA512 737bfa82008082d75ef5f36c5aa505af8e11ff08b7ec824a69f37dcafe1d7ea8e4909a94cf5de218f9bde4cd304e8ec57441b195d936b7db43e8b5881fda0d01
 DIST env_logger-0.4.3.crate 10891 BLAKE2B acbe308cb75ad68f824dd8cbbef13a9bab3234f121952f16af274180ce87bbde6f6327bd98f0d2a4623fa7a4980b554ffecc9280b709df1323de149399537d6d SHA512 ba2c10608f87804e528a2de28c236e780485413dbc3835b5bd9acf4a9c11d9c66665a310747b5d8a5ef7752186ab8a1ab5fbf6042657a3447380cb0869722246
@@ -11,18 +12,18 @@ DIST gcc-0.3.54.crate 37248 BLAKE2B e1e14c117776c6e194625223b027ff90b9fddc179ff3
 DIST iovec-0.1.2.crate 8565 BLAKE2B c1ff225d7e8cb8b7efc2be01763740c4f0c1188a5f1f27c5fd3fc34104b2280bee59915d71812756bfd36832fb807374d531792936ed8a7228d52ab98d622a50 SHA512 3e523bcb8b9891be66398f44c97933d246b7a7fbfc4f315bfda6cdb22ca2786ccc82139ee1b646b4c24f6f50f57fba38f9b1fb7c75e859722e9e9c789b458223
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-0.2.11.crate 12361 BLAKE2B 3fe6a480c30a792448a3a2b378e05634ec59603f07baa03c0881fe5af85ecde5a172bb0733e7043fb6c43eabc261635b23410658d48add09eef6d807a750d22f SHA512 c85ac434d1b7d41d638e76a142a43d925b96bdddda112b1abeca1bae160d828262a85cd333d72499fe1dc7ae9574d3db226106acb433328c056028eb8c42bfe6
-DIST libc-0.2.34.crate 304756 BLAKE2B 0a2af3e2a92ac6dfc72d72d26ff2df47b0c8656f22b3a52df02cf8eff787ae638ae8b2c56370da0e9f3831cca325d6073c6d08beedd7c75455c2785ccc5081bc SHA512 5f7a108608c2d202f6d59125aec37679f178cd1e34f0b6cc9384c476179aa45a8f10b5934314e2b2243fba4233bf8b1ce91399c8ba73e41c3591c14debc12856
 DIST libc-0.2.42.crate 336080 BLAKE2B 0de0726bfb00ff42d67abf06efa26c1a4f8132b29be2f957b9089da2ef3e4dfddddea49ea23af3449a367d262dc563b70968c6b2b6a1dc81829e6c6a8a1dac63 SHA512 c99a4358805012d7552f416ae68c9651dfd260599bf0cd618b55036acd08ab8eeda8aa18c18b893f074c9613694ef6562e87f032639eb86b86514aa0fd815870
 DIST log-0.3.8.crate 17756 BLAKE2B 1b06efd4625f9192e56629a5c8fd3072d876643ec5d42022e001d8c14139c56b7a2bbbaadeb5218a9ada6cd86aae26819dc4693eadb13ac1dd4ae93ac50554e8 SHA512 9fc80f2a72855a2b0260d6bfbdd55085791c67cb1896fd20da0a4d624125003cb0a10d9080c2fd7810ca67e41652a94177e1d091bdadeb5ea65c7c4acd666bd7
 DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST nix-0.10.0.crate 124570 BLAKE2B 2af23108f2e9403cdafbfa3b7b6fea9aab4c9006a6f16145d273833c845c4d3abea762d7f3720d54aefef0cebc4c55675b5a79ca7bf61184846276c543c1499f SHA512 335bb939af0132511798e6c8cd259e82b6c5570a51b2dffab8c7c1c1ef13f473ead04bb5d99ad2aa383ea3529d6ec526a1c5dd0adf501d37406cbf3113b453df
+DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
 DIST redox_syscall-0.1.32.crate 13555 BLAKE2B b8170ec049001e6007d736e19b8171cf2d605a987ad42910123478780e667deb7cf72ddfcc3ab5b073d966e13aed5be77e032af65ba3b8a74a8e6964fd08adb9 SHA512 8a19a241b0ffa235e7716e9c01ed7e0a424fc552e766e2ec3c0d41c70f62424fc3d000513d29462d753258c811a973eb0bdac5868b382a4334a7f25bc32553e5
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
 DIST regex-0.2.3.crate 193983 BLAKE2B e59478e264afed2ca0f675dd5abc39b0ec5f77609c7720ce6ebdd4cb31f51201024ffb3d13dce3f9ba643f8ab623248790412c63867ac660d8226bbec586280a SHA512 639e8f0e62127fa9ba84a53c2b9e4774ed126eb48dc0f3bbe093d8683987d74e90124f5ba1722af9ad5d8487469320f6dd6e5e76bfaa64e170c788c41162b58e
 DIST regex-syntax-0.4.1.crate 121453 BLAKE2B da7f780fdb19e0516cbe94eb3361b8f3b02ed36dcd7e58eb8e3a16601f169652d45dc10657d400796fdb93be560ec6678e34315d9e94a05e9d0b11b476d8ae1a SHA512 0c6996d0b8c16053f6e4e6324053f8b6924313827d9fec59e209852aed11a18902a51bdaa98b95ab706a4b65896a201549cda2972b54ac2e2a2c704b61690a0f
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
-DIST skim-0.3.2.crate 69623 BLAKE2B af7236145d300033fe4d61f639209660c41c67d9ee1848c9a55e928531fa450c9c69c806abf93fd21e8876d5755143f80ca3746053617b8309c7e36f009761c6 SHA512 3f0358bd48169e9a5bdfc9b7ce1269dd1823b8df4035b0d4c81ee1ae0bc7dfcab696efcaa4bfa6a7e0b0f7143dc2752dd5df45dbf10ce199615f509d6c68efef
 DIST skim-0.5.1.tar.gz 77080 BLAKE2B 9fa7e9f8d838cfc0608894177a1ca34da6e056bb2831eaea781b687b24f89bc865a710296191a986762d20169d20c3406562e291974a2d444bd95782c4cda48d SHA512 871d975e31fba4762555525b6ef22caf92a6df6eba9f6f1f2a7271569b6aa0af60352fedc515e6c6e614607546e943699f40acb8f3df819646c562a5171d77bc
+DIST skim-0.5.2.tar.gz 78847 BLAKE2B 0530a730abce8bdcaff1e6b2637777e87a0a9184dde112b9c8b4dde08780d7d50cb8bb4ec2ef555df941be4e89f1f3aa49b335e640702bf8b10e609d6cfba211 SHA512 018962a728b9729b51afdc8975cddeceec84731f43b776a740ad2b4d2a479ceadd7a4d45c6eb5389ef73cdf18955a74ac85e9bbb4ad823e4d4a5d9972a4aa19d
 DIST strsim-0.6.0.crate 8500 BLAKE2B fb5d756691a359d086886bf579445a262d2691285c120670e1b9da828922e43630339d59e4dbc98fe1fd6c92785264bef645be4ca80681059d8ee9f6d7be582b SHA512 43cbcf2cab7f91515f52f20719e8013cff23807ca79a9a69f1997ec1ba2eacf713d64c88e33f4c9ba852fb3dda4b87e943587ae4b6ff5bfbbb81deb6dbf76a97
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.9.0.crate 15795 BLAKE2B c4dd89d5757da74c145b6971cd08844f3a6eeb5d29ca012b67010743a2637ed83bca00eefb54ec3ddb1d02a06c9cc3b84984919e6fd187dd71ed9c2e8af41f63 SHA512 e176f703f971eefb5cfc1ecf9047858bd7610a58fa4103879fd963b292c79872bd8466ef8fc9742a428ac707400dade307e72fa965dc4d61da66e932e5b20c35
@@ -31,11 +32,10 @@ DIST time-0.1.38.crate 28500 BLAKE2B f0d98a7288616c2a5a07691e6bfe2bed5b043c9ddec
 DIST unicode-width-0.1.4.crate 15283 BLAKE2B 61a72cc00c929624bbf46ab89a8850270ce36d0c986dd302b436b98405e2b53c1199588c70920a3379fa55c9dadd070404a8d3580544c02ffe9bbdb6ed078215 SHA512 f06b243e533ab9c68d88ccd06a283dfff5fd13e9340cf11bfa74473fc9100bb704c34e7fb66919202a97e7d2ba2e7eed968eced02d557835a06e6a0166865ea3
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
 DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
-DIST utf8parse-0.1.0.crate 2927 BLAKE2B 7f199899b6e87f600b77deb69004faafc0b24af50e746f139d32456d461245d9793a7a739389f432fdc2e1617875aed5a03a4fcf4fa58d2f8d0deef788755f02 SHA512 732568bb44eb285fab2d55b90a97786e503ea680e06be606e9ce975d511fee086ecd490cbc5f3daa35deeba039406b9b8ff63c3ef11305436fd5594c6e5dd7b2
 DIST vec_map-0.8.0.crate 13742 BLAKE2B 5e1fd880c56f01d69d1680d77b361c89f94e77d75b0c8d1d49c780e6b729e3bc5e8d9a72e3a298bb350b1c27fac02dd7b31eb2f2018208f242b02d8d6d64af21 SHA512 7ce0c05c0b410577b489adb4d35376bc2a55c6041ce50e011b78415e952b5fb7fcff89fdd00b95e086de742f26ff057e99e55585824bbc0482e0ac2134406520
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
-EBUILD skim-0.3.2.ebuild 1243 BLAKE2B 12b4b6ace6d683ec02700b576624576aa6d15f5e2992440d80e558b6178684ef1060e16f7f6eaac49afad4df40a9c2d9fb696829c5be7305e2a4f9a8f73a5993 SHA512 ce00f85f43c33db517ead66810485a2626298501ede7f3520aa1a9e0dc0c68233b2def03507917b97b44ab04d1ba0c17e1de3fd2248edf1d0ef40d5d48586e6f
 EBUILD skim-0.5.1.ebuild 1451 BLAKE2B ec697e1f1632e95d4ba19ffa17d3a159877d0bd1a5b8eec513f9f8967592a0802a5c00606878d4b45fbb45dcb7f426e16d9ce7858635d8e04d8393b62b995d84 SHA512 847cc1a5baaab324a1f0cabd3c78ddebb8c6fb0ba50793cfd284cdd9c03b301ef186197cab837a6af75800d164c35dbbb1630ec0ffdcc0419ecdccb3ddfe5707
+EBUILD skim-0.5.2.ebuild 1454 BLAKE2B 609284af9a547b3a82d89243a6e121004886fbd8048c93e661764c0f2b0248b1e750820e19acc739f6f3faf178a8da8725151f0494a4e7e2da3a63f29a7877df SHA512 d6792f8e346b57443d92b55a082c1e408628df63573d30d1bdba1f325d12936bb95f669d237ec68dc95abea9832dcbf0221a2c2315fcf026e955e9a5f08fd347
 MISC metadata.xml 582 BLAKE2B cfdc16bbc46445ceb6fa494cd23600d7e73aac9b88d9ed04a639242cecd82ef930372ff9807cd3a595fe07f8dcc0eff20d06bddd7153e624f5bc65823fc27991 SHA512 28756c12e60594e90969979d729a3f05359e724e230dd04492780215d21a727429caefb048a6d3976cfd9c0acb63fca76c5195eb9fd5cdafdce73ec429274315
diff --git a/app-misc/skim/skim-0.3.2.ebuild b/app-misc/skim/skim-0.5.2.ebuild
index 7aa141240d6c..8a165d55e456 100644
--- a/app-misc/skim/skim-0.3.2.ebuild
+++ b/app-misc/skim/skim-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2017-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,19 +8,21 @@ aho-corasick-0.6.4
 ansi_term-0.10.2
 atty-0.2.3
 bitflags-1.0.1
+cc-1.0.17
+cfg-if-0.1.3
 clap-2.28.0
 env_logger-0.4.3
 kernel32-sys-0.2.2
 lazy_static-0.2.11
-libc-0.2.34
+libc-0.2.42
 log-0.3.8
 memchr-2.0.1
+nix-0.11.0
 redox_syscall-0.1.32
 redox_termios-0.1.1
 regex-0.2.3
 regex-syntax-0.4.1
 shlex-0.1.1
-skim-0.3.2
 strsim-0.6.0
 termion-1.5.1
 textwrap-0.9.0
@@ -29,7 +31,6 @@ time-0.1.38
 unicode-width-0.1.4
 unreachable-1.0.0
 utf8-ranges-1.0.0
-utf8parse-0.1.0
 vec_map-0.8.0
 void-1.0.2
 winapi-0.2.8
@@ -40,12 +41,13 @@ inherit cargo
 
 DESCRIPTION="a command-line fuzzy finder"
 HOMEPAGE="https://github.com/lotabout/skim"
-SRC_URI="$(cargo_crate_uris ${CRATES})"
+SRC_URI="https://github.com/lotabout/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="tmux vim"
+IUSE="tmux vim test"
 
 DEPEND="virtual/rust"
 RDEPEND="
@@ -54,7 +56,7 @@ RDEPEND="
 "
 
 src_test() {
-	cargo test || die "tests failed"
+	cargo test -j $(makeopts_jobs) $(usex debug "" --release) -v || die "tests failed"
 }
 
 src_install() {
@@ -69,6 +71,7 @@ src_install() {
 	fi
 
 	# install bash/zsh completion and keybindings
+	# since provided completions override a lot of commands, install to /usr/share
 	insinto /usr/share/${PN}
 	doins shell/{*.bash,*.zsh}
 }
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 45e0bc7a4f31..958e098aaf39 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,10 +1,8 @@
 AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4d31b4f7a3f9bcf8d3dfa38fc186a603a90fe734b25781b9d517115c2b089648c29e4605fa9610f6dc311a SHA512 505d5ec4fa1d7844870c67aedccac3a147db1971464fc21d19319bb343fb6fd73b696e85298f8592e46900774b35b250cc53841b05514333c44c3e973bcdb860
-DIST tmux-2.6.tar.gz 481000 BLAKE2B adbd276261f3f4be9d67c6c0fbad28a90eabbecfa68ebbc104fe56acaa9b7bd005060b854ce0a0e669fdf41dd058bfa8450a85a78f71f7248a44d25458f7d3bc SHA512 20a1ae8b8494c5b42757902322f3877731c2cc330c9c00f097a317785d25252b7ebaa8bbab9fc17843299e80cb2914aaac0a664715a85c50f7ea489d23753832
 DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37
 DIST tmux-2.8.tar.gz 637609 BLAKE2B d95fbdbc79c2c512908f82778816aa8540bf2fe26509c91f46c8c64c8c13c9ea41487e3a816cc11274d4cc2868d16622c87efe978a65b08201c9a1c48e3c8c4b SHA512 d938854994e77f7941a31db79e25706150253feeba5e655a8fa853864e3073d2ee0ea218f972e7c7b9c814d8e8c63c2d9ef9b70ed1c6f8e993a900add4b995b5
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
 DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1
-EBUILD tmux-2.6.ebuild 2140 BLAKE2B eaf576a0984fee2d9ef0eee0d823d28e5e4949e5a80003e539cb936e74fe1acf07ed883b71936dc3fd3c681806e766108a20cc574eb36a165f9abe584df2bd2c SHA512 cc02589f7cba6668bfe99193e910e4816cb9ef5e0adf6660bd6d4d2a281e3821e2ed383c50c905a95f97ec3c10d9b0c22a4f1fd552d05d7e869731deefc985ca
 EBUILD tmux-2.7.ebuild 2139 BLAKE2B 5c9aa9bf3925ef13c0f5693537f5e67901a88b14468a9e912a3fdaa30f6df272981bff901e1ebf0018bbc28f4e6c4bde6c5c0d2b807084b4a0d73095562b87bb SHA512 8b78fae41fdcb1d773902045a5011a36f40378bb56a546d26cf50b9e2dd74dfd4e2cdf233de55dc8516748fb0094eb6cdaff88a505eeac7465f549bdf32cc460
 EBUILD tmux-2.8.ebuild 2117 BLAKE2B 3edfccc8b61961b65e7d866ae3797b437283e37c29b2da28d71ff7246a7146e01bd091ed4854a8df864ea242de3bea82eb2c52f0169ef16a2dabe3a744a7fd60 SHA512 8884a5ca026a5f84bffbc76f794a8460e31f50997790ef4cf7f6cd306d1108ccf33d18fcc203a15428d57ba5bcdb4589d6a746bce64033ce2f1e64b929a2e730
 EBUILD tmux-9999.ebuild 2350 BLAKE2B a2fea8d287803a5779740ce34ed42ecf8f889f9b10020921aaf1e48d2fb65b12a43773caf04c088b5ac963d5b5f879746c789d4d24a839a1fcc040b370e109b4 SHA512 db22402a7bfa146ea6f4553f7f8d1291456466aa1c2938a747671fbd8123a7ab8cfba9a5ed4405d2c8faefdac93307e99ea55ddf3c5e60f0d5667603fe7d26f4
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-2.6.ebuild
deleted file mode 100644
index d92a3ffb9579..000000000000
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 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="https://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
-		)
-	)"
-
-DOCS=( CHANGES README TODO )
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.4-flags.patch
-
-	# usptream fixes (can be removed with next version bump)
-)
-
-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() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc
-		$(use_enable debug)
-		$(use_enable utempter)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	einstalldocs
-
-	dodoc example_tmux.conf
-	docompress -x /usr/share/doc/${PF}/example_tmux.conf
-}
-
-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
-}