gentoo resync : 03.11.2018

6 files changed, 101 insertions, 12 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 54d6b7a35041..02333b426205 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 11d4723fda8c..3c2c783533f3 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,7 +1,9 @@
 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.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.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.9.ebuild b/www-apps/nanoc/nanoc-4.9.9.ebuild
new file mode 100644
index 000000000000..9c3fe724e23a
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.9.9.ebuild
@@ -0,0 +1,94 @@
+# 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/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
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec test_all || die
+}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index a4b7092a1b1a..2901d96e5112 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -8,5 +8,5 @@ EBUILD otrs-5.0.25.ebuild 4116 BLAKE2B acd72a3d46fc25ee805a32df1e13c7a3e724f2a6c
 EBUILD otrs-6.0.3.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
 EBUILD otrs-6.0.4.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
 EBUILD otrs-6.0.5.ebuild 4163 BLAKE2B d77ab3f64c248feda6b18425151cb9b45cc60e2a0b240f5ae92dc31974e76fa76c6417da6651ec85a0c7b39bc83d46aac771846fbbaef5f105f7adfedb516993 SHA512 e9f98139307574c507fe267bd24f780561ce8c122b1c6f8ff23c61910c72b60d4edc10d4b4f2761344f37ab8b4b6549393f820a59e9294d9e440c9e5e36b5530
-EBUILD otrs-6.0.7.ebuild 4163 BLAKE2B 9b4dc98b2e68c0c08a3294f70c525d67799a4db85749adf5314b87c2a474a1490f1e3a9b8a5d15cf19d0b8bae7116ec87558517d636ce95c25f49e394df22c9a SHA512 a80c4ef113745b46a454a19431dbeb62977c09befa764e6dc86ed6ab724f1919b665a83001c23ff33830351a461d8f7e11533c3538fa605927945c843e458d7b
-MISC metadata.xml 581 BLAKE2B 14a4dfee6a80d7b1640d67ea954dd638978ebee0f6770a70a9a3e9f8a0182954d660439aa8f81cec5a85039a028f507e704109c7d946dc85b2491311f8e3f090 SHA512 8b39dcc1639161c524b1d34de6184409c72422e6442e4a61b0c47f7b1c37ef04d267936dc43c2a10f11f702c50b0b7fe04ffcf9de084f5196f1135ada3c3c802
+EBUILD otrs-6.0.7.ebuild 4164 BLAKE2B 2a947afa1d5fe3f29e9a9a5a405fc65ed71f3bb41cc0c57615225354cc58e1a783233e9a451623434ad59b60715a4554c700dfa442dc8067974a2af3733782f5 SHA512 74cdde8b76975c4d6f72c68e4363e558a4269dadf13deb39b970e0c9edfb6a70c4cc1258a6c48301afea21b2bd31e7497f22d253ec7e13ef03c5cdb72bea50b1
+MISC metadata.xml 356 BLAKE2B 01ce80250b32ee5bb55945f5753006caa150efe3d771eb5f16eb4ee05e5827ade93ca8d3ba691b08a5a06555d9a8463bbc072662a1c83f838cb94c0a7c32d636 SHA512 f3a9aa7354c5e544f5b904c5b875686c656432f84baf1b769c347057bde6919921fce09162dd6b1eb549fc468e0ac22b0c9709ed52016bfd414e6494f6ba70af
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
index 9c04a8ca23c3..b1745fd1cbc0 100644
--- a/www-apps/otrs/metadata.xml
+++ b/www-apps/otrs/metadata.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>lists@xunil.at</email>
-		<name>Stefan Weichinger</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<use>
 		<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
 	</use>
diff --git a/www-apps/otrs/otrs-6.0.7.ebuild b/www-apps/otrs/otrs-6.0.7.ebuild
index b2b0f33288d3..fa7797934ae0 100644
--- a/www-apps/otrs/otrs-6.0.7.ebuild
+++ b/www-apps/otrs/otrs-6.0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -18,7 +18,7 @@ REQUIRED_USE="|| ( mysql postgres )"
 
 DEPEND="media-libs/libpng:0"
 
-RDEPEND="dev-perl/Apache-Reload
+RDEPEND="
 	dev-perl/Archive-Zip
 	dev-perl/DBI
 	dev-perl/IO-Socket-SSL
@@ -36,6 +36,7 @@ RDEPEND="dev-perl/Apache-Reload
 	dev-perl/YAML-LibYAML
 	apache2? (
 		mod_perl? (
+			dev-perl/Apache-Reload
 			www-servers/apache:2
 			=www-apache/libapreq2-2* www-apache/mod_perl
 		)