gentoo resync : 23.03.2018

16 files changed, 74 insertions, 36 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3751d75fcb81..c6ad04282a76 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/away/Manifest b/app-misc/away/Manifest
index 1f4318356601..a1055498139a 100644
--- a/app-misc/away/Manifest
+++ b/app-misc/away/Manifest
@@ -1,4 +1,4 @@
 DIST away-0.9.5.tar.bz2 16909 BLAKE2B 80bbdf50e565c94f37a51dffaf3650eee05c59c1e0ef499c15be13b7e8c8d90defa689b36489a532007d9b018cebb4c4ac9b791c60678dd34375d7ff286cae01 SHA512 9cb0ab5caf80e337ce524ec88ee0ffc5305080be807494ababd122d7c5a00b7e79711537d74d930eb3768a71a31156e9abe5e0d9d424a201a9af31aa1bbc1c2a
 EBUILD away-0.9.5-r1.ebuild 846 BLAKE2B d774832642767b543d15faf8ed8ef6dc497c4b3147d11e5c2a3a013845d0a9bc9baebc85b6f87259df1b726495d2aebac322e29dbdd9dcea2e7b7fc04b952289 SHA512 1ed2bf3c0a588bd5400c17f71859049b2c24dccaf3f00ac4c8374cf07838542a4e8069d1874b16143ce70daf0857d63adb3677c87d4cdbeb0b4c057ce50714e4
-EBUILD away-0.9.5-r2.ebuild 808 BLAKE2B 2cc831c13591dda81acf4c59cd53c0e2360c79c8d5e68928935f1639a17615058ffe6b42307893935da72385f21135d874b3da66484c1392fe3d7729e697c67c SHA512 616c4063f7ed0c8c17f1cceb78c9fea3a4f5ce0fcbbedef4e65e88b6954fb87cb1fa58b98003dbc385a0a434f18ccb472857c163399b0137146d825366d809f2
+EBUILD away-0.9.5-r2.ebuild 787 BLAKE2B a39cf4d61cd5a7767d1149410bc098f3d3895d7a12fe14176e03a6de11d7321485354f93076880ea428d2c0533165f13c3aa6dd0f72db1798a7d012a800650e3 SHA512 e6c7807bb64488147e92a12ec33f6ad77fa2e49d5043f859d40e5de720a56893aadb3d5e98b9b4ea869e57d7741b4305eccab4af810e5411e9b5502d719844ef
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/away/away-0.9.5-r2.ebuild b/app-misc/away/away-0.9.5-r2.ebuild
index 2c5e59eac8d1..36184acaa9af 100644
--- a/app-misc/away/away-0.9.5-r2.ebuild
+++ b/app-misc/away/away-0.9.5-r2.ebuild
@@ -7,35 +7,33 @@ inherit pam toolchain-funcs flag-o-matic
 
 DESCRIPTION="Terminal locking program with few additional features"
 HOMEPAGE="http://unbeatenpath.net/software/away/"
-SRC_URI="http://unbeatenpath.net/software/away/${P}.tar.bz2"
+SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc ~ppc64 sparc x86"
-IUSE=""
 
 RDEPEND=">=sys-libs/pam-0.75"
 DEPEND="${RDEPEND}"
 
+DOCS=( BUGS AUTHORS NEWS README TODO data/awayrc )
 src_prepare() {
 	default
 	sed -i -e '/-o \$(BINARY)/d' \
-	-e 's:LIBS:LDLIBS:' \
-	"${S}"/Makefile || die "Makefile fix failed"
+		-e 's:LIBS:LDLIBS:' \
+		"${S}"/Makefile || die "Makefile fix failed"
 
 }
 
 src_compile() {
 	append-flags -pthread
 
-	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
 }
 
 src_install() {
 	dobin away
-
-	pamd_mimic_system away auth
-
 	doman doc/*
-	dodoc BUGS AUTHORS NEWS README TODO data/awayrc
+	einstalldocs
+	pamd_mimic_system away auth
 }
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index db01e3d7192f..d83398a61a0a 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,5 +1,7 @@
 DIST byobu_5.123.orig.tar.gz 581421 BLAKE2B 450804be3d625c31a493edef0f398b528b5c3b21dd38bb8c9319857ead9c5bd1b5cfa01bfa190ad6fe0f5a99007ac68d068ec6082bc1fcf32c667d6035f1e296 SHA512 915ad330e85a4405ad808a6f03205c468800c0942507fc0183a883bb0b33be4023b5ef9d7a63b3fce328f771ac1a4952735ee6119a26d6a5f2b01afec7a04059
 DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e89688a856e50b592f6999d3aae278358f7b0736b8b4c749fe577a1e9a326d3e1c5d4f08f15b033464cf890c47f4a3c96 SHA512 4ee12cdf2272532f35d2f7251e6f2aadb191f64db9f59cf63df54b2e4b1dacbac6ee9b65b8fed141204f9d309fb1a485ce86dd726c79106be0d52c2493a73bb7
+DIST byobu_5.125.orig.tar.gz 582407 BLAKE2B 7e74e121422bd9875697a96f39ab2e8e8f9d7f724ab8a597d2483bdbe89b3887e1894069dbe9b6ce75e610580b1bb002cfc632b6f2b8884db229382a719c86ea SHA512 cf5ef0e8902552fcfe839793b660454a6480154e0a315322311cecbc962ccf31aec5a6de035b7e83979d49058a64b222bade146163c31bd597feeed11c0a94b1
 EBUILD byobu-5.123.ebuild 944 BLAKE2B a35be83cc51db13385b74be9d9d1d78ab08900c4074eee26e53c98739ac494e78da2d05aa26d2503cc1b87fb37797f01debc17c5ad3762de0bb557abbdc04126 SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85
 EBUILD byobu-5.124.ebuild 946 BLAKE2B d688877e98d148332c753143ccaa5c6bae3d60b78338947c489ecd02664a348dc2902d6a151b7f1012b46e6b35a9866a220e2b550662c73e167cb58a7f81264b SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115
+EBUILD byobu-5.125.ebuild 946 BLAKE2B 42fba6e3128dd545ca139484b3749c8868e96ef0062d4b48b81b462073d1f1d673d2a57ab2efffd67e0c6a7cfa647955a1fe021615e2ee13cc82d2c2e95acd66 SHA512 3fe3808e439bfddb8b5b3c393b947ec22f9ec4d965ae30ac59259fb1032328e945d2b57f010a3c84ef3ac138bde07dfecf86b76e5e618ef360bff7626cbfc7e5
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.125.ebuild b/app-misc/byobu/byobu-5.125.ebuild
new file mode 100644
index 000000000000..d3b11ec6f89f
--- /dev/null
+++ b/app-misc/byobu/byobu-5.125.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1
+
+DESCRIPTION="A set of profiles for the GNU Screen console window manager (app-misc/screen)"
+HOMEPAGE="http://byobu.co"
+SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P/-/_}.orig.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="screen"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-libs/newt[${PYTHON_USEDEP}]
+	screen? ( app-misc/screen )
+	!screen? ( app-misc/tmux )"
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Set default system backend to screen
+	if use screen ; then
+		sed -i -e 's/#\(BYOBU_BACKEND\).*/\1="screen"/' etc/byobu/backend || die
+	fi
+}
+
+src_install() {
+	default
+
+	# Create symlinks for backends
+	dosym ${PN} /usr/bin/${PN}-screen
+	dosym ${PN} /usr/bin/${PN}-tmux
+
+	docompress -x /usr/share/doc/${PN}
+}
diff --git a/app-misc/g15message/Manifest b/app-misc/g15message/Manifest
index 33cd22cc2261..fc9c0314d85b 100644
--- a/app-misc/g15message/Manifest
+++ b/app-misc/g15message/Manifest
@@ -1,3 +1,3 @@
 DIST g15message-1.0.0.tar.bz2 219798 BLAKE2B 47320e9f43547756e3f427d917b76f816e5422ad65151e5b9cac72813a6a5c7233273c089e9bc2693c243d98bc612c0a2a824d7e6c84b2565f99c01f3034f476 SHA512 608fb789e1390e6f8fabe4c1f21cabfb0c445660a2629616ddca253d232d9e58775c8aeb8c44dde0b014e6e26cbab70db991000f1bfcb4daed1727a06de7a78f
-EBUILD g15message-1.0.0.ebuild 592 BLAKE2B 143593c24735262fa027a7779d66dfde6f4febcb6b204c2600a6fd2bd07821f4d07ad3443f61ae002b514ac8cd30dde646104da119c4b322d34cb195d5641530 SHA512 69dadd7e56b399a9323703137bcbca1f190ca2f5841a5a1de1cc7f40f00811efb8c535d5db6500cdd1c0613674ee7e9cc25f46ad0efa10070be8b81e8909a66b
+EBUILD g15message-1.0.0-r1.ebuild 466 BLAKE2B 13817da368acf6e69b7e132cfab56e416e31158d8fc6cfb47cf757e3cfb01b676617bab4e1287977e72c9099e0f9fda1632e04d1bd32ffda9e5d81995838a62b SHA512 14f41b0e97883870c74890dc05734bcdea84a658fd02abf832516026e6271534ed27f858b8dcec1950db674259c9898534584df3de09b883756ee20fd3ebdbb4
 MISC metadata.xml 409 BLAKE2B 89362ec09a6bc416fe1919f4e48d774f1cf751f147673ae89088b70bf7db7367ab8c7ece5e7276f5d9f2207cb5b3c15316dcdbf7dd65ce76a991b465c74e9b80 SHA512 f37883d9542d61a9abcc2596e88d80aa41aac439b1366239c7fa234c00776ce837cf19c8b2d153333c22e050380d7add26b7531423ef02e655157d39a72b121e
diff --git a/app-misc/g15message/g15message-1.0.0.ebuild b/app-misc/g15message/g15message-1.0.0-r1.ebuild
index ac6e5d6bfdc3..833b89120139 100644
--- a/app-misc/g15message/g15message-1.0.0.ebuild
+++ b/app-misc/g15message/g15message-1.0.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=6
+
 DESCRIPTION="A simple message/alert client for G15daemon"
 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
 SRC_URI="mirror://sourceforge/g15daemon/${P}.tar.bz2"
@@ -10,16 +12,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=">=app-misc/g15daemon-1.9.0
+RDEPEND=">=app-misc/g15daemon-1.9.0
 	dev-libs/libg15
 	dev-libs/libg15render
-	sys-libs/zlib"
-
-RDEPEND="${DEPEND}"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
-	rm "$D"/usr/share/doc/${P}/{COPYING,NEWS}
-
-	prepalldocs
-}
+	sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
diff --git a/app-misc/go-jira/Manifest b/app-misc/go-jira/Manifest
index 2de1a0dc157a..42ed030e6b45 100644
--- a/app-misc/go-jira/Manifest
+++ b/app-misc/go-jira/Manifest
@@ -1,5 +1,5 @@
-DIST go-jira-1.0.12.tar.gz 1296394 BLAKE2B 9f693fbaf1c2e4463a98b08b545646f0ac4780403f6b98f5218066eee8be8345c23389373c28aed160d8cea974f207b6a141cd031eb88e6a726e286bdc3f062d SHA512 d777544253920691b2802c3cc0651b908501660365e4a991713d85cbc10e8f4c319056b91926cf6b06c13682ee160747834a82898b269aa7e10d87981066633e
 DIST go-jira-1.0.14.tar.gz 1378174 BLAKE2B 119c40878eac9c6af2b7f17a914821110f40af3d5cb9b3f3783ba2c5c781314d0c76e5a0573c74e69e298f086d876b97ca7538828cbbf845f42e5874550beb7b SHA512 f9fc43adfb8c09f80307a39d2d169c4e4b537f64fbca5b7d355178125aa315cd6de9147b00b03a80218cb685ce02a0e0156cd902277367122aaa00c395c6f880
-EBUILD go-jira-1.0.12.ebuild 705 BLAKE2B a4033cdca05d9af408429c95910c4ad0bf1a3ae4204064f2cd5fe908182854907cf39347c2db9a09f2416a3e83c744570f0bf936780ef466619f4111d47f2b66 SHA512 11869bef72ceaec6df3da65a39050675d6d60b81224f0a31900fe483c09e5fea0b719817114380cefda461a8bb15a6e215419e9c0802f7f07474977539ab46af
-EBUILD go-jira-1.0.14.ebuild 705 BLAKE2B a4033cdca05d9af408429c95910c4ad0bf1a3ae4204064f2cd5fe908182854907cf39347c2db9a09f2416a3e83c744570f0bf936780ef466619f4111d47f2b66 SHA512 11869bef72ceaec6df3da65a39050675d6d60b81224f0a31900fe483c09e5fea0b719817114380cefda461a8bb15a6e215419e9c0802f7f07474977539ab46af
+DIST go-jira-1.0.15.tar.gz 1381623 BLAKE2B 430451fc6f86c72421619433427694f4a7a756c24cbd239c38ddcfb8b35a83215377bb239af43ceff90da1a9122d312190b8185dc5e04032a50491c8f61d9c2f SHA512 e4ceae1577ad8f512a9375775308687e78a50131faa298ba1cddc8397a8a04feca55f132c022d942458e8cab68f28e5610bf4b3334fe2c16f71e924e290ee955
+EBUILD go-jira-1.0.14.ebuild 704 BLAKE2B 1aa8dad2ff3972debb356ae656cf97669dadecc9b502f7b59f679463e22f22b14965cf72e838ef8040be61b1ed78e6372653806ca6a0e6733c98c0b682b97e40 SHA512 66a7667d8e4939bd30e7f7ca9afbfbcf715a3582e8bb6ac60e4b27cb014e6f51ebbf755726345833ca9e734e42d461bf45f5f75ca93b1046ac8bb8dfbf9bc454
+EBUILD go-jira-1.0.15.ebuild 705 BLAKE2B 3084d97fbb21bb6b9d02d2111ebd0c4b691b8603a372ac8f64e75da24a43eeb0bdc3492412d6c77c3bf3ad8322c0868dd1488411af368e219146753eeec2ca33 SHA512 b304de839b8e81b6d02ff7113417130c9b7e65d1110dbe52b6d5f262fbe150292635205a8afc78d81cffe457f35f5e32aa2a0b57242d7db4298a98029ebba2eb
 MISC metadata.xml 336 BLAKE2B e4bdd5129c1bc5e5a26f4ae70fa1528c9a5ee2811fa5df2e5876ea3f1044afa3327a3b9897b199b2f18b451bae57da965371f8184196b299a036843bce3ed494 SHA512 37e0c43ce89345c1e0136e8e1f162abd77def9f295ddd8abc3b49f638847a1c08c41cb1055415aeb5a3ce5d1eab37b9ca2654764255ea6ccf9d76adc0a5f8009
diff --git a/app-misc/go-jira/go-jira-1.0.14.ebuild b/app-misc/go-jira/go-jira-1.0.14.ebuild
index 76adf6c250b7..6092975389c0 100644
--- a/app-misc/go-jira/go-jira-1.0.14.ebuild
+++ b/app-misc/go-jira/go-jira-1.0.14.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 @@ 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/go-jira/go-jira-1.0.12.ebuild b/app-misc/go-jira/go-jira-1.0.15.ebuild
index 76adf6c250b7..80c476f47f72 100644
--- a/app-misc/go-jira/go-jira-1.0.12.ebuild
+++ b/app-misc/go-jira/go-jira-1.0.15.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
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 290b4195eb42..70c3ee3e3c4a 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -5,7 +5,7 @@ DIST pax-utils-1.1.7.tar.xz 648376 BLAKE2B 676551b2391b2ba27281d26fba61da7d0d277
 DIST pax-utils-1.2.2.tar.xz 655964 BLAKE2B 5e43b52648f1f0cc1f46616ebd9a554cf2e5909292337c84f9ee0e2eceb4879a5f16ca20700e5a16267b38ffea529814949817ea6054cd1b2ea38e267455de00 SHA512 6bafe93f3b84d4595b6adfa09b46a3dd249f309fe836d90115e9aa5fcc7da37b03f743e80719dfe6bcdb739ce6ec3843170a5513e196c348721f850e19d3e38c
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 EBUILD pax-utils-1.1.7.ebuild 1472 BLAKE2B ac8f899442a870fe81f1d5c80bd3ccf24082ecb029de9520bd45cf1efccf6e0ced8685af3c16ae25c9d57733a3e2bf57bb5d0e543e7f1e43244867807b35bd2a SHA512 7e166188a86da296040f1407377526f444af689e2aeead564f28089b996b5f34d658b3197b881ef84b3aa7600309f71d54cbbd86fdc61ce71706a64f8bb12368
-EBUILD pax-utils-1.2.2-r2.ebuild 1628 BLAKE2B fba8e9ec0d003ac37f253811b31be93267db64532a4026cbb7420c9e9e731fb6a41c8b2fdc33a2ceab2c314a842a0be602a2d45559f2c972617d93a97f0f7245 SHA512 f519351569a2ad65d27f3f1f29e68e6d1e6558d777f1ce7e66360b480985e36976e38b15e850394b62cb128438b4e525924ecfafd6e7f3900a992d9c5b34a689
+EBUILD pax-utils-1.2.2-r2.ebuild 1627 BLAKE2B 4cb00aa04ebbca333f1b1cc3c5db6580f592bd3a7dab1c87a8aa7eaa4250ca1f261442f0d662960e41fc659048672487d5674f930be972732239fe6e48bc4646 SHA512 ef06d06f27ed726e14e196ead496fc72c0f7426d45f35839527ed1fb8c5ebfc3ecca4aa8bf41cc5e35d00cbbe01d77aa45a1dbf8dccf88d72610098fa2e9257c
 EBUILD pax-utils-1.2.3-r1.ebuild 1698 BLAKE2B 3377c2719fbd8e49d50c166d7a10655570197c84bb42c2a57fc0bdc4ea33c4ce29a4094da408189e5fb9ae0ffe830f39aba1e5fc0c5d04679095f81e9b04d05a SHA512 04678abb457a3206152a37e4c563f424ee551038e10e3dd00149eed4503edf27a370e7d1665fff6fdb60a43ff2492a631f8fed2f53cf3e48e03f21ea62ca7c16
 EBUILD pax-utils-1.2.3.ebuild 1488 BLAKE2B 578a405210bc5e0beb2725cbc59ff3b1d39a9740fdec4d032e381fa87999f139e2face9830914b79d631d92d293005898549a79914d47011c8e097d3029de8fa SHA512 1f3d96207ef7a9a5f13814bf85edb2b601fd2c915dc0c498880a294f85cd703774b897b17f91a6f5308bba1640eee9901084d000192e8baa8791fe9f88396dc9
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
index 2540277851ed..ad52984becec 100644
--- a/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.2-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/tek/Manifest b/app-misc/tek/Manifest
index bc95b176f41f..5cb1db432cf9 100644
--- a/app-misc/tek/Manifest
+++ b/app-misc/tek/Manifest
@@ -1,3 +1,3 @@
 DIST tek-1.3.0.tar.gz 99399 BLAKE2B 191fec7992ea4b79aed5833012cb22ac3ad399eced53e74467139aa05e2dfda08af220b35cb191f5f1bf706186a8460f3d80196599f43654d5de05e36b5df84b SHA512 20e3e704db71a7c0fb7a7791c8ebbdb348d370b06bea39f2ee77cae72ac4b71873884c6ec58712c9bf85d7d0785310f33189ce977a77b970951e39c8803d28fd
-EBUILD tek-1.3.0.ebuild 934 BLAKE2B b4e3d75f50c11ff95561cc09501760b9439366f0e3f669ce69c9f7ae1a0fe7586f918f3991648c21ad996c2e20a940d54a1d7c58d5e06d8dc444151715314e49 SHA512 15e88bd7ebbdd7d5e298aab2f00252bba7e15cf3d146258e19fae9fe0e590619c958c33d53915e0b5ddd38430c0b89ead2824aeae23243e8605faf5ef8cb955f
+EBUILD tek-1.3.0.ebuild 935 BLAKE2B f3e3402447b1b3fb451389018fd16497bfe2eb52be781eace5bf5fe907fb86370283e23fd16572b56fa1eb8798ac46172c7c8de7f359901bf3a3f12b8864af1d SHA512 24f9cc5e5b8a8859a9f9a1de0fbd10c7deab048b40e2723fe65e0279f0c3eea345621a3bd386ceee482b5d9a5fc41dd293da5ba12378a73b903ea31c0d0ea13e
 MISC metadata.xml 330 BLAKE2B 98389927d53498647e22bc7460337219fee86fec8d06edc73edcf17a8a67d6b1c62bad2ef2fb3eec3d037b3960f5da0356ae6b81b5c525334c3216b7049c4190 SHA512 6d46988601ab6a6284211d488d55a6b56e63442424b4abc5910320cdfac5c1b5c8f050090878a7f3680de4acbecbd8e67f3195c9f6734139123c32fcebc103ee
diff --git a/app-misc/tek/tek-1.3.0.ebuild b/app-misc/tek/tek-1.3.0.ebuild
index a999ca161f55..69421b1eaec1 100644
--- a/app-misc/tek/tek-1.3.0.ebuild
+++ b/app-misc/tek/tek-1.3.0.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 @@ WX_GTK_VER=3.0
 inherit udev wxwidgets
 
 DESCRIPTION="GUI tool for upgrading the firmware of a Truly Ergonomic Keyboard"
-HOMEPAGE="http://trulyergonomic.com/ https://github.com/m-ou-se/tek"
+HOMEPAGE="https://trulyergonomic.com/ https://github.com/m-ou-se/tek"
 SRC_URI="https://github.com/m-ou-se/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="all-rights-reserved GPL-3+"
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 97aae9f38337..6a3167f8952d 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -15,6 +15,6 @@ EBUILD tmux-2.3-r1.ebuild 2234 BLAKE2B 3bb0de689495b69f479ad605480a0c93a13cbdbd5
 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 2142 BLAKE2B 8dc09b474811909a287012dccc5265c9ee46e6f70243e72932114f8868de7d660de25144ec6f3f4519d23d403fd745d2c98fedd361027c0078018604a8346e54 SHA512 6b50de0d33c428a5241fcd13163feb9d78be01a54c846b86e4f50446ff4865ca88c2484259d41f133e92daa1a5486d29ac6305a48dac45e07b862b2f6f627371
+EBUILD tmux-2.6.ebuild 2141 BLAKE2B a10ac8e52dbb63018a596484119e547982ddba5acc32e7ffde7e0b7fc8ab914327b3ee0dd8bcb47a9aed7b895f2eb17de206220f5d7a44a78a70653bf60959ab SHA512 a7ea10932ef2b6e9e99d9dac2b19b3b05b14b12bb0426007478be92e6ac8632acbf0b930f92dbfece8b2d31c572f17df7358b85ed0374779d5c9b7c07d30f5c6
 EBUILD tmux-9999.ebuild 2349 BLAKE2B e4f633dc28e278873941f66efb8adfff9735fd04ad98e505b474dfa657303033ba8cf1cc22f64f7e66ef248c2621858461bf133b2aaad9ee817ae80eba4de847 SHA512 0fd75b67ac3e782f9c6aec6e36bafd69f025555c493961da7945994b0cb3dc1d8991d5a41ad68f85bd176564427e0b5f21ffc53ee9a4db41d50caa043ac0dec2
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.6.ebuild b/app-misc/tmux/tmux-2.6.ebuild
index a4d3a8dc6f6b..f71497add19b 100644
--- a/app-misc/tmux/tmux-2.6.ebuild
+++ b/app-misc/tmux/tmux-2.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.
 
 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"
+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="