gentoo resync : 10.02.2019

28 files changed, 265 insertions, 285 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 07c05559c627..17177d6b6ff5 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cdctl/Manifest b/app-misc/cdctl/Manifest
index 832f1de14068..2dd65d4e5a83 100644
--- a/app-misc/cdctl/Manifest
+++ b/app-misc/cdctl/Manifest
@@ -1,8 +1,4 @@
-AUX cdctl-0.15-Makefile.in.patch 1437 BLAKE2B 5fac19f5c356b0c8d983135f5f41da20182091b483aff423d4d4fdd4a813df9bb8592fc8933d9ab74d98594578546dd16956a1073b4b4ded4145d0fa583bb351 SHA512 c83243336a36b289ad5262a30b70d7db3bff0662a21e900f5a8696f784326ca4ffd709634c144f304970d0deb3f7e2fc9e0a947d465906db36c318df05883dd3
-AUX cdctl-0.15-cdc_ioctls.patch 646 BLAKE2B fb8d93854cccc1cd1b399ea529ea2611606bb68dfa2a8ad551e13b38a015c8fbe53a226d7a28e263844884a6ffe9130a3307d7789d0dc16a6e6a8da42df5518e SHA512 354241683f3bc4cf25101a984053473ea2fb67b445d09bb09eba2b657380a5393d918d892ee8c20e5fa8de77018931bca27b8dc0880f6fb3ad4ec1715fd51e75
 AUX cdctl-0.16-Makefile.in.patch 1474 BLAKE2B 436f47f59a21eea1785c70285532983854a445258eb7a91d01d1c5dc6cd29c4041b1d6999b61a56614bfe9d69bf6824823c783150dcef21a1fb1722ec7929601 SHA512 78d9c1a4b1e3c29fb9b83d6b9250e07157715fa70a00798f6bf49e0af2c2269dfec816df76f1818d401992b793504e8049df836bc0d8a73ab2f0488f4689b5e2
-DIST cdctl-0.15.tar.gz 44163 BLAKE2B f5f3f44fabdff4446eb5d6e3fdcb12f17a4d6ee57e90f4bb772c963d89fd7b22301a6f8ae3b4f4b38f57aabd27cd68a292b96849d66c2b77741d07e129d2a8c5 SHA512 7bcaec8f52cafbe84d87dcb740a952520ceccb197b1491a88bb03d6a993a6385d424f67386a7175bb30c5c8b3ac02abf31c2e8843c1cd7d1d808eee70a5906f4
 DIST cdctl-0.16.tar.gz 34121 BLAKE2B aee95efe468c215102afcd40262f0f3e9196551a661052a9f0909ca068a6b74a25f3cdb01ac62fde2f940dcd6da6e5f4a33328331723b7a14d836bcab1c0c479 SHA512 e1c341cf0acabc28c8aedb3265e65ffe90668b83eb44d23577049cc81a160ab0ec8b6e813cf8ffe20aaf83b4d056a8f07c2e958f5a6086db3843b84b36e060b4
-EBUILD cdctl-0.15.ebuild 700 BLAKE2B 1d66bd0b7393aca38e99f76383a6be950a9e0d03178a9910b5c86a67f0da84156f602576899fe1961b8c87ba96b24229c0c2b55afbf3108d00568ab95992e98c SHA512 935931345e30e6eee205a0e75961b322ba1b167942d7b0f810500c1e02c57b4ac99472029c05064204041d06da6fecf1f712c7d913da13f7d06d5e7af795dad8
-EBUILD cdctl-0.16.ebuild 530 BLAKE2B ee0dedaf6504dd0f959c8622cb273a2f80c8e185daab209dacbde8005633fe34a6aaf3240090245743715f0cd8d28c597628347d49453dc3bf6d6992fe74ea72 SHA512 6c2e2872232e4a3487c1a0dd48a9b1d6f35788e19271092cd28cf30e3ebc9307731e89da320526e835029e3fb8463c8d3cb57c8354367eb89e7b3f36ae02ae5e
+EBUILD cdctl-0.16.ebuild 528 BLAKE2B f4f121c5d5f3a96e8b02e1b511ad61f061b2b6f6d3f7dc7e2a24a8bdbe136fe1a2339d9cb1fabe8522d4517196dd06d714f1cdc03c0121d4a368fb4bb5bd4b09 SHA512 8b03f644daf4477d780ba77e9ef68d0546e2116d173ca30d67a2fb4f76df9446b59e83256ac235039a7fc0a90127c3c89ce3a85dfc2ca5f2c02b89431729651b
 MISC metadata.xml 242 BLAKE2B 965d7f590657a56f8d90dace39b217902fd1f1f834b1b61d6e4119b92f8a85c090afb74eedc5cd987ba809f193ddf4cbeb44ed27de98e7f96c3bdd4a2332eecd SHA512 289f7a2af6d7c9dc7733456dd71cdc014bd0dd13d84d76605aa3ae4ba4bc39cab188b744309c974c14a2780662761ba2670a44037b40f07394e65c55c985ac6d
diff --git a/app-misc/cdctl/cdctl-0.15.ebuild b/app-misc/cdctl/cdctl-0.15.ebuild
deleted file mode 100644
index 59b947b72297..000000000000
--- a/app-misc/cdctl/cdctl-0.15.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Utility to control your cd/dvd drive"
-HOMEPAGE="http://cdctl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
-
-LICENSE="free-noncomm"
-SLOT="0"
-KEYWORDS="x86 ppc amd64 ppc64"
-IUSE=""
-
-DEPEND=""
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-Makefile.in.patch
-	epatch "${FILESDIR}"/${P}-cdc_ioctls.patch
-}
-
-src_compile() {
-	econf
-	emake CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc NEWS NUTSANDBOLTS PUBLICKEY README
-}
diff --git a/app-misc/cdctl/cdctl-0.16.ebuild b/app-misc/cdctl/cdctl-0.16.ebuild
index 46c0ff87e552..32444005ab91 100644
--- a/app-misc/cdctl/cdctl-0.16.ebuild
+++ b/app-misc/cdctl/cdctl-0.16.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/cdctl/${P}.tar.gz"
 
 LICENSE="free-noncomm"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 ~x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch b/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch
deleted file mode 100644
index 6d8e11502fcc..000000000000
--- a/app-misc/cdctl/files/cdctl-0.15-Makefile.in.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- Makefile.in.orig	2003-02-20 21:57:38.000000000 -0800
-+++ Makefile.in	2003-02-20 22:27:10.000000000 -0800
-@@ -2,10 +2,12 @@
- CFLAGS=-Wall -g
- BINS=cdctl sndreset
- OBJS=cdctl.o version.o ioctls.o iso_header.o
--DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README SEGFAULTS
-+DOCS=NEWS NUTSANDBOLTS LICENSE PUBLICKEY README
- MANS=cdctl.1
- MOS=cdctl.mo
- 
-+prefix = @prefix@
-+exec_prefix = @exec_prefix@
- bindir = @bindir@
- mandir = @mandir@
- datadir = @datadir@
-@@ -16,6 +18,10 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = $(INSTALL) -m 644
- 
-+DESTDIR =
-+
-+man1dir = $(mandir)/man1
-+
- all: $(BINS)
- 
- cdctl: $(OBJS)
-@@ -26,21 +32,21 @@
- version.o: version.c
- iso_header.o: iso_header.c
- 
--install: install-bins install-docs install-mans install-mos
-+install: install-bins install-mans install-mos
- 
- install-bins: $(BINS)
--	$(INSTALL) -s $(BINS) $(bindir)
--
--install-docs: $(DOCS)
--	$(INSTALL_DATA) $(DOCS) $(datadir)
-+	$(INSTALL) -d $(DESTDIR)$(bindir)
-+	$(INSTALL) $(BINS) $(DESTDIR)$(bindir)
- 
- install-mans: $(MANS)
--	$(INSTALL_DATA) $(MANS) $(mandir)
-+	$(INSTALL) -d $(DESTDIR)$(man1dir)
-+	$(INSTALL_DATA) $(MANS) $(DESTDIR)$(man1dir)
- 
- # FIXME: need to deal with other languages besides German
- 
- install-mos: cdctl.mo
--	$(INSTALL_DATA) $(MOS) $(localedir)/de/LC_MESSAGES
-+	$(INSTALL) -d $(DESTDIR)$(localedir)/de/LC_MESSAGES
-+	$(INSTALL_DATA) $(MOS) $(DESTDIR)$(localedir)/de/LC_MESSAGES
- 
- cdctl.mo: cdctl.po
- 	msgfmt cdctl.po -o cdctl.mo
diff --git a/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch b/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
deleted file mode 100644
index 8e440955907b..000000000000
--- a/app-misc/cdctl/files/cdctl-0.15-cdc_ioctls.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naurp cdctl-0.15-orig/cdctl.c cdctl-0.15/cdctl.c
---- cdctl-0.15-orig/cdctl.c	2006-08-08 23:18:44.000000000 +0200
-+++ cdctl-0.15/cdctl.c	2006-08-08 23:19:33.000000000 +0200
-@@ -337,7 +337,9 @@ int do_print_capabilities(int cdrom) {
- 	printf("Can report media change: %i\n", (ret & CDC_MEDIA_CHANGED)?1:0);
- 	printf("Can play audio discs   : %i\n", (ret & CDC_PLAY_AUDIO)?1:0);
- 	printf("Can do a hard reset    : %i\n", (ret & CDC_RESET)?1:0);
-+#ifdef CDC_IOCTLS
- 	printf("Has non-standard ioctls: %i\n", (ret & CDC_IOCTLS)?1:0);
-+#endif
- 	printf("Can report drive status: %i\n", (ret & CDC_DRIVE_STATUS)?1:0);
- 
- #ifdef CDROM_CHANGER_NSLOTS
diff --git a/app-misc/g810-led/Manifest b/app-misc/g810-led/Manifest
index b778209535bc..b2625201715d 100644
--- a/app-misc/g810-led/Manifest
+++ b/app-misc/g810-led/Manifest
@@ -1,4 +1,3 @@
-AUX g810-led-0.2.7-Have_makefile_use_environment.patch 1831 BLAKE2B fad7b6964f1ee769fbf0f2ef2730190d962891a00775a5cc23f7b8ded695fd5d445d9a9335d059bfd4a54d89d6a71a07d1e13ac5427d1e094eb3ec7a5d67b3cf SHA512 d741baad0aa127dc0064bd1017ef27077070f2ce86a3d9b3965d39a0bd0012a8c8b0669cbee016b7bfd85a8e844fe742da8f6f33b712a95e5b5a2dbceb31f55e
-DIST g810-led-0.2.7.tar.gz 33127 BLAKE2B 1ffa28f4e21273afa805ff2ddfeae00cf4b25382f7da617016651283331d7d17faee1e6f68d00ab988c30ba1a7d4b252cf28c021999871a7fbe54c47ae3ccb23 SHA512 f67d44f1c51a29cbdfe9bb5e28f3dea5e9b08aa5e2a08cf875578d6b74e8e77f880378c825efcc3068b400131295e1fd196454b8b10143c4f5d5f77be760512a
-EBUILD g810-led-0.2.7.ebuild 1146 BLAKE2B f7ac87e51561cea85e2674060890ea8a176d57a7c3b0c7d85431905d1073f6caf7bbac5d78d9256e3929372091c6858f32cde0ae2f785b857e22ab5eac5ad480 SHA512 1812d9eaa88ba280a4e4e5a040bf3bc2e212935bfe78fcf526e951706248c7f1c854f6422c15a288768bf64189896a668087e7db98b1a95dd82c2a0745595df2
+DIST g810-led-0.3.1.tar.gz 34069 BLAKE2B ebc83e1f0908e521573f6ea812c1893e8314548dbe30cad4a8f2af171eaf7f73ba905f6e01eafe9bca6c1bf006d626086091c871c6382dcd9a58caa76173ca59 SHA512 62bf73a897f8c1c967ce64f6e352d55b08af764b2aac8ce722906cdc67db28676bc5665d1ba307f0c43360e57d53e75fa39aea29ca7aa6da2e125782ae38446c
+EBUILD g810-led-0.3.1.ebuild 1030 BLAKE2B d4e1cad7408ceb58c18e56906de4f9eb6245b31f5742cb3e692f16f4282d4bda92ea84148c71d8ffa7dc17d68a73e03aefad3da2b72fe86cdcdaa43e8fa5b18f SHA512 1f961c941a7b797de5b68b45b5237fabefcca53b841437dbc6d2adfefb0c744851bce2c891ffaa234236b407d0866ea1971368cc6931952b8888e2c8b3a6764a
 MISC metadata.xml 610 BLAKE2B dc374b0b903c17b3418871362fbfe6bd47704f2d9d7895ffbbdfa468f98e42708d385d844cd96b04b88646f5b71f4acfae659c99f7c2fc5bcdcfbdb4eef18303 SHA512 978a7c99bf4e5f7a79e04055871645438322b950b8274512bdca9563050449ad395e40ba479ba70914aaef60bd86c3b41aab05f070e79fd7dbc61c941cb59fb8
diff --git a/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch b/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch
deleted file mode 100644
index 249462bbcf0b..000000000000
--- a/app-misc/g810-led/files/g810-led-0.2.7-Have_makefile_use_environment.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff --git a/makefile b/makefile
-index 019636d..707517d 100644
---- a/makefile
-+++ b/makefile
-@@ -1,18 +1,18 @@
--CC=g++
--CFLAGS=-Wall -O2 -std=gnu++11
-+CXX?=g++
-+CXXFLAGS?=-Wall -O2
- LIB?=hidapi
- ifeq ($(LIB),libusb)
- 	CPPFLAGS=-Dlibusb
--	LDFLAGS=-lusb-1.0
-+	LIBS=-lusb-1.0
- else
- 	CPPFLAGS=-Dhidapi
--	LDFLAGS=-lhidapi-hidraw
-+	LIBS=-lhidapi-hidraw
- endif
- SYSTEMDDIR?=/usr/lib/systemd
- 
--prefix?=$(DESTDIR)/usr
--libdir?=$(prefix)/lib
--includedir?=$(prefix)/include
-+PREFIX?=$(DESTDIR)/usr
-+libdir?=$(PREFIX)/lib
-+includedir?=$(PREFIX)/include
- 
- # Program & versioning information
- PROGN=g810-led
-@@ -20,7 +20,7 @@ MAJOR=0
- MINOR=2
- MICRO=7
- 
--CFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
-+CXXFLAGS+=-std=gnu++11 -DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
- APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h
- LIBSRCS=src/classes/*.cpp src/classes/*.h
- 
-@@ -32,19 +32,19 @@ bin: bin/$(PROGN)
- 
- bin/$(PROGN): $(APPSRCS) $(LIBSRCS)
- 	@mkdir -p bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
- 	
--debug: CFLAGS += -g -Wextra -pedantic
-+debug: CXXFLAGS += -g -Wextra -pedantic
- debug: bin/$(PROGN)
- 
- lib/lib$(PROGN).so: $(LIBSRCS)
- 	@mkdir -p lib
--	$(CC) $(CPPFLAGS) $(CFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS)
- 	@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so
- 
- bin-linked: lib/lib$(PROGN).so
- 	@mkdir -p bin
--	$(CC) $(CPPFLAGS) $(CFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN)
-+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LIBS) -L./lib -l$(PROGN)
- 
- lib: lib/lib$(PROGN).so
- 
diff --git a/app-misc/g810-led/g810-led-0.2.7.ebuild b/app-misc/g810-led/g810-led-0.3.1.ebuild
index 9251fa585b85..2e51fcb5d4f2 100644
--- a/app-misc/g810-led/g810-led-0.2.7.ebuild
+++ b/app-misc/g810-led/g810-led-0.3.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd udev eutils
 
-DESCRIPTION="Led controller for Logitech G- 213, 410, 413, 610, 810, 910 and PRO Keyboards"
+DESCRIPTION="Led controller for Logitech G- Keyboards"
 HOMEPAGE="https://github.com/MatMoul/g810-led"
 SRC_URI="https://github.com/MatMoul/g810-led/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
@@ -21,12 +21,7 @@ RDEPEND="
 
 DEPEND="${RDEPEND}"
 
-DOCS=("README.md" "sample_profiles")
-
-src_prepare() {
-	eapply "${FILESDIR}/g810-led-0.2.7-Have_makefile_use_environment.patch"
-	default
-}
+DOCS=("README.md" "sample_profiles" "sample_effects")
 
 src_compile() {
 	emake LIB="$(usex hidapi hidapi libusb)"
@@ -37,7 +32,7 @@ src_install() {
 	dosym "libg810-led.so.${PV}" "/usr/$(get_libdir)/libg810-led.so"
 
 	dobin bin/g810-led
-	local boards=(213 410 413 610 910 pro)
+	local boards=(213 410 413 512 513 610 910 pro)
 	local x
 	for x in "${boards[@]}"; do
 		dosym g810-led "/usr/bin/g${x}-led"
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index 909630c68c0d..c7dc3e3f6724 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,5 +1,5 @@
 DIST go-jira-1.0.17.tar.gz 1382832 BLAKE2B 17cada8407b5136ec3b84d9f43c67cb25a893bdfeae7309bc15eb479954ba3ce7df4bc1248782a0bd1874b08b48a68a8e69a1651960c10d6260b22c63a0a8147 SHA512 8abbe6233413d12495399446adbb02d6a37aedf2a2b1a860c403b6e210f5e1f44fa01dfe937d86241486cb4a56c52530eff1c582d59f5ddde4b466a6908fd020
 DIST go-jira-1.0.20.tar.gz 1292990 BLAKE2B 788dada892809df730988193e50bd1033b2efe4398cf1374c7c2a08c197e10215aa83feeb2b0573a04c7de72badf83089cd45da85d0e60a31d0fbf41615debae SHA512 f07e1fa6e24fa29a50e348490b0ebf6f3dfa1c1bcbc8420320f3c87b3fac74e6ff1d9acb8936fefb25debed2411508689f832eb19ce09f1c39657942c092220e
 EBUILD go-jira-1.0.17.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
-EBUILD go-jira-1.0.20.ebuild 686 BLAKE2B ab33305d1c3a5d86616dbe74f431e787a2f9580ae778467fd98c9f5f70b3054182036611d19d843137919b44f1662606b2811e53a263789a6d86d5210c7f81d4 SHA512 93c12cbaf1c43389ca3e96adcb78f63bdcc9057adf66b75d01841b9420f72d83b663e4e306997dbe1aae5306f786a0f7dd060591297ddc7a0a0c0ba6cd6f0b98
+EBUILD go-jira-1.0.20.ebuild 682 BLAKE2B f84e1b3a3791b2ed02f85d4362d6351077c9b720d1bb10451430d718ec00d501c4c3436f8284c5f6e06c9bd0c0af53db55b6337bf337e8e44fb75badac9c9ea0 SHA512 b373767742339c8a03ba0bc82226354fa0dee314fa7a4c6d98a17299e7a343008b556e27b6e63028dfa23919fbe7cc36ef19ace34788a0fae5aedf013d033c1b
 MISC metadata.xml 339 BLAKE2B 2b1e03ce70c1b7ff8244dc3673ce59305a6c9eabd2fc9d52209f3c85db21da04490378c95fbe647c21a0d26533d078a5b3842b4a41703a46aa670dc8dc569913 SHA512 f05c51962c3d381861ca4486baf4c1e4207c19ba87fb8113c4fd66c3a6b526ee5d9a74c98395631a7fca007fcbe2902464b02fb927dcc45b9f5ea0d4fcd96ef0
diff --git a/app-misc/go-jira/go-jira-1.0.20.ebuild b/app-misc/go-jira/go-jira-1.0.20.ebuild
index 513090c2a8f9..143386496429 100644
--- a/app-misc/go-jira/go-jira-1.0.20.ebuild
+++ b/app-misc/go-jira/go-jira-1.0.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ EGO_PN="gopkg.in/Netflix-Skunkworks/go-jira.v1"
 
 inherit golang-build golang-vcs-snapshot
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 DESCRIPTION="A simple JIRA commandline client in Go"
 HOMEPAGE="https://github.com/Netflix-Skunkworks/go-jira"
diff --git a/app-misc/jail/Manifest b/app-misc/jail/Manifest
index 20eb74011974..e8326ea9fc25 100644
--- a/app-misc/jail/Manifest
+++ b/app-misc/jail/Manifest
@@ -9,6 +9,5 @@ AUX jail-2.0-openat-syscall.patch 645 BLAKE2B db200b5969f031059a749283d5ee0945ab
 AUX jail-2.0-symlinks.patch 308 BLAKE2B ebe34547c79b036a4303afc48f8d3581b7963982d7c435418a2895a19f9663c8f015ee5992a2484f4dcfa1f7be5a5ac953cc6e76c2b035c63a4410e2a22824f4 SHA512 64e72367dee1f1639a4206280a28228d01702ddb1eefa75c7faabe32cbec699f3083d11b67dccdd56b8953f34646ab4eceb70ac898f1b2a60d142ce564a92b4f
 AUX jail-2.0-sysmacros.patch 426 BLAKE2B b4cccd5258f9e164f5432083ffb9aaa418c475b90a3a5b6210eb38a62440acc0b47ef6df07ff7241de6f3d9b284cebb151ca10b40b64b1591722097028dfbc1b SHA512 b8baa43c1ca0ddd1b08171489e2a3bf08bdd1911cb7d3bb06b8a20178b64716742faf505aec4156c012b3643298c5f4b79f03787f914717caa4c92e752852e4b
 DIST jail-2.0.tar.gz 31095 BLAKE2B c86d0c677eab38c7d90317c3a19dfdadd17ea74903a886015fc1c3926fe09855be4ed9f72b18e6f144de4a7c93fb6c5be3ca77f4ccf501ebedd09533337ce578 SHA512 dfca62091b34f9adbe4e94de1dbf0ccd31bd3f8e492ea9788f712e97271b389475bc19e0390c12445353c4f73e5ba2458360bf55f5f64491705e82192db985ae
-EBUILD jail-2.0-r1.ebuild 1991 BLAKE2B a0e0ba8b3d16324cf15199cb27f87e39a7df73f5d7d67a19b0806d7fc32c7b032a88b93876c2669d9a02702ecb5263f759b706763cf6ff41c5c5a4787a0cf388 SHA512 fe7787da5600a14444902560c8de142c237585b9ac006d96081ab0736ae9a09816d2e59158a76cb80efac867404c3aa09aee4e9ad899eb4b90de77982dd1a56f
-EBUILD jail-2.0-r4.ebuild 2211 BLAKE2B 8df423376baa65ac3b24de8bdf60a6e53dc5e38e0f67807a7d8c4f9741ed6ac38c53cfca497cc832a7ff660973ce5a621003ea5cf114d68ad17277d3709ff5bc SHA512 9c80666b71e28166bc01d423f68b4de2fbd17add5c4335f55287810e7a6ebfbe7f29d42b5841d9e5380f9a4b94b7f86731ed02d9a752ee5d96acde83b535f8fc
+EBUILD jail-2.0-r4.ebuild 2209 BLAKE2B 29f135548c57b6372c10e2826cdf250e063501b2d0317a7a27a46a5809732ecf1e53c531205fd2b286bc1011853def26ea143f6d598c8c124f289a364b671ecf SHA512 33a43b82ceca2f6e51e64bfdde53d457e6fad55e96f1bd67fa247fb205404793f6db791a5a8a7cd80c93c3d18b715899020b1244c6ff68a3125626c9ba5add7c
 MISC metadata.xml 749 BLAKE2B 6280537aad78398b6a8eb29ca55982ca838f91ad547a71a78dbedb5e63e9e028740ef230d3fd8668079c3d2983daf55187a04fdf662cceaff1f39e468d6f6143 SHA512 a9cee89d1b10080ba67cbbce957b8118484c0224368728ba1dbb553c0c6189c73c2f9c7b257a5e4fcde39270bd4d83f8e43f25948b28c151f0d9170af121b7d9
diff --git a/app-misc/jail/jail-2.0-r1.ebuild b/app-misc/jail/jail-2.0-r1.ebuild
deleted file mode 100644
index 60664a83e8e8..000000000000
--- a/app-misc/jail/jail-2.0-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic
-
-DESCRIPTION="Builds a chroot and configures all the required files, directories and libraries"
-HOMEPAGE="https://github.com/spiculator/jail"
-SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE=""
-
-DEPEND=">=sys-apps/sed-4"
-RDEPEND="dev-lang/perl
-	dev-util/strace"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PN}-1.9-gentoo.patch \
-		"${FILESDIR}"/${PN}-1.9-wrongshell.patch \
-		"${FILESDIR}"/${PN}-1.9-multiuser-rsa.patch \
-		"${FILESDIR}"/${PN}-1.9-ldflags.patch \
-		"${FILESDIR}"/${PN}-2.0-sysmacros.patch
-}
-
-src_compile() {
-	# configuration files should be installed in /etc not /usr/etc
-	sed -i "s:\$4/etc:\${D}/etc:g" install.sh || die
-
-	# the destination directory should be /usr not /usr/local
-	sed -i -e "s:usr/local:${D}/usr:g" \
-		-e "s:^COPT =.*:COPT = -Wl,-z,no:g" src/Makefile || die
-
-	# Below didn't work. Don't know why
-	#append-ldflags -Wl,-z,now
-	emake -C src CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	emake -C src install
-
-	# remove //var/tmp/portage/${P}/image//usr from files
-	FILES=( "${D}/usr/bin/mkjailenv"
-		"${D}/usr/bin/addjailsw"
-		"${D}/usr/bin/addjailuser"
-		"${D}/etc/jail.conf"
-		"${D}/usr/lib/libjail.pm"
-		"${D}/usr/lib/arch/generic/definitions"
-		"${D}/usr/lib/arch/generic/functions"
-		"${D}/usr/lib/arch/linux/definitions"
-		"${D}/usr/lib/arch/linux/functions"
-		"${D}/usr/lib/arch/freebsd/definitions"
-		"${D}/usr/lib/arch/freebsd/functions"
-		"${D}/usr/lib/arch/irix/definitions"
-		"${D}/usr/lib/arch/irix/functions"
-		"${D}/usr/lib/arch/solaris/definitions"
-		"${D}/usr/lib/arch/solaris/functions" )
-
-	for f in "${FILES[@]}"; do
-		sed -i "s:/${D}/usr:/usr:g" ${f} || die
-	done
-
-	sed -i "s:/usr/etc:/etc:" "${D}"/usr/lib/libjail.pm || die
-
-	dodoc doc/{CHANGELOG,INSTALL,README,SECURITY,VERSION}
-}
diff --git a/app-misc/jail/jail-2.0-r4.ebuild b/app-misc/jail/jail-2.0-r4.ebuild
index d023f2811adf..37ab62bd42c6 100644
--- a/app-misc/jail/jail-2.0-r4.ebuild
+++ b/app-misc/jail/jail-2.0-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/spiculator/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 569776d171ec..3d3980bc5681 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -6,6 +6,6 @@ DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc8
 EBUILD mc-4.8.20-r1.ebuild 2489 BLAKE2B 36736aba7e7cf3a54445d09aa3ca89940eea27f75662e338a177de584007467466f57878aeedeeab17c3de3ed99d508b571c6e17cf3668ad4c40324832479e98 SHA512 357c2fee6e10147f5b85b9dd645010f7a04365fd5f3d3b0d18fe6a25a48ec4534f492f924a869402a05072c26817bdda80b61f3c0af20f6aaa06d21376dceb0d
 EBUILD mc-4.8.20-r2.ebuild 2626 BLAKE2B 7c91fffbe41d84790039342966abc75ba05c40ddde03148493be89bdd5e1c8bef88640d8f800d10c571bdc74ee09153138d6fc06e2ec9f58657eeda21084f580 SHA512 fb5e82276dc7a1fe0e36d0f8cc2209aefebbb677e247685c918fb0ffbd36c132ef154a5e20b3dde2de4fde0adcf4afe85bc152fdb6289e186cd5dde2ca721bbb
 EBUILD mc-4.8.21.ebuild 2432 BLAKE2B a7c051633f812a0817f1fe590feece7f8926798a0e8aff4580d695fb1ecee428a82d66e269cfb3e1c3a041e1643079abd1ba30291a4f1c87e4d0e185fa31ff4f SHA512 fd97e7bf3293fb22d3dfa17cac05d2ee229fcf05c8bf496ea03e08b626abedc1e2b33b41711b38ae1c5083480682540c99064c49fc7969acbb9de3b4fd2442f5
-EBUILD mc-4.8.22.ebuild 2429 BLAKE2B 5261ad2abafb3e1f3397a1c07d74adf2cf6c59c4085e5481ac8514e971492867d9a7434a5bfa99dc8823cf1520b3a39b02305d121d80d6a150dc77b95b11bb37 SHA512 de03b0544966d3ccfbf8792ee3eba005a7559813abdbfd7d1181e7609423fc5f32e2e7bb680a952a07144a3f98bff078e228ebf589bd6055f5b935fc56516e3c
+EBUILD mc-4.8.22.ebuild 2426 BLAKE2B 43ae885288c699b4a1c20d85ca76137389a34dfc5ddb2d77e3e5850b87f734ffdf1fd15eee1dc2d2595bb2482c5547ecc09ff3e8ef4c487f71dd82650d9de203 SHA512 5723b0c73675be291ae2308abf5b5b686f84e22e39b9d6496e2869a26371d1e6f212a8928934367e1412581ec0fcc20aeecc844761e423eab7436748f66991e7
 EBUILD mc-9999.ebuild 2677 BLAKE2B 343e80aaeab6142e07612d179ed6639c4a6675211351c705f2ab2e52ae2c7cd268590e144f9c8cf7a4ef2e33255c3323b31f8d3e5cd365f99483918706924990 SHA512 4af49a3dfb63f3ac62bbb05ed9d35672685dd16f14e750656d4c2b7924807d324032221c73629f854b01a6263da32ba8ed018d244e1a04146b96fec6a753fa0a
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.22.ebuild b/app-misc/mc/mc-4.8.22.ebuild
index d6f2ab5c5677..b64ac7df89dd 100644
--- a/app-misc/mc/mc-4.8.22.ebuild
+++ b/app-misc/mc/mc-4.8.22.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/note/Manifest b/app-misc/note/Manifest
index d782ceceec2f..be8ab37d9b93 100644
--- a/app-misc/note/Manifest
+++ b/app-misc/note/Manifest
@@ -1,3 +1,4 @@
 DIST note-1.3.3.tar.gz 42691 BLAKE2B f4dc9b5c006925c04706260ed0d11f1c5bfb0923786284401c1f824936a32b61a60e516b35070cb4dcd8302caec820aad37e02c31c5fd50a8931d4cba54ef5ad SHA512 99744394084eec3bf84ecef10b2bc294375f18f6ce41614316c4f4bc02a73297f4b3a956f48fb424bb0b0f100ea23debea49c1029887ca52043dd733de0fcfad
 EBUILD note-1.3.3-r1.ebuild 1231 BLAKE2B ba0eef1712c8668bf5fb31b3f6c65b760030bac6f15201111c93ec9b6915735cee9ca434ac4c94d258a397f419379f45ae1feceee80d9bc7ec094560eb17694c SHA512 3510b02d469fc064209e3534db4353c51cd5057ab329d1cde7fa363e1b1a89ddf18b1ec3e7ee15b6b98eb563a93c48a053558a043a5313696261081f16174c2f
+EBUILD note-1.3.3-r2.ebuild 1324 BLAKE2B 7a604b50b71997aceae7e83b7ecf9ccb5f6408caa7f65b21156d759ea58d5c300f6bbbe6a8dffe16e2e6deabcf799b6e0f4bcdf783e0b09aa8518b664570731c SHA512 02de76e10586c371652f6189893a59eba3a500d479470fa95707fbd9175e0c7259f4e21c03e780a3de1ae20f0c46a4e43be10e2cce5bfbee47193db1520aa84b
 MISC metadata.xml 304 BLAKE2B 31f4157a7266980036c3450e1a3fa977448d5d5080189bb76c0dc974e6de75ce80b4f675f2f7a2bfa216c918337539f800d7f029e9ca9f930ac797caf8caf6d6 SHA512 0f0f283bc7066279d7d9dc7e9148173b1f7c5efdae22cf9013e6b04d15f68889016fb1c856d0a7906961023aaa7c302f93b8c5d2a0f65a4a333d318f699c70bc
diff --git a/app-misc/note/note-1.3.3-r2.ebuild b/app-misc/note/note-1.3.3-r2.ebuild
new file mode 100644
index 000000000000..fc0e6b7a020b
--- /dev/null
+++ b/app-misc/note/note-1.3.3-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit perl-module
+
+DESCRIPTION="A note taking perl program"
+HOMEPAGE="https://www.daemon.de/NOTE"
+SRC_URI="https://www.daemon.de/idisk/Apps/note/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="crypt dbm general mysql text"
+
+DEPEND="dev-perl/TermReadKey
+	dev-perl/Term-ReadLine-Perl
+	virtual/perl-Storable
+	dev-perl/Config-General
+	crypt? ( dev-perl/Crypt-CBC
+		dev-perl/Crypt-Blowfish
+		dev-perl/Crypt-DES )
+	mysql? ( dev-perl/DBD-mysql )"
+RDEPEND="${DEPEND}"
+
+# extraneous README that gets installed into the perl module
+PERL_RM_FILES=( NOTEDB/README )
+
+src_prepare() {
+	# Supressing file not needed
+	local v
+	for v in mysql text dbm general; do
+		if ! use ${v}; then
+			PERL_RM_FILES+=( NOTEDB/${v}.pm )
+		fi
+	done
+	perl-module_src_prepare
+}
+
+src_install() {
+	perl-module_src_install
+
+	# Adding some basic utitily for testing note
+	exeinto /usr/share/${PN}
+	doexe bin/stresstest.sh
+
+	# Adding some help for mysql backend driver
+	if use mysql; then
+		insinto /usr/share/${PN}/mysql
+		exeinto /usr/share/${PN}/mysql
+		doins mysql/{README,sql,permissions}
+		doexe mysql/install.sh
+	fi
+
+	# Adding a sample configuration file
+	insinto /etc
+	doins config/noterc
+
+	dodoc UPGRADE VERSION
+}
diff --git a/app-misc/recoll/Manifest b/app-misc/recoll/Manifest
index 6addaaf7aa50..17bc17e15d8a 100644
--- a/app-misc/recoll/Manifest
+++ b/app-misc/recoll/Manifest
@@ -1,5 +1,5 @@
 AUX recoll-1.24.1-qt-5.11.patch 290 BLAKE2B b68f02b9fce837cbfdc54c63787546608db2823c73a36809ceb4ef611f63b0be3528bbbab3f966e4481b09f314968ee22e6e74e5f86a65944dc7e6cd6420cf7b SHA512 51f2cfaeb1a6b62a012867d04d4ec4ca726f6d10e4dfb30d006588b02507d20f3d2a14c011b90a55df334b306ac4351aa5c81532d86822acb16a31b5eac3285b
 AUX recoll-python3.patch 473 BLAKE2B 78b15249de8b20a46e3331d90c52cc8987278d4c508480ceab35ee878c9467f796b209dca5eb0ed5637019718a5e0dc7a2888283b149041ffcedfc175419509c SHA512 50cd8bea004e2ee3a7b861b3b9bc981d5dc0656421894dc8f47777516f290aaaba4300eff52d01d496c873d0f135bfb39f2606a41e95a3dc4edd0a1195614774
 DIST recoll-1.24.1.tar.gz 2644672 BLAKE2B e5bce2231e075fe9a2bfad7d0d1068906e625106b09247dc5baffaf92957db111dd6be90c658266b8b9940d885b3495769c68ce66247d00568df24c1b5222226 SHA512 60bf57d2718a21dbd578fa1dc73a542fc7ab2152c4c5bb763885b19c14d080340587cb8c01f82f1ca7d1cb63a03edf03b4501f3ef63f06ab6506356c4a0a095c
-EBUILD recoll-1.24.1.ebuild 3613 BLAKE2B 65ace08c7bac1e13407cc90cdfa575955fcf93748c2e38e6c906efdaebd5c37deae4e637491463458977afe25dd79a1ce94462c93d414a10729c1e0dadcb750e SHA512 017be221c56370ab4bc98c170d8bb5e4fa24d1bb603fe0ba8d0fbd2a6a79996a6ea5944ad70f6d04de7dc52cf1600a82c63eba14da8970fea30170d83db1c38c
+EBUILD recoll-1.24.1.ebuild 3612 BLAKE2B 31ea52b3cfe16cbe19ec0de2578fc7444e389cfe5e5a9adbc7a9bfe36fe29c919a6cdd317887d1c9ae727eb21afd1ff49d4a0fc1f9fc3223b49d0904c9372e07 SHA512 8034a2f4ae1802520f9a2358b00ee48d22b756679ed8fbb03bab047ffde344dba609c229d837d92da703068e8c8bc356160052c9a3a93a27ceb867daa78f1dcf
 MISC metadata.xml 1204 BLAKE2B a27afe4b6f800a38fa63956a750e4ddcd8ac2e9a785df910f660fce03357a77b37752e405be6d76fad74ce6f90d8564912499f397eb819535859ddc259cbc7a3 SHA512 581c483f1d64131cb7a83e9a899b5286f03cbacc3f011c5fcdb3236b56e2b22e1a0fa880b34bb107874fe03fde7f82767805bb7e2d0aa46367e8d5dca0037ea5
diff --git a/app-misc/recoll/recoll-1.24.1.ebuild b/app-misc/recoll/recoll-1.24.1.ebuild
index 8029a864e67f..3d326d8297b0 100644
--- a/app-misc/recoll/recoll-1.24.1.ebuild
+++ b/app-misc/recoll/recoll-1.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,8 +8,8 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils linux-info python-single-r1 qmake-utils
 
 DESCRIPTION="A personal full text search package"
-HOMEPAGE="http://www.lesbonscomptes.com/recoll/"
-SRC_URI="http://www.lesbonscomptes.com/recoll/${P}.tar.gz"
+HOMEPAGE="https://www.lesbonscomptes.com/recoll/"
+SRC_URI="https://www.lesbonscomptes.com/recoll/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 958e098aaf39..fa861834ac41 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -2,8 +2,9 @@ AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4
 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.7-r1.ebuild 2117 BLAKE2B 8d4bb5506da4aafd44fdcee8c8397e247cdb1c966a5fdcd3f1d47963be41325dbeac03c96c412db05327498d93f8e511a0ebd933341591566474919d54453336 SHA512 8021c387bff7c3a99adb2a21fd4e72444513b4db63d87ec72242884b407561a257e99c805988da75ca91b3258a9ab61d3b84a6bf0a1f7671932eb20a7908d4f4
 EBUILD tmux-2.7.ebuild 2139 BLAKE2B 5c9aa9bf3925ef13c0f5693537f5e67901a88b14468a9e912a3fdaa30f6df272981bff901e1ebf0018bbc28f4e6c4bde6c5c0d2b807084b4a0d73095562b87bb SHA512 8b78fae41fdcb1d773902045a5011a36f40378bb56a546d26cf50b9e2dd74dfd4e2cdf233de55dc8516748fb0094eb6cdaff88a505eeac7465f549bdf32cc460
+EBUILD tmux-2.8-r1.ebuild 2088 BLAKE2B 9acf7e08f2ca611750dc78b9e8ff5c71602cd5d81ceb5837ef15298193510d64f67c6ea51b1ea629cdbd2badbda50c60e2194cfd8a5e0baa7724250eb66c31f3 SHA512 683cd4671d40c8bfbdf76d57347c11d6a8d3e364dd9626f5a2c66131d2a20b6950d0c93ac71e7bfa24ce981904cc53e82f8001ad7396394a7a2968514ef14627
 EBUILD tmux-2.8.ebuild 2117 BLAKE2B 3edfccc8b61961b65e7d866ae3797b437283e37c29b2da28d71ff7246a7146e01bd091ed4854a8df864ea242de3bea82eb2c52f0169ef16a2dabe3a744a7fd60 SHA512 8884a5ca026a5f84bffbc76f794a8460e31f50997790ef4cf7f6cd306d1108ccf33d18fcc203a15428d57ba5bcdb4589d6a746bce64033ce2f1e64b929a2e730
-EBUILD tmux-9999.ebuild 2350 BLAKE2B a2fea8d287803a5779740ce34ed42ecf8f889f9b10020921aaf1e48d2fb65b12a43773caf04c088b5ac963d5b5f879746c789d4d24a839a1fcc040b370e109b4 SHA512 db22402a7bfa146ea6f4553f7f8d1291456466aa1c2938a747671fbd8123a7ab8cfba9a5ed4405d2c8faefdac93307e99ea55ddf3c5e60f0d5667603fe7d26f4
+EBUILD tmux-9999.ebuild 2138 BLAKE2B db6a992c081e9fa1d7a0febd009c36cf68b95a60f559d30209af74cd608a658aaf72d115239fd49e16e2f37ed7be606481e54e7177896930b8614663b3aa881b SHA512 83505041418d4be58bfd1db86a822b4b2dcc300769d99309fc8dd5fdf4603e99fc8311db3e5d2fa16947e83013c39733a940be51a339cf29703a52eb38499e27
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.7-r1.ebuild b/app-misc/tmux/tmux-2.7-r1.ebuild
new file mode 100644
index 000000000000..22c5ad91fd7e
--- /dev/null
+++ b/app-misc/tmux/tmux-2.7-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# 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-vim/vim-tmux )"
+
+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
+}
diff --git a/app-misc/tmux/tmux-2.8-r1.ebuild b/app-misc/tmux/tmux-2.8-r1.ebuild
new file mode 100644
index 000000000000..dda8486cd791
--- /dev/null
+++ b/app-misc/tmux/tmux-2.8-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P}.tar.gz"
+SRC_URI="https://github.com/tmux/tmux/archive/${PV}.tar.gz -> ${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-vim/vim-tmux )"
+
+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
+
+	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 ! ver_test 1.9a -ge ${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-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild
index 30b2bd54a86b..103653e26eb7 100644
--- a/app-misc/tmux/tmux-9999.ebuild
+++ b/app-misc/tmux/tmux-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,8 +7,7 @@ inherit autotools git-r3 flag-o-matic versionator
 
 DESCRIPTION="Terminal multiplexer"
 HOMEPAGE="https://tmux.github.io/"
-SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b
-vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )"
+SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
 EGIT_REPO_URI="https://github.com/tmux/tmux.git"
 
 LICENSE="ISC"
@@ -31,12 +30,7 @@ DEPEND="
 RDEPEND="
 	${CDEPEND}
 	selinux? ( sec-policy/selinux-screen )
-	vim-syntax? (
-		|| (
-			app-editors/vim
-			app-editors/gvim
-		)
-	)"
+	vim-syntax? ( app-vim/vim-tmux )"
 
 DOCS=( CHANGES README TODO )
 
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index ebedf05e6e56..d1fa7d322f29 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,5 +1,5 @@
 DIST trash-cli-0.12.9.14.tar.gz 62090 BLAKE2B b227fe852aa204156b197e14e8dd34e1f9883f0dde11512842a2705ea20d781db031552f4b355096521fe720cd48d6fded74aa5d173d423bd3b6b8e77f413a1a SHA512 3846ec4e2e491b09ad93134313a875fb3e072abe3e895956b62a3e4f350c1f10dd1ded3fea0caec3fa8a6bd39f2d0a63ac6a3a070a6204fd2f27f1e447f5ba6c
 DIST trash-cli-0.17.1.14_p20170816.tar.gz 69713 BLAKE2B f995c22ba0704eba96abac2c130f9118cc98ad5c5f21903601ea60ee1f52c594b7f8b16ebcaabb4b34086f5f9f66ad02cd628c379ed5139bcb1f691016b435ab SHA512 9d35620b55c63b53b7255179a6304f4d7190c2a90f68c102f64b9616ee897460939633e9c77826968a1682fc5fa090b0f3ea1daad82a44cc96704dc54da45dcd
 EBUILD trash-cli-0.12.9.14-r2.ebuild 493 BLAKE2B 4be74b3dfab9cfc1e1c7a79ce37c2135f3cb448e735b7b8814dd213a0618bd0848df2cf7f57a34d83ebce1d7c2d0e761df6c3b8c430c3775c6fbd863a3701698 SHA512 1b918474fda9c92b81bc734f7d01f15fa31f5f8db9153a4aff4b330bb76ec64bb00eb3b3f4799ca2a3defb978fd2a39a952171f17007ca17b0b5502b2b1e10ec
-EBUILD trash-cli-0.17.1.14_p20170816.ebuild 690 BLAKE2B e1861defe15cc1c2b85bc9cdee959642ae6af982dd13cef06587aebc9143ee33b482495d5754d94d7709645d4b9a095f598e2fe7119a4106bae461dd80cbb1e9 SHA512 a609fe817df9fbdde828a4919850c13abc324a9843246b74c15c7b5ce5ad0eebed69c0e5d680e55f665aae2af26826efda9b0ab670042038d11c1f19af6bfadc
+EBUILD trash-cli-0.17.1.14_p20170816.ebuild 689 BLAKE2B df1530e4cedb7cda5736e56fd99b60a8ed91b0ebe7b41a9801ed6a51d3ee78d1979a0d85ee42d346015f07f75c10a9bdf5963ab3319d51390b1f9ddf6dea8233 SHA512 6fb15191afdf5bbba66c2480b1fcbe76c42f5a780bff2e5e1a5b8e40abb17b0eedc4e563b6d45de66432c7e71165f9794772c15291e7a6b50caf834ea82c5a81
 MISC metadata.xml 864 BLAKE2B 9c5096cdaea96ebdb3d23bbb1f44b9f706cef9b58ca6f4107bb2d1c4f11937753df808cf188625ad4ea42293492c0991693d36f9bcb2e2d9f3753de9bdcf463a SHA512 aadcc31272a1c57fbff503ffe14b595ba75096335b64ca9f460fd8c309b32ea283f602a5b89581473a1040dc099bd283e89deabf1ed5cccdfcc36daf5b7e04a2
diff --git a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
index bf00f26060c8..8a6df74f1953 100644
--- a/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
+++ b/app-misc/trash-cli/trash-cli-0.17.1.14_p20170816.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/andreafrancia/${PN}/archive/${GIT_REF}.tar.gz -> ${P
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
diff --git a/app-misc/worker/Manifest b/app-misc/worker/Manifest
index 9053b28501b0..1b5279aa3bdf 100644
--- a/app-misc/worker/Manifest
+++ b/app-misc/worker/Manifest
@@ -1,5 +1,5 @@
 DIST worker-2.19.6.tar.bz2 1191546 BLAKE2B ab806ef55e39f6e0909a25b01abd9c79afe61681ec8b8437fdedd8e663102de298c62141a39a8f0411e40c3ef92635e1593882fd7b93ec6df133d1bccd358f05 SHA512 401c986ff532c225cbd183afd8424e900ed8ff874368d68cb985136d130b5a4d4746a59e391ba01ae610eacd4fec0d76061ba967112b8262e4a9297599596b60
 DIST worker-3.8.3.tar.bz2 1519483 BLAKE2B 45573bed62256eda879a776f8a65af63a5c57f8c89784445faf264d2e09403faecdeb225d99ee50498df4c21a9cdf69a131c7d391a24eafe48c2319808b009dd SHA512 fa5d078233a91ec603cd87718542cdd5d99ef89c5d2e72c84fe40c08778c5e9dde8e99a23ccfee5ef61e63535c809a48ccf71fe9a256fd7afa05f848c5045738
 EBUILD worker-2.19.6.ebuild 1330 BLAKE2B e88996e3a9b9c57ceed6ab4abab1d8e407bbcb16719bf03f3ffcb64465b9f4814b01c6c5b1b817dcaf30382dbeeb3a20db456ba2a7a477d6af81b18606016278 SHA512 4180da05eebb296b791d326ad7bdb25d693e7eadda33e077f740dccf0a0d88fc71912b2f619a76d729e016a663259b042ce1a8a6e570b30cd6a63253b651858f
-EBUILD worker-3.8.3.ebuild 1270 BLAKE2B e7ff347eb2cfa70eb6df4bc6aff3a316c98ebd018ce01f345af02aa32fe1e46ebb5d2544d29c6bca669585246c8a96b077d1d4d08dea2c52b61fd5e81b3726ad SHA512 3e40f9c9c3e81e489381ef2c17d266170a61ebe0506b8ce5360bd1474c5a950916a0b6be0daa0321ff8a24664905826b95f551d3cddf2be887fb7854e131c38c
+EBUILD worker-3.8.3.ebuild 1265 BLAKE2B a7edef4905b9ea59723d6fd4df43b6ee32e075860305eb7352da393f96e90b693ac3b3f79f23b5fda90f82778365d7359beeeb49248d2709cff4f8c95432a699 SHA512 224a905768919f501046674f6acd7dd9c6d8653edf36bfbbed5efd1445df4b8c2828451a57dfa1f2d264da3ba7f230376ff6179f6d6cf8c1a4d8e82d09ef64d7
 MISC metadata.xml 636 BLAKE2B 9de5b71c8c1536a59308e33590c08227ef0bf31d96c6581fa87126576026bbd2646d1da648da45cfc35bace216a7a3a74c839340eb9f8b8a579b747feaead0b4 SHA512 67911dd438f9fa6ccd9e1f1bf47feb23016564b7d3cd33f846c17e82d83f70c39e6472bb61585a143475f207c3160c575e33fcd5edc5d2fe517ac5cf9f56c682
diff --git a/app-misc/worker/worker-3.8.3.ebuild b/app-misc/worker/worker-3.8.3.ebuild
index f6b863b19af4..b4c4e60edc8e 100644
--- a/app-misc/worker/worker-3.8.3.ebuild
+++ b/app-misc/worker/worker-3.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.boomerangsworld.de/cms/worker/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ppc ~ppc64 x86"
 IUSE="avfs debug dbus examples libnotify lua +magic xinerama xft"
 
 RDEPEND="x11-libs/libX11