gentoo resync : 16.06.2019

8 files changed, 252 insertions, 3 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 6c33cdf7bab3..ed38353fc3aa 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 5b99cb32e1fe..1f55f96c7328 100644
--- a/www-apps/mediawiki/Manifest
+++ b/www-apps/mediawiki/Manifest
@@ -1,5 +1,7 @@
 AUX postinstall-1.18-en.txt 2611 BLAKE2B c4d110d0d7c3fc270b0dc7f134cf7de8f2ca4595692ac146c2e4cd1c3647e7399d44249059496960ae94490c5b188c986dab64d4b90901bd7fc44203493532a0 SHA512 2b6a0e00160c15466bf70189499816d18a5ea06f040ed79f2361842be93a584ea19033170dc59c1d78c590da85223a61b8d04730084e60bc7906648f2532578b
-AUX postupgrade-1.16-en.txt 1514 BLAKE2B f2a7284a49638a2e1ca694a84b490f4a3348cab1afe1b022f617fc7df74c958be29e36e3c777514765b7a01758f11cfb653092e2190a5e7dc572884f5942196c SHA512 58d11cdf8daaa2ee62ca64dfeddad3ef2d10feac5b93b51f96e5802dd2915c3d969b8e99d059e79a9b62386ae70a7690db3c4e4d248501e839769bc7f24d2dd5
+AUX postupgrade-1.16-en.txt 1519 BLAKE2B 39cf00073c5d12e04dd69126c7671acb5876bcdd592526d6aca475b98f9ed7abcb6d2691cef8642be04d8041fcbdaee0555937f1480f71a82c3f367f2a3d99b6 SHA512 495a2ea3074e96e570ed83e557691786524aea878fa6ee489080245a9bb1669d93e318c3871ce44918225d0e64d09e1e644538627bfb35a4a2a12d27365dc89d
 DIST mediawiki-1.32.0.tar.gz 36168475 BLAKE2B 33613bf6274abe3d58f66319afaea8ea091d5b07c1d1b1148721856c8d38b84cb96e9a9c041a93ef27a6700e36a10bba9dffc7cbc245dba2a10a6ce0d46a49fe SHA512 5e198844bba12f5a3a73a05dd7d855d3e883914c6e7c23676921a169dc1c7089ed31adfb7369c24cbaf10b43171dd2a12929284b65edde44d7b9721385ff1cc3
+DIST mediawiki-1.32.2.tar.gz 36188194 BLAKE2B 5f5a2b077ec6451541134e7d3cd6dc6ed1fc1a35716f496b8028e3852a767a70ab5331a94d93a3dbea5d8f0df6ae3622aa01b7375ad6053d57e771d0b2eb3d95 SHA512 79f13245fe2a8851780ac9f38c3f439a4911f6760e810712922b18c577e3ee6e4b0f3e336c567f6115258aebd5fc5e7c6c1045f43b5d0f615bfdcfb54fd16335
 EBUILD mediawiki-1.32.0.ebuild 2439 BLAKE2B 734d7d537bd429c67d48de191ae3a5a3541eab6215011ca506373ebfd655ec4027d7c800aac3799d70a46c87d0cf812b0cdef070c4c97a0a213161e037da5cbe SHA512 2dbc7bca92d6cf21efc3e787fd7315ec10f5648461e8b7bbc754e3eb6bea65f89e8ad484aaedd22327cc83ecf70d86e1b1ba64574542059bee512bd1d6113405
+EBUILD mediawiki-1.32.2.ebuild 2442 BLAKE2B 1e2ccc9ca8133a9a6c06a08587646b36ead094d35598a31c39c401b66c564fed1bb3d404dd3b94feec527242b2b75de18b0f854a68bf2aafcd46b100cf83d24a SHA512 a41a895d3c7310acb7869840c87ce4353a300b5313edb65dd7ea4fe70fbbc4bfe9157da75e3986c7b5bfa75e9dfdfa821da698bb7d8a99a11f544081702aa318
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/files/postupgrade-1.16-en.txt b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
index e26939c36e3d..0840f97fbf17 100644
--- a/www-apps/mediawiki/files/postupgrade-1.16-en.txt
+++ b/www-apps/mediawiki/files/postupgrade-1.16-en.txt
@@ -30,8 +30,8 @@ http://www.mediawiki.org/wiki/Manual:Upgrading
 Upgrade extensions
 ==================
 
-Certain extensions have been updated in order to work with MediaWiki 1.13. Be
-sure to upgrade to the latest versions of such extensions. You might need to
+Certain extensions have been updated in order to work with installed MediaWiki.
+Be sure to upgrade to the latest versions of such extensions. You might need to
 perform manual updates to custom extensions.
 
 
diff --git a/www-apps/mediawiki/mediawiki-1.32.2.ebuild b/www-apps/mediawiki/mediawiki-1.32.2.ebuild
new file mode 100644
index 000000000000..b211b54dfd99
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.32.2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit webapp eapi7-ver
+
+MY_BRANCH=$(ver_cut 1-2)
+
+DESCRIPTION="The MediaWiki wiki web application (as used on wikipedia.org)"
+HOMEPAGE="http://www.mediawiki.org"
+SRC_URI="http://releases.wikimedia.org/${PN}/${MY_BRANCH}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~x86"
+IUSE="imagemagick mysql postgres sqlite"
+
+RDEPEND=">=dev-lang/php-7.0.0[fileinfo,iconv,json,mysql?,postgres?,session,ssl,unicode,xml,xmlreader]
+	imagemagick? ( virtual/imagemagick-tools )
+	!imagemagick? ( dev-lang/php[gd] )
+	mysql? (
+		|| ( >=dev-db/mariadb-5.5.8 >=dev-db/mysql-5.5.8 )
+		)
+	sqlite? (
+		>=dev-db/sqlite-3.3.7[fts3(+)]
+		>=dev-lang/php-7.0.0[pdo]
+		|| ( dev-lang/php[sqlite] dev-lang/php[sqlite3] )
+	)
+	virtual/httpd-php"
+
+need_httpd_cgi
+
+RESTRICT="test"
+
+src_install() {
+	webapp_src_preinst
+
+	# First we install docs and then copy everything left into htdocs dir
+	# to avoid bugs like #236411.
+
+	# We ensure the directories are prepared for writing.  The post-
+	# install instructions guide the user to enable the feature.
+	local DOCS="FAQ HISTORY INSTALL README RELEASE-NOTES-${PV:0:4} UPGRADE"
+	dodoc ${DOCS} docs/*.txt
+	docinto php-memcached
+	dodoc docs/php-memcached/*
+
+	# Clean everything not used at the site...
+	rm -rf ${DOCS} COPYING tests docs || die
+	find . -name Makefile -delete || die
+	# and install
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	# If imagemagick is enabled then setup for image upload.
+	# We ensure the directory is prepared for writing.
+	if use imagemagick ; then
+		webapp_serverowned "${MY_HTDOCSDIR}"/images
+	fi
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-1.18-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-1.16-en.txt"
+	webapp_src_install
+}
+
+pkg_postinst() {
+	webapp_pkg_postinst
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		echo
+		elog "=== Consult the release notes ==="
+		elog "Before doing anything, stop and consult the release notes"
+		elog "/usr/share/doc/${PF}/RELEASE-NOTES-${PV:0:4}.bz2"
+		echo
+		elog "These detail bug fixes, new features and functionality, and any"
+		elog "particular points that may need to be noted during the upgrade procedure."
+		echo
+		ewarn "Back up existing files and the database before upgrade."
+		ewarn "http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki"
+		ewarn "provides an overview of the backup process."
+		echo
+	fi
+}
diff --git a/www-apps/nanoc-core/Manifest b/www-apps/nanoc-core/Manifest
index b63d54eca40e..49911e6b7d95 100644
--- a/www-apps/nanoc-core/Manifest
+++ b/www-apps/nanoc-core/Manifest
@@ -1,3 +1,5 @@
 DIST nanoc-core-4.11.2.tar.gz 302927 BLAKE2B 206142cc13468c3456dfd141bb031791c3d6aa31b81cca04493519e8b44d7bc82d6837d266a0edecc58c0e635cee7428bfdf0d5428de7d5e6fb6eacebb09d45e SHA512 842703e5218c06e817ce188458ee0e9267467b92219dd566fda9d58cd21ec9842bbc011b8f2faa7854caf39af1379c2eae16a3e3b73c53f2c8af6b8851c7c8b9
+DIST nanoc-core-4.11.5.tar.gz 305078 BLAKE2B d86fc1991f7aa1d0459c0a8b30053a97065f23a7c088fe739db6362ad2692622fe08c715b05b156d44e5bcdc1283e2bce2deeb562e61dc0933e3444f421d9113 SHA512 65285a0ddd822d15b788e824fc114c4c5f89d94221b6c7379eb8037519afd85d5131c571e0fbae4a447723448f61cdd4cdb8543de98f3bfdb1ac669a59ad64b8
 EBUILD nanoc-core-4.11.2.ebuild 1592 BLAKE2B 296339b47fcf2130599ea5e09ee6cc39e2cc096b7f0f93353c5178d99f89fabcaee3aa4182d7ba9f264ad2eb1dfaa2fccf659368dd034eafeb8c91d28aa38523 SHA512 fd916642ab968c7cd67a2ff2c791c7ac67c52628d2afe299b8eec6d63b308ee4d89725a757a89a1c78321f1f3ae7279e576b5af286618c5bdac280804cd29311
+EBUILD nanoc-core-4.11.5.ebuild 1632 BLAKE2B d06dad58a34f38c7dfd1457e7d799db600d657d2ec80edd71a9489a3152a6a0ae2dcf4a2442fde6b0c50fda1a3a9f856bd121fe4f9703e6b0d776adb547a2f44 SHA512 10283e30908089080cd032a0548e6977728101d2568bc3205325ede4d67d92b6df49fb1ac985cbd67a5e89f112ee06c8b0173425852a16ef4ff733ee19de0d9d
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc-core/nanoc-core-4.11.5.ebuild b/www-apps/nanoc-core/nanoc-core-4.11.5.ebuild
new file mode 100644
index 000000000000..5dfb3c57964a
--- /dev/null
+++ b/www-apps/nanoc-core/nanoc-core-4.11.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+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="nanoc-${PV}/nanoc-core"
+
+ruby_add_rdepend "
+	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/slow_enumerator_tools:1
+	>=dev-ruby/zeitwerk-2.1:2
+"
+
+ruby_add_bdepend "test? (
+	dev-ruby/bundler
+	dev-ruby/rspec:3
+	dev-ruby/rspec-its
+	dev-ruby/fuubar
+	dev-ruby/minitest
+	dev-ruby/timecop
+	dev-ruby/yard
+)
+"
+
+all_ruby_prepare() {
+	# Avoid unneeded development dependencies
+	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
+	sed -i -e '1i require "tmpdir"; require "pathname"' spec/spec_helper.rb || die
+
+	echo "-r ./spec/spec_helper.rb" > .rspec || die
+
+	sed -i -e "s:require_relative 'lib:require './lib:" ${RUBY_FAKEGEM_GEMSPEC} || die
+
+	# Use useable tmp dir
+	sed -i -e 's:/tmp/whatever:'${T}'/whatever:' spec/nanoc/core/checksummer_spec.rb || die
+}
+
+each_ruby_test() {
+	RUBYLIB="${S}/lib" ${RUBY} -S rake spec || die
+}
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index c7b1145dd923..25d925e6a280 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,7 +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
 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
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.11.5.ebuild b/www-apps/nanoc/nanoc-4.11.5.ebuild
new file mode 100644
index 000000000000..d5f2df4948fb
--- /dev/null
+++ b/www-apps/nanoc/nanoc-4.11.5.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby24 ruby25 ruby26"
+
+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/colored-1.2:0
+	>=dev-ruby/cri-2.15:0
+	~www-apps/nanoc-core-${PV}
+	>=dev-ruby/parallel-1.12:1
+	>=dev-ruby/tomlrb-1.2:1
+	>=dev-ruby/tty-command-0.8:0
+	>=dev-ruby/tty-file-0.7:0
+	>=dev-ruby/tty-platform-0.2:0
+	>=dev-ruby/tty-which-0.4:0
+"
+
+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 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
+
+	# 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 '/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
+}