gentoo resync : 24.12.2018

4 files changed, 140 insertions, 13 deletions

diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 3c2c783533f3..627a9be9a5b7 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,9 +1,11 @@
-DIST nanoc-4.8.10.gem 260608 BLAKE2B 102548bc4616287d7084f81f505f2c1f7fa294a6bfc87c9be80919a4fff6c547ecbc77cc5cb96d7b1fd9414f189cdf62bad9cd4cdf44fe536c60a2eb3c39ac63 SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24
-DIST nanoc-4.9.5.tar.gz 282523 BLAKE2B 5faad9c9d666637cb5540d26bb1db0ee42615333aac4daec94a8c13c1d68da0b0ccf714a1643fd231dd39cfb4f169ef9ad6bbc1ccc6bf141c26f7236e234d627 SHA512 455a55ce5cd983d0c292380d0e60e8016e7c7dbde7ea1d17ef7cf112707a481da4623ad30762b64167e2e277a7a11c0b06f21b2685467455ee31fc3b9d6cc4c1
+DIST nanoc-4.10.3.tar.gz 290368 BLAKE2B 5fed3e8d137a24df9a1e94e112425198422a284274a1a052fe89d02f9fd04960e54e867c0d96141a7e143b20d7731f60af5748100dc19df07e62a7921d21d009 SHA512 aace4b84de90177d25099194158ef6308b98242935f65ac6bf07f7e508297a866e86a64e0304bdf5df6c88603479abfb9245ba125074dd8c4185d1a492bb0a46
+DIST nanoc-4.10.4.tar.gz 290367 BLAKE2B 0b5cf03938af1f971fccddb6bed4fa6b67da3aaf93cb7666c52e3ff8fc524f17ff10bf1a60ccf7f7b59f840d4c445ef57677349f5b83bc55e754e7078ac4b8d9 SHA512 5446e351906b5b6bbe5c9059dab86490d5deef5e1197adf5827fe201f2932d5cf79c65bfd9d9370ce57c35d965e013098d39d53fa96db8b4d1c6017977683ea2
+DIST nanoc-4.11.0.tar.gz 291654 BLAKE2B ab88bf36b472106f356ae67782dac61f691e0d64646f410ae0cceca7a9df11689dd7a011bf58a773d6b35956f0092deac4db43bb8663d66463b72e10da27c658 SHA512 357345c9247465bd470bf6c71ea2b16e3415680fad6a4d4ee755eeb3a1443664590753003a5de0a740ffcfbaf93049c2c12c1f22de052f4d6efc2382430a4e08
 DIST nanoc-4.9.6.tar.gz 282811 BLAKE2B 109b73e4908b45c055912f6e3b2d18675ee00dd848cf7b84197d1a53c30d5862183dcdbd917f1f6f235f97dc5d33b36ba423f34b72bb83ca6f9f2fda4f0081b3 SHA512 67b2df683c4becfbb9a64462b053544c68117c2459fce8e5941f8415c79f1ec73e9c386622dfdb201cf5473f6b83ff1b1444b6492d247036e696d3761e4589ce
 DIST nanoc-4.9.9.tar.gz 286136 BLAKE2B c8cc2d334b3e8b74032be108495f2501fffa78650e35c30865c78e888f471fadc1e26ec6ba23481f76caa63b4167ea394f78903f41428bdd899efa60f3e6a4a2 SHA512 fd180254dd79cf238ca9e9f87e7b3f84d43ff24a0d81da8ccf9f0d5b22bb1e0373c7e2f10a5b69a392d95897958af63ab9f415f0060dfe9c4d68fd2cbd6d7e7a
-EBUILD nanoc-4.8.10.ebuild 1579 BLAKE2B 98932d52b2f1db9f17e0d0af6117a380712a3bf6aad6506417368b797fb5a76a0a8a8908cf7c1c376c10eba31e1db216bae063e2e691c769b8934c7c925bf3e8 SHA512 c33f02538ec443598aeb7b103c7d452470898a74f1b9f28f53258b196287fc035f244fb5535cc84c64a898615b46a8b7ab2509e1b553e2da2039f068aa22f153
-EBUILD nanoc-4.9.5.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
+EBUILD nanoc-4.10.3.ebuild 2599 BLAKE2B 46a90fb82d90aab556488823fe787f63b1de4fa1a0a4ef93f5621f5ef9f91d5b4c27fa599a396035e34daed1db73975b82304ef690f17b2185da4c7c52c20e02 SHA512 09e5afd771b1ae2e368c6c747da06677e1f1d0f2d892ed72e08882d376af2174d82fc09daf4a8a905b2733c5ab87dbc4f8a2ebf97d8682671949f827b4330add
+EBUILD nanoc-4.10.4.ebuild 2619 BLAKE2B 7e5ff080ec66019c9c0706b66fee93fc4029daa1a174eb907798f98673abd0b468ca49f85fa91c4bb214316613e1f0cbc2c42536a9a9ebc19e2d3126ad957a58 SHA512 588d87ec7f8545e89685e80c838280147792b10010ed8ae81dd8a1d10d2c68aa7681eea4cb12d1840242847c1ec164e4252d40a76812323ae10b57aab363a92b
+EBUILD nanoc-4.11.0.ebuild 2619 BLAKE2B 7e5ff080ec66019c9c0706b66fee93fc4029daa1a174eb907798f98673abd0b468ca49f85fa91c4bb214316613e1f0cbc2c42536a9a9ebc19e2d3126ad957a58 SHA512 588d87ec7f8545e89685e80c838280147792b10010ed8ae81dd8a1d10d2c68aa7681eea4cb12d1840242847c1ec164e4252d40a76812323ae10b57aab363a92b
 EBUILD nanoc-4.9.6.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
 EBUILD nanoc-4.9.9.ebuild 2477 BLAKE2B 3d555df3161c39e057cabee67d0f9115c63f00024da419eb0f8f86a3a92604c8d431ac1d2bf43c6baeda4322d840181816280bce54cb62e484b60fb1198e1c0b SHA512 28d82a455baf1c2ffcf241925def5deb463c49dfe1d2c87d42ee665e1f864b19e03958be56e6374b0ca8cbb5fe3a65620299a5165c723dbf98ebb67da6ceed6f
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.9.5.ebuild b/www-apps/nanoc/nanoc-4.10.3.ebuild
index 9e6642788b8f..5bc4acaf8b84 100644
--- a/www-apps/nanoc/nanoc-4.9.5.ebuild
+++ b/www-apps/nanoc/nanoc-4.10.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -29,11 +29,12 @@ ruby_add_rdepend "!minimal? (
 	www-servers/adsf
 )
 	>=dev-ruby/addressable-2.5
-	>=dev-ruby/cri-2.13:0
+	>=dev-ruby/cri-2.15:0
 	dev-ruby/ddmemoize:1
 	dev-ruby/ddmetrics:1
 	dev-ruby/ddplugin:1
 	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
 	>=dev-ruby/parallel-1.12:1
 	dev-ruby/ref:2
 	>=dev-ruby/slow_enumerator_tools-1.1.0:1
@@ -86,6 +87,7 @@ all_ruby_prepare() {
 	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
 	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
 	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/www-apps/nanoc/nanoc-4.8.10.ebuild b/www-apps/nanoc/nanoc-4.10.4.ebuild
index a98bfc00657b..aeeea18a61de 100644
--- a/www-apps/nanoc/nanoc-4.8.10.ebuild
+++ b/www-apps/nanoc/nanoc-4.10.4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23 ruby24"
+USE_RUBY="ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
@@ -12,6 +12,7 @@ inherit ruby-fakegem
 
 DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
 HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 
 KEYWORDS="~amd64"
@@ -20,24 +21,38 @@ IUSE="${IUSE} minimal"
 
 DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
 
+RUBY_S="${P}/nanoc"
+
 ruby_add_rdepend "!minimal? (
 	dev-ruby/mime-types:*
 	dev-ruby/rack:*
 	www-servers/adsf
 )
 	>=dev-ruby/addressable-2.5
-	>=dev-ruby/cri-2.8:0
+	>=dev-ruby/cri-2.15:0
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
 	dev-ruby/ddplugin:1
 	=dev-ruby/hamster-3*
-	dev-ruby/ref:2"
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/parallel-1.12:1
+	dev-ruby/ref:2
+	>=dev-ruby/slow_enumerator_tools-1.1.0:1
+	>=dev-ruby/tomlrb-1.2:1"
 
 ruby_add_bdepend "test? (
 	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
 	dev-ruby/fuubar
+	dev-ruby/maruku
 	>=dev-ruby/mocha-0.13
 	dev-ruby/minitest
+	dev-ruby/pry
 	dev-ruby/rdoc
+	dev-ruby/rouge:2
+	dev-ruby/rubypants
 	dev-ruby/systemu
+	dev-ruby/timecop
 	dev-ruby/vcr
 	dev-ruby/webmock
 	dev-ruby/yard
@@ -51,7 +66,8 @@ doc? (
 all_ruby_prepare() {
 	# Avoid unneeded development dependencies
 	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
-	sed -i -e '/simplecov/I s:^:#:' -e '/codecov/I s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head.rb || die
 	sed -i -e '/coverall/I s:^:#:' \
 		-e '/rubocop/ s:^:#:' Rakefile || die
 
@@ -61,7 +77,18 @@ all_ruby_prepare() {
 	rm -f test/checking/checks/test_{css,html}.rb || die
 
 	# Avoid tests for unpackaged dependencies
-	rm spec/nanoc/deploying/fog_spec.rb spec/nanoc/filters/less_spec.rb || die
+	rm spec/nanoc/deploying/fog_spec.rb \
+	   spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/base/checksummer_spec.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
 }
 
 each_ruby_test() {
diff --git a/www-apps/nanoc/nanoc-4.11.0.ebuild b/www-apps/nanoc/nanoc-4.11.0.ebuild
new file mode 100644
index 000000000000..aeeea18a61de
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.11.0.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+inherit ruby-fakegem
+
+DESCRIPTION="nanoc is a simple but very flexible static site generator written in Ruby"
+HOMEPAGE="https://nanoc.ws/"
+SRC_URI="https://github.com/nanoc/nanoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="MIT"
+
+KEYWORDS="~amd64"
+SLOT="0"
+IUSE="${IUSE} minimal"
+
+DEPEND+="test? ( app-text/asciidoc app-text/highlight )"
+
+RUBY_S="${P}/nanoc"
+
+ruby_add_rdepend "!minimal? (
+	dev-ruby/mime-types:*
+	dev-ruby/rack:*
+	www-servers/adsf
+)
+	>=dev-ruby/addressable-2.5
+	>=dev-ruby/cri-2.15:0
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=dev-ruby/json_schema-0.19:0
+	>=dev-ruby/parallel-1.12:1
+	dev-ruby/ref:2
+	>=dev-ruby/slow_enumerator_tools-1.1.0:1
+	>=dev-ruby/tomlrb-1.2:1"
+
+ruby_add_bdepend "test? (
+	dev-ruby/rspec:3
+	dev-ruby/asciidoctor
+	dev-ruby/fuubar
+	dev-ruby/maruku
+	>=dev-ruby/mocha-0.13
+	dev-ruby/minitest
+	dev-ruby/pry
+	dev-ruby/rdoc
+	dev-ruby/rouge:2
+	dev-ruby/rubypants
+	dev-ruby/systemu
+	dev-ruby/timecop
+	dev-ruby/vcr
+	dev-ruby/webmock
+	dev-ruby/yard
+)
+doc? (
+	dev-ruby/kramdown
+	dev-ruby/rdiscount
+	dev-ruby/yard
+)"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	sed -i -e '/simplecov/,/SimpleCov.formatter/ s:^:#:' test/helper.rb || die
+	sed -i -e '/simplecov/I s:^:#:' \
+		-e '/codecov/I s:^:#:' ../common/spec/spec_helper_head.rb || die
+	sed -i -e '/coverall/I s:^:#:' \
+		-e '/rubocop/ s:^:#:' Rakefile || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	# Avoid tests requiring a network connection
+	rm -f test/checking/checks/test_{css,html}.rb || die
+
+	# Avoid tests for unpackaged dependencies
+	rm spec/nanoc/deploying/fog_spec.rb \
+	   spec/nanoc/filters/less_spec.rb \
+	   test/filters/test_{markaby,rainpress}.rb || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/base/checksummer_spec.rb || die
+
+	# Avoid non-fatal failing tests due to specifics in the environment
+	sed -i -e '145askip "gentoo"' spec/nanoc/cli/error_handler_spec.rb || die
+	sed -i -e '/does not crash when output dir does not exist and/askip "gentoo"' spec/nanoc/cli/commands/view_spec.rb || die
+	sed -i -e '/watches with --watch/askip "gentoo"' spec/nanoc/cli/commands/compile_spec.rb || die
+	sed -i -e '124askip "ordering issues"' -e '168askip "ordering issues"' spec/nanoc/data_sources/filesystem_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}