gentoo resync : 27.10.2018

12 files changed, 217 insertions, 289 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 940c7ff8df73..54d6b7a35041 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 5e2c40c59f65..1b1ba72c19a5 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,7 +2,11 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-5.2.4.tar.gz 54300847 BLAKE2B defb1b32fafe95c17ab4201665df053d8cb1cf7154a366d2b0bbf3936ffa4baf6f5a3ae3e5fe9fa96334fc0bfcc557106c38d4dcab5d5b5ca64b588726274034 SHA512 75c0ca8735ab0e8c2b340322cc5b0d5adec90a7159761cd9fa2c346a5a4e9fcceb904d160e55be2e4c9b5fa582356aa20430f9d4577e2df3195825d83de897d2
+DIST grafana-bin-5.2.5.tar.gz 54300812 BLAKE2B c6b0928f15938e6240551a80b00e996e450a1fef5aeb703728e4654d4e0c081ad23f3250775d5de5858b4bff7ed0753a90b41caf502e2e93b28bb4fa4f1c86c7 SHA512 eff8331c99ed4483a6d715b58170cc0b9c7f57aaff66cc03daa68e767cfb67635ece0583ea476a74e0df176d40fe4d92778533d0545476a5528d8ec8f9e400a7
 DIST grafana-bin-5.3.1.tar.gz 54595281 BLAKE2B a6feb32e885bb6ce89c168e51e2b2ef6fd33557b44e6ed5f23a3b724b67f7e3055234bb25a714cc515a89d0de6dd69ccfec92c5aeeed72865ce4f646b3a9bba5 SHA512 b439be6d031d24f046985cddce0ce2866efb808f9d107f305998ed042b6bc86f5fdb4482d31bb3da53e4f57d52ac61bd7448394410cd063e46f396f7506cd179
+DIST grafana-bin-5.3.2.tar.gz 54609996 BLAKE2B c5c4493e31a766332cda727ede440d4cce59278e1d1693409d112d8093f3074f95e2cc10b0c21379f306eed497d1fc236d5744f111afb512473ff5e097afb3d2 SHA512 d2f4786c304af42c2680210f712cb11010825b76cb1155235841a1f80d30715f2f2b3510ac93594d807b132e4f5c43d89cab026db2b7ea20672f592e3b117b09
 EBUILD grafana-bin-5.2.4.ebuild 1780 BLAKE2B 603d8212864953f010df6846f9ab863a3a0256d912a0d53d4d5b0b1239c3d60252ae9a2781d210daddbaff0970095740f6cd900b6863aaa1cb38da9debf1b75c SHA512 0674a4fee1ae83ff36ca4506c534b7c02f2bc47e930f67ab76dd2ac9eae979022cb9d23a85c45c4ccc395ce3245125930878cf6513d61c65afed90dd233f034d
+EBUILD grafana-bin-5.2.5.ebuild 1777 BLAKE2B 9450adb124f556ad37ce3526d30e416b1c38c16b406bc4e6de0c2f16b0b8c0d3ffa10bc94d73c5abdb608367715a806bfe9a7bfbdc2c80a1a3f3131f1ee5b9b3 SHA512 6fdc6feb53f5a578e8c3cbc766499daabcb00d56910a1beb9214b15a06c31898bc5f18a128e3310ca90e8fa66932762af432661c079a9d543316368616709c34
 EBUILD grafana-bin-5.3.1.ebuild 1743 BLAKE2B f9636d2f85fd3c96a88a915b0bb173bec3f2cb46db4c9434eb44840a6a93e0657f3b00542ccdffe82bf3f737338511249c76884c9dfd599f34182ead06889586 SHA512 d5612249b0f78b21ccfdea99b034ffc9697367c64cb6fbff5578ccca279d3c23e08c360965f71e038caf1b41dc2a8142ba4c0edc4db74cadb52dc28f24f3ab96
+EBUILD grafana-bin-5.3.2.ebuild 1743 BLAKE2B f9636d2f85fd3c96a88a915b0bb173bec3f2cb46db4c9434eb44840a6a93e0657f3b00542ccdffe82bf3f737338511249c76884c9dfd599f34182ead06889586 SHA512 d5612249b0f78b21ccfdea99b034ffc9697367c64cb6fbff5578ccca279d3c23e08c360965f71e038caf1b41dc2a8142ba4c0edc4db74cadb52dc28f24f3ab96
 MISC metadata.xml 416 BLAKE2B ff5bdf7e202aa96bbf615df2f86c6542bb7d291e6d564dfac683a2e54002380dd80ef3f1ca0b6c1f398de0115e26398903256b9d64e353127f25c3e97e5b21c8 SHA512 db2cbd25cf9b21664db93dc8f9719bf7f9a2fd632c5231d0f296bb32f3f6af3e08307c8a662081cc68f33638d70f6512094fad76073a5de4ceba02eeb3d1188b
diff --git a/www-apps/grafana-bin/grafana-bin-5.2.5.ebuild b/www-apps/grafana-bin/grafana-bin-5.2.5.ebuild
new file mode 100644
index 000000000000..211fc9468af4
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-5.2.5.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/grafana-bin/grafana-bin-5.3.2.ebuild b/www-apps/grafana-bin/grafana-bin-5.3.2.ebuild
new file mode 100644
index 000000000000..e918394e986d
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-5.3.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd
+
+MY_PN=${PN/-bin/}
+S=${WORKDIR}/${MY_PN}-${PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://s3-us-west-2.amazonaws.com/grafana-releases/release/${MY_PN}-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+QA_EXECSTACK="usr/share/grafana/vendor/phantomjs/phantomjs"
+QA_PRESTRIPPED=${QA_EXECSTACK}
+
+pkg_setup() {
+	enewgroup grafana
+	enewuser grafana -1 -1 /usr/share/grafana grafana
+}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	elog "${PN} has built-in log rotation. Please see [log.file] section of"
+	elog "/etc/grafana/grafana.ini for related settings."
+	elog
+	elog "You may add your own custom configuration for app-admin/logrotate if you"
+	elog "wish to use external rotation of logs. In this case, you also need to make"
+	elog "sure the built-in rotation is turned off."
+}
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index 80fe94c31e74..fa76bd681b97 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,5 @@
 DIST klaus-1.2.2.tar.gz 35308 BLAKE2B 4ac2cd77f5c95fd207a83e1688b65e286009a5830c96fce442e3e4a2989a320c0980ab96a03817be27d45d01ccb5e2db277ed535d62a781006b4747c797838d2 SHA512 2f054ca3d285dcf334188d72bbbc4ea99fe8778126d0d215cfd3508cb294d52e2944b3e251f903a863df018ec61d9dcd779f5c6cd284fb2f6cd90abb98783176
 DIST klaus-1.3.0.tar.gz 35363 BLAKE2B 881f9bd1a80d4a580a0dc84a7b8528a5703777817495639bb3ea8f608c2495287a37fe43839d0c64002e1d36453d37f116c73c9a7ef93651bc8a2d010d4d2e2c SHA512 c159d8195b1bde43f46d013f0337e998d905b1f3a9a23caf5f71180d19192c3c391cc5143545bd3d05a2aef45451a43e873ca3828c8f9f69ae3eaaa0d00560cb
 EBUILD klaus-1.2.2.ebuild 853 BLAKE2B f7bb566cf8e489e138196d63388d1276702be34767c975aa2feb835cfbe878d9e565c43937c4f914d962f0ee710985463a78cdd87ab0eca7e269486b285e94e1 SHA512 9e40e69e71f8ee761afb602e2f51b9962180a9fa7b7bb597b7eb1c0b040e3e833e25041add734ebd7dde09197e7d26a15eff21fed64c1956e1b3c98f4088d756
-EBUILD klaus-1.3.0.ebuild 853 BLAKE2B 83c4da269b41f460732704a09aa7e10362712eb1db10f3fa03c273bca271e53b8580c36df8725564df8b66836ce3a086685d84b7af8faea01c7886e77065f3b8 SHA512 8dd0503816b90a10de341a3fdf14deee2062396d70e8d9e7a2238032e9382e63e4a912beb8d606dc00ebff74d3a6684e1fc14c84e96cc02ca486ddbd8684d048
+EBUILD klaus-1.3.0.ebuild 847 BLAKE2B 41989d0d9c77e7f46c48723d27298f9e65b5b771d2363a7e6741bca525c88ebf0fc7294ce79cbb5338cafcecda9fd646796e53aec120077637b8f248dc6af6f9 SHA512 35e570f6fdd45a2b3153122e4c833c8b50b9e1a4160df1dc28ca9bc78a41e0cdd2d49027c5ef11867cdae6bd91914b93e22c30bcd79f807e85ca5cc5d668814b
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.3.0.ebuild b/www-apps/klaus/klaus-1.3.0.ebuild
index 564444a7884f..97d0bc760bac 100644
--- a/www-apps/klaus/klaus-1.3.0.ebuild
+++ b/www-apps/klaus/klaus-1.3.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
 
 inherit distutils-r1
 
@@ -23,9 +23,7 @@ RDEPEND="
 	dev-python/humanize[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]
-	ctags? (
-		dev-python/python-ctags[${PYTHON_USEDEP}]
-	)
+	ctags? ( dev-python/python-ctags[${PYTHON_USEDEP}] )
 "
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/www-apps/mediawiki/Manifest b/www-apps/mediawiki/Manifest
index 01c31e1d6d12..62e988ef5ba5 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
 DIST mediawiki-1.27.3.tar.gz 31509270 BLAKE2B e48feef42bd1bc32019df338975851df737eb032a48703a07d074b5efa6fa9acade2f412017c55990288beaf0267cef3fb49248002e41a61a700911cc023d549 SHA512 bc6228342b589a3acb0f5623b9ef45982d7aab032ff322aaf7bda7ac3ee16a7732b8013698d8f509da4310bbb65c12a73b7bbe4612d5e0e3d93965199efdc8eb
+DIST mediawiki-1.31.1.tar.gz 35260876 BLAKE2B 4a1b5f2c47535a1099b105f35158c2e15cef028e752b1a195de4f924ba2a1d02bce64f713d2bde608882228e82cbea91ee2f5fb2f1f64f267334550b7cd33cdb SHA512 ee49649cc37d0a7d45a7c6d90c822c2a595df290be2b5bf085affbec3318768700a458a6e5b5b7e437651400b9641424429d6d304f870c22ec63fae86ffc5152
 EBUILD mediawiki-1.27.3.ebuild 2364 BLAKE2B 5026e3364ae048e973a6f11d898ae52831e541f3b682420bc41c4936504ec778826a1f5be34546bc2c9aa97a84c4a39a32fa571a5b73db1a2618679fdfe6bbdc SHA512 0adfcc39cfcb96f80e33d3d428e3d2cd243a36caf51a4505aed59456fde85c677b38252a383eff32d0d5946b19cd7a57516e0691961aaeab2fdcce701f204056
+EBUILD mediawiki-1.31.1.ebuild 2437 BLAKE2B 8334f4316ac8bbb91f33d2fc6c702ca55186d5f6cfdef85e50c573b11e4a04b991f03bc498c5ec8781b73c34c92120ba8631db538aec5420ed079cb0e8a3a104 SHA512 49f663aa4941524ea38fd092814200d3e880bfdb3b68cf5af327a4a47b8904d3042a13eb4d86010814cfb74991222b8d7f42b513c4151a9203ab8ab2d4aba635
 MISC metadata.xml 246 BLAKE2B 6bdcea4d16a06756a1ab24fb076af6d88134c134f9239e658b7e5facb8cf6ed2f30d98938fd92bc8a3690e54273fd7f72420ccab04e7a6f7319e257a9f9ed618 SHA512 1181711d3b020b2ca7beae0a539a9b7f1abe70962cd8561900e5f06e14c9c871c61ca6088fb674de19ef3b844a1b3c29cf0f84f638b2d0cb7c030f60cd1d42ed
diff --git a/www-apps/mediawiki/mediawiki-1.31.1.ebuild b/www-apps/mediawiki/mediawiki-1.31.1.ebuild
new file mode 100644
index 000000000000..635e4d5a95a4
--- /dev/null
+++ b/www-apps/mediawiki/mediawiki-1.31.1.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit webapp versionator
+
+MY_BRANCH=$(get_version_component_range 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[json,mysql?,postgres?,session,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/Manifest b/www-apps/nanoc/Manifest
index d173db049444..11d4723fda8c 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -1,13 +1,7 @@
 DIST nanoc-4.8.10.gem 260608 BLAKE2B 102548bc4616287d7084f81f505f2c1f7fa294a6bfc87c9be80919a4fff6c547ecbc77cc5cb96d7b1fd9414f189cdf62bad9cd4cdf44fe536c60a2eb3c39ac63 SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24
-DIST nanoc-4.9.2.tar.gz 275891 BLAKE2B 6c2ca3b1f00f59762530ccf8dfb37599d89b67819e893fc49252afa0be334c64c0c2f771f7b05db14d24e264d355870a7308a117823750ba6edd68d82b113357 SHA512 593ed6def82e1c109983e37602a1def0bec0ea7a025d2badd3ddd3c564cb43ef619ea9173e563e32ae3891d4e3de85b5020e83292c5e16e1a6888399213c26cf
-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.2.ebuild b/www-apps/nanoc/nanoc-4.9.2.ebuild
deleted file mode 100644
index 31fbd3271a0e..000000000000
--- a/www-apps/nanoc/nanoc-4.9.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.8: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/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/nanoc/nanoc-4.9.3.ebuild b/www-apps/nanoc/nanoc-4.9.3.ebuild
deleted file mode 100644
index 31fbd3271a0e..000000000000
--- a/www-apps/nanoc/nanoc-4.9.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# 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.8: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/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/nanoc/nanoc-4.9.4.ebuild b/www-apps/nanoc/nanoc-4.9.4.ebuild
deleted file mode 100644
index 9e6642788b8f..000000000000
--- a/www-apps/nanoc/nanoc-4.9.4.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# 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
-}