Merge updates from master

9 files changed, 115 insertions, 14 deletions

diff --git a/app-admin/github-backup-utils/Manifest b/app-admin/github-backup-utils/Manifest
index aee3781a8488..84e3b2c3f759 100644
--- a/app-admin/github-backup-utils/Manifest
+++ b/app-admin/github-backup-utils/Manifest
@@ -1,3 +1,5 @@
+DIST github-backup-utils-2.10.0.tar.gz 73061 SHA256 08c2f24adcbc1554fc6079a46f7b59e1cb2f21950546956f9c4367c25dc716a5 SHA512 e4ec432289da71e7c8d50023e4874b4aef5e99b27f67c42ebadc61473f5b0bce473f768ff19d1d611d91944ce887ad496535f1bc8d6557a31a99353e100f7776 WHIRLPOOL c33ccbff94e5c56f2017ff344170538822637261e7c87037db1e5c9abcae28276424aab0d7ed6b3c489148430a05cd488dca4871b302e69acf821f089a73c479
+DIST github-backup-utils-2.11.0.tar.gz 75105 SHA256 ae28ab08b933a8288e9eb9a92df221b0762cd1e7e399b5c116405a0d5fc3175b SHA512 7d96aff4c2e2bcce7b2b2d32854e759d561de8e683a13d3890bbbc5177cea861a666a60527b4b6ec4d4d7e8123bfff4618b6dfd0c3db73b1829cca0c43c0a9ec WHIRLPOOL 05be640c5f95025cb694d4f8e1f1fda4a1d349889333f9ada1f15b48b3bb01d89b9bd4fb984549916f63815548efb272621d016cebdfddb803ec5fdd41b62377
 DIST github-backup-utils-2.5.0.tar.gz 40850 SHA256 9cc7cd40f41e6071c36527ec7983b877e461452cd08d04439efd5fa9352900a0 SHA512 ecd5b85e0e2e300a9f40ecb8f545868554c7b48bdf800a21cf111ead80c185c96d475c67487c9b9e8af676f8c71a001730084abde79e05860b3e24004888292d WHIRLPOOL 15be1d603c9b61a4cff47e319ee1a66b64684dfd19f06c696bffb41b77dc756a895e25074d5a6dd19aeebaa3106fe12842cb22a639ed4abd3a6c2922e8cdbc1f
 DIST github-backup-utils-2.6.0.tar.gz 45970 SHA256 7273cebcb23bc597432a2b66ab7e9367a4fb09a750cf2438f8957dc83dcf27c3 SHA512 a795e439f9d28e27b457c5b6eb42f35d6aea1527c2a01a26b81d6e86829db14a0b27a366d9358214bbe1c16540fe524fb0010d5f509c78ba5398c6bdbf04182e WHIRLPOOL fd1aeec46946190657e61e611a089b4a7cef53beb7b3f9a500b7117fcdbd89c5ef09681aff98ed5d559cc243f76180eb6eec0cc6f2fcfeed0789c159f5a09afe
 DIST github-backup-utils-2.6.3.tar.gz 50884 SHA256 3a5e48ff250b64a9bcec69a269b0e93efda078b8b77afc992c12aa40ee7bb3d9 SHA512 dff092325ad6f3502c8c0afbea90a53469af0ab4b98eaa39a950022c5b4e199cd3b48b5ec0585e3ea39b9bbd707dd037e8e0ed00ed8c6858276ba1a8e1075290 WHIRLPOOL aa19640ee5583d5e64aaab7b5a9d5572c47a09dd11fd0bed30ffc6aad0a10ddfc4e258f4680180547f8327fbedc5866bde4b20bd5e962dfa8162cd8ecf5e6db3
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.10.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
new file mode 100644
index 000000000000..586f3c415df5
--- /dev/null
+++ b/app-admin/github-backup-utils/github-backup-utils-2.11.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# See https://github.com/github/backup-utils/issues/135
+PYTHON_COMPAT=(python2_7)
+inherit python-any-r1
+
+DESCRIPTION="Backup and recovery utilities for GitHub Enterprise"
+HOMEPAGE="https://github.com/github/backup-utils"
+SRC_URI="https://github.com/github/backup-utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+
+DEPEND="test? (
+	dev-util/checkbashisms
+	${PYTHON_DEPS}
+)"
+
+RDEPEND="net-misc/rsync"
+
+MY_PN="${PN/#github-/}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	dobin bin/*
+	insinto usr/share/${PN}
+	doins share/${PN}/version
+
+	exeinto usr/share/${PN}
+	doexe share/${PN}/bm.sh
+	doexe share/${PN}/ghe-*
+
+	insinto etc/${PN}
+	newins backup.config-example backup.config
+}
+
+src_test() {
+	emake test
+}
diff --git a/app-emulation/fuse-utils/Manifest b/app-emulation/fuse-utils/Manifest
index 500fa206c186..882bb5aaa6e7 100644
--- a/app-emulation/fuse-utils/Manifest
+++ b/app-emulation/fuse-utils/Manifest
@@ -1,2 +1,2 @@
-DIST fuse-utils-1.3.2.tar.gz 490454 SHA256 45b664bf7b2130899bffad4606d8de824c002ee2f0af9683ad343630efe4190a SHA512 26c0b675355d79f5e8a1f28127101d473dd2996ff40c6fd13a92b99d2a54fbecce52cad42b6fb3dfba4d397a0e9b44e58ae5df7d958b9ddabd8702fe147f96f7 WHIRLPOOL aefe7c7b8d8d78925d2b5c4fc5f873e82d0386e6c4915b797edac5bebddc618701e60c44b0fdc30e99555d105e72b19297fe11ba14fd28a779a0707c274bb18d
 DIST fuse-utils-1.3.3.tar.gz 491483 SHA256 e6242dbf3359be8b92b228fb3dc5753b17f2c3b6cf4a70c4c71b63c20fe9ded1 SHA512 f2b0afc61b178ae51f2dcbff70112e35213efe8885e4f89903d02e5613652b0620bc6fbf80cfb8ca761324894e2913739b9083f91a03e689086051f83d182805 WHIRLPOOL 65db3e48f2a49199c0800fbe116eae519c997f1b767a833b184e4320c43d6d33c210b838505c3a02b775856db5a23f093877cac4e3b1b96128dbd2c0b78c0f2b
+DIST fuse-utils-1.3.4.tar.gz 493813 SHA256 d8615623f78001ec098f0bb262da6184930ab3654cfd4f00c3232f1a5f295fe0 SHA512 878f0481f7b62a989c1c1e947996b9c3ffafbfde4eb6c0af46aaabe765768f308ca26d3a451f438e48c795a6f08791c9ebf672448519a5d0790d5781c9bad6bb WHIRLPOOL 62ec95b67dadf10f0ba07ede8d44bf7084e7ed69edaf660046198b3424fd5ca42be487b1da222608d6869806cfd1841e4d06b03dba465e74e5ec6a7afdb4dc52
diff --git a/app-emulation/fuse-utils/fuse-utils-1.3.2.ebuild b/app-emulation/fuse-utils/fuse-utils-1.3.4.ebuild
index c5868adca4d7..384e894a681a 100644
--- a/app-emulation/fuse-utils/fuse-utils-1.3.2.ebuild
+++ b/app-emulation/fuse-utils/fuse-utils-1.3.4.ebuild
@@ -12,8 +12,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="audiofile gcrypt jpeg png zlib"
 
-RDEPEND=">=app-emulation/libspectrum-1.3.5[gcrypt?]
-	audiofile? ( >=media-libs/audiofile-0.3.6 )"
+RDEPEND=">=app-emulation/libspectrum-1.4.0[gcrypt?,zlib?]
+	audiofile? ( >=media-libs/audiofile-0.3.6 )
+	jpeg? ( virtual/jpeg:0 )
+	png? ( media-libs/libpng:0 )
+	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -23,5 +26,5 @@ src_configure() {
 		$(use_with gcrypt libgcrypt) \
 		$(use_with jpeg libjpeg) \
 		$(use_with png libpng) \
-		$(use_with zlib )
+		$(use_with zlib)
 }
diff --git a/app-emulation/fuse/Manifest b/app-emulation/fuse/Manifest
index 330540545b30..7b2b6c935c71 100644
--- a/app-emulation/fuse/Manifest
+++ b/app-emulation/fuse/Manifest
@@ -1,2 +1,2 @@
-DIST fuse-1.3.7.tar.gz 1644585 SHA256 ba57f4b4c1a7ed398b8d85b7da14b85bd346023bed17d8d7b6ed3e0452e7b4b0 SHA512 68a251de93a71a6ca8c107a9bd4258e6b4f5643af5dd76c0855ebfcfcaba768b932e6d0d0ab7b521ecaef50d975b86b4bfb7094e9a72ec6bf7d94911823d0886 WHIRLPOOL aab8ffdfd40ebbac9f88736dff98891f0eb51e43548ceb0c4d1ccba241009304c431651ed0c034797290eb79e6ffdd97f45591dd6efb426a60f0e511f642cf0f
 DIST fuse-1.3.8.tar.gz 1645303 SHA256 299b7efe342c6268a05e805c20427083bcec127ad36b1ebfd4ae7294978a7de1 SHA512 e048d984bfc405e8e9801812fcf4b0b62c8bdb67eb573a815157a1f76e4c752303c919dc62b351db25c156b944c4b1b6d28595f8ce86390221039852baf13aa6 WHIRLPOOL a1dec25d878e49c11a4d69b59cce594a4a0ee075ad7b758eaa9afda9dfc6cbb2f6fded96938c4ca8473416f7f741cf3d4314fcf015aaacdb87b69387378a1ed0
+DIST fuse-1.4.0.tar.gz 1652821 SHA256 75ac811534c7e352f238b1959a7f6478661bc4103f96dd1166ec395ad7523d97 SHA512 e5d0e65820f54d0ac0447d50aa89ea4ba3e6bb717e270ae813c640a9b36fe015c68f194edacb5cbe8899ee7893c30cab4493ed297919e962e722e9d3e1f72001 WHIRLPOOL 64f043b26ff5e6dcc0c1f33c106328c61ac86c16844f9d56951737c96e1fdb20ed196edb2940a220089ed05e8ba524621b65f2984a9aa04d88ae67dd7123dcef
diff --git a/app-emulation/fuse/fuse-1.3.7.ebuild b/app-emulation/fuse/fuse-1.4.0.ebuild
index 9c2d6dfb79ab..818bbdff2bea 100644
--- a/app-emulation/fuse/fuse-1.3.7.ebuild
+++ b/app-emulation/fuse/fuse-1.4.0.ebuild
@@ -15,18 +15,18 @@ IUSE="alsa ao fbcon gpm gtk joystick memlimit png sdl svga X xml"
 # Only one UI back-end can be enabled at a time
 REQUIRED_USE="^^ ( X fbcon gtk sdl svga )"
 
-RDEPEND=">=app-emulation/libspectrum-1.3.5
+RDEPEND=">=app-emulation/libspectrum-1.4.0
 	dev-libs/glib:2
-	X? ( x11-libs/libX11
-		x11-libs/libXext )
 	alsa? ( media-libs/alsa-lib )
 	ao? ( media-libs/libao )
 	gpm? ( sys-libs/gpm )
 	gtk? ( x11-libs/gtk+:3 )
 	joystick? ( media-libs/libjsw )
+	png? ( media-libs/libpng:0= sys-libs/zlib )
 	sdl? ( media-libs/libsdl )
 	svga? ( media-libs/svgalib )
-	png? ( media-libs/libpng:0= sys-libs/zlib )
+	X? ( x11-libs/libX11
+		x11-libs/libXext )
 	xml? ( dev-libs/libxml2:2 )"
 DEPEND="${RDEPEND}
 	fbcon? ( virtual/linux-sources )
@@ -53,12 +53,12 @@ src_configure() {
 	econf \
 		--without-win32 \
 		${guiflag} \
-		$(use_with gpm) \
 		$(use_with alsa) \
 		$(use_with ao libao) \
+		$(use_with gpm) \
 		$(use_with joystick) \
 		$(use_enable joystick ui-joystick) \
-		$(use_with xml libxml2) \
-		$(use_with png ) \
-		$(use_enable memlimit smallmem)
+		$(use_enable memlimit smallmem) \
+		$(use_with png) \
+		$(use_with xml libxml2)
 }
diff --git a/app-emulation/libspectrum/Manifest b/app-emulation/libspectrum/Manifest
index b3e6bfdb9921..bae1f0675f31 100644
--- a/app-emulation/libspectrum/Manifest
+++ b/app-emulation/libspectrum/Manifest
@@ -1,2 +1,2 @@
-DIST libspectrum-1.3.5.tar.gz 502777 SHA256 674c3c973af342054a3613686a57f5ddd425c2b83cd84a07bcbe5c89f312461d SHA512 2c4447f94d0ada671f2ea17437bd71c85535d600917052fe835e66b634c833356a5b7e425fcd12666b31b3165453fcaa599e8a0fb60494e6a4583bd06f4a474f WHIRLPOOL 57fdcd23cc8eb1a8b1d55406b95e1db38600a057bf552b67e625ad82bd5126caaead0c064302622155b8485ab904cb8a76e1f44749b26d1bb75ea702cf42b115
 DIST libspectrum-1.3.6.tar.gz 503554 SHA256 31c85d85bc17acbf7465f7d7805fc84dfc4830cee3715b929d4440aaacb6ef47 SHA512 691d4525468396b48f9fd8580b2d93060816094bbb8f8d581b537a1028f1cfa9ceac24a3032008456a8d0dfc144d8b753bbf01c3358fb5fdc50534d232d84d58 WHIRLPOOL af15c5d5c6092000baeebc577658cddf777b51d9a093208dd7bc1dd8c89e29debe5c325c06292b22528fa02f9c63dc480435afeec828eb78966bababc736d670
+DIST libspectrum-1.4.0.tar.gz 514972 SHA256 6207d60e259fac2c2074b2149ff64914d656b658fb002d002a2be30bf0e6185f SHA512 4005133185bc677ac8c960fb3f731fa6dc29caa31e008ba59f1791626999717cb79e9be284d1534a3a3550fa2ea5f2b1616256f3deeac73853f5b8fe3031e3f3 WHIRLPOOL 46dcaaab260831c386f7c7d51fe7b4a79474a819cf51522738918ae1bb6250ada0483ecc6e4aca40a54b650f6b292e8aee31becc4e156747e22d08f83435d101
diff --git a/app-emulation/libspectrum/libspectrum-1.3.5.ebuild b/app-emulation/libspectrum/libspectrum-1.4.0.ebuild
index 89d3021f9a99..89d3021f9a99 100644
--- a/app-emulation/libspectrum/libspectrum-1.3.5.ebuild
+++ b/app-emulation/libspectrum/libspectrum-1.4.0.ebuild