gentoo resync : 04.05.2019

5 files changed, 55 insertions, 104 deletions

diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index ff915680978c..fc7d8f94b0f9 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,7 +1,5 @@
-DIST phpsysinfo-3.2.10.tar.gz 1021435 BLAKE2B b9db266021c0392902d6de58492165a889151716484d23f99648e8322c7e76edfda17e8a7b8f415fcc42d5970a98603ea84571989c1168e10e8d87ee3a2f6927 SHA512 56954e64e6c267c2a60baaf91a9a218d2c81d99dc4f159e35d752328bdd38135eb4e9d91d09798b3822cdbf0d04a6169a46385c2d02a812b136fe115b7310a88
 DIST phpsysinfo-3.2.2.tar.gz 899974 BLAKE2B 4da569d90a4ee383535a5a155c754a40f104453d504148729fcde03a4ee6839e914dc0375115d392c81225a451a35e3009218c20019abf0661ba629c98377952 SHA512 fe1fae67379abf0fb75d166aaab87cb91ead33c87cfbd0569b61d95b9b3172820565dff37f6d35744fbf9332adc5a5af1ec49477a56572f55f57e53edb9164b9
-DIST phpsysinfo-3.2.3.tar.gz 909045 BLAKE2B dc1f9d9f7cd83b60eb16f073607f5c7a5f5ad155b297d4defc9b1768c771cd12bd315af3e67f4c7a5f731ef66b8e9eb00da4083074f9cb3908ebbce9198a568c SHA512 33a77d96f3f9ac4e59a078e3106af656f68ec048aa7b89409915373cb4174fff7f709a3a3984cdba2990d397fd019930ae7f24b8fe5484061f3a89dc9f023eaa
-EBUILD phpsysinfo-3.2.10.ebuild 1349 BLAKE2B 977967ab77016bdd78ae0c3a463316c142e31ec461b6053dc743032f88a2abd68ec4fc4057f5b90950828e948b0786199055064169d0f5753300e88d0188efc2 SHA512 ba60f658ad46f82d5c4db16e0ed5a973416bd3fd00a71bfab7bc834c793897414335b005cf617641a8bf81fdc2f6718a77574a9ff3c85db9ec2e3d3440c30c8f
+DIST phpsysinfo-3.3.0.tar.gz 1053425 BLAKE2B ced437dfd7b4e88bf0f4c8b2989db313564c4d8725a339f583bc27b6106f2a4e0f8f599949321d023b442d0110d5a7fc67aa07f71bbf163efd52ee2b84104971 SHA512 dc70303aa1d78120ac184e54f70766d7b28fd32fe60d4b4f0d9996afe82ca06ef398ad88bdeee469ee0a2c213c03ba91c184329195f9b7b5e047298590774614
 EBUILD phpsysinfo-3.2.2.ebuild 768 BLAKE2B 93aa4397be216ffd4e0b68d713343188beac30ed635931c93978747ec8fb2ea7a66b3bf5de1f7669c9fb280143425968dd9629e11b6f9c4ac2023cf251f1c023 SHA512 0d323edd89bc17bb949aa386505a2c5ad5e81f355f9abfe4d0d59009f7f62f94b156bd8d94a8bd0da7a9e2c2677bea23a4650357f8f75941fb49127f7c9370e2
-EBUILD phpsysinfo-3.2.3.ebuild 773 BLAKE2B 3aef2f8cc844f30046b344153450f9910c0f08b8af5fb198db073eeff12df0000fd006322bdf0155682de301987891dd0b5cb98c2c98979afaa0b979a04b403e SHA512 a33a1ce86e6048ff9a768401c598999082554c8ffe37e64d128196f0cf8b988d83c2f82d2558023cc51cdcd046acc663d80041e6a544270041f003d4ae72b416
-MISC metadata.xml 1998 BLAKE2B 44ef1459ba690c8a4f590ed98f3c199cb7b5ce34dff56ab1dc053ddf839649d02ddd196fe131decea06095372d4a82f6cca4172846097a176d73cd64d1a55213 SHA512 253afce98c226f160ab955961163517e36103c05dba11e08493adda9a0e237e7168c0dfe07caafc7f14f7e73c2680f8ff0cf79d8a1f2f436614226a2506f6aaf
+EBUILD phpsysinfo-3.3.0.ebuild 1690 BLAKE2B dd970fc1a01a11413ec438cf136825b6c51063b1099b206e85ed39499dff4170e6c1b6260b8ec8b54c8182b10e3489a433add47873f682e36061f2bcb5746ff5 SHA512 31c64b22daf9e3ddbec83d76336509cec80d425b421fd8fcc562e9ecec25284e24f86c5db19f3f483b31e9218cecf32da975d2f04d6a7dbab23cba32bca92e7b
+MISC metadata.xml 630 BLAKE2B df872dd395f9330647888f294f5c971ad2153f5e6051b7611b5a890295f37abe4101e570f62c508c3393c58f15fa652f14f4f41937a20da412e807e2e8897a06 SHA512 eb92eb13af2ebbd1444035cca86e2754516f5fea843f6cec328e933b3a7b2799a6a00807945e73893dfda5558febf85317edec44c89515b292e532b1f80f62d8
diff --git a/www-apps/phpsysinfo/metadata.xml b/www-apps/phpsysinfo/metadata.xml
index 9f825ab8bb6d..920c77979871 100644
--- a/www-apps/phpsysinfo/metadata.xml
+++ b/www-apps/phpsysinfo/metadata.xml
@@ -13,23 +13,6 @@
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
-	<use>
-		<flag name="apcupsd">Install <pkg>sys-power/apcupsd</pkg> to display those stats.</flag>
-		<flag name="dmraid">Install <pkg>sys-fs/dmraid</pkg> to display those stats.</flag>
-		<flag name="freeipmi">Install <pkg>sys-libs/freeipmi</pkg> to display those stats.</flag>
-		<flag name="hddtemp">Install <pkg>app-admin/hddtemp</pkg> to display those stats.</flag>
-		<flag name="ipmitool">Install <pkg>sys-apps/ipmitool</pkg> to display those stats.</flag>
-		<flag name="ipmiutil">Install <pkg>sys-apps/ipmiutil</pkg> to display those stats.</flag>
-		<flag name="iptables">Install <pkg>net-firewall/iptables</pkg> to display those stats.</flag>
-		<flag name="lm_sensors">Install <pkg>sys-apps/lm_sensors</pkg> to display those stats.</flag>
-		<flag name="mdadm">Install <pkg>sys-fs/mdadm</pkg> to display those stats.</flag>
-		<flag name="megactl">Install <pkg>sys-block/megactl</pkg> to display those stats.</flag>
-		<flag name="nut">Install <pkg>sys-power/nut</pkg> to display those stats.</flag>
-		<flag name="quota">Install <pkg>sys-fs/quota</pkg> to display those stats.</flag>
-		<flag name="smart">Install <pkg>sys-apps/smartmontools</pkg> to display those stats.</flag>
-		<flag name="snmp">Install <pkg>net-analyzer/net-snmp</pkg> to display those stats.</flag>
-		<flag name="uptime">Install <pkg>app-misc/uptimed</pkg> to display those stats.</flag>
-	</use>
 	<upstream>
 		<bugs-to>https://github.com/phpsysinfo/phpsysinfo/issues</bugs-to>
 		<remote-id type="github">rk4an/phpsysinfo</remote-id>
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
deleted file mode 100644
index b3a02983ac6b..000000000000
--- a/www-apps/phpsysinfo/phpsysinfo-3.2.10.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-DESCRIPTION="A customizable PHP script that displays information about your system nicely"
-HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
-SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="apcupsd dmraid freeipmi hddtemp ipmitool ipmiutil iptables lm_sensors mdadm megactl nut quota smart snmp uptime"
-RDEPEND="dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
-	virtual/httpd-php
-	apcupsd? ( sys-power/apcupsd )
-	dmraid? ( sys-fs/dmraid )
-	freeipmi? ( sys-libs/freeipmi )
-	hddtemp? ( app-admin/hddtemp )
-	ipmitool? ( sys-apps/ipmitool )
-	ipmiutil? ( sys-apps/ipmiutil )
-	iptables? ( net-firewall/iptables )
-	lm_sensors? ( sys-apps/lm_sensors )
-	mdadm? ( sys-fs/mdadm )
-	megactl? ( sys-block/megactl )
-	nut? ( sys-power/nut )
-	quota? ( sys-fs/quota )
-	smart? ( sys-apps/smartmontools )
-	snmp? ( net-analyzer/net-snmp )
-	uptime? ( app-misc/uptimed )"
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md README*
-	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	newins phpsysinfo.ini{.new,}
-
-	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
-
-	webapp_src_install
-}
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.2.3.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.2.3.ebuild
deleted file mode 100644
index bf257b348abc..000000000000
--- a/www-apps/phpsysinfo/phpsysinfo-3.2.3.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp
-
-DESCRIPTION="A nice package that will display your system stats via PHP"
-HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
-SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-RDEPEND="
-	virtual/httpd-php
-	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
-"
-
-need_httpd_cgi
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc CHANGELOG.md README*
-	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	newins phpsysinfo.ini{.new,}
-
-	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
-	webapp_src_install
-}
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.0.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.0.ebuild
new file mode 100644
index 000000000000..c7e5df2476a8
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils webapp
+
+DESCRIPTION="A customizable PHP script that displays information about your system nicely"
+HOMEPAGE="https://rk4an.github.com/phpsysinfo/"
+SRC_URI="https://github.com/rk4an/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+RDEPEND="
+	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc CHANGELOG.md README*
+	rm CHANGELOG.md COPYING README* .gitignore .travis.yml || die
+
+	mv phpsysinfo.ini{.new,} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_configfile "${MY_HTDOCSDIR}"/phpsysinfo.ini
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	optfeature "showing disk temperatures." app-admin/hddtemp
+	optfeature "showing system uptime." app-misc/uptimed
+	optfeature "showing snmp statistics." net-analyzer/net-snmp
+	optfeature "showing iptables rules." net-firewall/iptables
+	optfeature "showing ipmi sensors." sys-apps/ipmitool
+	optfeature "showing ipmi sensors." sys-apps/ipmiutil
+	optfeature "showing system sensors." sys-apps/lm_sensors
+	optfeature "showing s.m.a.r.t. health." sys-apps/smartmontools
+	optfeature "showing lsi raid controller health." sys-block/megactl
+	optfeature "showing fake raid statistics." sys-fs/dmraid
+	optfeature "showing software raid statistics." sys-fs/mdadm
+	optfeature "showing quota information." sys-fs/quota
+	optfeature "showing ipmi sensors." sys-libs/freeipmi
+	optfeature "showing apc ups statistics." sys-power/apcupsd
+	optfeature "showing ups statistics." sys-power/nut
+}