gentoo resync : 30.09.2018

7 files changed, 143 insertions, 3 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 3ee98e90eb52..c0b3964ce38b 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 36ffc08cbc9b..008378952ded 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -9,5 +9,5 @@ DIST kibana-oss-6.3.2-linux-x86_64.tar.gz 89561513 BLAKE2B 37031653e171d683a18f2
 DIST kibana-oss-6.4.0-linux-x86_64.tar.gz 75103937 BLAKE2B 6fa7b731a15f2fb2088740a59706bf4085b049cd880f63b10cdcc0cd9e3e7d197384731360c285adab2a6838454761f6fa95bddbc470b4895728f87b14b946ff SHA512 eec78bb1935fdc126f7c69ea08c0997abc74f435f5ca24aa6fa370ad201dd1ebe9ab1d177f64ec66652a3c9c0dd3f13a8fa7866697d3f201f8bc124c051ebeba
 EBUILD kibana-bin-5.6.10.ebuild 1612 BLAKE2B fba7f593b8a2bbed90cf316f4c7f118fb65204efb9be4ebd81480f0ddc0333648a6478bb4fe0d2c1bda61e7ed355f084647d55c62685852daab3c0182b1f7476 SHA512 eb15aae68dec70c34af29140039ec0e16ccc8721817df07ff191eb18ea81bd1d4872b37ade34b74ca5470847b158d90d81c4e0b123073c5bee89854ad41f3c76
 EBUILD kibana-bin-6.3.2.ebuild 1892 BLAKE2B 29ed1dfb8f3b986e6b0d1cc2d2e5c1d87e903108963acd4ebac21f44252f8daa1c76165fe6bb49dfb1e079d47c8378d7285b9650170db4c2a03da01d371a79cd SHA512 8b269eab38464251f02d9e25882543d520efb2eadde3b0164977f808dfb5d70b943f995c573f00210e3367462cda985b034a0a6bf5d54bd0c48a5b5d8d126071
-EBUILD kibana-bin-6.4.0.ebuild 1882 BLAKE2B 1275be8817fc3a1fc6d039fb90e38f9e2bcffc65bc96a1de5296e63231a669f93df712b0e9a8de3f67d2ed85d9168d0966bd295bc4d7e4bb071cf54bc73b1b73 SHA512 de9a09a3c293382e9e9c97d9d38d33dcdb8e044407538d724369a43fa159d64acc792db1279252a403454ad3998752fefc6243a92f841ec740b775d1eea2646e
+EBUILD kibana-bin-6.4.0-r1.ebuild 1986 BLAKE2B cafeb52102f2b0178d64ad4a00f2a8e5493639849f65b9849b1446a416aaa026458358d0a6ab3a9ffd25925a171d7fd83d6c598cc26cc738e5ae0958cb96bbfc SHA512 298c1a920a31d534562db1f1a2bc4ca5f3407c0e52a0979b204f203292cfe68e908506aa6bf4eeb8997b3743d7410963c074f9646fff161d1c1c61a107f2b944
 MISC metadata.xml 538 BLAKE2B 649a05badea8d1116854565d09820a8ce623c733d9d0d1cbded145fdc0dfcac2478273d99f686119adab16126149ad4da8f6feb0c7be9499f5721f31a259ec34 SHA512 f0e65883a644eeb57f2d11d0871631142665e74bf8820431ac8333a1cf3e40a0b517b5cca747adba173c7eab20b70311b7bd8de6c4fb5cee4982e044189e5256
diff --git a/www-apps/kibana-bin/kibana-bin-6.4.0.ebuild b/www-apps/kibana-bin/kibana-bin-6.4.0-r1.ebuild
index ad544d11f39b..fda8f3b78d71 100644
--- a/www-apps/kibana-bin/kibana-bin-6.4.0.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.4.0-r1.ebuild
@@ -19,7 +19,7 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="x-pack"
 
-RDEPEND="net-libs/nodejs"
+RDEPEND=">=net-libs/nodejs-8.11.4"
 
 S="${WORKDIR}/${MY_P}-linux-x86_64"
 
@@ -36,6 +36,9 @@ src_prepare() {
 
 	# remove empty unused directory
 	rmdir data || die
+
+	# handle node.js version with RDEPEND
+	sed -i /node_version_validator/d src/setup_node_env/index.js || die
 }
 
 src_install() {
@@ -53,7 +56,7 @@ src_install() {
 	insinto /opt/${MY_PN}
 	doins -r .
 
-	chmod +x "${ED%/}"/opt/${MY_PN}/bin/* || die
+	fperms -R +x /opt/${MY_PN}/bin
 
 	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
 	keepdir /var/log/${MY_PN}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index ea59895f09cd..d173db049444 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -3,9 +3,11 @@ DIST nanoc-4.9.2.tar.gz 275891 BLAKE2B 6c2ca3b1f00f59762530ccf8dfb37599d89b67819
 DIST nanoc-4.9.3.tar.gz 276677 BLAKE2B d14ba8518a299fa9c4ac6ca638eb644dce9b1c0ab0895843a9bb8a916329916c9efaf4bd0bd397cb4dc10319081593dce167d966c2cc1d35247e5c0fd8368e72 SHA512 cc3946a8887f917cba4ef7d0fb5e5043eb8c6995a09de8e525562594fba2410d457643b27d158c89cb03b17b014624bc2844a85bbc6ae92dbf18723692c63a85
 DIST nanoc-4.9.4.tar.gz 281066 BLAKE2B bcf0771af8368e1910bc471d936490823a3f2768bf8503ffe20eb86a2c52f35d03962a969f35335fc9f2e292056441f8e37b73a907bf2bedbb5ab81f3b341fa4 SHA512 8e6b92ea031397442551e240a0b400b3fd9b55cd3782ee3297c562160b3a5d9539f2587d526453bde9154f2de421198a528ad73ab6230c49de4599f0b4d298d2
 DIST nanoc-4.9.5.tar.gz 282523 BLAKE2B 5faad9c9d666637cb5540d26bb1db0ee42615333aac4daec94a8c13c1d68da0b0ccf714a1643fd231dd39cfb4f169ef9ad6bbc1ccc6bf141c26f7236e234d627 SHA512 455a55ce5cd983d0c292380d0e60e8016e7c7dbde7ea1d17ef7cf112707a481da4623ad30762b64167e2e277a7a11c0b06f21b2685467455ee31fc3b9d6cc4c1
+DIST nanoc-4.9.6.tar.gz 282811 BLAKE2B 109b73e4908b45c055912f6e3b2d18675ee00dd848cf7b84197d1a53c30d5862183dcdbd917f1f6f235f97dc5d33b36ba423f34b72bb83ca6f9f2fda4f0081b3 SHA512 67b2df683c4becfbb9a64462b053544c68117c2459fce8e5941f8415c79f1ec73e9c386622dfdb201cf5473f6b83ff1b1444b6492d247036e696d3761e4589ce
 EBUILD nanoc-4.8.10.ebuild 1579 BLAKE2B 98932d52b2f1db9f17e0d0af6117a380712a3bf6aad6506417368b797fb5a76a0a8a8908cf7c1c376c10eba31e1db216bae063e2e691c769b8934c7c925bf3e8 SHA512 c33f02538ec443598aeb7b103c7d452470898a74f1b9f28f53258b196287fc035f244fb5535cc84c64a898615b46a8b7ab2509e1b553e2da2039f068aa22f153
 EBUILD nanoc-4.9.2.ebuild 2441 BLAKE2B 66d7dbce1f5f4f0f0b7cbf6aad01772a581d2a616c1ec833c53393e5449805012ace501ab759e5166194abad8c59a21f0090e64d1ae58549fb1969402dc9b20d SHA512 2c78f6f710c56dca01cd07533dbac9d443d0bf12bdfd4bfb93c12d777005a0f021ee2c91811bc82dc6ca2139944303fa16fd45cf488359a3943f805207a57248
 EBUILD nanoc-4.9.3.ebuild 2441 BLAKE2B 66d7dbce1f5f4f0f0b7cbf6aad01772a581d2a616c1ec833c53393e5449805012ace501ab759e5166194abad8c59a21f0090e64d1ae58549fb1969402dc9b20d SHA512 2c78f6f710c56dca01cd07533dbac9d443d0bf12bdfd4bfb93c12d777005a0f021ee2c91811bc82dc6ca2139944303fa16fd45cf488359a3943f805207a57248
 EBUILD nanoc-4.9.4.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
 EBUILD nanoc-4.9.5.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
+EBUILD nanoc-4.9.6.ebuild 2456 BLAKE2B 5cb22d012719734408ffba44834bff4e592fb7003770e9e8acca8e1b2c584b235d043e37f152a998e29ea18fca3259c3e52b0dc6501d9ede8c94974d13be2030 SHA512 8862a7c15cb81ceb803e2e55729681de2a096d031d9bca657ee3d4d1e89d81f567f7e44f71f7d48179b4a264b2b423870e3f6ca94595877ae9590654f3cfde36
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.9.6.ebuild b/www-apps/nanoc/nanoc-4.9.6.ebuild
new file mode 100644
index 000000000000..9e6642788b8f
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.9.6.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby23 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.13:0
+	dev-ruby/ddmemoize:1
+	dev-ruby/ddmetrics:1
+	dev-ruby/ddplugin:1
+	=dev-ruby/hamster-3*
+	>=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/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index c89cd72eb5ac..2f9c747e31e7 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -4,9 +4,11 @@ DIST nextcloud-12.0.11.tar.bz2 45123785 BLAKE2B 3d1f9131ff89d348dd18c0f7de284b13
 DIST nextcloud-13.0.5.tar.bz2 44792418 BLAKE2B 0582b36a078ccea7a2b482e8be213f0102fff2d60f0b92736d7c488498cf8ae4b75ea6a9e5c14cd0d71f2b3ad9d0ff9b6a2fba7b809bcc89e2287c7801e26a49 SHA512 5456f95d3835e0c9fcf015453e1f6e75ba6f5c0266d8951596fad7d3bf06230199a22e5869bc616581410db0ed831a5cdec123a9d2955898a837614a2bfff32c
 DIST nextcloud-13.0.6.tar.bz2 44769940 BLAKE2B e9c227d64a23dbd677326f528cc268842403c6d51514e8b0d5d446ca5e91fd49910777b6cc7d7bbf0e7f6e1c422fed390cd38506edde019dc5a1955d94757102 SHA512 cbecd5dc98c96f28cbefe6b25e51f4be4583004841eb38d32a3261ed01f906590e16053dd7d8e31589a2288eafd368a47e280d511ee8c994886b4ea892f535ff
 DIST nextcloud-14.0.0.tar.bz2 49762528 BLAKE2B 4c5bbddda0d93504b3530ac0a69511b66faba5d64014a372cd411b9807ca931de484f0db74823534fe97ad5beee25d8c3a0eb001e25a208983b7f13545bd1af4 SHA512 8028f46a6b45834f411ff0942dfc41b72d41d356d01136c74c82fabe1247cd5e62e3b57a298b706a02eb27fabc03790a6ec6a8618b70f2016ae756cf8b523014
+DIST nextcloud-14.0.1.tar.bz2 49761953 BLAKE2B bd7886defeee82d28cbe28548a015cd64bac7d15a3f4d1a6c458f25b87d07370537c26a432c3abf32c574f6b202f15a2cd6a5f1fbbb40bd50b4bd94132154619 SHA512 2d74ac3806372f86020f586f33bde6e4b7694f6dca38a49eaba8955c2108b034e62042e4fa166b3b8e2ecf979c4130674408c4500c461637037a9d4a55fc5465
 EBUILD nextcloud-12.0.10.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
 EBUILD nextcloud-12.0.11.ebuild 1036 BLAKE2B b2879a65866185315d051004f3d4126e7b309f6f0ffee59f08ec4a60b2474db4d1177827d6aad961b1fd1d07d02582124051b29b62763a5aeab0d2d3cfc49c3c SHA512 c978bb14c48115b5dc0e7aaea8e93d87b78426f31ac4a8d2225c6d22c8f00fb0d330f4fcbb2da232d18ede79dc27451a69787232d5d3ef0527a5b128d560a56a
 EBUILD nextcloud-13.0.5.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
 EBUILD nextcloud-13.0.6.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
 EBUILD nextcloud-14.0.0.ebuild 963 BLAKE2B dff4264ae3181dde8690bfef1340c4aeaa57a626439eebea606bb8c52e5d9348ac348e53a20c45c176fb0a9e4f6dfbe67d013fcc4645547f4adca3d691f8ea92 SHA512 f464b4beb1435cd48f670dc5c75fadb7aad567bf55f15a6b928af54a43c9452e1f60346ff930930195c90143fdbc56345ebfa3eb099871e08e7dd0c24702f697
+EBUILD nextcloud-14.0.1.ebuild 960 BLAKE2B 2cb97022fdd35b923c7da44caeb91589690e2af957d7d0dd0b39bda3a3449500bf2de19d9bace295895443acda66968e05a629afe4c8e72faba094f242736112 SHA512 2d02b65261d1dacd1736182f0731e83aabd16031189b8e372d27634361deccea91651a4e2bbd6edaf66c4a3ea80a34b32ed0909b252d115171380e63371b14d4
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-14.0.1.ebuild b/www-apps/nextcloud/nextcloud-14.0.1.ebuild
new file mode 100644
index 000000000000..b6bf2a09eba7
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-14.0.1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="http://nextcloud.com"
+SRC_URI="http://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}