gentoo resync : 30.05.2020

3 files changed, 2 insertions, 56 deletions

diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index 76d4d306675d..4452d84ff3c5 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,5 +1,3 @@
-DIST phpsysinfo-3.3.1.tar.gz 866981 BLAKE2B 9dcaba2bd1b4faa79fe12a2c50dbc767953cf98d45801ca6bc8398eb625b93ebc56356db0f6e05422dd665d8c6e88cb831b4288a5f0190f3c113c1171ea81def SHA512 7b8e0c469651c878b2dcc37189be7b592be5bde4ece38e0aec21afa5a422286b4c6a555bbafc4b7a2eb19e1c2afdac80fddcf03b41084f9da02fb3c92c7242b5
 DIST phpsysinfo-3.3.2.tar.gz 891158 BLAKE2B 40428647a502f9861f89a490a10e95bef0fdf306d2ee27507b4f396ee7371ca3d75b7259db53b8501b127fb525dce283cb8c73e50172b5b2a78fc490fc7f658a SHA512 33f76436d6ba1aa76a4c7e7dba84f5d4bf458b505df47d65ff9f1ffecc4db48a853c9cdb8583019e70c4d0b54c184ae6d48968f3ed820a711804095a5fc31b07
-EBUILD phpsysinfo-3.3.1.ebuild 1675 BLAKE2B 2d35b9e6dba6b3ec5963f35526ea1a4975937ecb643ba315da8847612c66cf39fb326d3de8702f239ffd9cf9f4f16b8e031ed9f63e004a0d4650f8eafdf2478b SHA512 f5f4092dbba9c37e53c745f94d3f31fd82c57eaea60297630fc12421f9c4ffe1f0058e5a7f88f48e67c7748b96122a0aea87f5d67343935950e97afa478855ee
-EBUILD phpsysinfo-3.3.2.ebuild 1680 BLAKE2B 79c5612f8ed44352bdae51fa97687f5e8d111d9e1b7994fdf9d35c117564a0e61ddb7464fe552e5c1a01cdfa3aa422a03ba938010163c92512c1b585610639ec SHA512 f9b2318d5c09115594e35d86d195a0fbc84080bbc68a7a61a964268eaedbfa25f4cb0a68bb93dca44a9e4dab1f6ed5fa40ac529b9bb26532ba718e05d3b77ca1
+EBUILD phpsysinfo-3.3.2.ebuild 1675 BLAKE2B 7c8bfb0aee2fcda08b5ef0a1fa54727e6ac800894058f2cb77d9790607e71b3cd91800fafd57fe55fa7fba9e059feffdc6376a0adff899e21180828df1de4680 SHA512 90044784e857262744e4d8123b18430a2f3cc2b58db6ed3be15c3c7a4e14a19ef77d4e2c8b461882dd03f4405ac1d3180ad4c56b7857fbac5841ac0e5e5489b9
 MISC metadata.xml 511 BLAKE2B 3139dd25eebac631793e015cb1db6e41d64c5a3e9a75f61f340d0f1ba73b99d304716dfca4b0f0f51baf0f46a740312bb198c52aa625f5b838e6ae10f341a8e1 SHA512 59fd8766c9545193c86374e1dd05d0a08e1f5c548f4297ad4fe22acbd4ba36aa4ae46ccf6f497bfae1a7e015cf95a5f51fb417266c21cf5b5201eac31b543d41
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
deleted file mode 100644
index faff23b9887b..000000000000
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# 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"
-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
-}
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
index 4861a565e05c..acf34b79ac08 100644
--- a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 RDEPEND="
 	dev-lang/php[simplexml,xml,xsl(+),xslt(+),unicode]
 	virtual/httpd-php