gentoo resync : 05.02.2020

15 files changed, 250 insertions, 124 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 383243a60263..659775d2a4b2 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index d546145bb581..c83da665aa0b 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -2,7 +2,9 @@ AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1
 DIST drupal-7.69.tar.gz 3314294 BLAKE2B bfa1d528caf5dc1fa8a21d65244801e2d10961ec707bdb05c99cdd4fbb1e8f90692549b00befd29583371791a22fdf46af87dcc8c43204dce6ba505376bff5d4 SHA512 521eec475cbd11d9c997f660c8cd3f92e7a164650eaec67bc1d40c53e901576bc827a3805d2341ab80e9a5bb2f4524e7541d0a99970f2a51a3e45a9ac8ae7880
 DIST drupal-8.7.11.tar.gz 17899106 BLAKE2B b0971595319abcae978a0a85f3d11345e3411d412775754139c9562baf5e3c4e49f5ff279139ab1b2128f72987746f13b3edb801cca9984269ce929492243f79 SHA512 1952630cce84c3d819e9f34e2beed3268f0e6aaa634aa367310b4aad59c1d86a59fe11d258aa6d0823cd0d2c227ce54d88fc27e07c53b660a6833e1f15feb9f1
 DIST drupal-8.8.1.tar.gz 19409293 BLAKE2B f0fb8874fc4c706f15ab35795357088d4edf75a2bac23343feadf9e02a706f553d3985c418369c76ede310744c645d3ca4085d920f1bd3069c36d31ef3b90d52 SHA512 68663b078c7e4468d8fcaa82c385c79930d4d5741e9ec598faeda6b1f8eeb37dbd8a841bc5a458c1dc97dda9a566edaa981991cdd19fea1edc963f72d746c639
+DIST drupal-8.8.2.tar.gz 19438764 BLAKE2B d37d1a4387b8873d6b42ed6afcae89025325aefddecfc3528b161fc86898630f6117301217b4aeeff0aa35ee906aa21de367dc1958db27ec26987c1e599217db SHA512 e4ec3e93649e1698da95a46af9087068beaf5c89a7941d7a3d9fd90d5d28a6ba765cc2ba1954a9c27117197e4322df711c07017b29fd89abc75bfa596fa58362
 EBUILD drupal-7.69.ebuild 1546 BLAKE2B 35cdab15e35337c9f7afd5188883ae89c4729ef0616de25fafe42d0252a517771fe1a075255239b3c7f1290a411490ddc6d4a64c66c67f1a25c09f06e0fc3d9a SHA512 bddd764fb0eeec6170b936829aad59cb7fe20dffef37eea6df80dd3ce05a13ee36710ab7b36975a450ee310ec94f0362763cb5541f6c721a5054b961c665a42d
 EBUILD drupal-8.7.11.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
 EBUILD drupal-8.8.1.ebuild 2084 BLAKE2B 11f1dfac694f10e65ef501c4e8d6306c005115ff7c617e97ba9b37480f5d7d6792e2f84114197388ee8a94b9d3b0bf5dc9f3e84a5e70e11a2c6aa3f357714d78 SHA512 2a81cb1142d338d34b0c9d0bad5cc6a6b0b48879ac20e3e3fb18434aa29f8e9428b406790d591ce397337af5e69d0ad52d5859a92ec79d7d3c5edf24c41b0063
+EBUILD drupal-8.8.2.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-8.8.2.ebuild b/www-apps/drupal/drupal-8.8.2.ebuild
new file mode 100644
index 000000000000..50acdd30770d
--- /dev/null
+++ b/www-apps/drupal/drupal-8.8.2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit webapp
+
+MY_PV=${PV:0:3}.0
+MY_P=${P/_/-}
+S="${WORKDIR}/${MY_P}"
+
+DESCRIPTION="PHP-based open-source platform and content management system"
+HOMEPAGE="https://www.drupal.org/"
+SRC_URI="https://ftp.drupal.org/files/projects/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="+mysql postgres sqlite +uploadprogress"
+
+RDEPEND="
+	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	virtual/httpd-php
+	uploadprogress? ( dev-php/pecl-uploadprogress )
+"
+
+need_httpd_cgi
+
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+src_install() {
+	webapp_src_preinst
+
+	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+
+	dodoc ${docs}
+	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+
+	cp sites/default/{default.settings.php,settings.php} || die
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	dodir "${MY_HTDOCSDIR}"/files
+	webapp_serverowned "${MY_HTDOCSDIR}"/files
+
+	webapp_configfile "${MY_HTDOCSDIR}"/sites/default/settings.php
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	echo
+	ewarn "SECURITY NOTICE"
+	ewarn "If you plan on using SSL on your Drupal site, please consult the postinstall information:"
+	ewarn "\t# webapp-config --show-postinst ${PN} ${PV}"
+	echo
+	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
+	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
+	echo
+	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
+	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
+	ewarn "reported by the setup."
+	echo
+}
diff --git a/www-apps/klaus/Manifest b/www-apps/klaus/Manifest
index 4187e8ccb3b9..e313380e00b6 100644
--- a/www-apps/klaus/Manifest
+++ b/www-apps/klaus/Manifest
@@ -1,5 +1,5 @@
 DIST klaus-1.4.0.tar.gz 36879 BLAKE2B 8a621338514e3be143c5b64a0a486d47edc7e7a14c839bc135e7c1693fd09ddea1529b5b2e1d8e0bb70f152629d7bff288f9221ae4243dac01995da4d00e5848 SHA512 8e596590fe29c62eeb823047780f747a0f4908f926dad8ff54000469dca013fcfcbaf7b53c0555db095fef71e4d9056e9b6e959005550bdfccc338f1ee3a5d2c
 DIST klaus-1.5.1.tar.gz 37563 BLAKE2B 164971626cab61d49e662fd356e0954e6ce8c1028d2452d661b3fdc386d835408e5aaaf83f14ec8851b7482e5a848086c6f15765811454ecf16628c01ba154b8 SHA512 a2244973ff93dbb00f5771755704fe7c6d5ee7f4f47189643f27cc114216a9b14327fc537b5c934c7ed8a08df52727600761402da0d492ffa5d5ba6c5f24af56
-EBUILD klaus-1.4.0.ebuild 917 BLAKE2B 3df20f77ddf240417afff4cd576fa4405d90c5848b6ac98d064d65abd084f5af1713d9ea5a050c97a3d903e1885ca9db069465512c5800fafa6b6b2f481ae615 SHA512 0f89b312fa490af3c9e49312fbe9dff1272b61b36e2ada7ee8961f0b65ed0c5bacbb01e3be6758f2cec554bf548e359c3537836a909f50c163ae2d8e5337ff22
-EBUILD klaus-1.5.1.ebuild 917 BLAKE2B 3df20f77ddf240417afff4cd576fa4405d90c5848b6ac98d064d65abd084f5af1713d9ea5a050c97a3d903e1885ca9db069465512c5800fafa6b6b2f481ae615 SHA512 0f89b312fa490af3c9e49312fbe9dff1272b61b36e2ada7ee8961f0b65ed0c5bacbb01e3be6758f2cec554bf548e359c3537836a909f50c163ae2d8e5337ff22
+EBUILD klaus-1.4.0.ebuild 911 BLAKE2B fac3bf89c501e5ad8250324a3f4e996548f3f7869835f4eb406fa06b40e23aa0e3bb4f7a965af08f54dca8df3c3d57f1e27b95c8f6d917e0dda5e9a6d3d7fa75 SHA512 915cad70176d471709dc8e72411d5c689c3f95c0d1a0d477857229461fc3f6b2acd88517d9de54606b5456cf6fb59a0d0a4d962f835903346aef73ca46d5225e
+EBUILD klaus-1.5.1.ebuild 911 BLAKE2B fac3bf89c501e5ad8250324a3f4e996548f3f7869835f4eb406fa06b40e23aa0e3bb4f7a965af08f54dca8df3c3d57f1e27b95c8f6d917e0dda5e9a6d3d7fa75 SHA512 915cad70176d471709dc8e72411d5c689c3f95c0d1a0d477857229461fc3f6b2acd88517d9de54606b5456cf6fb59a0d0a4d962f835903346aef73ca46d5225e
 MISC metadata.xml 684 BLAKE2B 3fd97f5f66e03afef819feddd1995814e607f188ca87ce5a294f3a10f794fdbcba2fdea691bca7e100d0b853925fd1248fea7eafc37cc947d31454a01c070af2 SHA512 37f5386826bc762dda625012e6016f65d0dd3d1ed4b88f62341cb4ed7b2876cc2a819550faed8fbcb939796d6d76f6d4dcca8f0559be329cc9f8f583c188d5e1
diff --git a/www-apps/klaus/klaus-1.4.0.ebuild b/www-apps/klaus/klaus-1.4.0.ebuild
index 88fc4b726a3f..5293ee80373c 100644
--- a/www-apps/klaus/klaus-1.4.0.ebuild
+++ b/www-apps/klaus/klaus-1.4.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/www-apps/klaus/klaus-1.5.1.ebuild b/www-apps/klaus/klaus-1.5.1.ebuild
index 88fc4b726a3f..5293ee80373c 100644
--- a/www-apps/klaus/klaus-1.5.1.ebuild
+++ b/www-apps/klaus/klaus-1.5.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index 9697648f7e65..3d471d271d51 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -14,6 +14,7 @@ DIST netbox-2.6.5.tar.gz 2408180 BLAKE2B d119a1bf8256e0d6265eda7122a1d436ecb0e8e
 DIST netbox-2.6.6.tar.gz 2414895 BLAKE2B b27e1bd5bf810627a4ec563b2eb5dbd7c86bf3d98e52555e511ee16492fd96a6cb7604dce8f5954120ab8b3a48d6acf7878721005bcfd2bd9e3880294dfbcd4d SHA512 9b44442cea1f76cdecb37faee8fe32012b869ff63c1b0bc678d2bb8624851941e9296854a9d85abea24e49a75fd5b31b968e4adbd56e5bc03a1c9f28fc8b846e
 DIST netbox-2.6.7.tar.gz 2416096 BLAKE2B 9c9744b60c3999fa7c3336539937cc20eebac67559444a4512cc4d69e8d38babc147254fd1fc49b8515203a8fd4411bc61c4c30aa3313e1ffe0d0e86abd8c9bb SHA512 63ed6a95a1f33ee5dd19dc2e43fc5c6aa09979c6f6856b28060992a8aaee956363caf20c48e72884adb84d260669d828311c0cf0d143fc0e58fed9677baf76db
 DIST netbox-2.6.8.tar.gz 2416523 BLAKE2B 1624415302696f47f799f8bd42b827bfdac7866e750ad71cca84a3c095aa39e403036d82257c864f0e4ecc1725087cc1253c73fa26928915e2c53213c3a3852a SHA512 12a094434c66f954cdd356a41123d5e6c2df8ba9aa846731ee439fd0bf330a003ca4b96c8889aef7be2e551c1d518e96c83182168049a76e9cf4ca3104533280
+DIST netbox-2.7.2.tar.gz 4936914 BLAKE2B 905e2667d0637d2edb655efcba1d697eacb097ddd67c8e4586ee2a3ce5a81e4fe98a71f574ae5c732190e03e42fd4cab2f781a30622e79d5e9ea4db7c86de263 SHA512 87753ce955e296d9605e44d5f0df58c14876ca8feda3245dee166fba8a51cbfda7def8da39663570cd0e7c9195cc163d9e877b59027ea1161c7eec33702a3ea4
 EBUILD netbox-2.5.11.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
 EBUILD netbox-2.5.12.ebuild 4066 BLAKE2B ed0de78a0382a8bf4695f73787c85aead88e12498c668b5d902ec9a1a876f8e4f69bcba69d4e2da935ff6c792c5dd84bfccddf5361364efc79bba31795f57722 SHA512 7d0dab9d6fa2b347b4bee9037fe03e1e3798871997d6f19a99252934013147796fa72a9da05c9a6efd24285aec41b536f4cbfabc7a44e531c362e2c16c34ef37
 EBUILD netbox-2.6.1.ebuild 4245 BLAKE2B 8e04b1ee274fa82d7db31627c12c7fe7038dfd7f79640d2c737dd6a6c9cfed6c1c0eb67b355bd6e96f62a1c7840329adfe86c793efb2fd97a2c71f9e485914fd SHA512 a6d53f3b1fd03b6ee2a6e1eb7cf3da083922277350f21d20ff319d4ff09f8e5692e5f2dcc16e8ac85c198a52be1bba0cd6dc53779fa96241679e7ce1e3c36597
@@ -22,4 +23,5 @@ EBUILD netbox-2.6.5.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc
 EBUILD netbox-2.6.6.ebuild 4260 BLAKE2B bbba31a097e8405b52069fdd92098782f0478bbc67ff01bbe0ae3034c6797dbb32266ade0e4ba3a3e9f64e4d4e2cc4c05c27e44f9be122bdb00e774a7b3052e2 SHA512 4f8e434d048bff36029485337ef847f44c54333bc50418a3c9b3faa5870642082aff65fb5937801cf975e93c794b00062bc8473672bce79a5a9068e877060756
 EBUILD netbox-2.6.7.ebuild 4253 BLAKE2B a7bc7d7cc3043236a63973544d2ac7051d474b4b4e2e6cb44e617c20bb61e2abe58ef148fc68b715a0d6513f9a89cc734f527eb1aebbbe94457fd0118b270f35 SHA512 025be51114549859ba406276c1af6cd16ac668cb0982d1bd3cbd0ed87a852a3cef6d16ff9a864b4b7fca7e4be442556702ff8e3e985109f2bc4021efd7886d5e
 EBUILD netbox-2.6.8.ebuild 4260 BLAKE2B d97a4b11d73c392787c116c059e14ff6f7f353e312f29db2e3ff4fe5ac9f9b3ed04f5bf0063cf99db1c2c7e491155925f463d5d6d3404b9f9017a06c1d873513 SHA512 87dd3997a6e9bebc80462c9dc3ad2a50b96f869a47f1cb990b5f223db74ba9cc6ed678f067029bae091c32bcbd4828710c034b0b1299aced6b2be81bbf79be84
+EBUILD netbox-2.7.2.ebuild 4212 BLAKE2B fe91ebc782696d72ff03024a58f53e2807e42eefbfa623642ada8ad0ffec1cc4a92d41dcae8cb6c0515114362286d92d43a9df6fc882b8c4a8663e0546e70fac SHA512 241f852796b64706e6ed70cc1d80a3e6ce4fbcad2925b94d565ffed67b80485ece9da38dbe7edeb9c37c598497ad694ecabc6de5653f5f018a4f630395baa975
 MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
diff --git a/www-apps/netbox/netbox-2.7.2.ebuild b/www-apps/netbox/netbox-2.7.2.ebuild
new file mode 100644
index 000000000000..f80801767e3f
--- /dev/null
+++ b/www-apps/netbox/netbox-2.7.2.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_6 python3_7 )
+inherit python-single-r1 readme.gentoo-r1
+
+DESCRIPTION="IP address and data center infrastructure management tool"
+HOMEPAGE="https://github.com/netbox-community/netbox"
+SRC_URI="https://github.com/netbox-community/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="ldap"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+acct-group/netbox
+acct-user/netbox
+	${PYTHON_DEPS}
+	>=dev-python/django-2.2[${PYTHON_USEDEP}]
+	>=dev-python/django-cacheops-4.2[${PYTHON_USEDEP}]
+	>=dev-python/django-cors-headers-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/django-debug-toolbar-2.1[${PYTHON_USEDEP}]
+	>=dev-python/django-filter-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/django-mptt-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/django-prometheus-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/django-rq-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/django-tables2-2.2.1[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/django-timezone-field-4.0[${PYTHON_USEDEP}]
+	>=dev-python/djangorestframework-3.10.3[${PYTHON_USEDEP}]
+	>=dev-python/drf-yasg-1.17.0[${PYTHON_USEDEP},validation]
+	>=dev-python/jinja-2.10.3[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.6.11[${PYTHON_USEDEP}]
+	<dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
+	>=dev-python/netaddr-0.7.19[${PYTHON_USEDEP}]
+	>=dev-python/pillow-7.0.0[${PYTHON_USEDEP}]
+	>=dev-python/psycopg-2.8.4[${PYTHON_USEDEP}]
+	>=dev-python/py-gfm-0.1.4[${PYTHON_USEDEP}]
+	>=dev-python/pycryptodome-3.9.4[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3[${PYTHON_USEDEP}]
+	>=dev-python/redis-py-3.3.11[${PYTHON_USEDEP}]
+	www-servers/gunicorn[${PYTHON_USEDEP}]
+	ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.6.7-no-pip.patch
+	)
+
+DISABLE_AUTOFORMATTING=YES
+DOC_CONTENTS="
+netbox is installed on your system. However, there are some manual steps
+you need to complete from the installation guide [1].
+
+On Gentoo, the configuration files you need to edit are located in
+/etc/netbox, not /opt/netbox as shown in the installation guide.
+
+If this is a new installation, please follow the installation guide
+other than this difference. Also, if you need ldap, set the appropriate
+use flag when emerging netbox to install the dependency for it.
+
+Once that is done, you should be able to add the netbox service to the
+default runlevel and start it.
+
+If you want to use webhooks,  you should also add the netbox-rqworker
+service to the default runlevel and start it.
+
+If this is an upgrade, follow these instructions:
+
+Stop the netbox service. If the  netbox-rqworker service is running,
+stop it as well.
+
+Next, run the upgrade script as described in the upgrading guide[2].
+
+Next, check for new configuration options and set them as appropriate
+for your system.
+
+Next, start the netbox service.
+
+Finally, if you are using webhooks, start the netbox-rqworker service.
+
+[1] https://netbox.readthedocs.io/en/stable/installation/
+[2] https://netbox.readthedocs.io/en/stable/installation/upgrading/
+"
+
+src_install() {
+	dodir /opt
+	cp -a ../${P} "${ED}"/opt
+	dosym ${P} /opt/netbox
+dosym ../../etc/netbox/gunicorn_config.py /opt/netbox/gunicorn_config.py
+	dosym ../../../../etc/netbox/configuration.py \
+	/opt/netbox/netbox/netbox/configuration.py
+	dodir /etc/netbox
+	insinto /etc/netbox
+	newins netbox/netbox/configuration.example.py configuration.py
+	doins "${FILESDIR}"/gunicorn_config.py
+	fowners -R netbox:netbox /etc/netbox /opt/${P}
+	fowners -h netbox:netbox /opt/netbox
+	fperms o= /etc/netbox/configuration.py /etc/netbox/gunicorn_config.py
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newinitd "${FILESDIR}"/${PN}-rqworker.initd ${PN}-rqworker
+	keepdir /var/log/netbox
+	fowners -R netbox:netbox /var/log/netbox
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+	local r
+	for r in $REPLACING_VERSIONS; do
+		if [[ $r = "2.5.10" ]]; then
+			ewarn "The home directory of the netbox user is now /var/lib/netbox"
+			ewarn "Please adjust your system."
+		fi
+	done
+}
diff --git a/www-apps/phpsysinfo/Manifest b/www-apps/phpsysinfo/Manifest
index d7e7f2958cf1..76d4d306675d 100644
--- a/www-apps/phpsysinfo/Manifest
+++ b/www-apps/phpsysinfo/Manifest
@@ -1,3 +1,5 @@
 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
 MISC metadata.xml 511 BLAKE2B 3139dd25eebac631793e015cb1db6e41d64c5a3e9a75f61f340d0f1ba73b99d304716dfca4b0f0f51baf0f46a740312bb198c52aa625f5b838e6ae10f341a8e1 SHA512 59fd8766c9545193c86374e1dd05d0a08e1f5c548f4297ad4fe22acbd4ba36aa4ae46ccf6f497bfae1a7e015cf95a5f51fb417266c21cf5b5201eac31b543d41
diff --git a/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
new file mode 100644
index 000000000000..4861a565e05c
--- /dev/null
+++ b/www-apps/phpsysinfo/phpsysinfo-3.3.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 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/prewikka/Manifest b/www-apps/prewikka/Manifest
index 5c9474af8293..a5bd31efe5c0 100644
--- a/www-apps/prewikka/Manifest
+++ b/www-apps/prewikka/Manifest
@@ -1,9 +1,3 @@
-AUX prewikka-4.1.5-fix_rule_error.patch 1207 BLAKE2B 0c2b4400c1f463c0acd1ee19ad797abac57e0de5af86e1f7fded068f6aa62f9954fea08849a06d5fc42b41b6406a1b28007178ccb24e81fa73c66b445d8436aa SHA512 97d0c518fb4a941e0611d00d1ed4050c65f878998656731be449339f4796e29530381e55a712838b58e56271ff33cbadfc90b511022a4c10b32e19bc770b6b6e
-AUX prewikka-4.1.5-fix_siteconfig.patch 618 BLAKE2B 44c24ebff3d06d50ef17d9b429918223dcdcf9bb3fed0f0f86d083e3619c3c4922ff322c2024584a0217aaad0214aa0a24f5695b1bfe0173846d27975d0b38ed SHA512 70412631cccd13495fd611f0623ab284e99151cfd8502924cb3c7f556e4216d1b8829bce52a504b08f0a398e59882369caa4628149853cbf1067f57c6752b233
-DIST prewikka-4.0.0.tar.gz 1365985 BLAKE2B 2248c80bebccf4a5f4b99f46d3af6f2aff433c19105e02dfa6c8570a6e41436a9f74971774f3963cbec9abcf70a2bf52b04cd99d930f3e193033aeb1246d1a18 SHA512 01e69b89543cac6b7a694a48cb184759641d37a5987530ce5b738a287a9cd72cc37f6bb85a621d6eb973e957730a6cb438fd302a33f2324359232e4325970bb6
-DIST prewikka-4.1.5.tar.gz 1432885 BLAKE2B aa899eae92b7eee10c4e80544fc02c80fce403dd808464ef3ca21a6d8ddb052730314bd4b83970c684401c53f8398df0f9ca5180c946999e08a2faf9eb7b94f4 SHA512 f68fb6c893727e1bfc2611ef8e3327e6c44d24ea36239fb998675d0e8102dd9849990dbd344c9f584a045f9ed6b4208c3a9928c952ed6248e691687827677dd3
 DIST prewikka-5.1.1.tar.gz 1662093 BLAKE2B a4057ee35bb2dbc55ee86c4f41c32074d20712e79fe62b4a409fb0c842ee6aac06418aeace8d11d3c74c99b6787a2e507d0e424180849b4acb3296ebc6c785f0 SHA512 97ac557964fc7a3a633d879830dbda1a263061acc7d943798638686a67db46f08371af081b07eded60dc9856dd47641fae5df50603e190f36acb71a45ee6089a
-EBUILD prewikka-4.0.0.ebuild 964 BLAKE2B 4c87378418b75c9ccfd46f3a1089442fe427584cf337a3ba41b93f4e7d0c06e9cbfc48e608c0a9bed50a60f9d17c3504ed180156aaef2e75f66e0bccb966b305 SHA512 cad0bac73833ff273de437a0a8443bffd745437c4464381e16e86832de75cff5ece23642875189c0ae0422dba79ee9cf2b1bd6e3d9cfbd1159e27874b54e6a0b
-EBUILD prewikka-4.1.5.ebuild 1112 BLAKE2B e00144a87aa4c9cba29a312ada04a7104f4081b60caad52d466a3a39fcb4291fbd8da75c441fcf5c8b23482d15904c6cf0b76e224b9487a1516d55d128ea1529 SHA512 a7ff9fc01016b30dcffb6b01409a43a23b2b9b626cbffde6e16628b304590eebca1b5d8f329b108658b979edb725cee6f92e0c8313127532e59eb14d8c9f9341
 EBUILD prewikka-5.1.1.ebuild 1232 BLAKE2B 75e65f8ec0b5c3c1f57afd24db9c5ea99db5356d05185d7901dbc39adb3ac50407b32d9a632eccb2df82b8a53ca49ae2b8a017365e586386a4ccc5d0b5a93e18 SHA512 877ad958b4760a2bda4ddb58aaab2e2e346dbc1e40a5b4bb00af3aa919f32bf87cab0603f77d651233318d1a67c42a014c32976657523af8b10bce4fea318181
 MISC metadata.xml 789 BLAKE2B cd4566869293a5c7d48ec9ebe94116da4c1955242e7d09eb2cb9c71a4251d05c44ad1b11a26c70b5e2abadee72fe642dd4aa1a8bd354253126bcd546735aeea8 SHA512 a5c66025685b64102ef46cb970be45a7f06dfc823ce9f5dfce3eb412060ac7fd56c6e3bc81522a51a6a35ae33dd5c07e4a91bb9ca4e86d34d97efdc7a342238e
diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch
deleted file mode 100644
index 64fd92f14ef8..000000000000
--- a/www-apps/prewikka/files/prewikka-4.1.5-fix_rule_error.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-# Based on https://www.prelude-siem.org/projects/prewikka/repository/revisions/9814f708b6e157795b89f9edda32ab38d0a2ced7/diff/prewikka/view.py
-# Already commited
-
---- a/prewikka/view.py
-+++ b/prewikka/view.py
-@@ -523,7 +523,7 @@
- 
-         try:
-             rule, view_kwargs = env.request.url_adapter.match(request.path, method=request.method, return_rule=True)
--            view = self._views_rules[rule]
-+            view = self._views_rules[rule.rule+rule.endpoint]
- 
-         except werkzeug.exceptions.MethodNotAllowed:
-             raise InvalidMethodError(N_("Method '%(method)s' is not allowed for view '%(view)s'",
-@@ -580,7 +580,7 @@
- 
-         rule = Rule(path, endpoint=v.view_endpoint, methods=methods, defaults=defaults)
- 
--        self._views_rules[rule] = v
-+        self._views_rules[rule.rule+rule.endpoint] = v
-         self._rule_map.add(rule)
- 
-     def addView(self, view):
-@@ -601,7 +601,7 @@
- 
-             rule = Rule((view.view_path or "/" + view.view_id), endpoint=view.view_endpoint)
- 
--            self._views_rules[rule] = view
-+            self._views_rules[rule.rule+rule.endpoint] = view
-             self._rule_map.add(rule)
-             self._views[view.view_id] = view
- 
diff --git a/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch b/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch
deleted file mode 100644
index 773b2e984698..000000000000
--- a/www-apps/prewikka/files/prewikka-4.1.5-fix_siteconfig.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -84,7 +84,8 @@
- 
-     def init_siteconfig(self):
-         config = open("prewikka/siteconfig.py", "w")
--        config.write("tmp_dir = '%s'\n" % (os.path.join(tempfile.gettempdir(), "prewikka")))
-+        config.write("import os, tempfile\n")
-+        config.write("tmp_dir = os.path.join(tempfile.gettempdir(), 'prewikka')\n")
-         config.write("conf_dir = '%s'\n" % (os.path.abspath(self.conf_prefix)))
-         config.write("data_dir = '%s'\n" % (os.path.abspath(self.data_prefix)))
-         config.write("libprelude_required_version = '%s'\n" % (LIBPRELUDE_REQUIRED_VERSION))
diff --git a/www-apps/prewikka/prewikka-4.0.0.ebuild b/www-apps/prewikka/prewikka-4.0.0.ebuild
deleted file mode 100644
index 5d997575de18..000000000000
--- a/www-apps/prewikka/prewikka-4.0.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit distutils-r1
-
-DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="adns"
-
-DEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-devel/gettext"
-
-RDEPEND="~dev-libs/libprelude-${PV}[python,${PYTHON_USEDEP}]
-	~dev-libs/libpreludedb-${PV}[python,${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	media-fonts/font-xfree86-type1
-	adns? ( dev-python/twisted[${PYTHON_USEDEP}] )"
diff --git a/www-apps/prewikka/prewikka-4.1.5.ebuild b/www-apps/prewikka/prewikka-4.1.5.ebuild
deleted file mode 100644
index 712e2dcd0579..000000000000
--- a/www-apps/prewikka/prewikka-4.1.5.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="ssl"
-
-inherit distutils-r1
-
-DESCRIPTION="Graphical front-end analysis console for the Prelude Framework"
-HOMEPAGE="https://www.prelude-siem.org"
-SRC_URI="https://www.prelude-siem.org/pkg/src/4.1.0/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="adns"
-
-DEPEND="dev-python/lesscpy[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	sys-devel/gettext"
-
-RDEPEND="~dev-libs/libprelude-4.1.0[python,${PYTHON_USEDEP}]
-	~dev-libs/libpreludedb-4.1.0[python,${PYTHON_USEDEP}]
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/croniter[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-	media-fonts/font-xfree86-type1
-	adns? ( dev-python/twisted[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.1.5-fix_siteconfig.patch"
-	"${FILESDIR}/${PN}-4.1.5-fix_rule_error.patch"
-)