gentoo resync : 18.11.2018

3 files changed, 8 insertions, 61 deletions

diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index f3e02e3ea7f8..c6b545290212 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,5 +1,3 @@
-DIST cgp-1.tar.gz 139265 BLAKE2B bf0f18def8ac3c2117b951172d4150f0626e8dcbe22accbcc6ad156e5f9f5c21792e38fa1bf5a964d8b50cbc7ee9003e4dcdcd75730ba2b0445f4dcfeffdda6c SHA512 fc5bc6d39dac896b56579cb6ca013c81493b994a7a190e0c0eec8a64f7b87c6eb2e0ad5cc969b8ea03ca4b00eee212ccee5c8785c23f5656bff3fe5490ff8f75
 DIST cgp-1_p20180620.tar.gz 139549 BLAKE2B 2cc1a416ae1158b5788615b05bf43039049af52eb5296e7fd8136c9895e8ee0a9887e84ad37c6598a4c4387982a2860fbdb7cf9cdff39cfe5bbee598b9ace88f SHA512 acd09bb699af678347dacfc08fee60a86843874543851805f245952e538777d7ccd528c156f7a21b803503c7aac134013a4eb8200d5266cf35541b0dce5839e4
-EBUILD cgp-1.ebuild 1262 BLAKE2B a1a68c636ea31e13e1a62cca4522934276783d872c3032ce50581ff080cd0605c9a6ac4f5d467017480cc8a829309aa8b4c7d5de18a401cd87bb2a35391f8c14 SHA512 a23e7721c97d8c1d97f313e0474cbdffe69f2172de50be4406e0549d7299407bf77024e65261e4d09d9592c68451e5ee10be67f5f2fe0c80653dc66cbcfd36d8
-EBUILD cgp-1_p20180620.ebuild 1316 BLAKE2B a0a69092f89fad5b8b06b421a005f944a5f723a9da8259d7c3ee99f78a7d147093ee528d75edb580cc4c9db0eaf0ca6dbab870c30b36cd573390aaf6384fb1f4 SHA512 c76b4cafd07a56c68b50744cf5f15e0f0de8f734a8f6f30a18333996c8afa3672daba101564660deeb1dd8f024d433a554b01eafc30c07a54f257162342f4504
+EBUILD cgp-1_p20180620-r1.ebuild 1278 BLAKE2B 7b40e0cc919201e00a42a420db0c531da1db82846a4985e99931bb76e5ef281d078febb48f9338155416bec2a42f8153b24c433ce97ba489e4ac82e52d240b80 SHA512 006443901477d5547435592cd872ad00b35434305563d9a40bca90fcdb166e319b1f60a2b120ffde10d1ff18b536613ceb79bf9e8eab4e92169fb91d0e51ffd3
 MISC metadata.xml 677 BLAKE2B 2085e266da1c26131975e252ac7f4e9d778b8d32c708e78cecab760775af5273d1b8cfed21141159178b4a5d4d516118934b40e6ceaa67fc4b98decc643dfaf4 SHA512 a31566e2a70a4819d03b18bb7fe5a951d53db2a354430e767a26bea62666fd7c7968c423e335dd4e5d7070537e5e062bad4f5567dabcf4d900d560cc6a30bbc1
diff --git a/www-apps/cgp/cgp-1.ebuild b/www-apps/cgp/cgp-1.ebuild
deleted file mode 100644
index 0d1bc985b145..000000000000
--- a/www-apps/cgp/cgp-1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PN="${PN^^}"
-
-DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
-HOMEPAGE="https://github.com/pommi/CGP
-	https://pommi.nethuis.nl/category/cgp/"
-SRC_URI="https://github.com/pommi/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="dev-lang/php[json]
-	net-analyzer/rrdtool[graph]
-	virtual/httpd-php"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
-
-src_install() {
-	webapp_src_preinst
-
-	einstalldocs
-
-	# Since the docs are already installed, remove them from htdocs
-	# The file doc/CHANGELOG is needed, as CGP reads from there it's version
-	rm -r .gitignore doc/LICENSE doc/nginx.conf || die
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	einfo "The command shell_exec must not be disabled"
-	einfo "through the disable_functions php.ini directive."
-	einfo "It must allow execution of the rrdtool program."
-	einfo ""
-	einfo "An configuration file for www-servers/nginx"
-	einfo "has been installed as an example."
-}
diff --git a/www-apps/cgp/cgp-1_p20180620.ebuild b/www-apps/cgp/cgp-1_p20180620-r1.ebuild
index 6051624a6a90..6fe5fc73bda7 100644
--- a/www-apps/cgp/cgp-1_p20180620.ebuild
+++ b/www-apps/cgp/cgp-1_p20180620-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI="7"
 
 inherit webapp
 
@@ -9,16 +9,17 @@ MY_PN="${PN^^}"
 MY_PV="1920ca24a067ac157a6bd8f3c017f4c6244ae245"
 
 DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
-HOMEPAGE="https://github.com/pommi/CGP
-	https://pommi.nethuis.nl/category/cgp/"
+HOMEPAGE="https://github.com/pommi/CGP"
 SRC_URI="https://github.com/pommi/${MY_PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="CC-BY-2.0 GPL-2+ GPL-3 MIT"
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="dev-lang/php[json]
+RDEPEND="
+	dev-lang/php[json]
 	net-analyzer/rrdtool[graph]
-	virtual/httpd-php"
+	virtual/httpd-php
+"
 
 need_httpd_cgi