gentoo resync : 18.08.2019

5 files changed, 15 insertions, 199 deletions

diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 5aae05c05ab2..319fe40dd05a 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,13 +1,9 @@
 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.11.2.tar.gz 302927 BLAKE2B 206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e SHA512 842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
-DIST nanoc-4.11.5.tar.gz 305078 BLAKE2B d86fc1991f7aa1d0459c0a8b30053a97065f23a7c088fe739db6362ad2692622fe08c715b05b156d44e5bcdc1283e2bce2deeb562e61dc0933e3444f421d9113 SHA512 65285a0ddd822d15b788e824fc114c4c5f89d94221b6c7379eb8037519afd85d5131c571e0fbae4a447723448f61cdd4cdb8543de98f3bfdb1ac669a59ad64b8
-DIST nanoc-4.11.6.tar.gz 306875 BLAKE2B dbb949572d22c6acb3ba7acf94712966a4105024f51f3e3df74f4ef010577d75be7859ad3eb2e877837c0fa38fbb384f00bd756466a23804d4b0e3167c22a12b SHA512 3735c374c302258ebc22f52e0044727de1fb283ed4c4f0075aad351b4645935d58aa04638f90c3e29e0c5270db148f83768aef41881c6fb5b53fe9efcf2b29a2
 DIST nanoc-4.11.7.tar.gz 307042 BLAKE2B b1144c80ea80ccf5bf713f93469061fbfb8a74890c3b9563ee8d88cd85375810fa6161a53d9221d817985b870426cafb52257403d05245b735855aecd76356a3 SHA512 d82d89dcd9f056e711cb722b6fbe22045eecf9fd61e3541529b89c8eb916ca850ef498148f1065b792e1a1d786e6d2f1477b41713753ff9d7b283ecc3cf2649c
+DIST nanoc-4.11.8.tar.gz 307102 BLAKE2B 615dfc1e2a6424343327888d4d5c577652d8480178769accc15f86ae8f64f7dc8aecbfd98b16791f98dc3f5fbf1a9e88ed6ca38354aa5277aea13dec42a6404b SHA512 939e54a55ffeca9ea392d2e4ad49564761dc7497052a8bc367a9df9d7dd2fbc1943bc363e7df82da988d6897ed24d9a5db1c869ce063dd7dd6ae03d0da8d19b5
+DIST nanoc-4.11.9.tar.gz 307441 BLAKE2B 9357a78412056eb62b8aac04ff2d02238bd02786bf6d3a1d0d4cc738b833f596122f55d325779760d2afa579b2864561701ccf107c9f0bd1a04e6aacd6d2b64d SHA512 34b6a52e16d04d69e3016ae9b77080d96860ab406ada8a597d5cf721761d82ec5e6d4dcc64193b6804315f3731618cc6286b5d6844f55c8d20dabed1a8251579
 EBUILD nanoc-4.10.4.ebuild 2619 BLAKE2B 7e5ff080ec66019c9c0706b66fee93fc4029daa1a174eb907798f98673abd0b468ca49f85fa91c4bb214316613e1f0cbc2c42536a9a9ebc19e2d3126ad957a58 SHA512 588d87ec7f8545e89685e80c838280147792b10010ed8ae81dd8a1d10d2c68aa7681eea4cb12d1840242847c1ec164e4252d40a76812323ae10b57aab363a92b
-EBUILD nanoc-4.11.0.ebuild 2626 BLAKE2B b4cdd5df85c200cca904dd6564d22e0b08ff6d76aee5110a0d2ae9cf7195884c6bf6c6e5e0b1af3c28bd5dee95931e6be2727047351dc42c0b53e736bd3fe0d7 SHA512 071fd944e68c277b9aa13bbcf22ce3bd7b4642974f43950dc75975e8255de90be402a60df2642b54f9ec6e6f731f771839e4701ccbb44e51ca2054647fe0e7a6
-EBUILD nanoc-4.11.2.ebuild 2446 BLAKE2B 6422042144f1749a3c5821295de682ceea1a682076b7edd5b45a6e9278324829c709609d89a3e689dda6d94069b6db817a3a8afb56c3a3587f94b36cb79dd2a2 SHA512 8bdf7d4686765c1b5d3a6484d48e1310f702d8d3e800e6293b090a0962978b970df863705af6f56d8371acaaf38dbb466b02032f3153613bc6a9e5afb089d156
-EBUILD nanoc-4.11.5.ebuild 2528 BLAKE2B 68387ce2f89aa9c3dcf403ae4a455145a76f2a47675b8750042d35d16e1954c4ad67f088affd5729ee43fe4001307092f5d74bbe32b199873ebdefbc67307543 SHA512 a421572284c30e0a957e83832a3aef80486bb8145f39e9e7b55ec2c1214e03e38bf99cf944cb5916f90750441e1d67538b3676953c1967a59dfc1d5f7f718608
-EBUILD nanoc-4.11.6.ebuild 2536 BLAKE2B c371d49228f52fb4645f5c4592cce3a53ea5a7d06f90db63f87e9cf460da59756325b932b12a0b44b930be03089a3d4f9589c27181d99b6733f9fcdbf36cddb4 SHA512 d852f521864ff2c0b4bf8d2c0da9a54f812aaa66ea70dd9bc4bf8776d6d70e8e5d9c7694515149a5f3830b63e04111a602ecde7fdb7d58da50954b08709590cf
 EBUILD nanoc-4.11.7.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+EBUILD nanoc-4.11.8.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
+EBUILD nanoc-4.11.9.ebuild 2670 BLAKE2B e129567600ce751c5c7c7e0e27370212d266a1346a057c639d75b1d70a3fcf3a1edbf6075d188cab9327eb3960cb98e6b9914423894991021ee55ef4f5784f5d SHA512 360ae7ed9f0352fe767e5e24b0cc30ac583c328563164eda854b00e73c8513b8b6184c67aab9beabadc30e14c624a043781781c99397ef14999e6c0a7d4064fe
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.11.0.ebuild b/www-apps/nanoc/nanoc-4.11.0.ebuild
deleted file mode 100644
index 9de9c8a62776..000000000000
--- a/www-apps/nanoc/nanoc-4.11.0.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25"
-
-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
-}
diff --git a/www-apps/nanoc/nanoc-4.11.2.ebuild b/www-apps/nanoc/nanoc-4.11.2.ebuild
deleted file mode 100644
index 02aaf44b073f..000000000000
--- a/www-apps/nanoc/nanoc-4.11.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby24 ruby25"
-
-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
-	~www-apps/nanoc-core-${PV}
-	>=dev-ruby/parallel-1.12:1
-	>=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/haml
-	dev-ruby/maruku
-	>=dev-ruby/mocha-0.13
-	dev-ruby/minitest
-	dev-ruby/mustache
-	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_core.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
-
-	# 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
-}
diff --git a/www-apps/nanoc/nanoc-4.11.6.ebuild b/www-apps/nanoc/nanoc-4.11.8.ebuild
index 39188d42e3e4..de28a28b1206 100644
--- a/www-apps/nanoc/nanoc-4.11.6.ebuild
+++ b/www-apps/nanoc/nanoc-4.11.8.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
 
 inherit ruby-fakegem
 
@@ -75,6 +75,9 @@ all_ruby_prepare() {
 
 	echo "-r ./spec/spec_helper.rb" > .rspec || die
 
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid tests requiring a network connection or make assumptions
 	# about the local network environment.
 	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die
diff --git a/www-apps/nanoc/nanoc-4.11.5.ebuild b/www-apps/nanoc/nanoc-4.11.9.ebuild
index d5f2df4948fb..de28a28b1206 100644
--- a/www-apps/nanoc/nanoc-4.11.5.ebuild
+++ b/www-apps/nanoc/nanoc-4.11.9.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 USE_RUBY="ruby24 ruby25 ruby26"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
 
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_GEMSPEC="nanoc.gemspec"
 
 inherit ruby-fakegem
 
@@ -51,7 +51,7 @@ ruby_add_bdepend "test? (
 	dev-ruby/mustache
 	dev-ruby/pry
 	dev-ruby/rdoc
-	dev-ruby/rouge:2
+	>=dev-ruby/rouge-3.5.1:2
 	dev-ruby/rubypants
 	dev-ruby/systemu
 	dev-ruby/timecop
@@ -75,6 +75,9 @@ all_ruby_prepare() {
 
 	echo "-r ./spec/spec_helper.rb" > .rspec || die
 
+	# Avoid basepath issues when generating gemspec
+	sed -i -e "s:require_relative ':require './:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
 	# Avoid tests requiring a network connection or make assumptions
 	# about the local network environment.
 	rm -f test/checking/checks/test_{css,html}.rb spec/nanoc/cli/commands/view_spec.rb || die