gentoo resync : 09.12.2017

5 files changed, 47 insertions, 2 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index da5f787a4a62..cdddd62590c5 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/byobu/Manifest b/app-misc/byobu/Manifest
index bb816f2ba0c8..b7cc6a41b74e 100644
--- a/app-misc/byobu/Manifest
+++ b/app-misc/byobu/Manifest
@@ -1,3 +1,5 @@
 DIST byobu_5.123.orig.tar.gz 581421 SHA256 2e5a5425368d2f74c0b8649ce88fc653420c248f6c7945b4b718f382adc5a67d SHA512 915ad330e85a4405ad808a6f03205c468800c0942507fc0183a883bb0b33be4023b5ef9d7a63b3fce328f771ac1a4952735ee6119a26d6a5f2b01afec7a04059 WHIRLPOOL a3c35f42828e3fc492d2873f67f9094d8b6a73db594acb7b50616bed5a1638415ea1526345ef12b0b79e65e461900fdd6caaded597f8ccfcb400b082ad7a3ac3
+DIST byobu_5.124.orig.tar.gz 582725 BLAKE2B 1bf4de3cfd5ce3a31c020f3a56ac495e89688a856e50b592f6999d3aae278358f7b0736b8b4c749fe577a1e9a326d3e1c5d4f08f15b033464cf890c47f4a3c96 SHA512 4ee12cdf2272532f35d2f7251e6f2aadb191f64db9f59cf63df54b2e4b1dacbac6ee9b65b8fed141204f9d309fb1a485ce86dd726c79106be0d52c2493a73bb7
 EBUILD byobu-5.123.ebuild 944 BLAKE2B a35be83cc51db13385b74be9d9d1d78ab08900c4074eee26e53c98739ac494e78da2d05aa26d2503cc1b87fb37797f01debc17c5ad3762de0bb557abbdc04126 SHA512 68e5edd4db0a5afba31ce4c984e3c1a95c84a16e7e5f8fef9afe6be77126c596e9e288f339f3994eb00c4d7f56514e5e2ce13e61a7cd0542542835aaee903d85
+EBUILD byobu-5.124.ebuild 946 BLAKE2B d688877e98d148332c753143ccaa5c6bae3d60b78338947c489ecd02664a348dc2902d6a151b7f1012b46e6b35a9866a220e2b550662c73e167cb58a7f81264b SHA512 468978f2398a70477a5b62df314507b44891b29fe4df4f8424f5be639238f9f997a39debeedfc3ddf30a60f447147fdb2d50707d2c98d6f7b73fb3836773e115
 MISC metadata.xml 981 BLAKE2B 8e3ed29634279b4fec3b92e5b192e4aaea2c3d8aeb29d1e29f03220d32f3c522d27fdcf8aa2fd601fb647c8ec41e1d56e5d1cb32c635070b516592cffdac9499 SHA512 6056ce18301ef9147fce0922c07ef455c416d75b78e23bc0aca9154e1765f167ebffbafc8e330f4878f0b575483131d417354f14e392568c91ef04087cf87d0b
diff --git a/app-misc/byobu/byobu-5.124.ebuild b/app-misc/byobu/byobu-5.124.ebuild
new file mode 100644
index 000000000000..f67cbf99d559
--- /dev/null
+++ b/app-misc/byobu/byobu-5.124.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2017 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/vlock/Manifest b/app-misc/vlock/Manifest
index a8bcdca43f16..bac23d0575bc 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -2,6 +2,6 @@ AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B d32fb731251246dc26d5079eaaf781a1134c1
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 43179e0763a90bd44d3ac9699cf65c80314e24c31433d8f7da9be7633d99a9ab3ba4663591c6e4eef091aceaf62f5e8ddd1b3e3d56960439c45ea9240a14a372 SHA512 959d10b3c777936ce7b29b6a8efea55d8d76cf0007704c6b17217be4687516d2fb8d4d268d58175ebaca8594c9d5b47724788b235a5386ee2a458ed640fd63eb
 DIST vlock-2.2.3.tar.gz 54860 SHA256 85aa5aed1ae49351378a0bd527a013078f0f969372a63164b1944174ae1a5e39 SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855 WHIRLPOOL 3cc62216d07111eaa5c3298714274266e1a204c79423c1447205d8df7aadeaac51dcab287d7cda0456fbaf605cc5ac31a838350ac07878b6778f8903390328d6
 DIST vlock-2.2.3.zip 85751 SHA256 8b1e4a3a1dcea619333256814b72c552c2e99a7d9d15bcc3a72fd9bb39e3df61 SHA512 90390bcecbc5cd55a19f9d3a6007fd39257183f63366d667263c8d49217206ba5d929814c32181bf3d3fa82197a544211ee815b65ab1c7e09a2502c4ab079b07 WHIRLPOOL 28f4412532e57f1371ead9328461189d63850e09d83be9f1a5770453bf30a96d71f40de3f2a36a93d007e33c53fa388cf2d4171add8fa6a9550041cd9b66a9a7
-EBUILD vlock-2.2.3-r1.ebuild 1116 BLAKE2B 7f0588491d0c82e4b8131383151b46f8b6f23a00795abc52390a9ca76b7bf5e2d74251637706ec6fbadfd44bdc7b300092295c405fd434fdf067ecefa88da794 SHA512 7588bb4b6a838008b8c12fd9dc25af02487926589c0fbe46c17b069ea95f4bdb09a24306299c5171efdea6f17f39ad715198f26ca859f19ea402b62143af0fc7
+EBUILD vlock-2.2.3-r1.ebuild 1115 BLAKE2B 76a13d1f23b74f1042c799f49e38e43655c7748754bbf7c7ae223d6bc38c7afce8f3d0c4a43a7e3b85e103db00d3fa5a34499f81efd62e35202e060a546e0c06 SHA512 eb4b0a8c4abf03a1b0b90de94c0c9ca1e30368480eef0952985f874a07d4ce1bac4e62f7ad65acbe78f64875d38340d97dcf8cef2921ddb333147be5004b247f
 EBUILD vlock-2.2.3.ebuild 1257 BLAKE2B aaaa6c8a91b2fe65472543f5b8bf3279038384e44fd57ad90281b4ee20181b12aac617baf0b0260539933c4731d8dd24627b851570878d2b3ee7e151f4a4afd4 SHA512 200ee863b096f0601080f4851e13c8deddfabfff0aafceee4a1ac33c5b25323436361d8e47c9e61e4bd3518df236c75b2a3bbca7c19aafdb695bb169c6e0d1d2
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index ec4e63d05ac1..01fe34bdd5b0 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/WorMzy/vlock/archive/master.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="pam test"
 
 RDEPEND="