gentoo resync : 19.04.2018

6 files changed, 3 insertions, 60 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index a6ab64857d1f..990a148ed1e6 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/collectd-web/Manifest b/www-apps/collectd-web/Manifest
deleted file mode 100644
index 5f6635154f27..000000000000
--- a/www-apps/collectd-web/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST collectd-web-0.4.0.tar.gz 771364 BLAKE2B 6381881c1b5566bddaa2dc8b3d5cf4b79a7bf6d13e958805b499d4e3725d5521818a5225675e899111a58bffc510d98f60d2cf03d0473fe436b62b6f41629290 SHA512 7ce242ceab9d98c28332c66d8db727fe8f4ea357eb847f0d3f9275bac813941255bbaf0078282a4cd08750915ee81665d52ba07a94d1a3a72298b822de7a95e9
-EBUILD collectd-web-0.4.0.ebuild 818 BLAKE2B 6cd9f80c668022c4856dc7b13eab3346b47e40cf850deedaa319191b414db6e9c2c08ddd95cd5a75e9655b7c93293ab344343d18bb143a19af19f7fba00532ab SHA512 66dcd9008a8c666498ba3b8be2ae5cd0a5315894a9e559c4f3e0e1cbcbb0dab23ed81fd5da6a91fd1283b6c63c0aeb99d5ffde3e988c07423a9afd30056baff0
-MISC metadata.xml 335 BLAKE2B 57ae9c0e85d568f9a47cd3d3a46fc872a97cc9872354f07fa080908e06e2be045876bd3f9f604f8b524015677f5935f45777ba10bda21c8c417e15a1ffcb5c90 SHA512 b1a5faf853e5c3a9faaa39ce427cb1a1f6c6693df62d08a1b4114eff809265bff44fedea36d7e3ea4c5dd91acb0a2f39e2e202025d4a259f77af8b8ee9797696
diff --git a/www-apps/collectd-web/collectd-web-0.4.0.ebuild b/www-apps/collectd-web/collectd-web-0.4.0.ebuild
deleted file mode 100644
index adc5865c33f2..000000000000
--- a/www-apps/collectd-web/collectd-web-0.4.0.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=3
-
-inherit webapp
-
-DESCRIPTION="Collectd-web is a web-based front-end for RRD data collected by collectd"
-HOMEPAGE="http://collectdweb.appspot.com/"
-SRC_URI="https://github.com/httpdss/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-need_httpd_cgi
-
-S="${WORKDIR}/httpdss-collectd-web-a23c49f"
-
-DEPEND="dev-perl/HTML-Parser
-	net-analyzer/rrdtool[perl]
-	dev-perl/JSON
-	dev-perl/CGI
-	dev-perl/URI
-	virtual/perl-Time-Local
-	virtual/ttf-fonts"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	webapp_src_preinst
-
-	cd "${S}"/cgi-bin
-	insinto  "${MY_CGIBINDIR}"
-	doins -r .
-
-	cd "${S}"
-	insinto  "${MY_HTDOCSDIR}"
-	doins -r iphone
-	doins -r media
-	doins index.html
-
-	webapp_src_install
-}
diff --git a/www-apps/collectd-web/metadata.xml b/www-apps/collectd-web/metadata.xml
deleted file mode 100644
index 65d831e8d139..000000000000
--- a/www-apps/collectd-web/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">httpdss/collectd-web</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/www-apps/nanoc/Manifest b/www-apps/nanoc/Manifest
index 82813e2aaca9..840175d78513 100644
--- a/www-apps/nanoc/Manifest
+++ b/www-apps/nanoc/Manifest
@@ -3,5 +3,5 @@ DIST nanoc-4.7.14.gem 256000 BLAKE2B 73b6e038052407f2f698d9d2490476c13f39bca5b9f
 DIST nanoc-4.8.10.gem 260608 BLAKE2B 102548bc4616287d7084f81f505f2c1f7fa294a6bfc87c9be80919a4fff6c547ecbc77cc5cb96d7b1fd9414f189cdf62bad9cd4cdf44fe536c60a2eb3c39ac63 SHA512 36080407696d19739af666d9ba4e04d051d679b29b3e8e5d24d893a2d05b05201b74777007781a0da80125a98fd8cc465fb0b78ca0c28c5fc80bdd5229d5fa24
 EBUILD nanoc-4.6.4.ebuild 1244 BLAKE2B 4dd9efd6511b3eceab5e245a698094776e15f7b3f9d9e2f36708e974d9d6b0e3716d4c00dc3bcda0ee127b2723dd4453867a5deca58fabf1663526568322e2ce SHA512 2be4cc8b453fccf9c1bb77cbc38b2f3d8b8d70dbe23611d0b6f40e832847f740c9747b9de1853e1a6d09d6ecc9f7548bc0098556362cff9b93ccd4dad3659959
 EBUILD nanoc-4.7.14.ebuild 1527 BLAKE2B 4246e332e60334722e37db7ff9ca994f3af437859ed6fbe57375b11347e01c5b6bb179618c43854a46f55cdb02f06c5d1f14874ee9c73408131f82df093b0c67 SHA512 d8bed9a8d6bcb697bc2f6a406e56be084a2a60ff56580b4b6bda4e4e68081a9227c8ea793934332c891ff515ad54fbc83cf29f3d32352e416d994009878f0061
-EBUILD nanoc-4.8.10.ebuild 1572 BLAKE2B 832932b42156ccef9ee7f8df5edf3567cefcd365789b6b0f61e79fcd1774b08c2dce1e8810b8bba9138d50516d2c9eabec2f1a30b6f00e1628511a79254ead00 SHA512 bdf5c69689dd2cf7658ad4839fe7350b0a55fe3ca78edbfeb927f837353d2d3221fe022505a93a80f3abe4a565d77446adb9f594cb897facfca6125bd22765af
+EBUILD nanoc-4.8.10.ebuild 1579 BLAKE2B 98932d52b2f1db9f17e0d0af6117a380712a3bf6aad6506417368b797fb5a76a0a8a8908cf7c1c376c10eba31e1db216bae063e2e691c769b8934c7c925bf3e8 SHA512 c33f02538ec443598aeb7b103c7d452470898a74f1b9f28f53258b196287fc035f244fb5535cc84c64a898615b46a8b7ab2509e1b553e2da2039f068aa22f153
 MISC metadata.xml 317 BLAKE2B c6af48dcdb56be1e50ef78910bc5150112d2914bbd13b576883eeeecdcc2a47f6360ffcf7a83432266bc737891527f4f1cacaf90b62e7b38d75a0c74c87bb0d8 SHA512 5394c6280515d4728d6b30f6eff872dd1d3dc283fe125aa8b5bc7f1206d967b74864bd144c6b2623ea63db19f78b5a94d13261464b35b4056cf92cccf374db1e
diff --git a/www-apps/nanoc/nanoc-4.8.10.ebuild b/www-apps/nanoc/nanoc-4.8.10.ebuild
index b1c3454fd12c..a98bfc00657b 100644
--- a/www-apps/nanoc/nanoc-4.8.10.ebuild
+++ b/www-apps/nanoc/nanoc-4.8.10.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby23"
+USE_RUBY="ruby23 ruby24"
 
 RUBY_FAKEGEM_EXTRADOC="NEWS.md README.md"