Merge updates from master

5 files changed, 67 insertions, 0 deletions

diff --git a/app-emacs/with-editor/Manifest b/app-emacs/with-editor/Manifest
index 80be1fcdcca1..0d73764e7b76 100644
--- a/app-emacs/with-editor/Manifest
+++ b/app-emacs/with-editor/Manifest
@@ -1,2 +1,3 @@
 DIST with-editor-2.5.10.tar.gz 28081 SHA256 c7a849ed827e830f0092695d6b99dce9fad5e1a87e6f0cf1fe7379f860505d53 SHA512 797c7d905eeb4d7398dfba10e4a9b7e7729098a87e48dd75c14fd80f1dd9c5a9693033367a0a9788c4b6c6cc3aa8d2a6ef66ac8bddd24457a61c830887e66a59 WHIRLPOOL bc57ec45d64f4c587fbba2bd847b27ad41ec79dca5745ddd1034005d5c4d48546692bc9dabe723e453ab807a7bc070598701761d7d65fde6d4f2357364376fe5
 DIST with-editor-2.5.8.tar.gz 27978 SHA256 56b2216fb316af5c7673589405a0a7e545a2414a9991374ad95ef15f2a68f0b5 SHA512 abd42a096e3318cc25576b240df1ed670de327afabe675d3df12780c392779f33b88e7a76d125f31cf37e3b22eda88391329c73d21ccc834e611893e759ea3e0 WHIRLPOOL 3b6c47ab250a892d31a7108d668ab14729ab8b37662f20c89450193613d3f5824df54720d3a23cd4b3c1afdf9b02ab462feb29528335d602b999daec161554d5
+DIST with-editor-2.6.0.tar.gz 28124 SHA256 8f26a619d745f0a47281fd389c6f947733752472eec26a2b1d5e7f641063ea04 SHA512 454af6222f54b6695aedb085b6f9a4e60d4ebd9dd6047d67cba13087d3966670aa63358dff45633f3492152f6a15c4c1e92efbaaa787867fef9edcf8b14f690c WHIRLPOOL d6c119d48ede86eb2eefc284d41691d277fea46fbb8292f76f36bba969c4372998658d5cc681115ad03322d33f940d828d5ccc3732e84a3bf3e765c54bd0a78e
diff --git a/app-emacs/with-editor/with-editor-2.6.0.ebuild b/app-emacs/with-editor/with-editor-2.6.0.ebuild
new file mode 100644
index 000000000000..b4bc6121aac1
--- /dev/null
+++ b/app-emacs/with-editor/with-editor-2.6.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+NEED_EMACS=24
+
+inherit elisp
+
+DESCRIPTION="Use the Emacsclient as the \$EDITOR of child processes"
+HOMEPAGE="https://magit.vc/manual/with-editor"
+SRC_URI="https://github.com/magit/with-editor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+SITEFILE="50${PN}-gentoo.el"
+ELISP_TEXINFO="*.texi"
+DOCS="README.md with-editor.org"
+
+DEPEND=""
+# Versions of magit before 2.5.0 bundled with-editor
+RDEPEND="!!<app-emacs/magit-2.5.0 ${DEPEND}"
+DEPEND="${DEPEND} sys-apps/texinfo"
diff --git a/dev-lang/rust/rust-1.19.0.ebuild b/dev-lang/rust/rust-1.19.0.ebuild
index ce67be791546..402db0937fa3 100644
--- a/dev-lang/rust/rust-1.19.0.ebuild
+++ b/dev-lang/rust/rust-1.19.0.ebuild
@@ -59,6 +59,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}
 	>=dev-lang/perl-5.0
 	clang? ( sys-devel/clang )
+	>=dev-util/cmake-3.4.3
 "
 
 PDEPEND=">=app-eselect/eselect-rust-0.3_pre20150425
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 5a8fcce43bc0..a9b176e2dd03 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,2 +1,3 @@
 DIST rack-cache-1.6.1.tar.gz 259823 SHA256 59cc43d86f4147dd899c09bf6222f1509702b471aeed52525802bf6585237e27 SHA512 326643c9b438b94e556b38530401d2ef2cda8b86ccc5b2e8bdbd79bcba93cec6124ca425f12b993b9090a11210586f8772b552b4a526eb07c7d91ed71275f2ff WHIRLPOOL 938e3e2dfbee7d3fd2974a4337156ca2bcdefdbf9de588d1d1940348ec6440f93e63900bd56a04a184141aa078457581058de2f73658c66bf2d9439eaacd41c2
 DIST rack-cache-1.7.0.tar.gz 260355 SHA256 fb08ad4a253485dfa9e6633ec731cc34b855a920ce25a3a7eb4cd725fb7fcce3 SHA512 efb4a7736747fd088862373205295655c9dad63e5d1c357a5e19fbe8196f4310fd50cd8cb0c81133f6339b57aa8e152733341373756567166df9d59def8d0914 WHIRLPOOL d4fd640a1ba14880c7e91fe5266f07746af259871e55a22cae5f376c4e7e984c746306fcc08301ba02929434e0d839bc294fdddf2dc03573aa61184d7f077bd1
+DIST rack-cache-1.7.1.tar.gz 260613 SHA256 059ced5ec9ee9d524a5cad80bcc77a32d9f3ae47d1e24bf61d019515637cd317 SHA512 a4045483b0e10054f8e2dafddb45f72f3d06acde1df9f14ab51f72bbbf16b8e587b3fdb1f0d18a358fd5a46fb7babaa3d4f2b49d26ea1efbaca32cc62d2b19ff WHIRLPOOL 0eae8920d7d1b48908c6e22fd1a503918a19060fe16f77b56215520738405f456eb0aacf193c44473b398e2db62af12449aae6f871421c6fc208d970f1799243
diff --git a/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
new file mode 100644
index 000000000000..191d24cf05f5
--- /dev/null
+++ b/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+# no documentation is generable, it needs hanna, which is broken
+RUBY_FAKEGEM_RECIPE_DOC="none"
+
+RUBY_FAKEGEM_TASK_TEST="none"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
+HOMEPAGE="https://github.com/rtomayko/rack-cache"
+SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1.2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_rdepend "dev-ruby/rack:*"
+
+ruby_add_bdepend "test? (
+	dev-ruby/maxitest
+	>=dev-ruby/minitest-5.7.0:5
+	>=dev-ruby/mocha-0.13.0 )"
+
+all_ruby_prepare() {
+	sed -i -e '/bundler/ s:^:#:' \
+		-e "2i require 'timeout'" \
+		test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
+}