gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /www-apps
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
119 files changed, 1422 insertions, 3423 deletions
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index d4b38c79e922..5a1d177b1d4e 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/airdcpp-webui/Manifest b/www-apps/airdcpp-webui/Manifest
index 9c06724867fe..8ef0a1e511da 100644
--- a/www-apps/airdcpp-webui/Manifest
+++ b/www-apps/airdcpp-webui/Manifest
@@ -1,5 +1,5 @@
-DIST airdcpp-webui-2.6.0.tgz 7829663 BLAKE2B 2c0859598414f456cdca0ef8f0777580d64be6ecc0678e126b61acfe1c2b0cf3361d37b5ff49c89d897953bf998305d2062eb4b55336ddd6d37c52e3c46363c4 SHA512 e4556c0d5697ffcb4d0b4a7f297f9652c339bd1f66242765a74eaffdca077ccbdb323dd70485df34f39e95abfcdc9252280eb28f67cd50a1c28291385dcb2286
 DIST airdcpp-webui-2.6.1.tgz 8418223 BLAKE2B d5f271909d20e8719d707e9eefd464379ec41c8cec378440f7a4483fef1f8c40e119cf827cef88e15c6925d02e71cd4d16dc9471fd5830c9e5bd8ae67a4b02f6 SHA512 be03b595a1f2ffc1bb35835d4bab0eb035dcbee0351aacad529dd4b93fa67af866ab9778a579410ecb8075ede5be8b10eb7cc89eab97f0d2a3f502889cd84fa8
-EBUILD airdcpp-webui-2.6.0.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
+DIST airdcpp-webui-2.8.1.tgz 8640776 BLAKE2B 6016a7cb1e4cf15d4bf331839140cdd4a3a03a9abd75f68e72d4770cd83a5d85daf80f69a8f5b604f4d6f8b0f3c4de1ef27da1804a73edeff58f59ac41d1bc30 SHA512 520d74b85d67a88428bb8eec0cf5c95f774ef04682a36fbd0d10db48c298486ad9c53dfbd4a298c5295e1d1b1c8f186c084f742f522a6187daacb9515f95714c
 EBUILD airdcpp-webui-2.6.1.ebuild 466 BLAKE2B 871c7665811ba71d6cdbe42220bdb9f88174e033c7b0c430788fa08ee24a01290a17612797ba6db9a89dace0c2c4a9a0b95400d8254a7ba06124545d5863dff7 SHA512 ce4e7b13149a79ace635f2f0f1d97fa3cdfb909cfb29323ba48d8d75ae3e3e87848c0f0c397180ea41d3722e471b6401c749557cb9ef2f982d5758886412bc62
+EBUILD airdcpp-webui-2.8.1.ebuild 466 BLAKE2B 653bbb9da8b78f84fbae7427681388e8eed36969eec8af7e8275aadceda156900fffd87dc5a88d7ca47312b1b368a9ecaf8fd8b042b3125259440121cb5ccb67 SHA512 c0303de5e61ac84b3590b58a973cccf1eed9905d3797f2fda2a9725a4c0f041ad1c34be332c06ae4fc7a01c8ee202c9202b1365281169b569fbd509fa241aacd
 MISC metadata.xml 553 BLAKE2B aacc047cadd9f0d8078a997d9ac02aeda726575f1af69cd4e97afe9159987347247aee7ac74b11b8d23b18a669b447451e3e6123f578b501a872f395e418341c SHA512 0d1233d39b432f28fb9977b06a750e990524b250563e8fa5594bdf7dd6cc5b35468b70abe41e0cae87331c2052b592d4d314a897549f0a247c04af1a15782feb
diff --git a/www-apps/airdcpp-webui/airdcpp-webui-2.6.0.ebuild b/www-apps/airdcpp-webui/airdcpp-webui-2.8.1.ebuild
index d656c051b69b..aed6a3249e7e 100644
--- a/www-apps/airdcpp-webui/airdcpp-webui-2.6.0.ebuild
+++ b/www-apps/airdcpp-webui/airdcpp-webui-2.8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/bugzilla/Manifest b/www-apps/bugzilla/Manifest
index 4d49a966deda..206f9ddd1e17 100644
--- a/www-apps/bugzilla/Manifest
+++ b/www-apps/bugzilla/Manifest
@@ -1,12 +1,9 @@
-AUX bugzilla-5.0.3-leftbrace.patch 821 BLAKE2B a63ba2d824a4742bbb3848b74c01bf2a1c1e49c3ff813372da5b77dccda5d45888eff6e0dc9579ab4b2d9002db6fc42fc5f487e2d8ee8765c06433f73be6a30d SHA512 f60c570bdf2b8c7dacc5022ac859b09ef9add572eba31676be497319edf1f8d1789fe6ca6dab53f5d90ca4244f547a9e5b17fbe8bd92182e5db4777049628272
-AUX bugzilla-queue.confd 94 BLAKE2B 5d5a0e6bfada763c19bcdf15e9c556440e6eb1fef45469f0033bdffee338ef602b95989a8fb39572a452549a6c981e59ad7503e4869e1e3936a4c4a5ac35d3a2 SHA512 ea43eb5a3ace6bede21f9fc96c9560fbb6e24180303feeb717202715f23e785c923838e32730988c4a166a78af529c9535ca47356b31da8cd2e434ea4802b42d
+AUX bugzilla-5.0.6-leftbrace.patch 575 BLAKE2B f65d620eced64b48243bad5116ea6addc49b84a70def7bb7e46bd73ee23ff38b00c9d83b6e88871f0f6e549c00156f4f4b38c351a2bb05e16a4a58c466a61f07 SHA512 e4cee7f75fa80401acb3f000eb73aabb81a862a24152568965f8c0216a0298932b943000713adb713818c349934880942c31b6ff641c255753312a4ce4061d55
+AUX bugzilla-5.0.6-perl.patch 557 BLAKE2B 10dd18e87cb0ea7155bd9bd75c41ace70d2c8227c2296e92cebbeee8beec623944a29a3a0821a16caceae466e274bac1a7e61ed71ac7b22c01d65279684ef61d SHA512 73ea0cd2a3339fc3dd9499398c3b93c49cb79d05933b25d07ed5905f4ebea45cc1962c5fb889413522e380e7659140acd0cb487f29404b8404133daf1adae21a
+AUX bugzilla-5.0.6-template.patch 795 BLAKE2B 89a83ad619aab60b1e6ec4199906687f8297c846986e913a92319476d56e08df605c86fdcd2e5af9970471f7c2363ad43acf4c78a77c92515117d063d32617df SHA512 a16d6fd055e551dd7fbd15e8a72472b5d18efc7fa685a60a8ceaae462edcce7a74190f1e824c78fd5aca368c22076eb88e49724cfcb2a208d6553348fdc6066b
 AUX bugzilla-queue.initd 1253 BLAKE2B 68464ac8184bb224ddeca047c1476c887a32d56ad75cf1978f20bb3b7381c510dc63b33efb2788e21e0ca449e76dc2384505e5db7c5a908aca0cadf319bfee97 SHA512 9e7277c06a07a15f2470b7ea42529c309c32783f192b0703d6b7ea6e1078a116cd2b220413a059bad2c7f5d362876a1207a2f9345c5dee9e28c8175055297e64
-AUX bugzilla.cron.daily 115 BLAKE2B abe56dfecb3cd7eac956750aea9bd8284d9e954df99158f74f3bd0443231a57034e6e21bb6bc7dbe1eb69bb297f59c0563ccde678d66ac6f152861b5321cf55d SHA512 12703cd0f18172ebae4ce57b9ad45c70388a2355ab65751aded718535711be3a2ae45099e5c6f8f488397b5a9ba54ae75c680413cd845d64a5747015713cd2c1
-AUX bugzilla.cron.tab 49 BLAKE2B 3d16a0caf647e28f8bfcf90ca01b8889dc5990112aa25f3099afb716c5ab6f631ef3275056cecdd40c7123c681311c5f00e0554a12ce184740f7558c30180b75 SHA512 e864e543ca9c3526fea765aadfba7d2194035f27b0855b584a7253d82d0ec85266320941d3d1ce12d11d16fb0bd258ddf4678ad8e97d86790c6ab31ad367cc67
-AUX postinstall-en.txt 670 BLAKE2B 1b04aee08ce7fa84e75590374397bf96e9cfd12c2f98250f5ec870f6dc01323b3285542bf0e94558a597540841dc35954c81b4dd1244cdba41c1d3687f8343f8 SHA512 2e30fb234d6d86372e7f8b6dd48050a5061fbccfe8420212ae6cd8c4dfc07442de47e2f3e90f8690f4b12ca7702524bd90b4b8fbfe18e8659a04ca11e876a3fc
-AUX reconfig 349 BLAKE2B a733307066d91e2c4df0969a3bee5969df51bf72ef0a7a343cf453a804ac474c7d0dc7d43dd89e54a2ec60579824ce495e3062829c05583363bbbe6c1743569a SHA512 bde5c8b728d9f40a8c7b6ff4df683b415c82729ccb95f3652500f6b0274bf7e2471ced0480813765d9c682f43d7de3baac7ab5b27a9a25525393c5c13270b6b0
-DIST bugzilla-4.4.12.tar.gz 4931062 BLAKE2B 21d060d3a6bc8fd16d5a0283bb5c3735a473283d829be711e22b9d21fc203c8bd33cc9b940417480fa4b16dc478dcb3b526f305c324c97ccac7965b2820bea01 SHA512 51520cc55ae0fb30f8a8efb98e9b5a5a35ca74e9ec3667528fae6520fa7f12137e01948009b152481d0b8e02d435b42c3cacb5449fb42fe709964db68a386548
-DIST bugzilla-5.0.3.tar.gz 4069689 BLAKE2B 1be1d911b59a06f9073a2e610b88af2b1b62bda1e2ef812f65faf2fc35499cff20b96f29a522cf8478ed65c4de9008a349162159f180f59f79a380d777340548 SHA512 82334533bd75a4a5eee5213826da916175ecf39cbfd1c4d820519f015257b02998a3acd881f8f52c1650d1140158c8aa839e374574a1fa862a6a4a1351748c46
-EBUILD bugzilla-4.4.12-r2.ebuild 2916 BLAKE2B 0c53ce6a900b767b022da559440deffa39c3fbd06bf24d033926ba0ca68306fa7eee905c64ebe8e5b8d6566a8a94a13f809444cbb96fc83b2446ddae5c2e0ad2 SHA512 f82af8cda95d78f7cd49fb6069cf16edda5c2edc5276e00efaa10b50395c29a0da2de94b5f156f722a72cee59292864426e02cd05e89ea57a0a9ca1288cbed0f
-EBUILD bugzilla-5.0.3-r2.ebuild 3094 BLAKE2B 148d88c1a0030194f1900aff351d69f8a9de97c9d6f6076f6a51c6932069d2c83271264c9dd0001f51571b29326cf330d624a89bf3e442f18d05fbc7fe6a71f4 SHA512 aedceffbb1435f28cfe7a67da7430e6349e8d05fb064bf1d6040e3cb373fa9953f5f3447a5785232a83b1c6c087d0f5d94c5031a682510a5161972f96f8e8c7f
-MISC metadata.xml 392 BLAKE2B 7988b93af36ffeb2841c4a7b3d4dbe41533347c3847d41a999e7b00ddb4e11cd738defe96a95a51c5b6f7416f2fbeaf78ea47f3eb3502c5d02f964d1e3cd8c3a SHA512 e0893f3ce807576e90bdddfbf8b19bd32665fa40b288d01126ecbc402d2867b512f26afb5a62e8ed3bd0fa9c749a7f0e2e90547db5f1078274b4e0653f1d0fc1
+AUX postinstall-5.0.6-en.txt 1292 BLAKE2B deaa9f4c11ffff9f34e0beedbf83b47a568aca86892c63c7a2127fce891168b1cbe8d1ac7aacddbd7fdce48cc8fb6f9530a230a93fde9c726143be3548aa4cbb SHA512 7b7928f6f4b9ec1bf4c565311bebdeb8ec9190d7a3c94a7cb243ca1c0a80c43e6ec1307f7f97d46f480a4aa4f82dded9df4f9894be3f54c1753e937746c1b448
+AUX postupgrade-5.0.6-en.txt 544 BLAKE2B 43b2aa5673de0994ebf33b7e2167e7e91a77cfb7f5b0dea5c04590bd5f97027cb733eaf1ec8b1f209fd2aec690719e383de460b4dbf42f5e18fa5f880010cfd4 SHA512 7f9a0aeda0c665c8027fd71b0a317863dfd1c0a705371de34bf77c31ae0da562a39b101379313a227d1883e5df74c99f16f8b91b69e050c749fc30c9499a0a33
+DIST bugzilla-5.0.6.tar.gz 3970724 BLAKE2B 9fab818a4d93bcd8092ddd2707f5a479b5535ba7621cccb84ce6b8785812e0e46f6d8883b76d3358a60ea5f0b6068008b9b2bfcc745b760f6fec5372216cc1af SHA512 8ca47ea1be2b433a6ce68e1a595d72f3d0f0fede44d1194dc6bc9a116dbde3ab7285212c71995e200d31544876e4c3c57b63da1f877a0cb22747ab87a5d598de
+EBUILD bugzilla-5.0.6.ebuild 3578 BLAKE2B 557811417a48366e7cbb01dc594e4b659012dd1e36c5b5be119908fb45f9f357d526a2da577d33cac5f9fafb07a5c065d8e328cf1d89b87a016890f6945cf524 SHA512 d6fd65d9dad1326620629f9c031355dc0fb88bf6863eceb2a063ecac49e915b1ee1c7d790f4017c6e6fedf4b6a41c082454ab35506f5a5daae4c5c707a75c9ab
+MISC metadata.xml 477 BLAKE2B 5b332f06a8d6164869f2f699a0550e5039ca099459d24c6fd56939c7d103d43ebbb39eba91caf8ee4f20bba7ac655a77a56dcd7db271cf107bc955daa66213ed SHA512 50a29d5231624acf829e0c6a9aa1cbe269c5d7d1318e0bff28ca73f8fc6a734fc00d0c0a7316bc292ae97b045075f683411c39018f9343536da0f42480602dd3
diff --git a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild b/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
deleted file mode 100644
index c12d12dd9aa9..000000000000
--- a/www-apps/bugzilla/bugzilla-4.4.12-r2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp depend.apache eutils
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="https://www.bugzilla.org"
-
-LICENSE="MPL-2.0"
-KEYWORDS="amd64 x86"
-
-IUSE="modperl extras graphviz mysql postgres sqlite test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=" || ( mysql postgres sqlite )"
-
-COMMON_DEPS="
-	>=dev-lang/perl-5.10.1
-	>=dev-perl/CGI-3.510.0
-	virtual/perl-Digest-SHA
-	>=dev-perl/DateTime-0.500.0
-	>=dev-perl/DateTime-TimeZone-0.710.0
-	>=dev-perl/DBI-1.601.0
-	>=dev-perl/Template-Toolkit-2.22
-	>=dev-perl/Email-Send-2.40.0
-	>=dev-perl/Email-MIME-1.904.0
-	dev-perl/URI
-	>=dev-perl/List-MoreUtils-0.329.0
-	dev-perl/Math-Random-ISAAC
-"
-
-DEPEND="test? ( dev-perl/Pod-Coverage${COMMON_DEPS} )"
-RDEPEND="
-	virtual/httpd-cgi
-	${COMMON_DEPS}
-	postgres? ( >=dev-perl/DBD-Pg-1.49.0 )
-	mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
-	sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
-	extras? (
-		>=dev-perl/GD-2.35[png,truetype]
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Template-GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph
-		dev-perl/XML-Twig
-		>=dev-perl/MIME-tools-5.427.0
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.6
-		dev-perl/perl-ldap
-		dev-perl/Authen-Radius
-		dev-perl/Authen-SASL
-		>=dev-perl/SOAP-Lite-0.712.0
-		dev-perl/JSON-RPC
-		>=dev-perl/JSON-XS-2.0.0
-		dev-perl/Test-Taint
-		>=dev-perl/HTML-Parser-3.67.0
-		dev-perl/HTML-Scrubber
-		>=virtual/perl-Encode-2.21.0
-		dev-perl/Encode-Detect
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		dev-perl/TheSchwartz
-		dev-perl/Daemon-Generic
-		dev-perl/File-MimeInfo
-		virtual/imagemagick-tools[perl]
-		dev-perl/MIME-tools
-	)
-	modperl? (
-		www-apache/mod_perl:1
-		>=dev-perl/Apache-SizeLimit-0.96.0
-	)
-	graphviz? ( media-gfx/graphviz )
-"
-want_apache modperl
-need_httpd_cgi
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.0.3-leftbrace.patch
-)
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	# Get a rid of the bzr files
-	rm -r .bzr* || die
-
-	# Remove bundled perl modules
-	rm -r lib/ || die
-
-	default
-}
-
-src_test() {
-	perl -I. runtests.pl || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	doins "${FILESDIR}"/bugzilla.cron.{daily,tab}
-
-	webapp_hook_script "${FILESDIR}"/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	if use extras; then
-		newconfd "${FILESDIR}"/bugzilla-queue.confd bugzilla-queue
-		newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue
-	fi
-
-	# bug #124282
-	for f in "${D}${MY_HTDOCSDIR}"/*.cgi ; do
-	        fperms +x "${f#${D}}"
-	done
-
-	fperms u+x "${MY_HTDOCSDIR}"/jobqueue.pl
-
-	# configuration must be executable
-	fperms u+x "${MY_HTDOCSDIR}"/checksetup.pl
-
-	# bug 487476
-	mkdir "${D}${MY_HTDOCSDIR}"/lib || die
-}
diff --git a/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild b/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
deleted file mode 100644
index 937a2262fe6a..000000000000
--- a/www-apps/bugzilla/bugzilla-5.0.3-r2.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp depend.apache eutils
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="https://www.bugzilla.org"
-
-LICENSE="MPL-2.0"
-KEYWORDS="amd64 x86"
-
-IUSE="modperl extras graphviz mysql postgres sqlite test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=" || ( mysql postgres sqlite )"
-
-# sorting is identical to upstream MYMETA.json, please dont change
-COMMON_DEPS="
-	dev-lang/perl
-	>=dev-perl/CGI-3.510.0
-	>=dev-perl/DBI-1.614.0
-	>=dev-perl/TimeDate-2.230.0
-	>=dev-perl/DateTime-0.750.0
-	>=dev-perl/DateTime-TimeZone-1.640.0
-	virtual/perl-Digest-SHA
-	>=dev-perl/Email-MIME-1.904.0
-	>=dev-perl/Email-Sender-1.300.11
-	>=dev-perl/File-Slurp-9999.130.0
-	>=dev-perl/JSON-XS-2.10.0
-	>=dev-perl/List-MoreUtils-0.320.0
-	>=dev-perl/Math-Random-ISAAC-1.0.1
-	>=dev-perl/Template-Toolkit-2.240.0
-	>=dev-perl/URI-1.550.0
-"
-
-DEPEND="test? ( dev-perl/Pod-Coverage ${COMMON_DEPS} )"
-RDEPEND="
-	virtual/httpd-cgi
-	${COMMON_DEPS}
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
-	sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
-	extras? (
-		>=dev-perl/GD-2.350.0[png,truetype]
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Template-GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph
-		dev-perl/XML-Twig
-		>=dev-perl/MIME-tools-5.427.0
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.6
-		dev-perl/perl-ldap
-		dev-perl/Authen-Radius
-		dev-perl/Authen-SASL
-		>=dev-perl/SOAP-Lite-0.712.0
-		dev-perl/JSON-RPC
-		>=dev-perl/JSON-XS-2.0.0
-		dev-perl/Test-Taint
-		>=dev-perl/HTML-Parser-3.670.0
-		dev-perl/HTML-Scrubber
-		>=virtual/perl-Encode-2.210.0
-		dev-perl/Encode-Detect
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		dev-perl/TheSchwartz
-		dev-perl/Daemon-Generic
-		dev-perl/File-MimeInfo
-		virtual/imagemagick-tools[perl]
-		dev-perl/MIME-tools
-	)
-	modperl? (
-		www-apache/mod_perl:1
-		>=dev-perl/Apache-SizeLimit-0.960.0
-	)
-	graphviz? ( media-gfx/graphviz )
-"
-want_apache modperl
-need_httpd_cgi
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-5.0.3-leftbrace.patch
-)
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	# Get a rid of the bzr files
-	rm -r .bzr* || die
-
-	# Remove bundled perl modules
-	rm -r lib/ || die
-
-	default
-}
-
-src_test() {
-	perl -I. runtests.pl || die
-}
-
-src_install() {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	doins "${FILESDIR}"/bugzilla.cron.{daily,tab}
-
-	webapp_hook_script "${FILESDIR}"/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-
-	if use extras; then
-		newconfd "${FILESDIR}"/bugzilla-queue.confd bugzilla-queue
-		newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue
-	fi
-
-	# bug #124282
-	for f in "${D}${MY_HTDOCSDIR}"/*.cgi ; do
-	        fperms +x "${f#${D}}"
-	done
-
-	fperms u+x "${MY_HTDOCSDIR}"/jobqueue.pl
-
-	# configuration must be executable
-	fperms u+x "${MY_HTDOCSDIR}"/checksetup.pl
-
-	# bug 487476
-	mkdir "${D}${MY_HTDOCSDIR}"/lib || die
-}
diff --git a/www-apps/bugzilla/bugzilla-5.0.6.ebuild b/www-apps/bugzilla/bugzilla-5.0.6.ebuild
new file mode 100644
index 000000000000..db9d8def08d9
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-5.0.6.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils webapp
+
+DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
+SRC_URI="https://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
+HOMEPAGE="https://www.bugzilla.org"
+
+LICENSE="MPL-2.0"
+KEYWORDS="amd64 x86"
+
+IUSE="apache2 doc mysql postgres +sqlite test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+# sorting is identical to upstream MYMETA.json, please don't change
+# These are mandatory for checksetup.pl to configure bugzilla
+BASIC_DEPS="
+	dev-lang/perl
+	>=dev-perl/CGI-3.510.0
+	>=dev-perl/DBI-1.614.0
+	>=dev-perl/TimeDate-2.230.0
+	>=dev-perl/DateTime-0.750.0
+	>=dev-perl/DateTime-TimeZone-1.640.0
+	virtual/perl-Digest-SHA
+	>=dev-perl/Email-MIME-1.904.0
+	>=dev-perl/Email-Sender-1.300.11
+	>=dev-perl/JSON-XS-2.10.0
+	>=dev-perl/List-MoreUtils-0.320.0
+	>=dev-perl/Math-Random-ISAAC-1.0.1
+	>=dev-perl/Template-Toolkit-2.240.0
+	>=dev-perl/URI-1.550.0
+"
+
+RDEPEND="
+	${BASIC_DEPS}
+	apache2? ( www-servers/apache[apache2_modules_access_compat] )
+	!apache2? ( virtual/httpd-cgi )
+	postgres? ( >=dev-perl/DBD-Pg-1.49 )
+	mysql? ( >=dev-perl/DBD-mysql-4.0.5 )
+	sqlite? ( >=dev-perl/DBD-SQLite-1.290.0 )
+"
+
+BDEPEND="
+	test? ( ${BASIC_DEPS} )
+	doc? (
+		dev-python/sphinx
+		dev-perl/File-Copy-Recursive
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.6-leftbrace.patch"
+	"${FILESDIR}/${PN}-5.0.6-perl.patch"
+	"${FILESDIR}/${PN}-5.0.6-template.patch"
+)
+
+src_prepare() {
+	default
+
+	# Get rid of the bzr files
+	rm -r .bzr* || die
+
+	# unconditionnally remove pod-coverage tests
+	rm t/011pod.t || die
+}
+
+src_test() {
+	TZ=UTC perl -I. runtests.pl || die
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_postinst_txt en "${FILESDIR}/postinstall-${PV}-en.txt"
+	webapp_postupgrade_txt en "${FILESDIR}/postupgrade-${PV}-en.txt"
+	webapp_src_install
+
+	if use doc; then
+		docs/makedocs.pl
+		dodoc -r docs/en/html
+		dodoc -r docs/en/txt
+	fi
+
+	# openrc service file to enable mail queuing as a service
+	newinitd "${FILESDIR}"/bugzilla-queue.initd bugzilla-queue
+
+	# must be executable and stay that way upon upgrading
+	fperms u+x "${MY_HTDOCSDIR}"/checksetup.pl
+}
+
+pkg_postinst() {
+	elog "Optional dependencies:"
+	optfeature "Graphical reports, new charts, old charts" "dev-perl/GD dev-perl/Chart dev-perl/Template-GD dev-perl/GDTextUtil dev-perl/GDGraph"
+	optfeature "Move bugs between installations, automatic update notifications" "dev-perl/MIME-tools dev-perl/libwww-perl dev-perl/XML-Twig"
+	optfeature "Patch Viewer" "dev-perl/PatchReader"
+	optfeature "LDAP authentication" "dev-perl/perl-ldap"
+	optfeature "SMTP authentication" "dev-perl/Authen-SASL"
+	optfeature "XML-RPC Interface" "dev-perl/SOAP-Lite dev-perl/XMLRPC-Lite dev-perl/Test-Taint"
+	optfeature "JSON-RPC Interface, REST Interface" "dev-perl/JSON-RPC dev-perl/Test-Taint"
+	optfeature "More HTML in Product/Group description" "dev-perl/HTML-Scrubber"
+	optfeature "Automatic charset detection for text attachments" "dev-perl/Encode-Detect"
+	optfeature "Inbound Email" "dev-perl/Email-Reply dev-perl/HTML-FormatText-WithLinks"
+	optfeature "Mail Queueing" "dev-perl/TheSchwarz dev-perl/Daemon-Generic"
+	optfeature "Sniff MIME type of attachments" "dev-perl/File-MimeInfo dev-perl/IO-stringy"
+	optfeature "Memcached support" "dev-perl/Cache-Memcached"
+
+	ewarn "If Apache is the chosen webserver, please consider turning the apache2 use flag on"
+	ewarn "Not doing so may result in unexpected runtime errors"
+
+	webapp_pkg_postinst
+}
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch b/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch
deleted file mode 100644
index f5704406d875..000000000000
--- a/www-apps/bugzilla/files/bugzilla-5.0.3-leftbrace.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3c60fba26b1fa51ec302d05dc6e76236d2f54ba4 Mon Sep 17 00:00:00 2001
-From: Simon Green <mail@simon.green>
-Date: Sun, 30 Oct 2016 14:55:23 +1000
-Subject: [PATCH] Bug 228444 - Checking for unquoted non regex variable
- interpolated into regex
-
----
- t/010dependencies.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/010dependencies.t b/t/010dependencies.t
-index 4b7ca223d..1b6c270a8 100644
---- a/t/010dependencies.t
-+++ b/t/010dependencies.t
-@@ -69,7 +69,7 @@ foreach my $module (keys %mods) {
-             $used =~ s#/#::#g;
-             $used =~ s#\.pm$##;
-             $used =~ s#\$module#[^:]+#;
--            $used =~ s#\${[^}]+}#[^:]+#;
-+            $used =~ s#\$\{[^}]+}#[^:]+#;
-             $used =~ s#[" ]##g;
-             push(@use, grep(/^\Q$used\E$/, keys %mods));
-         }
--- 
-2.20.1
-
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch
new file mode 100644
index 000000000000..efecc0a07d0f
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-5.0.6-leftbrace.patch
@@ -0,0 +1,17 @@
+Fixes unescaped left brace in regex to pass test 010dependencies.t
+
+Fix by David Denoncin, based on the 5.0.3 patch
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=228444
+
+--- a/t/010dependencies.t	2020-06-09 21:21:28.049161109 -0000
++++ b/t/010dependencies.t	2020-06-09 21:21:07.059161235 -0000
+@@ -71,7 +71,7 @@
+         $used =~ s#/#::#g;
+         $used =~ s#\.pm$##;
+         $used =~ s#\$module#[^:]+#;
+-        $used =~ s#\${[^}]+}#[^:]+#;
++        $used =~ s#\$\{[^}]+}#[^:]+#;
+         $used =~ s#[" ]##g;
+         push(@use, grep(/^\Q$used\E$/, keys %mods));
+       }
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch
new file mode 100644
index 000000000000..540e70bd880b
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-5.0.6-perl.patch
@@ -0,0 +1,17 @@
+Fixes a Perl bug making checksetup.pl fail 
+
+Fix by David Denoncin
+
+https://github.com/Perl/perl5/issues/17271
+https://bugzilla.mozilla.org/show_bug.cgi?id=1588175
+
+--- a/Bugzilla/Util.pm	2020-07-10 07:18:37.329165376 -0000
++++ b/Bugzilla/Util.pm	2020-07-10 07:18:55.869165262 -0000
+@@ -106,7 +106,6 @@
+     # |U+200e|Left-To-Right Mark        |0xe2 0x80 0x8e      |
+     # |U+200f|Right-To-Left Mark        |0xe2 0x80 0x8f      |
+     # --------------------------------------------------------
+-    $var =~ tr/\x{202a}-\x{202e}//d;
+   }
+   return $var;
+ }
diff --git a/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch b/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch
new file mode 100644
index 000000000000..040eaf734a8a
--- /dev/null
+++ b/www-apps/bugzilla/files/bugzilla-5.0.6-template.patch
@@ -0,0 +1,17 @@
+Fixes a simple typo in a template allowing tests to pass
+
+Fix by David Denoncin
+
+https://bugzilla.mozilla.org/show_bug.cgi?id=1644655
+
+--- a/template/en/default/pages/release-notes.html.tmpl 2020-06-09 21:34:41.845822737 -0000
++++ b/template/en/default/pages/release-notes.html.tmpl	2020-06-09 21:05:23.515833860 -0000
+@@ -45,7 +45,7 @@
+ 
+ <h3>5.0.6</h3>
+ <p>This release contains a schema change to the flagtypes table, allowing for many more flagtypes.</p>.
+-<p>The flagtypes table should have been using a mediumint for several releases, but due to a bug in the schema migration code this never happened.</p>
++<p>The flagtypes table should have been using a mediumint for several releases, but due to [% terms.abug %] in the schema migration code this never happened.</p>
+ 
+ <h3>5.0.5</h3>
+ 
diff --git a/www-apps/bugzilla/files/bugzilla-queue.confd b/www-apps/bugzilla/files/bugzilla-queue.confd
deleted file mode 100644
index 2eec355a0986..000000000000
--- a/www-apps/bugzilla/files/bugzilla-queue.confd
+++ /dev/null
@@ -1,4 +0,0 @@
-#JOBQUEUE_USER=bugzilla
-#JOBQUEUE_GROUP=bugzilla
-
-JOBQUEUE_PATH=/var/www/bugzilla/jobqueue.pl
diff --git a/www-apps/bugzilla/files/bugzilla.cron.daily b/www-apps/bugzilla/files/bugzilla.cron.daily
deleted file mode 100644
index e3e86589891d..000000000000
--- a/www-apps/bugzilla/files/bugzilla.cron.daily
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-cd /var/www/bugzilla/
-./collectstats.pl
-./whineatnews.pl
-echo "*** Bugzilla nighlty flush has done! ***"
diff --git a/www-apps/bugzilla/files/bugzilla.cron.tab b/www-apps/bugzilla/files/bugzilla.cron.tab
deleted file mode 100644
index 3cf2d4a66240..000000000000
--- a/www-apps/bugzilla/files/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * * /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/postinstall-5.0.6-en.txt b/www-apps/bugzilla/files/postinstall-5.0.6-en.txt
new file mode 100644
index 000000000000..5c60465deb8f
--- /dev/null
+++ b/www-apps/bugzilla/files/postinstall-5.0.6-en.txt
@@ -0,0 +1,30 @@
+0. Bugzilla has been installed into ${MY_INSTALLDIR}
+
+1. To finish the installation, please read
+   https://bugzilla.readthedocs.io/en/5.0/installing/index.html
+   https://wiki.gentoo.org/wiki/Bugzilla
+   You will need to run ${MY_INSTALLDIR}/checksetup.pl
+
+2. Please read the Release Notes, especially if you are upgrading:
+   https://www.bugzilla.org/releases/${PV}/release-notes.html
+
+3. Please note that Apache2 sets AllowOverride None by default. You may have
+   to edit it to process the .htaccess file provided by Bugzilla. Please see
+   https://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and
+   https://bugzilla.readthedocs.io/en/5.0/installing/apache.html for more info.
+
+4. If this is a large project and you wish to enable mail queuing, you need to
+   emerge dev-perl/TheSchwarz and dev-perl/Daemon-Generic. To enable mail 
+   queuing as an openrc-service, create a file named bugzilla-queue in 
+   /etc/conf.d/ with this one line 
+
+   JOBQUEUE_PATH=${MY_INSTALLDIR}
+
+   Which defines the variable used by the openrc service file 
+   /etc/init.d/bugzilla-queue
+   Then run:
+
+   rc-update add bugzilla-queue default
+
+5. For other optional post installation configuration, please read
+   https://bugzilla.readthedocs.io/en/5.0/installing/optional-post-install-config.html
diff --git a/www-apps/bugzilla/files/postinstall-en.txt b/www-apps/bugzilla/files/postinstall-en.txt
deleted file mode 100644
index 9b6a8798a640..000000000000
--- a/www-apps/bugzilla/files/postinstall-en.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-0. Bugzilla has been installed into ${MY_INSTALLDIR}
-
-1. To finish the installation, please read
-   http://www.bugzilla.org/docs/${MY_PB}/en/html/installing-bugzilla.html
-   You will need to run ${MY_INSTALLDIR}/checksetup.pl
-
-2. Please read the Release Notes, especially if you are upgrading:
-   http://www.bugzilla.org/releases/${MY_PB}/release-notes.html
-
-3. Please note that Apache2 sets AllowOverride None by default. You may have
-   to edit it to process the .htaccess file provided by Bugzilla. Please see
-   https://httpd.apache.org/docs/2.2/mod/core.html#allowoverride and
-   http://www.bugzilla.org/docs/${MY_PB}/en/html/configuration.html#http for more info.
diff --git a/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt b/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt
new file mode 100644
index 000000000000..9b1fab718b61
--- /dev/null
+++ b/www-apps/bugzilla/files/postupgrade-5.0.6-en.txt
@@ -0,0 +1,10 @@
+0. Please NOTE: It is impossible to downgrade bugzilla. Prior to upgrading 
+   you should always make a backup of your database, data files and lib files and 
+   read https://www.bugzilla.org/releases/${PV}/release-notes.html
+
+1. If you have bugzilla emerged with the vhosts flag on, please refer to 
+   https://wiki.gentoo.org/wiki/Webapp-config#Upgrading_an_installed_webapp
+   or https://wiki.gentoo.org/wiki/Bugzilla#Upgrading to upgrade your bugzilla
+   instance.
+
+2. After upgrading you have to run checksetup.pl to complete the upgrade.
diff --git a/www-apps/bugzilla/files/reconfig b/www-apps/bugzilla/files/reconfig
deleted file mode 100644
index 71b0acea2585..000000000000
--- a/www-apps/bugzilla/files/reconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-FILE="bugzilla.cron.daily bugzilla.cron.tab"
-
-function die ()
-{
-	echo
-	echo "***"
-	echo "*** Fatal error: $*"
-	echo "***"
-	exit 1
-}
-
-if [ $1 = "install" ]; then
-	cd "${MY_INSTALLDIR}" || die "Cannot find install dir ${MY_INSTALLDIR}"
-	sed -e "s|/var/www/bugzilla|${MY_INSTALLDIR}|g" -i ${FILE} || die "sed failed"
-else
-	echo "done."
-fi
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index 2901e955608a..0ca8941051bb 100644
--- a/www-apps/bugzilla/metadata.xml
+++ b/www-apps/bugzilla/metadata.xml
@@ -1,12 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="person">
+		<email>ddenoncin@gmail.com</email>
+		<name>David Denoncin</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>web-apps@gentoo.org</email>
 		<name>Gentoo Webapps</name>
 	</maintainer>
-	<use>
-		<flag name="extras">Optional Perl modules</flag>
-		<flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg> support</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index bb9bdd01fb64..55ccf8375536 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,3 +1,6 @@
+AUX cgp-1_p20190510-double-quote.patch 866 BLAKE2B b222ceb7b7198aa7b73aae6793b49ff84f66c83f014ed05bccb697bdd915e0a70cc059ccf0c45a038e9a7a8a4833079708558d2a91da521250be589aac3414d3 SHA512 ca9a12c2b52554ceb85038a2b7fe67b1ce6a7a84ce702c3b100659fea143903fd3b29aab877240e3e00dc8b3f3d8b34dad835665aa4d4719054fca0f1ff1f0b2
 DIST cgp-1_p20181209.tar.gz 139556 BLAKE2B 0a79ff1974b0ae50db5582121c4fdcc2db0b89ef11ecb001dfa525dd753481f0a454e424d17f24b142fd116a9ea2eeb4ba1dade6f2ffadd63943e5c065323224 SHA512 fcbf81fca2bb14ed143ea414c2f11fe09f4594891507a1ad08482720b104ec62c9986ce25b127d45a7962a8b3db54293a6775dc2359bde41f19b5419606b51eb
+DIST cgp-1_p20190510.tar.gz 139241 BLAKE2B 663d8b8f6e144b4b28ca36674f4f0b68537dba36aa481faa5d0b5ff1ea11933018b91e94750c15833e3bc9b4ce6604898276e84ff3d3d649ebff11089f6328e0 SHA512 3a6d6af25db00f8d80b0e0aa6e19763da8492d0e1cb421474bf31c325ff37357b9bf88af70459e669c4e9f740dd1a547421fcb3184526d9f3ba4333eb57fec8f
 EBUILD cgp-1_p20181209.ebuild 1274 BLAKE2B 4e4f86373415213c1b88cac4828de7144732481d48d72c81d7b4156e59847af341bebd94f3f9f8e26177c324756fd99edc6973921f78e6567fbfdf01280cc69f SHA512 76a6f6b6a889d53f84b783cd67f7b60f11e472e8564c4b5caa39e14506a922a72fcce400cafd4b81b35c5508808faff5acda55041c763b2c5d0dc02a34856451
+EBUILD cgp-1_p20190510.ebuild 1323 BLAKE2B 03e60db4dcb33230e93fb1b29faf0878f97632fb1edb61da6f1d78e341bc1196ae2ab28478f154402c0f76e27aaa9147487df6f48578e1f6d154d1bb744d1046 SHA512 df6590b0a287fcd07a7e0840af1b7d1c6697b5a5f8213f99665c6df6e434bea6f836c86585e3cb1f26097252ea6dc3c9be9f757e49b84296cb80e59db308375f
 MISC metadata.xml 558 BLAKE2B a2ef24fdd53e577774517c18e6030b08a375cf342aa003fc2f82fa7c73065cd9703f67ba6a2113a6e605280a6239fc7eaeca8f5d0827d587bbfcc9e49b4dc351 SHA512 87e53979d5f382d585ba2c8dbe30ed21402abc270ecad1a6bcc1147aaf7ccf9aba8090c3acfde20fd23b4cf57b4c3621f8e863d9ce175564949619a3c7853576
diff --git a/www-apps/cgp/cgp-1_p20190510.ebuild b/www-apps/cgp/cgp-1_p20190510.ebuild
new file mode 100644
index 000000000000..4821fa570298
--- /dev/null
+++ b/www-apps/cgp/cgp-1_p20190510.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+MY_PN="${PN^^}"
+MY_PV="fd8fa70739d18d786e88f7ffa57e250e0e41af8f"
+
+DESCRIPTION="A graphical web-based front-end for visualizing RRD collected by collectd"
+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]
+	net-analyzer/rrdtool[graph]
+	virtual/httpd-php
+"
+
+need_httpd_cgi
+
+S="${WORKDIR}/${MY_PN}-${MY_PV}"
+
+DOCS=( "README.md" "doc/CHANGELOG" "doc/nginx.conf" )
+
+PATCHES=( "${FILESDIR}/${P}-double-quote.patch" )
+
+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 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/files/cgp-1_p20190510-double-quote.patch b/www-apps/cgp/files/cgp-1_p20190510-double-quote.patch
new file mode 100644
index 000000000000..1cfa7f9898d3
--- /dev/null
+++ b/www-apps/cgp/files/cgp-1_p20190510-double-quote.patch
@@ -0,0 +1,23 @@
+From aec5ed41122b1a900c6fe0a3ddc11656c150b6d5 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Tue, 24 Sep 2019 00:01:59 +0200
+Subject: [PATCH] inc/functions.inc.php: add double quote for whitelist
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ inc/functions.inc.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/inc/functions.inc.php b/inc/functions.inc.php
+index 376b6e1..48336fb 100644
+--- a/inc/functions.inc.php
++++ b/inc/functions.inc.php
+@@ -34,7 +34,7 @@ function GET($index = NULL, $value = NULL) {
+ 		case 'h': # host
+ 		case 'pi': # plugin instance
+ 		case 'ti': # type instance
+-			if (!preg_match('/^[\w\-.: ]+$/u', $value)) {
++			if (!preg_match('/^[\w\-.:" ]+$/u', $value)) {
+ 				error_log(sprintf('Invalid %s in $_GET["%s"]: "%s"', $desc[$index], $index, $value));
+ 				return NULL;
+ 			}
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index b3273262d79f..852c1ac6405a 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,5 @@
 DIST chromedriver-bin-83.0.4103.39.linux64.zip 5222065 BLAKE2B 7d801205bcd0174d1d622b8e3c6c755f1dfae1fd4bf1bc225dbd05bd0d868c300d7bf442a39f29525d4af1f54c0f2e46b233d433d70523d48df15a30aa1a89f0 SHA512 9cb02938cef436dcf0b3f54e5ce668de86e9afc702a1903e2f35ecabcbd4c468f525ff3c6b079eb88b14c1a956bc070fa281fdf64d9d54027254f769c00d24f9
-EBUILD chromedriver-bin-83.0.4103.39-r1.ebuild 610 BLAKE2B 3c886ead5a8351ed0de86598339c851db690291703f385a5cb3612c426fcfdb1da8336cc94d34d9107a0e643a3b51bd7fc2eba998492c320a08fc2ae327bc9b4 SHA512 99b76b3627fecb3ea206f5246979ac5a068b195eff25fa9e43b1e7bad4e259aabb8fd67204f84a655d24ea07deb57590ba119f8420dce68e6fe248e7ed805aee
+DIST chromedriver-bin-84.0.4147.30.linux64.zip 5306126 BLAKE2B 2ee0a05eaa42e4724634251fd44d81a2d96f7486db40dc570c01f96cf16124fe2d666e110a4b9c6cd06adf38181c0b2aa3a38beb4ec59fbd65a98cba466fca71 SHA512 ec010c80958439427567c12c714afd5e15f80a9ccb7120e9539986d1af931eb063ad50b709cfa6495bb5a214027ed8531007d4497a01b26a94259aa4a2525f2d
+EBUILD chromedriver-bin-83.0.4103.39-r1.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
+EBUILD chromedriver-bin-84.0.4147.30.ebuild 595 BLAKE2B 630d77aec56a4bc0d3bdf7a602f7568b205b4511fef2ffd28d0b811c86e6c31b436ed172198901e143eff56c0633d1b463c338907c79798e10e5468b7a0b5bc8 SHA512 33779f842a2e2e5aedf085c50f91c856438396705dd1191beceb85ae3cd6cfec23fe707de697f2de533289562676e9779bb8195bb63911eb245884bafc7a56fa
 MISC metadata.xml 460 BLAKE2B 6da42de60f119a13f70f0a64f61f4fde912d15a7582b240631761e852b0db50bdb2f95102be05b09b1d653907b4c0a8a9641a9952cb6a7c1bd84d8f51ae1d83b SHA512 a8dfdafe46c651f3b06e0c004750747cfbe21e0ee704e5afd6f302c2ea61e288fad3987732b0e4b6ecec4805822c347f1d43a5e09e911e7d950196207eb81f43
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
index 75e2c16479fe..c96967a171b8 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-83.0.4103.39-r1.ebuild
@@ -17,7 +17,7 @@ RESTRICT="bindist mirror strip"
 BDEPEND="app-arch/unzip"
 
 RDEPEND="!www-client/chromium
-	=www-client/google-chrome-$(ver_cut 1)*"
+	www-client/google-chrome"
 
 S="${WORKDIR}"
 QA_PREBUILT="usr/bin/chromedriver"
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-84.0.4147.30.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-84.0.4147.30.ebuild
new file mode 100644
index 000000000000..c96967a171b8
--- /dev/null
+++ b/www-apps/chromedriver-bin/chromedriver-bin-84.0.4147.30.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="WebDriver for Chrome"
+HOMEPAGE="https://sites.google.com/a/chromium.org/chromedriver"
+SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver_linux64.zip -> ${P}.linux64.zip )"
+
+LICENSE="google-chrome"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RESTRICT="bindist mirror strip"
+
+BDEPEND="app-arch/unzip"
+
+RDEPEND="!www-client/chromium
+	www-client/google-chrome"
+
+S="${WORKDIR}"
+QA_PREBUILT="usr/bin/chromedriver"
+
+src_install()
+{
+	dobin chromedriver
+}
diff --git a/www-apps/dokuwiki/Manifest b/www-apps/dokuwiki/Manifest
index bf7c02176a71..6e06a012b0eb 100644
--- a/www-apps/dokuwiki/Manifest
+++ b/www-apps/dokuwiki/Manifest
@@ -1,12 +1,10 @@
 AUX htaccess 170 BLAKE2B bcdf354e630f2e2995a56b7f435da2cff2c39f85ee70f745d43ec3cb575816da7b6c9626f2090dd1c2b25b38dc444904d547e4b8f96262b0ad9a9bda805cc045 SHA512 a19dba09a2a5c6926b56ca1063e329e431253825550890be56a46faccd736aec7236167b5da1f0b0cfec47a9935f340f246b4bfaaaaeba06644d08a76fc52514
 AUX htaccess-dist 1639 BLAKE2B 52fea4574320fc4e56aa061e46f7ec978a6282996188f2d86b9eea4e8b4617c561f94621ea3cf334d4eae16d164c96ce419258da40e9644b951f5c4d828acf09 SHA512 8d05756eb04a61fc9a89b814d0cf9022feb57c3de10fa74cf1964bdba7910d25448109147facccd8447a4ff446cb7a0cf8d8134642061d23b03e0921b032fc76
 AUX postinstall-en.txt 1791 BLAKE2B 96a1f47933d402d7d33aa6cd54724d1f1e9fb717c3a031be6785c49f26d5bcc518388d838a5e68f3911495b51391367ac5777698a8e79e45b5160f99250745e5 SHA512 a7492810fad0c5ca6f3e724679ae753934b7a92f90663dc0e93608dca06d1a4b2ba04842e0755955b9b3e6ba63742a5b3c882d097c8c0e2df178d044f471c5b5
-DIST dokuwiki-2016-06-26e.tgz 3464178 BLAKE2B cdeebee2f36cc899fcffe1d6df6f5beee8f7dd303db00a41fa4d187c27528971a8ea0fccffacb6331fe61f5854a9b2687ff55c2578d628164a39f817e4538a58 SHA512 b47c3a31b0bc731392703ed8d705717e7d1b75db0c44d822d8791c1e409d5285fe863a3dbd13bc60b73c01ca268f7a73a6a24c90edd211fd5c124d3a8be70039
-DIST dokuwiki-2017-02-19e.tgz 3505643 BLAKE2B 99fedb175fa8e1330a4ad14ed8d593edfc1edb9aeb7d8b9100e940fb4c5bfac9dada2fe395e030cff18b8c809e36211fc9d0bdc22d5be3fae7f243343704218a SHA512 6fadb64f9d8394731f346708849d8828b33f4f775e23bca97896b2e06bbfc3b70a6fc17d63dcef8199fdb0aaf0b8291eb0eebcdff7b81524b2d454229eb20be4
 DIST dokuwiki-2018-04-22a.tgz 3749191 BLAKE2B bb03b771e857a2db16ebd44d3f888af8e3c9dcd6fb5da2a549dc7c942ad87cb1e0aee6d3ed78edaa9df864804bf51cd18a17cf8a4123d12fac39405fe661bc04 SHA512 bf1dd7411abadedb395c9e12c7a9f5586fe078e59556b1ce66a5351c06f338406eca944d7589f40d8a9eb098da6ed0edc256f83ec8b19f6335415e2fe6c31284
 DIST dokuwiki-2018-04-22b.tgz 3745314 BLAKE2B 56c349c72038db83b5ae199ac1d6d00ef8566a00fdf2bc5a782e808e5205ae3ba5cfa47bdfc4f7fb0b2e493a22eed006517cfb46f7c0c57de748cfb800942f58 SHA512 6fc1fba8d93296d7cc795a4067e409339b3ce965ad38aefa42f1974d267ac05f199185e895a60d355ebe8371c68345fa51f2aea5871f955dbba1cdbdf8bedebf
-EBUILD dokuwiki-20160626e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
-EBUILD dokuwiki-20170219e.ebuild 1658 BLAKE2B f8feede582cc726c174c76e7720de8d3b352d77be650533645f48abc8092f5b077695cdbe3e4e2e74916dc4da7db5c7399b99e181a9775d5db25ea072661e3e9 SHA512 cd6a68cfd2eac03ec5e77e44aaad86abad20ad1065ca2838a3ab5cf80bc3f84b4e4245684c7f892072cca196340a5f6b25539120953ee50eecc1aa069b4ecf9b
+DIST dokuwiki-2020-07-29.tgz 3821413 BLAKE2B bd14ec2450365befb85afdefc6bb078f10bdf1659d85adac3bbb2f502d29f3e706fb277d65810103e66b0c692f7166ed3c8d9e780489c08fb7ef9695de550d75 SHA512 093474bf5d5bb2c95400692927cbc8ffbe7666f178ffaa648a043ef05a2b32471feeed5de282c36b41e6e80e0a065909ea2ced8ecffc7fb339bda902697d596c
 EBUILD dokuwiki-20180422a.ebuild 1654 BLAKE2B 6b468972d44f26972dee1b761afceb73b761adec0e29e3c33c8b255db5294e33a8081b9fe0b495b334841192d7e349a01686ea9f038e2ede3acfad33ba53e5b2 SHA512 b9c3fdf7a2f7e68374957cd47f837b3dbf7b34776864e38cca57c2db5990d8059dc92e03192f579db41beecbdaabd8b70fcb1af7d9ee5e1bd5469c913eeca41c
 EBUILD dokuwiki-20180422b.ebuild 1651 BLAKE2B 8bf185b5b0a8e72c0cfc74579582e33f0e701371a7d025956cd521d48c394566be6a11d923e4b9fcaba1e0fed6147d8526cd8f39ba73b34558bbb0895c227170 SHA512 74d04e42a4d0c02c6b5f8bd4340779ce5077733737e7d9fd6191f28bf8c94107a0ccabe186de6e89674269bfa63810eddcf08a6c9cbdd889c19ad89366ed8356
+EBUILD dokuwiki-20200729.ebuild 1861 BLAKE2B a3f181b2a9eca3924dd58dc44472f5e66b4731a15af4f8a91d82698a84351604257785bbed789a0a99c2356805a06a3f116c01eb608627b2ca0b1965763f043c SHA512 e86bd291b5f9aab0b2d16f4f9925f20b3a2b28ec6b41765261e9c963bb010d9250c45dbd63f3f5a93916335cb0a7be997deff5c0357042e1b0d56e525b3806a8
 MISC metadata.xml 820 BLAKE2B d67c70213557139c38731aae770bc35541a5e10a3c757012dc6a9bae78310bb9b57a9e62d3cf46b99bfb414047bfdbaf7edb66ded453bdee696bcf9a849ab498 SHA512 9fc806f40f766674a758578017d2dd6a81ff81d65b9dc202c811d4970eea0b2e5135e49c9b655bfd25969ba038ce449885424020ac52c2b2e493665b9d2e313f
diff --git a/www-apps/dokuwiki/dokuwiki-20170219e.ebuild b/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
deleted file mode 100644
index d6e837cfd1cc..000000000000
--- a/www-apps/dokuwiki/dokuwiki-20170219e.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit webapp
-
-# upstream uses dashes in the datestamp
-MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PV="${MY_BASE_PV}${PV:8:1}"
-
-DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="gd"
-
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.3[xml]
-	virtual/httpd-php:*
-	gd? ( ||
-		(
-			dev-lang/php[gd]
-			media-gfx/imagemagick
-		)
-	)
-"
-
-need_httpd_cgi
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	# create initial changes file
-	touch data/changes.log
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc README
-	rm -f README COPYING
-
-	docinto scripts
-	dodoc bin/*
-	rm -rf bin
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	# Copy custom .htaccess that works with both apache 2.2 and 2.4
-	for dir in "conf" "data" "inc" "inc/lang"; do
-		insinto "${MY_HTDOCSDIR}/${dir}"
-		newins "${FILESDIR}/htaccess" ".htaccess"
-	done
-
-	# Use custom .htaccess.dist that works with both apache 2.2 and 2.4
-	insinto "${MY_HTDOCSDIR}/"
-	newins "${FILESDIR}/htaccess-dist" ".htaccess.dist"
-
-	for x in $(find data/ -not -name '.htaccess'); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess.dist
-	webapp_configfile "${MY_HTDOCSDIR}"/conf
-
-	for x in $(find conf/ -not -name 'msg'); do
-		webapp_configfile "${MY_HTDOCSDIR}"/${x}
-	done
-
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/dokuwiki/dokuwiki-20160626e.ebuild b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
index d6e837cfd1cc..1b6c72ea09b0 100644
--- a/www-apps/dokuwiki/dokuwiki-20160626e.ebuild
+++ b/www-apps/dokuwiki/dokuwiki-20200729.ebuild
@@ -1,17 +1,26 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit webapp
 
 # upstream uses dashes in the datestamp
 MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
-MY_PV="${MY_BASE_PV}${PV:8:1}"
+
+if [[ ${PV} == *rc* ]]; then
+	MY_PV="${MY_BASE_PV}${PV:8:4}"
+	MY_P="${PN}-rc-${MY_BASE_PV}"
+	S="${WORKDIR}/${MY_P}"
+	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-rc.tgz -> ${PN}-${PV}.tgz"
+else
+	MY_PV="${MY_BASE_PV}${PV:8:4}"
+	SRC_URI="https://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+fi
 
 DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
-HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
-SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
+HOMEPAGE="https://wiki.dokuwiki.org"
 
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~sparc ~x86"
@@ -31,11 +40,11 @@ RDEPEND="
 
 need_httpd_cgi
 
-S="${WORKDIR}/${PN}-${MY_PV}"
-
 src_prepare() {
 	# create initial changes file
 	touch data/changes.log
+
+	default
 }
 
 src_install() {
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index bb45dc85a07c..13bdb428da28 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -2,9 +2,17 @@ AUX postinstall-en.txt 1595 BLAKE2B 9b5c237befcf415d0f769052c9634da830326ff57da1
 DIST drupal-7.72.tar.gz 3323531 BLAKE2B 07d22cde80763e9d9e959907ae246b95dc611b6ae32f8bf69e5c2fa03ad023bcb3810703dbe2285b89f43709616d9302b0598012237fe97487820e71df1b9b70 SHA512 5ad91d9aa31a0d31ba07dba0de5fd4d0fb4b875ed3fed7d48e3b65d4e2e8d7e7f3e66dcbe9d2a7a78fa22923597a396f43d70ee7b5ac63469ca3e256ba4746b6
 DIST drupal-8.8.8.tar.gz 19504669 BLAKE2B f98e772753ffc6df5e9404bcf1c30acaca284447040b73ba43e62aa413c712f3174f636efa24a3e24c5d2dfd3906ad920b40eab5c7ad51f485ef6b25647bcf84 SHA512 1170d4a6372f21d8817264f17998f3b29c5c158267d4d60d057475a773fe24eb85b4988c89daef80c08a89bf4d4ba1a85d1d35ac698ebd588109be0731b796ca
 DIST drupal-8.9.1.tar.gz 19776948 BLAKE2B 34dafaddafb0a8e742ff8591aa016e1d8cdf40c5779236308427339087b2c2f552b8829de0ae3dc2eedf5e99d70922e89a281852b3e3f2f3c27a00efafdea849 SHA512 db518cc180508023025c2f7b898f85c4728712bafaa048fe1783aa471d0c38f24f27e62175a8cea314c330b0a147509d8285ee6f0838d990ae3c76aab83d081f
+DIST drupal-8.9.2.tar.gz 19780242 BLAKE2B 72a84df5f2ed029dd4c6d6e6f6473d5934bdf4d02069fb0d522c3144e99b0409fd751d3e2201be562ea76b61f167bcc0fe1f0276311a7c58b291caf890f8bf72 SHA512 71643fb4c0ca8f299f9791c25172c4f4a8a7a5f9dcb7eba76bb25446c4f91c7d8fba6c93acec80302c33e7945e9d3b9f46e3b40a51a935724ddde4c702a3c9b0
+DIST drupal-8.9.3.tar.gz 19787804 BLAKE2B e52cacda133d59b090a8e6c5485629aa5297f55521f777edf55c13d3416c95f2e850c206053b12b391f3558039209b8b411650e302575de65efba41549347c60 SHA512 527598c4863a3ff71e9ec9d4f750e8d3f9a7930d91e4a39d15eb3f1e101d1bb9d2143fb517cade4c734a2935a712e38cdaa5020e9643badd172a8be2667bdee0
 DIST drupal-9.0.1.tar.gz 16832166 BLAKE2B b783bb0282f0ee81fa1a3d606e3a97d65a537f20e2820270a2e5d554b737af45f31fac82f45e1322df8ee04ba1a4a5ee757a67fe2a09c272a32400c4d5b51424 SHA512 499459ebf72b1008266e6075667a4781b27d2e82635687744321513af1ac2289a0a33273666f251b90c4a2020e4fb52b83146b9a65007de788c5f3559bb4cb0a
+DIST drupal-9.0.2.tar.gz 16841367 BLAKE2B c9813a0c4fd5a0b3a78b44c540c9938fe851a4c743a0ff21e9f5d7dc19190b03ec5ea6f10370e92589567b11dae19ea392a611022bad60be21eb58a3bc39808c SHA512 0ad937a2f0d300f70e33018b89074a0c97592dcad1eb0c3ba9fb8df3f4df53e659c6a47f4a94926ecdae34204f16173f75c14bf9756355254f4e1b666ba5ac39
+DIST drupal-9.0.3.tar.gz 16853404 BLAKE2B 2b5038164288c87dbb59c7582f9c7f35b5ddf550ce2cf7b25b8506fa1476ff9da68c77e450749fa0adfd80692d2f84d64f2a80a13d22b38ffaafe4da585a249d SHA512 f8489c13cd1a55f81b4abf61191c6a79e1046659425269aebf124e33c9f160202241b292a121a66ea96d744f97e0a4e9f92027e504eaf1a3b459a5bbdb226c8b
 EBUILD drupal-7.72.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
 EBUILD drupal-8.8.8.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 EBUILD drupal-8.9.1.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.9.2.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.9.3.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 EBUILD drupal-9.0.1.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-9.0.2.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-9.0.3.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-8.9.2.ebuild b/www-apps/drupal/drupal-8.9.2.ebuild
new file mode 100644
index 000000000000..50acdd30770d
--- /dev/null
+++ b/www-apps/drupal/drupal-8.9.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/drupal/drupal-8.9.3.ebuild b/www-apps/drupal/drupal-8.9.3.ebuild
new file mode 100644
index 000000000000..50acdd30770d
--- /dev/null
+++ b/www-apps/drupal/drupal-8.9.3.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/drupal/drupal-9.0.2.ebuild b/www-apps/drupal/drupal-9.0.2.ebuild
new file mode 100644
index 000000000000..50acdd30770d
--- /dev/null
+++ b/www-apps/drupal/drupal-9.0.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/drupal/drupal-9.0.3.ebuild b/www-apps/drupal/drupal-9.0.3.ebuild
new file mode 100644
index 000000000000..50acdd30770d
--- /dev/null
+++ b/www-apps/drupal/drupal-9.0.3.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/gitea/Manifest b/www-apps/gitea/Manifest
index 1d1bd673f4d4..a3b9fae58661 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,8 +1,11 @@
+AUX 1.12-fix-vendoring.patch 430 BLAKE2B 897214736e27f49023c8de9da5e7caa3612947f381d10e1bfd9fca2a6f4cfdcefb7fd6a70fb972e9db1c8a84deb592f585d0c6beda66b551b6e65cdce33e73d6 SHA512 9b2678c373dfb18e53be53b99e2cebdb656f777f850c6f9b67e29d52011edc320fb7d14045fef08b0b3b70959784070264f1cdfae70937097977b2865c8c71b5
 AUX gitea-logflags.patch 4568 BLAKE2B 280697f7ca87c3c985aef0462f63f431860411ad7c39e462e5a63607ef076b116c27d2090f894095193dad33918f1fad1767489d45ae80f9699dddf65141ceb9 SHA512 aa09b233402ecb450cab13ed08786c1b8dc72a944efe69792bcf95d6109dd41b73abae95c3048bf339c8bb7849b3a20edb473388c052d32e00f7fb8b9381138d
 AUX gitea.confd-r1 243 BLAKE2B 87caa8371f53f52b0a85f720342f9f358dedec9240ab78998655a03df6bf3f301fe077afabdca1b1895dbcab2fa05748735d6f38f9b3ad53534fe8ae6e72db49 SHA512 485dc9d0b86d0a7b3ba958aac9de1129aa0ffbb47219419d38811f2accca2539e49dd93cc4a24b21f1c3802b024aa8449f54e320e8a16197f201532edeca6836
 AUX gitea.initd-r3 802 BLAKE2B 2e33e95f7d2762986184d45b0bbb250cc5e04fffc4e4b006233b28e5b57be69eef1d83441adebe2b94681585edaf77f9da4eb97930f91e75c1b1a5cd8d137633 SHA512 5ff2e653180a0601734fcd055dfffdfdc12363736ed2e56c8576c802398b90f4025b44002cbb9a3fd1e0c2d4c169f62d460381c6c549746d3390e55fc1c677d1
 AUX gitea.service-r2 734 BLAKE2B 84825b8198e9495e2803ca3702e6a631fb269c5c8fb4ff4246465a5bd7f7d796b0c3eaea72d0a25cef4f5d38d27a6c99a1b6d41f489749bef322a4ac93cfdd12 SHA512 287670f196bf6353dbdeb6ac37b4ac73693e16a6a3a83f57e7179ccb64364d1d85950a2ddd0a77238a3d218afdaacc8ba849c2810a7ba1238c7277074d1ebe39
-DIST gitea-src-1.11.6.tar.gz 68915319 BLAKE2B 8d8fd34fe38e153aa4af932a83933d0b5ad81a63bf7b7b5be59e64dd82db3282072686979a41fafa3ac2e523f79d6926ed057b2ed18645040bf1c446c6ab04b2 SHA512 57d5214a5e05581c134d42e00ec29fe15f3245a75440fca26c7162937570affc5a2e4ba8e903cb7f15fcb271144183ce5aa473457245f36d52686ea9f1cc93b3
-EBUILD gitea-1.11.6.ebuild 3690 BLAKE2B 0ff7475081d352a4e7877639633d19e3ae9705a5c5525589d3e7168ce2a5b65cf88f5ee21e49158ae8d65a16020f3f437490a7227aed319dea62225e59390c24 SHA512 8e8fd381a2a47e204b3b5f1d60cb9c5b16550ee5b3e2a2e225332e8e6e55fbd21e45e2388560ca42135a40e0ccf862defdc2ad3a7610841dba751a2279411469
-EBUILD gitea-9999.ebuild 3579 BLAKE2B 8bd251e0fe851dc894dbb49aa476f20760f74c245de2df7d9bd026da36115a3f5fabaf7af00f0137ffb363566a2f35b93c2276f1bf6b9c69a2d821f439c79500 SHA512 75836046d9d6e04a438e9128bf5b2cb997ec12edb1f3be9591ceea89374b550317b185e8d5b4bf125de824b25a1e5dbde136521f4b17531f1e97084b0eaf8451
+DIST gitea-1.12.1.tar.gz 135104234 BLAKE2B 36510e25e8c2cc1c718702a7cd0be74bbf5448beb33a90732599a4830b0899b37dfc9a58e3a8ffdb5037e93f185ba3b09a0ac7b8acd629c46b1982d6aeab1ec1 SHA512 6ba8a703272e611aac4c214cd818490a9615a9ab9b64ec22ec2c6331e865226324896f600218fb3b39cea7b6649456db7ff18e1857ece6964ab5d3c6d99c3aec
+DIST gitea-src-1.11.8.tar.gz 68927493 BLAKE2B 4e1b1d201848227bd5d5bfac5bbddc291e2f14d7262bb2f8353131b6284520ecda3f844e81c23e95c5cd4ef17a6414e0b3c6adf6e6be5c59f7367c19a2e549d8 SHA512 13216a4d98211eb1a5c319992c9c253ce6f7a7a343ebfdca18802eb599f7300a3c23adbba94784f70ca604751ced5aac7d663a210885554c61a24857de79b6e6
+EBUILD gitea-1.11.8.ebuild 3698 BLAKE2B 8848e4f4e8b104d5c9d84fdf5ce2f06a14a42220dfc9e66845cfb5d546438f9ea2b4345e03f4687ecb0e935bc1c58f5b996657688dfb82a425acbd5519b500e7 SHA512 0c5b5da2758f4677b22e1b2910da9e1c859cb63d8229c52b3170dee2e92a027afc47836cc058f1840cccee08260f53224ed6f85bc099477537561e0b900107bb
+EBUILD gitea-1.12.1.ebuild 3484 BLAKE2B 70484a7472390bced7d383df71160a22e3cecef96811aef7ea29f1e67f46b1e56886c97d5737c37df5b7e1ff341f9909fcb5f6c6ec863730a9479128dffb1230 SHA512 deca4c035589312c00727e997ef9e257bd1dd0450eec83b452d37acff82b562fa95ac06c7d8e6b8713d2d0f1b46fe7e9e6eb7d4db6b909b6c752ff28d5a38053
+EBUILD gitea-9999.ebuild 3235 BLAKE2B 893edb722e2f4de3054d8bc3744414a0dca088ecb9b1cfd25bd24a839f0da9653df401db84dfd46221d3d60b3a1010f48d1ff9a3528c5b8035717faf1be8d262 SHA512 5fbfdd2d1ee6bedbb70fd23180d0473d6ddee629ad06225298c4a170a5c3198896f663033cfc0db84b02098b181a2f0f29d120799e3c7cf222de175b29888e4a
 MISC metadata.xml 639 BLAKE2B ded4337596780b55640ce8db682ac7fcd8b6624147d6f9cf6190d41212b98f77d752b98eb4f6af7e6bbc5472bff5f3eb6ab016325e68e3f2b2284c5b4294d5a3 SHA512 5e6a76f08e5d2161192c35371caeb38f8dc972f478aca0f3f1025852c482f54be9b7ca30dbb1365ac5c7a9902534d74b05d7dc0f21109a752f0446ff5b4191e1
diff --git a/www-apps/gitea/files/1.12-fix-vendoring.patch b/www-apps/gitea/files/1.12-fix-vendoring.patch
new file mode 100644
index 000000000000..9baff97307a0
--- /dev/null
+++ b/www-apps/gitea/files/1.12-fix-vendoring.patch
@@ -0,0 +1,13 @@
+diff --git a/vendor/modules.txt b/vendor/modules.txt
+index efbc866..1c34104 100644
+--- a/vendor/modules.txt
++++ b/vendor/modules.txt
+@@ -845,6 +845,8 @@ gopkg.in/yaml.v2
+ # mvdan.cc/xurls/v2 v2.1.0
+ ## explicit
+ mvdan.cc/xurls/v2
++# src.techknowlogick.com/xgo v0.0.0-20200602060627-a09175ea9056
++## explicit
+ # strk.kbt.io/projects/go/libravatar v0.0.0-20191008002943-06d1c002b251
+ ## explicit
+ strk.kbt.io/projects/go/libravatar
diff --git a/www-apps/gitea/gitea-1.11.6.ebuild b/www-apps/gitea/gitea-1.11.8.ebuild
index 44802e089f92..555b0028a9ec 100644
--- a/www-apps/gitea/gitea-1.11.6.ebuild
+++ b/www-apps/gitea/gitea-1.11.8.ebuild
@@ -30,7 +30,7 @@ LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="+acct build-client pam sqlite"
 
-BDEPEND="dev-lang/go
+BDEPEND="<dev-lang/go-1.14.0
 	build-client? ( >=net-libs/nodejs-10[npm] )"
 DEPEND="pam? ( sys-libs/pam )"
 RDEPEND="${DEPEND}
diff --git a/www-apps/gitea/gitea-1.12.1.ebuild b/www-apps/gitea/gitea-1.12.1.ebuild
new file mode 100644
index 000000000000..18b851d0c981
--- /dev/null
+++ b/www-apps/gitea/gitea-1.12.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit fcaps go-module tmpfiles systemd
+MY_PV="${PV/_rc/-rc}"
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io"
+
+if [[ ${PV} != 9999* ]] ; then
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64"
+	S="${WORKDIR}"
+else
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
+fi
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct build-client pam sqlite"
+
+BDEPEND="build-client? ( >=net-libs/nodejs-10[npm] )"
+COMMON_DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	cap_net_bind_service+ep usr/bin/gitea
+)
+PATCHES=(
+	"${FILESDIR}/1.12-fix-vendoring.patch"
+)
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^RUN_MODE = dev#RUN_MODE = prod#"
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+		-e "s#^APP_ID =#;APP_ID =#"
+		-e "s#^TRUSTED_FACETS =#;TRUSTED_FACETS =#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.ini.sample || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
+	fi
+
+	einfo "Remove tests which are known to fail with network-sandbox enabled."
+	rm ./modules/migrations/github_test.go || die
+
+	einfo "Remove tests which depend on gitea git-repo."
+	rm ./modules/git/blob_test.go || die
+	rm ./modules/git/repo_test.go || die
+
+	# Remove already build assets (like frontend part)
+	use build-client && emake clean-all
+}
+
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
+
+	if use build-client; then
+		# -j1 as Makefile doesn't handle dependancy correctly, and is not
+		# useful as golang compiler don't use this info.
+		env "${makeenv[@]}" emake -j1 build
+	else
+		env "${makeenv[@]}" emake backend
+	fi
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r2 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.ini.sample app.ini
+	if use acct ; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
diff --git a/www-apps/gitea/gitea-9999.ebuild b/www-apps/gitea/gitea-9999.ebuild
index 0d1559ca4a39..672af6461ca6 100644
--- a/www-apps/gitea/gitea-9999.ebuild
+++ b/www-apps/gitea/gitea-9999.ebuild
@@ -2,70 +2,42 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-
-if [[ ${PV} != 9999* ]] ; then
-	SCM="golang-vcs-snapshot"
-else
-	SCM="git-r3"
-fi
-
-inherit fcaps golang-base tmpfiles systemd ${SCM}
-unset SCM
-
-EGO_PN="code.gitea.io/gitea"
+inherit fcaps go-module tmpfiles systemd
+MY_PV="${PV/_rc/-rc}"
 
 DESCRIPTION="A painless self-hosted Git service"
 HOMEPAGE="https://gitea.io"
 
 if [[ ${PV} != 9999* ]] ; then
-	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz"
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${MY_PV}/gitea-src-${MY_PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64"
+	S="${WORKDIR}"
 else
 	EGIT_REPO_URI="https://github.com/go-gitea/gitea"
-	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
-	has test ${FEATURES} && EGIT_MIN_CLONE_TYPE="mirror"
+	inherit git-r3
+	S="${WORKDIR}/${P}"
 fi
 
 LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
 SLOT="0"
 IUSE="+acct pam sqlite"
 
-BDEPEND="dev-lang/go
-	>=net-libs/nodejs-10[npm]"
-DEPEND="pam? ( sys-libs/pam )"
-RDEPEND="${DEPEND}
+BDEPEND=">=net-libs/nodejs-10[npm]"
+COMMON_DEPEND="
 	acct? (
 		acct-group/git
-		acct-user/git[gitea]
-	)
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
 	dev-vcs/git"
 
-DOCS=( custom/conf/app.ini.sample CONTRIBUTING.md README.md )
-FILECAPS=( cap_net_bind_service+ep usr/bin/gitea )
-S="${WORKDIR}/${P}/src/${EGO_PN}"
-
-PATCHES=( "${FILESDIR}/gitea-logflags.patch" )
-
-gitea_make() {
-	local gitea_tags=(
-		bindata
-		$(usev pam)
-		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
-	)
-	local gitea_settings=(
-		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
-		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
-		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
-	)
-	local makeenv=(
-		TAGS="${gitea_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
-		GOPATH="${WORKDIR}/${P}:$(get_golibdir_gopath)"
-	)
-	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${PV}")
-
-	env "${makeenv[@]}" emake -j1 "$@"
-}
+DOCS=(
+	custom/conf/app.ini.sample CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	cap_net_bind_service+ep usr/bin/gitea
+)
 
 src_prepare() {
 	default
@@ -89,27 +61,34 @@ src_prepare() {
 		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.ini.sample || die
 	fi
 
-	# Remove already build assets (like frontend part)
-	gitea_make clean-all
-}
+	einfo "Remove tests which are known to fail with network-sandbox enabled."
+	rm ./modules/migrations/github_test.go || die
 
-src_compile() {
-	gitea_make build
+	einfo "Remove tests which depend on gitea git-repo."
+	rm ./modules/git/blob_test.go || die
+	rm ./modules/git/repo_test.go || die
 }
 
-src_test() {
-	if has network-sandbox ${FEATURES}; then
-		einfo "Remove tests which are known to fail with network-sandbox enabled."
-		rm ./modules/migrations/github_test.go || die
-	fi
-
-	if [[ ${PV} != 9999* ]] ; then
-		einfo "Remove tests which depend on gitea git-repo."
-		rm ./modules/git/blob_test.go || die
-		rm ./modules/git/repo_test.go || die
-	fi
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		TAGS="${gitea_tags[@]}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[@]}"
+	)
+	[[ ${PV} != 9999* ]] && makeenv+=("DRONE_TAG=${MY_PV}")
 
-	default
+	# -j1 as Makefile doesn't handle dependancy correctly, and is not
+	# useful as golang compiler don't use this info.
+	env "${makeenv[@]}" emake -j1 build
 }
 
 src_install() {
diff --git a/www-apps/gitit/Manifest b/www-apps/gitit/Manifest
index e52b44a759bd..97f2525265d2 100644
--- a/www-apps/gitit/Manifest
+++ b/www-apps/gitit/Manifest
@@ -1,8 +1,3 @@
-DIST gitit-0.12.1.1.tar.gz 274787 BLAKE2B af4c6824f0e59caa88c16c64cd009ba9e234b19c07f44b1f71291f7ec42fe083c9d118feb5f0ed40364df30bf0e79d48cc11b450128c4797f26d969df7d9fb24 SHA512 ad27445b517e268d773993f2f642b8fa392c25b863ee6370d235708c9d6015363a253afd9e3ea0ed46414b6b5ad98bad445f73e9f459285d0c31590ef42b91f1
-DIST gitit-0.12.2.1.tar.gz 271239 BLAKE2B 20424b20afd0720dd5b4ac1fbf9753c3fbe8288478569672643825cd83bb54a99975306cf7bdcfe52dc2d729922ca20f129a293c808dd2c60027e23c9490bf28 SHA512 dd81ae190bd77b39e15881d87dd7efdcd02ac16a4933f3d44a5c900275fc494c8bc9a883c92fcf18ff49a6285d6dd56464e57695c9cb39d5616d43dbdcc58162
-DIST gitit-0.12.2.tar.gz 270891 BLAKE2B 9b05fb70ac1c98c8eb6f54d987e7d53c609f87a2c2b3f557ffaae36a1dc72806cbc4ac63d990d5e6727805fec5e589de3eb979bc11b78a19fcfa1cabf4db727a SHA512 3420335d3aabfde5466e4a70319712d87cf98e7151fe9a23d58807f74fa2bdb74cbf028fe4ab764a192f0e7ad9c56b70749029d64306c495d8012824c8f281cf
-EBUILD gitit-0.12.1.1-r2.ebuild 3423 BLAKE2B 9bb7b9225614a7b0716074822893ccc5fcaf786f812419af978b14ad13fb9ad5e2a467d04c2c719083869cf0b2a86e922502b9c958c2e8d40f0ab70c8f954e00 SHA512 c7f13f94f4b00768aef3eec7c823bb4e880d7b46480c2c098a905bcce852512c2c66b808fd38502364b56d4076c92b36b26ecd6e74cd265980946be77b952ee4
-EBUILD gitit-0.12.1.1.ebuild 3360 BLAKE2B b0e8335f5f280fd222e9b779c8291cc924a344e5edef8ea3dc1c59808066fb7e36cef034477cb570d0a8aecd369d789741ff1802dcbe8ea4220897cf08fda52b SHA512 2f0c471289ce828a10ebb0b0af7a52504bd1d1a5b1c0146c6562f6144ee30418293dbd3238e43249d159f38f6c2c078c0f1904ad1b26e2d2abf70f299f0dc635
-EBUILD gitit-0.12.2.1.ebuild 3384 BLAKE2B 769ccd9837c1533d9be2f0873ef9771d6012c758d662dc48d7b76d79731abcb2dfb02ae0d4bcc172a112069f717ad192b031703eb79c6b443ef31b2444609028 SHA512 73e30b3cf65c4d94125a77adeb053faf56239225364ca01b183e4e9e0b995c3b74c891fc1f5337776ddce740fbfcffabce376fe58fdfcc5a17932dba72727403
-EBUILD gitit-0.12.2.ebuild 3353 BLAKE2B d01c8a8f965e85377b1173f44ac43641ea0a211097c60d89610ff65466ae742eb10c54d87eca3545a740f8e4f62720a76f45ede7a989af30a1a953a3cc5bca81 SHA512 a4554ec771f69c0239fb5d22151868427258790dec765f5db7b6f666d0dd764edf7bc941d0b7f900a3fc5d3d6ceffe30b0afc232c99f6a28d247e3a18c82d6e5
-MISC metadata.xml 1425 BLAKE2B ab2606f347d8d99f01907d132df362516973e61fd36e9bb87f969bb53c17b04f1daa87ca3ca0aa45fa0859437bd392ad7071316ac49790dc962032c8e7364d0b SHA512 c3e877337e7c03fbe0a53d46b704100a19c450862be2f2de49b0a130e18f0704656ee371f832b8fe6efb0145f5af7d86deac024bb7972c01572da53c6439f9d6
+DIST gitit-0.13.0.0.tar.gz 274691 BLAKE2B 74ef7d4a73356a2be7531fa22faf6ebd2f5a2edf9ce40909cff31756d93e1bea8e563d953b6c3fe0ea30fa98d13dee21aa7331bbb281fcfd476b2de90cd0accb SHA512 dce06c73813a71df4e9896e62f611906de708a5186ace2ba4679bd53bae48495ced5b888febb65a395cef3b11ecb595dfca079b1c3ed24fb464aa997e710ab1e
+EBUILD gitit-0.13.0.0.ebuild 3239 BLAKE2B fdf70a2ba2dbe3091acf3fe692f359a4696b22dcbf1ec6bd3a7797db00504c0342b9390dcbcfb28e197ae6601feaa08a9d158c8035952d4708c60407ae35b274 SHA512 57e7289d0303e2516259c7083486a553304674ebc880269602b80e0838308583ccb21f71e3c3b8f58df483dd5124933d980fedfea7d9e1e0fbb1350164e13e03
+MISC metadata.xml 1345 BLAKE2B 0647bf06da38617360a67c71cecde3b5337073b6dcf0413d3f962dc0e69625c4b0e2a0919c1cbc93ad88d5e38748a8c96d16704aaf76bb547da8c503f18ddb36 SHA512 fc120ee0cecb42984179def72c1d91bba405a7c91357ffa934e9f98edb224fb9a147be0a5beab49c90bc47e0adfcd1c01dbc16998da9c151b348d8c78ab6b0ef
diff --git a/www-apps/gitit/gitit-0.12.1.1-r2.ebuild b/www-apps/gitit/gitit-0.12.1.1-r2.ebuild
deleted file mode 100644
index 5bb96f459a0e..000000000000
--- a/www-apps/gitit/gitit-0.12.1.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
-HOMEPAGE="http://gitit.net"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +plugins"
-
-RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.18:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
-	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
-	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
-	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
-	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
-	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
-	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/recaptcha-0.1:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/tagsoup-0.13:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
-	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
-	dev-haskell/xhtml:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	plugins? ( dev-haskell/ghc-paths:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_prepare() {
-	default
-
-	cabal_chdeps \
-		'tagsoup >= 0.13 && < 0.14' 'tagsoup >= 0.13' \
-		'aeson >= 0.7 && < 0.12' 'aeson >= 0.7'
-}
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag plugins plugins)
-}
diff --git a/www-apps/gitit/gitit-0.12.1.1.ebuild b/www-apps/gitit/gitit-0.12.1.1.ebuild
deleted file mode 100644
index a9fede7ee3c6..000000000000
--- a/www-apps/gitit/gitit-0.12.1.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# ebuild generated by hackport 0.4.7.9999
-
-CABAL_FEATURES="bin lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
-HOMEPAGE="http://gitit.net"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +plugins"
-
-RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.18:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.12:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
-	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
-	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
-	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
-	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
-	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
-	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.3:=[profile?]
-	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.2:=[profile?]
-	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.17:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/recaptcha-0.1:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
-	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
-	dev-haskell/xhtml:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	plugins? ( dev-haskell/ghc-paths:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag plugins plugins)
-}
diff --git a/www-apps/gitit/gitit-0.12.2.1.ebuild b/www-apps/gitit/gitit-0.12.2.1.ebuild
deleted file mode 100644
index 9ed02d571d8f..000000000000
--- a/www-apps/gitit/gitit-0.12.2.1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.1.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
-HOMEPAGE="http://gitit.net"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +plugins"
-
-RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.20:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
-	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
-	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
-	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
-	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
-	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
-	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
-	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
-	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/recaptcha-0.1:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
-	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
-	dev-haskell/xhtml:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	plugins? ( dev-haskell/ghc-paths:=[profile?]
-			dev-lang/ghc:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag plugins plugins)
-}
diff --git a/www-apps/gitit/gitit-0.12.2.ebuild b/www-apps/gitit/gitit-0.12.2.ebuild
deleted file mode 100644
index 9fcfde99b656..000000000000
--- a/www-apps/gitit/gitit-0.12.2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# ebuild generated by hackport 0.5.9999
-
-CABAL_FEATURES="lib profile haddock hoogle hscolour"
-inherit haskell-cabal
-
-DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
-HOMEPAGE="http://gitit.net"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
-IUSE="+network-uri +plugins"
-
-RDEPEND=">=app-text/pandoc-1.12.4:=[profile?] <app-text/pandoc-1.19:=[profile?]
-	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.1:=[profile?]
-	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
-	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.9:=[profile?]
-	>=dev-haskell/configfile-1:=[profile?] <dev-haskell/configfile-1.2:=[profile?]
-	>=dev-haskell/feed-0.3.6:=[profile?] <dev-haskell/feed-0.4:=[profile?]
-	>=dev-haskell/filestore-0.6:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
-	>=dev-haskell/happstack-server-7.0:=[profile?] <dev-haskell/happstack-server-7.5:=[profile?]
-	>=dev-haskell/highlighting-kate-0.5.0.1:=[profile?] <dev-haskell/highlighting-kate-0.7:=[profile?]
-	>=dev-haskell/hoauth2-0.4.2:=[profile?] <dev-haskell/hoauth2-0.6:=[profile?]
-	>=dev-haskell/hslogger-1:=[profile?] <dev-haskell/hslogger-1.3:=[profile?]
-	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
-	>=dev-haskell/http-4000.0:=[profile?] <dev-haskell/http-4000.4:=[profile?]
-	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
-	>=dev-haskell/http-conduit-2.1.4:=[profile?] <dev-haskell/http-conduit-2.3:=[profile?]
-	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.10:=[profile?]
-	dev-haskell/mtl:=[profile?]
-	>=dev-haskell/old-locale-1:=[profile?]
-	dev-haskell/old-time:=[profile?]
-	>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?]
-	dev-haskell/parsec:=[profile?]
-	dev-haskell/random:=[profile?]
-	>=dev-haskell/recaptcha-0.1:=[profile?]
-	dev-haskell/safe:=[profile?]
-	>dev-haskell/sha-1:=[profile?] <dev-haskell/sha-1.7:=[profile?]
-	dev-haskell/split:=[profile?]
-	dev-haskell/syb:=[profile?]
-	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
-	dev-haskell/text:=[profile?]
-	>=dev-haskell/uri-0.1:=[profile?] <dev-haskell/uri-0.2:=[profile?]
-	>=dev-haskell/url-2.1:=[profile?] <dev-haskell/url-2.2:=[profile?]
-	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
-	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
-	dev-haskell/xhtml:=[profile?]
-	>=dev-haskell/xml-1.3.5:=[profile?]
-	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
-	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
-	>=dev-lang/ghc-7.4.1:=
-	network-uri? ( >=dev-haskell/network-2.6:=[profile?]
-			>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?] )
-	!network-uri? ( >=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.6:=[profile?] )
-	plugins? ( dev-haskell/ghc-paths:=[profile?] )
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-1.8
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		$(cabal_flag network-uri network-uri) \
-		$(cabal_flag plugins plugins)
-}
diff --git a/www-apps/gitit/gitit-0.13.0.0.ebuild b/www-apps/gitit/gitit-0.13.0.0.ebuild
new file mode 100644
index 000000000000..12a22b58b39c
--- /dev/null
+++ b/www-apps/gitit/gitit-0.13.0.0.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.5.9999
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour"
+inherit haskell-cabal
+
+DESCRIPTION="Wiki using happstack, git or darcs, and pandoc"
+HOMEPAGE="https://hackage.haskell.org/package/gitit"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+plugins"
+
+RDEPEND=">=app-text/pandoc-2.9:=[profile?] <app-text/pandoc-2.10:=[profile?]
+	>=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.5:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?]
+	>=dev-haskell/blaze-html-0.4:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/configfile-1:=[profile?]
+	>=dev-haskell/doctemplates-0.7.1:=[profile?]
+	>=dev-haskell/feed-1.0:=[profile?] <dev-haskell/feed-1.4:=[profile?]
+	>=dev-haskell/filestore-0.6.4:=[profile?] <dev-haskell/filestore-0.7:=[profile?]
+	>=dev-haskell/happstack-server-7.5:=[profile?] <dev-haskell/happstack-server-7.7:=[profile?]
+	>=dev-haskell/hoauth2-1.3.0:=[profile?] <dev-haskell/hoauth2-1.12:=[profile?]
+	>=dev-haskell/hslogger-1:=[profile?]
+	>=dev-haskell/hstringtemplate-0.6:=[profile?] <dev-haskell/hstringtemplate-0.9:=[profile?]
+	>=dev-haskell/http-4000.0:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.2:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-conduit-2.1.6:=[profile?] <dev-haskell/http-conduit-2.4:=[profile?]
+	>=dev-haskell/json-0.4:=[profile?] <dev-haskell/json-0.11:=[profile?]
+	dev-haskell/mtl:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?] <dev-haskell/network-3.2:=[profile?]
+	>=dev-haskell/network-bsd-2.8.1:=[profile?] <dev-haskell/network-bsd-2.9:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?]
+	dev-haskell/old-locale:=[profile?]
+	dev-haskell/old-time:=[profile?]
+	>=dev-haskell/pandoc-types-1.20:=[profile?] <dev-haskell/pandoc-types-1.21:=[profile?]
+	dev-haskell/parsec:=[profile?]
+	dev-haskell/random:=[profile?]
+	>=dev-haskell/recaptcha-0.1:=[profile?]
+	dev-haskell/safe:=[profile?]
+	>dev-haskell/sha-1:=[profile?]
+	>=dev-haskell/skylighting-0.8.2.3:=[profile?] <dev-haskell/skylighting-0.9:=[profile?]
+	dev-haskell/split:=[profile?]
+	dev-haskell/syb:=[profile?]
+	>=dev-haskell/tagsoup-0.13:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	dev-haskell/text:=[profile?]
+	>=dev-haskell/uri-bytestring-0.2.3.3:=[profile?]
+	>=dev-haskell/url-2.1:=[profile?]
+	>=dev-haskell/utf8-string-0.3:=[profile?] <dev-haskell/utf8-string-1.1:=[profile?]
+	>=dev-haskell/uuid-1.3:=[profile?] <dev-haskell/uuid-1.4:=[profile?]
+	dev-haskell/xhtml:=[profile?]
+	>=dev-haskell/xml-1.3.5:=[profile?]
+	>=dev-haskell/xml-conduit-1.5:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/xml-types-0.3:=[profile?]
+	>=dev-haskell/xss-sanitize-0.3:=[profile?] <dev-haskell/xss-sanitize-0.4:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.0.1:=
+	plugins? ( dev-haskell/ghc-paths:=[profile?]
+			>=dev-lang/ghc-8.0.1:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.0
+"
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag plugins plugins)
+}
diff --git a/www-apps/gitit/metadata.xml b/www-apps/gitit/metadata.xml
index f5359672dbc6..1823049e9787 100644
--- a/www-apps/gitit/metadata.xml
+++ b/www-apps/gitit/metadata.xml
@@ -37,7 +37,6 @@
 		For usage information:  @gitit --help@
 	</longdescription>
 	<use>
-		<flag name="network-uri">Get Network.URI from the network-uri package.</flag>
 		<flag name="plugins">enables optional plugin runtime loader</flag>
 	</use>
 </pkgmetadata>
diff --git a/www-apps/grafana-bin/Manifest b/www-apps/grafana-bin/Manifest
index 478d4666d6f4..e13b3f46fbde 100644
--- a/www-apps/grafana-bin/Manifest
+++ b/www-apps/grafana-bin/Manifest
@@ -2,5 +2,7 @@ AUX grafana.confd 162 BLAKE2B f5567427be3510fd7c79eefe06fe4050c7e350eaa9e82c3e87
 AUX grafana.initd.3 972 BLAKE2B 077e7cf023b83b152c762f63c937435823053909e26d6743e94fc59f76ef77220610d2fd02950ad0157b9ebbfd8380a489cd0da33b5b25102fbaa936c1212e2f SHA512 fbad0e00b1b47d9eba808d2ed84e3208d2279f1deeaad71710c6756ad120b1f9f1bb2ba1c5f9677ed3a5efe28df8437c48f5c68b5e8eabb1e91b14e762c1e442
 AUX grafana.service 676 BLAKE2B 98b7e216324a451f97b9b0c2d1bbe493ea3206b8a6113f34f1064f8fde3c931c32913d4b94d77722eefe709434c3f5692b58a840066ae017f5b5f9dfd18ba9a9 SHA512 2355f708b8b5f520efa0d18c81a5e817c29953373b689b8fdd7c3f722f9b4d566d2e8329434daf2268d24fb2ff563b80ad84b144855a67abcf96c2b7b910b31c
 DIST grafana-bin-6.7.4.tar.gz 65083442 BLAKE2B c619432325ac5254c78ec08579f048483dfd1b28fbf8a9b919517277ad887b238f953ba796366af5c9f29a53daeade160c55a2255cfe75bf767b4ddd57474f87 SHA512 fe412966558529f114b70a5cb42f82c37dce67b2b04739ddba0d9821a3e12a5f1e44757df19d283a9b486737a411ca759adab9beaca6d0f14259945675218df4
+DIST grafana-bin-7.1.3.tar.gz 52611015 BLAKE2B 15f66a1cbe1669df4ae6b14347c4a7df8825780b9f01c090e3facea6ebbc375a79d25a50c8047a91c96d3d0f3c05800159dc40c9d4df3a6c9e7405a006ee6c11 SHA512 556211cd2d32068c0f6be6ea8c88144dc2d7c3577c2ab8661cc4f4d330a7c62df7fc98e3d222a7693d1b1d92207af694514faa1c3c2d5507780fdba731bd0bf8
 EBUILD grafana-bin-6.7.4.ebuild 1969 BLAKE2B b871590d26c2be2d591be5a35c4b06ed5f3a820315f9661bbe1da3fe4f6c369987b7a51afc73456fcd10c08e26aee07bd5116b69075add4ddb07bb76a9f289a3 SHA512 c7091e34535a4fbedda19751d7a8ce7497ba6c00a5957d85130c6eed881d57a2d40ff0188aa3b632c1c42ac9b6ba9ebe6a9a073f2be6c4f20c401c4e5c592f2e
+EBUILD grafana-bin-7.1.3.ebuild 1768 BLAKE2B 23986d4f829d0bcddc32ff228a71e3855652f0d990222d307d25b5e17cd96c6dee2680654d6538178c9197bafd777eec7c0b7da14b12d2bcd45d13684c12767d SHA512 ec778d6f7768395692eb0db5287b9c8203b73bad269a8109fb71b462987732bafbf39995ac6c18753042a6245773c8b0bf870cb51af6437651f0d857bf39cadd
 MISC metadata.xml 218 BLAKE2B 2189d142b4baed0b8edb49fcc98f7397610a257a4cb5f87873272b284f84290420f0950c8b41d1d050ca7a1e0486c6e00344672a3f0479d1d382c14bf7f18485 SHA512 882f7787b97aa780dd3ba4112b9e1dcc84986e2a17704cba9a557ec3a3f9211bcf93532b92d42f60157b56b457ee9ee17e5409066230e54d48931b91bd6786cd
diff --git a/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild b/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild
new file mode 100644
index 000000000000..d666b4c9db30
--- /dev/null
+++ b/www-apps/grafana-bin/grafana-bin-7.1.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+MY_PN=${PN/-bin/}
+MY_PV=${PV/_beta/-beta}
+S=${WORKDIR}/${MY_PN}-${MY_PV}
+
+DESCRIPTION="Gorgeous metric viz, dashboards & editors for Graphite, InfluxDB & OpenTSDB"
+HOMEPAGE="https://grafana.org"
+SRC_URI="https://dl.grafana.com/oss/release/grafana-${PV}.linux-amd64.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+DEPEND="acct-group/grafana
+	acct-user/grafana"
+RDEPEND="${DEPEND}
+	media-libs/fontconfig"
+
+QA_PREBUILT="usr/bin/grafana-*"
+QA_PRESTRIPPED=${QA_PREBUILT}
+
+src_install() {
+	keepdir /etc/grafana
+	insinto /etc/grafana
+	newins "${S}"/conf/sample.ini grafana.ini
+	rm "${S}"/conf/sample.ini || die
+
+	# Frontend assets
+	insinto /usr/share/${MY_PN}
+	doins -r public conf
+
+	dobin bin/grafana-cli
+	dobin bin/grafana-server
+
+	newconfd "${FILESDIR}"/grafana.confd grafana
+	newinitd "${FILESDIR}"/grafana.initd.3 grafana
+	systemd_newunit "${FILESDIR}"/grafana.service grafana.service
+
+	keepdir /var/{lib,log}/grafana
+	keepdir /var/lib/grafana/{dashboards,plugins}
+	fowners grafana:grafana /var/{lib,log}/grafana
+	fowners grafana:grafana /var/lib/grafana/{dashboards,plugins}
+	fperms 0750 /var/{lib,log}/grafana
+	fperms 0750 /var/lib/grafana/{dashboards,plugins}
+}
+
+postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+
+		elog "${PN} has built-in log rotation. Please see [log.file] section of"
+		elog "/etc/grafana/grafana.ini for related settings."
+		elog
+		elog "You may add your own custom configuration for app-admin/logrotate if you"
+		elog "wish to use external rotation of logs. In this case, you also need to make"
+		elog "sure the built-in rotation is turned off."
+	fi
+}
diff --git a/www-apps/icingaweb2/Manifest b/www-apps/icingaweb2/Manifest
index 209264f3b56d..6d9b6d456955 100644
--- a/www-apps/icingaweb2/Manifest
+++ b/www-apps/icingaweb2/Manifest
@@ -1,6 +1,6 @@
-DIST icingaweb2-2.7.3.tar.gz 8388950 BLAKE2B 8d32f770020f72f1fbbf4c73de1935430976afe976c0b4497a1dd470aad286a9ec57d16dcd1f3f7354082206033d58b43966884c453fd8dd4106c13d8d3e8359 SHA512 eee3f81bb3eb29eeaeffe2f890639a12d75f9acf3b7c6649faaff3ab817ab2a5b6cd93b31637794969817f2d42ef5a46704fdc09488642caf6380f57c90d97cb
-DIST icingaweb2-2.8.1.tar.gz 8513180 BLAKE2B ee386e1a7cdba73d1ee7f7196fe0a759bdb1ddae6bb5d225b9a6ceabf0b638f8d0e9f9d963635339951ea668b0fefd6569ba58797289990f4b63a4c65f0559b3 SHA512 4c8aaeebd96f484cac5b62c5bdc871b06c2d0a9194e3067d6dd439ce9132c913971d0a625cf32c231fe4fa3644a9cdbe25ae2211a81e572bcb7fef95d528cca8
-EBUILD icingaweb2-2.7.3.ebuild 2527 BLAKE2B 804935e74b5969090cd6caca25e16e0537ce9c467007fa72a56011b0b852b01920bb3592bba24da63a57767d3385229851749eb1a829e62523b6995ebbc6d9ce SHA512 7030468c78d304c7d745d95b3acbe1f8782b323126664449785ce9145fab750dccff5daf2c97e72179fb483790e9a978585ffc9d9e81c6723db337ba9fe96d1c
-EBUILD icingaweb2-2.8.1.ebuild 2630 BLAKE2B c8019eb9c1c182b30510d644bb85afb8cb65756e3a11b6099fc9aded90ea33e229afabb247813e0d7e4ed23a746a55381b5846671678fe36651defd9cc633f6c SHA512 40ea036ab1d3f7e0424b303ad59ef5f8572622a54285378944aece3287ad312b3aedb59483975ce3cfcbb65f47c7827a6395704d7e83acfdbe117e0fb040cd70
+DIST icingaweb2-2.7.4.tar.gz 8388685 BLAKE2B b179820828631bc65140bfc81908c267fb7ee0b5cd3e1edbafc1edf583718b478061beb66931cdb3ff8b0243d7205600d5549d7db1838650be0cb4fdae0e38bd SHA512 e8864a3aa03b902ba31dcec4c3ef2c87eeab8f885020b6b6b1bd97d90be1e8645c3e56b8e32d42f3379fc43f338c31cb2fb1114a1ef2fd97f33b344068771c78
+DIST icingaweb2-2.8.2.tar.gz 8514166 BLAKE2B 7e6a44574999967a6a728c5818999ac6f15234f1cfd1415132e1a8219e897affddd4d4ec488bb90ced82a0ce5403220463ccfa0424014a4c090176d85fd968a9 SHA512 252ecb36751add239897b6344dd622542f892b1850398fe724d0ab91e8d691cefe0b33c727c28aa630c93b76b381aabe69721db034c4de0518f346bbd5b698de
+EBUILD icingaweb2-2.7.4.ebuild 2527 BLAKE2B 1aae9e69d0749410fdf54034972a0f9cd25a92c859a3530538067ec964f9d221615a0ad32282abbae3438185a81999ce8b906f1b1d3c5f3e433bee442e1cff8b SHA512 c124df8222ddc56047240669348fd326b4a2b3f66bfe0c675f91725fe5a8c0709523e6f3cf543258047b3b777e5a25bf7f37036be7fa1e351a8dd43b4b709f1c
+EBUILD icingaweb2-2.8.2.ebuild 2630 BLAKE2B c8019eb9c1c182b30510d644bb85afb8cb65756e3a11b6099fc9aded90ea33e229afabb247813e0d7e4ed23a746a55381b5846671678fe36651defd9cc633f6c SHA512 40ea036ab1d3f7e0424b303ad59ef5f8572622a54285378944aece3287ad312b3aedb59483975ce3cfcbb65f47c7827a6395704d7e83acfdbe117e0fb040cd70
 EBUILD icingaweb2-9999.ebuild 2529 BLAKE2B 49280ea2832b73adbbb3a246cbea7bb10871be65e2741a1324712727508f0f4d344217568e1f77a8f520cd1a490f614d44bb22c762c57103d98625c82f940e69 SHA512 7d4c16ee5dcf92a26096c8ec7ca084d5b36afa25652246d0c34207d1a53a83fef34d625377b0c44e2648df3573a7241c7d4f16a6356fbc17c1f0bd969d59f0ea
 MISC metadata.xml 530 BLAKE2B 855edf88f825a4c2f286068f7195264f1ca75f15aecf56d322a2e96b79ccdbea0b45c0a9a6cc4025dd2632cb0c97b60ffda3dd859adb7a2cfb35c0373c72bc0f SHA512 4ec6c57d7342dc1fa154f16e262f762374e37f6e4db09290c1b1188cc27ee605697d28b8349c51dee71fbfd5a90fd091e17b1dff4c9c9745bd6e69df8191897a
diff --git a/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild b/www-apps/icingaweb2/icingaweb2-2.7.4.ebuild
index 4d66e260c407..261a6839860d 100644
--- a/www-apps/icingaweb2/icingaweb2-2.7.3.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.7.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/www-apps/icingaweb2/icingaweb2-2.8.1.ebuild b/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild
index 0d65a04a2a7e..0d65a04a2a7e 100644
--- a/www-apps/icingaweb2/icingaweb2-2.8.1.ebuild
+++ b/www-apps/icingaweb2/icingaweb2-2.8.2.ebuild
diff --git a/www-apps/jekyll-coffeescript/Manifest b/www-apps/jekyll-coffeescript/Manifest
index 03af72b3e134..1254db922691 100644
--- a/www-apps/jekyll-coffeescript/Manifest
+++ b/www-apps/jekyll-coffeescript/Manifest
@@ -1,5 +1,5 @@
 DIST jekyll-coffeescript-1.2.2.tar.gz 5963 BLAKE2B d71d343786f855d480694aa9bac99497b21498ed730198d5fef3f309b96bf5924ecefbf0dee9a6e2ecc9272941c58206508dc47ce0b5bd88afab500bdf07b7e3 SHA512 4b531fd69553036bae22c6f9bae2552da13eb6957e122592ebfa9253b260718a6ec66c34dda8fea83d6d2a0e01eea16c65a4915d6c730dbc6ed53632d2eae198
 DIST jekyll-coffeescript-2.0.0.tar.gz 5984 BLAKE2B 2158f138820253a4e181035dcdf7e25ac7ded26ce7b6e6d6fb5f73e18f5c7e8bbeed8b47a8b12c059b2e7e5167e41f0f9645d5d08e85ff8ab52d400b1c4eb3c7 SHA512 31742ff4a9139d56baaa657b8259c1327a3f7ea14465203907b4d98e6c2b70286f5a1a7515140638a2347db86a35645e715a527b4b85fd536176277f7cfa3400
 EBUILD jekyll-coffeescript-1.2.2.ebuild 843 BLAKE2B 26ff2f0fb6bd6e3f86784eb89103b2eaa5d447221e835bb3a6b3454ca113ba80cf6be009eb1c3e08c668b0043e17873ab000c08b0220f51d331569dd5b32aa93 SHA512 e809a9239462376d826e1b7d20c28446d6545c10523410f6318252e4bde476de9006c306bdc65fedeb1c40dd9e6ba72e9db0ded463cb5c520671fa478c84c6ac
-EBUILD jekyll-coffeescript-2.0.0.ebuild 976 BLAKE2B 2de7f2ed8f56f15f5efcae019b13f1772bd3a382ea0a59c1f59857dfa40287dc3aa42098b1f3bfe19a1c35f5fcf289c3ba465a2ad194b5befd135d064da1fa46 SHA512 f582a78d84ba93c6cbfccf14d84ab4d882af4cccf6432df90a3bfb242e29e652b7c98ad5af6e46e598ef2540be86ee50ba26aeae0595f0328db4b2c196cd14a4
-MISC metadata.xml 338 BLAKE2B 224b7454b4b3fb88128aafe4b0980619f366f5c5151d14f801bda08f2457c9a9bcac20767070cc4240ffcaed43b62382a14bc886d17a4259a9c7b9ecb0b6cb0b SHA512 01c630c47335166243996a64160cce9820e4b46086ccfba65c9ea6455c69ff94c3a0ab8760993b49e80f0f36d8375af02bc1774fba9fa020cdf7dc87c23bfded
+EBUILD jekyll-coffeescript-2.0.0.ebuild 983 BLAKE2B b77b8db45cb5e13fe18a15718e5c1f8fe6f6f063057b140c53989276da4bb20107b52a05852fce612442463f5483961800c34ecd4606d2f56b105ddb08f6766d SHA512 c533d2b279badddc9b1ff5fa54253ab889e65064290172f932e3c44166bfb0dd5be4af38b7563b6a5967497d9c01903783db1d6d44adecfddb17467663945ca9
+MISC metadata.xml 256 BLAKE2B 91077d2e9e84295909405e547aceaa5b70bc6825205a2b4a689568de3bfe2204c7df492d425a0b56ad2ed38e48f9bc59e150a127b92ae9fce5ce713ecfe952cc SHA512 4640ad8626df1f627d4f145caa95d272da5020a1fc7ed591bbbe33e0be47668cd7ce71fbbba73367da76c74f90ccf1ee70b6bc6d9a8936916cdd49907dd58f7b
diff --git a/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
index b508938a3c9b..72f03cd668f7 100644
--- a/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
+++ b/www-apps/jekyll-coffeescript/jekyll-coffeescript-2.0.0.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/jekyll/jekyll-coffeescript"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/www-apps/jekyll-coffeescript/metadata.xml b/www-apps/jekyll-coffeescript/metadata.xml
index 95d941ca4d2e..794b74ece86a 100644
--- a/www-apps/jekyll-coffeescript/metadata.xml
+++ b/www-apps/jekyll-coffeescript/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">jekyll/jekyll-coffeescript</remote-id>
 	</upstream>
diff --git a/www-apps/jekyll-sass-converter/Manifest b/www-apps/jekyll-sass-converter/Manifest
index 16e104feab91..9bf80d0c8e6d 100644
--- a/www-apps/jekyll-sass-converter/Manifest
+++ b/www-apps/jekyll-sass-converter/Manifest
@@ -1,5 +1,5 @@
 DIST jekyll-sass-converter-1.5.2.tar.gz 9004 BLAKE2B a5c0e9a3aa51e47efcc7af90682c3fdb5ab23ba8142768afb175c1edaf2edd4feb8a867aebc72d3c89cc39fe40ed1ec7d1334a473d6023c95478411178e33758 SHA512 370ac6bd150a51afc766e4eb065b55d8965e7c39070fd133ea5422db1c559d4bf84d59bd601a3565792fd90a99c32ea1ccb5ecbed0cc8e1a3a343e7923250cb2
 DIST jekyll-sass-converter-2.1.0.tar.gz 13136 BLAKE2B 9a0a477004a1967a51f894f9bdb99f5c311cbfedfa2b1f0ba1aa7756c8550099361d24347bd3ba8d61fdc5c6c0058cc06be0c87145bb52e67fb65348112f5937 SHA512 336420ee5cf099af94c6f6d9a1cf5bae971f4720f625040f722f502acf05b94e17fdfaac4ccab8b1e58768b653df6c4640dfc835a6425a56a41ddfe709e7009d
 EBUILD jekyll-sass-converter-1.5.2.ebuild 709 BLAKE2B 773a9d2288c32fae6494eebd531e83ab41f4aed9c16783545a516eed2dec66104e92bc564fac950587f70c57f2d1ee376e17b8e45fa91662e8399dfb721a03ed SHA512 8a499a2490eba86e0429ab233c1475c1e06a1073a398b57f55e25e1697756a83fb2022f0c49bb137b5d50eb9a8ed2f7d186f5530b546c953218db792e3a5ed64
-EBUILD jekyll-sass-converter-2.1.0.ebuild 950 BLAKE2B f60cda92a6a46624b2acf5bba5bbcbfe981c0b3ea188cd6bf86854d1adab25cc2ac8c569400661e476fd212fbb937ff7eb7040095a627d75f4ea44c9459913cc SHA512 8fff2d2df1454a8005a6fc5c1ad3fe10d0b28166641bdfeaf866dd99a2299d3d81d14350ccdcacdc90a0645efc9addcf88339c399f78b82947d4b3b6d7db03f5
-MISC metadata.xml 340 BLAKE2B 2e117f6e85b11458811aa3cab607946ca1baaf9b6022c02d1ffffa62da6be9443624e31642a6bc793a0fda23c6b84c91df7f4413de7ea84217fd984c7a5c4a58 SHA512 db6a48ae69a3e29603aa912dbc716f790f4d47e33a2fa416d71716b34f75122ae9f28d17fb97bdc1472e71f3dc311087443ed494c4e06eb500c4345c5cf37603
+EBUILD jekyll-sass-converter-2.1.0.ebuild 957 BLAKE2B 6e1c54410613ce1f60a95b7293470a78886090fb107a4af20399c05c54fdcea6c0343de5204d47290fb08684aaff3d08efa1a0ebf9cec4de7996136ea28a0a37 SHA512 8452ee610271de42ee0e35370b0ea531b999a78d74a9c64ede02e00d8c610a4aa71cc3d08519f4effe82e8c28031a9932c54883186ac2d9be61660ab89ba33df
+MISC metadata.xml 258 BLAKE2B cc80231eeb696b3c37c4ba2e43e7d2313165ec5f95f0e0e087d3059f2d2935ff136263aaa905c33d6b3e3a87a062f1dc46641751333d5c8dc0d5ceed318f05a9 SHA512 2de0f9bdc2f408153b78771d9d4780f407b60dce4063c545cd5151ad13da77e5a61672eceac092405f8ee2cd1cf66bf96a2da301a3696ff3875afd7fc42d4ef3
diff --git a/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild
index dd31e7061403..cf125868b075 100644
--- a/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild
+++ b/www-apps/jekyll-sass-converter/jekyll-sass-converter-2.1.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 ruby_add_rdepend ">=dev-ruby/sassc-2.0.1:2"
diff --git a/www-apps/jekyll-sass-converter/metadata.xml b/www-apps/jekyll-sass-converter/metadata.xml
index e6f5e3b38d60..c6fd197da041 100644
--- a/www-apps/jekyll-sass-converter/metadata.xml
+++ b/www-apps/jekyll-sass-converter/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
+	<!--maintainer-needed-->
 	<upstream>
 		<remote-id type="github">jekyll/jekyll-sass-converter</remote-id>
 	</upstream>
diff --git a/www-apps/jekyll-watch/Manifest b/www-apps/jekyll-watch/Manifest
index 0242c875e9ee..3ce4e03857e7 100644
--- a/www-apps/jekyll-watch/Manifest
+++ b/www-apps/jekyll-watch/Manifest
@@ -1,3 +1,3 @@
 DIST jekyll-watch-2.2.1.tar.gz 16631 BLAKE2B 2311802227206b76d1f7b18ccc6360514164c6148f549490bd4df69e56e4d7a8c944c828e950bb156929081ea8ac15bdc37099eba5af3e0f3e1c20b403828f60 SHA512 55867bedf0f453aad7df267d21cc2a49857916b51ed70e727718c9ed18dedd474bc45c446abcbc803ab4b8b26f8afb1f0e05e6655441186788fbace869c74b6d
-EBUILD jekyll-watch-2.2.1.ebuild 671 BLAKE2B 5baf1d60ee35494c4df981a49d91282b08d3bf1bbe565a13dd52e2a65cb3795b4683b00bfa7c49f194c88f358939d48fc8088174653b4e5bae344d8cd3638ce8 SHA512 17e277cd6ea46f4494457407ab02965e201aeb360c4910f2e0836cb9dc2f62025b012ee7a25396b44d1d4854fbd7538e9184d87012c8fc1972e6d62434e51d82
-MISC metadata.xml 436 BLAKE2B 72dd2e30ff3976205bc604cf6a5be914ad2a1e79b72a96b6bee54dba91d5a8f19b857d70510483ad10a093ef0786da8a2c71a4d4c8ed800d3756e4a6136d4d03 SHA512 965327c1e3256487e17066618b4f27ae8e60d4d705988da4409fc62b52fe4e3a7d31d9bc13ef794b7544e2a4fb3b76e8d8cee075075c56817128b749fc22f419
+EBUILD jekyll-watch-2.2.1.ebuild 678 BLAKE2B 64803ff784392d70473d4a608bae7d08d44ff3655958bf952251fcb70093f6a930ecbb670289874a50bfbdc19290859200d2b4daff861709fdd0792da856593d SHA512 43f8ed4995e2812ca2a616ce8d8771e52ee5e562550ceff09bdab84f03eeeaae445a228216936d7031dd03ac3e0885cd16a6692554dd6afd17e32627450087a7
+MISC metadata.xml 327 BLAKE2B 50cb91b71c974b0f1f6795876897226afed3ed9b5c22b905154e85e51de24790a9773d7a6c052792374603c7bc84052af01a6b5f5e549198e8c8984d9b4e0a59 SHA512 55b40dc2e4f9cb4b2a88931875614ce93b26423e86ec69926b458535bca185345f85129e75d9f9a4bd665245b4ec321d3f8642084f04c0311cf304b338c6ef3a
diff --git a/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild b/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
index 094211910e63..00fa650ff7b0 100644
--- a/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
+++ b/www-apps/jekyll-watch/jekyll-watch-2.2.1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/listen:3"
diff --git a/www-apps/jekyll-watch/metadata.xml b/www-apps/jekyll-watch/metadata.xml
index 6f7f00be6e72..77cfe2e50895 100644
--- a/www-apps/jekyll-watch/metadata.xml
+++ b/www-apps/jekyll-watch/metadata.xml
@@ -2,11 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="person">
-		<email>bman@gentoo.org></email>
+		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
 	<upstream>
diff --git a/www-apps/jekyll/Manifest b/www-apps/jekyll/Manifest
index a64309b956df..3607eacc46b2 100644
--- a/www-apps/jekyll/Manifest
+++ b/www-apps/jekyll/Manifest
@@ -1,6 +1,8 @@
 AUX jekyll-3.6.0-test-helper.patch 657 BLAKE2B 8e9d9bb57efa2370976d459dac772f7f41c0bf02c2fc0c71f19d4b78714e06f96d8a800a45f7c3eca80f766639036a624df24e681a9258e4bdc76bfb563498ad SHA512 7b53cd03a988cc5c949d15be8de91ffd37d4f228822cc3bec64c961c163ba60946df1d314bdf746a33a42df091f06f481f945a712515cca04539e111393246d0
 DIST jekyll-3.8.5.tar.gz 852490 BLAKE2B 3831c68c8c17b5ca14521988572849b89c8cd37f3fa4d7048adb7e25319f59a31e6174a6d25fb5ba4d33c919389f3a30cb28274cddd29ea644ec5d5aa11875e7 SHA512 2cd6bb8786fa2efc249457f72e9e1a3dc76c61a23d2ed8388fef56f1bd576897260b199edb393eb358cfe3a0b26487e40cc2fd3502c52cc9c828839b9eef624d
 DIST jekyll-4.1.0.tar.gz 1397143 BLAKE2B f7021fdc418acefa1b7e92318225ff8afff8dd84a0134906bb48ae461a94e4a71a8d0de0800ea489a3bd3eb7bfa36be4b8781e4c89729d5adc9e8ddc3b711dc3 SHA512 fdd9b28ff065a1dbe78f197c618bdd00bfeb37f66983c55ce971edcc96c3af39d926ec64b3866084dc8c21a56764ecdfb61d954123b15fe41a9de68fc951dc48
+DIST jekyll-4.1.1.tar.gz 1398438 BLAKE2B ac207d58b155e069fda40b4598d441d8fb88f22e85740082829d018dc9cefe51ca636b23a6207c37711c4d26e078f6e4913946599f0200b8e8cb065a9ceff952 SHA512 98c635b54219c9666de6496e76f3a131fc715d650d868049c0fe10d76851a027e0808609c2dce1a138c95eb2fb7e58ef978237a305484071339b4a15d5acc4d5
 EBUILD jekyll-3.8.5.ebuild 2144 BLAKE2B cb825e8834f8c0feefedd7f2cef69dbf46a3656a5a9281698b65f668cac2897c098d625fdf227460ab2f6d5e7663ff42e0f4ab985daa7fba6615148ed5f2358c SHA512 2ce9ac22ab20aed5b3861d0bbc1035bfbf8b87317935d97981ee87e469cd11764ab1a99715ffb9b99dc2743f616840da44a57f0c4766ef90c71fd018ed49aee0
-EBUILD jekyll-4.1.0.ebuild 2502 BLAKE2B 2ef03dc06618aa1cf002c71876f04afb245519644b6a186b2c8aff6f888b8effab917b80ce46c1097b0c7fc19f89d4896fb26b82d4a5007b8694f2ff14a5add9 SHA512 2c20176fb75b3ee25948d796156bdbe3633ec2708a2792d1900d409ef48d613298c784e2208aa931648e2e890c285edef9cf3126df1491a4f48bea133ea7d70c
-MISC metadata.xml 429 BLAKE2B 9a3bc0c4945b7be24fae6e0b8bfe18b33ea06d32232200b42050c18f9bd9786c3737cedec0e850312df0599d78cd9db66a4d302395017cb9d27a1cba184c4df3 SHA512 0755fd020670ebb1fbb922a1765cb2d6a4fdb4c39886ef010aee9ff4035d7e6157721060da917567d6ccac0910d1e3872896490b35eedf7c293a16bab44e3645
+EBUILD jekyll-4.1.0.ebuild 2509 BLAKE2B 6dee78779fd33557d2fb0a02e724c17c783ccb826fcc106b9fdfb99583249fc03136306fdf0f9421bcc253e4a7e9a9aa63f473f7e6749454957d59a08af00a83 SHA512 a104f7107f569836c7e37a0c80fe56e259b0b007c154421ecf83f0e0df8b11f0d5752c62f7c14b3eb9598159295259925ef510613a02345842a04a48fc4ecce2
+EBUILD jekyll-4.1.1.ebuild 2478 BLAKE2B 7ebfa111013b93c0f930c1ee67a0a7b72b70e9c3084b6781dbb2192742720e3c5d408e7189489e51d3afbfd6f5d6e3df24fc09d979eb15f9a73713675c349ffc SHA512 20d1db68d598c41702f1dafb9c6ced88b93e0f4db63f67349a7e179b35fff6fe75c21caf8a8b566204d6d403c5a2f040d375c62358b5f125b258d1b14577120b
+MISC metadata.xml 321 BLAKE2B 29660b55030baa390178266fa77f44eb0396ac4dabd22929e683d9263fa596af844cd0ba7d6ac062ae16bb03bd28dd2210d2bee0025cd440bed8fbbe22194eff SHA512 f9d8641c5df992e4b59095b7b40ebf7448a5751d9668796f96db23b829c7ac56c7d594d513421040bf7c47d1ef1b6106e4c89564071fc52cf330b043c148c9d2
diff --git a/www-apps/jekyll/jekyll-4.1.0.ebuild b/www-apps/jekyll/jekyll-4.1.0.ebuild
index c31e66aae8c2..b60329211a3f 100644
--- a/www-apps/jekyll/jekyll-4.1.0.ebuild
+++ b/www-apps/jekyll/jekyll-4.1.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE="test"
 
 ruby_add_rdepend "
diff --git a/www-apps/jekyll/jekyll-4.1.1.ebuild b/www-apps/jekyll/jekyll-4.1.1.ebuild
new file mode 100644
index 000000000000..f6aebf2bdafd
--- /dev/null
+++ b/www-apps/jekyll/jekyll-4.1.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby25 ruby26"
+
+inherit ruby-fakegem
+
+RUBY_FAKEGEM_EXTRADOC="README.markdown History.markdown"
+RUBY_FAKEGEM_EXTRAINSTALL="features"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+RUBY_FAKEGEM_BINDIR="exe"
+
+DESCRIPTION="A simple, blog aware, static site generator"
+HOMEPAGE="https://jekyllrb.com https://github.com/jekyll/jekyll"
+SRC_URI="https://github.com/jekyll/${PN}/archive/v${PV}.tar.gz  -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+ruby_add_rdepend "
+	>=dev-ruby/addressable-2.4
+	>=dev-ruby/colorator-1.0
+	>=dev-ruby/em-websocket-0.5
+	dev-ruby/i18n:1
+	>=dev-ruby/kramdown-2.1:2
+	dev-ruby/kramdown-parser-gfm:1
+	dev-ruby/liquid:4
+	>=dev-ruby/mercenary-0.4.0
+	>=dev-ruby/pathutil-0.9
+	=dev-ruby/rouge-3*
+	>=dev-ruby/safe_yaml-1.0
+	>=dev-ruby/terminal-table-1.8:0
+	>=www-apps/jekyll-sass-converter-2.0
+	>=www-apps/jekyll-watch-2.0
+"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/classifier-reborn-2.1.0
+		dev-ruby/launchy
+		>=dev-ruby/rdiscount-2.0
+		>=dev-ruby/redcarpet-3.2.3
+		dev-ruby/rspec-mocks
+		>=dev-ruby/shoulda-3
+		dev-ruby/test-unit:2
+		www-apps/jekyll-coffeescript
+	)
+"
+
+all_ruby_prepare() {
+	eapply "${FILESDIR}"/jekyll-3.6.0-test-helper.patch
+
+	# Drop tests requiring bundler
+	sed -i -e '/bundle_message/d' test/test_new_command.rb || die
+	rm test/test_plugin_manager.rb || die
+
+	# Replace git command in gemspec
+	sed -e 's/git ls-files/find -not -type d -print/' \
+		-e 's:_relative ": "./:' \
+		-i $RUBY_FAKEGEM_GEMSPEC || die
+
+	# FIXMEs:
+	# fails to find fixtures because this requires bundler
+	rm test/test_theme.rb || die
+	rm test/test_theme_assets_reader.rb || die
+	sed -i -e '/^    should.*theme/,/^    end$/d' \
+		-e '/^      should.*theme/,/^      end$/d' test/test_site.rb || die
+	sed -i -e '/context "with a theme"/,/^    end/ s:^:#:' test/test_layout_reader.rb || die
+	sed -i -e '/normalize paths of rendered items/askip "test-theme"' test/test_liquid_renderer.rb || die
+	# partially requires 'toml'
+	rm test/test_configuration.rb || die
+	# pygments tests fail because of line numbering
+	sed -i -e '/^  context.*pygments/,/^  end$/d' test/test_tags.rb || die
+	#sed -i -e '/^    context.*pygments/,/^    end$/d' test/test_redcarpet.rb || die
+
+	# Tries to use bundler and install packages.
+	rm -f test/test_new_command.rb || die
+}
+
+src_test() {
+	local -x JEKYLL_NO_BUNDLER_REQUIRE=true
+
+	ruby-ng_src_test
+}
diff --git a/www-apps/jekyll/metadata.xml b/www-apps/jekyll/metadata.xml
index 28188a0391e2..0bb46a0fb9bf 100644
--- a/www-apps/jekyll/metadata.xml
+++ b/www-apps/jekyll/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>bman@gentoo.org</email>
 		<name>Aaron Bauman</name>
 	</maintainer>
diff --git a/www-apps/kibana-bin/Manifest b/www-apps/kibana-bin/Manifest
index 85a4082c1141..55c609c0452b 100644
--- a/www-apps/kibana-bin/Manifest
+++ b/www-apps/kibana-bin/Manifest
@@ -2,16 +2,10 @@ AUX kibana.confd 72 BLAKE2B 786203cfc47132fedb989fbcaebc799ed566e15f2b0ced965798
 AUX kibana.initd 1022 BLAKE2B 8eb81203f713e75d3eead4eb25a7670c7fab8af67d1fbe749856959061feedf049caa234e58c1bd39bd4127a34c9d3de0bde0a3d41bd4856aa5176e6fd442158 SHA512 e4555584ab4f3980ec703edcfb8349ec8847cae0fb25ba2243ff3404d8d7058fb317bd4b06c2df7a8b369f733648422f0e0cb8db745844ce36d4ada3385a4f90
 AUX kibana.logrotate 186 BLAKE2B e0446247e29b474dcab5756ac26f10fd8f46300e144386ff54a4e25fc1c2678ce0d21196b7365b01417cd0304a3f1edd6841800256e931bdc10f7d4e0f4ccd49 SHA512 1e0a51a83798e30b3807f496245b5733bc60a7bd1a529d2548a187ff8d3fa56d60bc23abf516d239ef76a8e9b66358ed84c687040a7b04c7818ea63417d33a1e
 AUX kibana.service 511 BLAKE2B 2b0786bfaf37c26e061973f38adea0a55ac1b8bf771395242c0ed3b53c6586099c121c286b23f0a3be67dc481a3e95c6f87486cd1601df997126d3cfd14435c1 SHA512 0b7754ebfa7e3538e64843436d8abe32a6ce38a9ab5e252e52657a99d97fa1801777db4502c1af5ec6082d83f0b3a0613e074f6ebe28624832bd0c258a478899
-DIST kibana-6.8.8-linux-x86_64.tar.gz 189162738 BLAKE2B 63ff29f7b2cf8bed931a473c0c33a9b9a82bbbd95ede171ad964e5855d56bd113981065ec12c0eb48f5e010d003229f3c91d9578a520e5909e04de5e5a635662 SHA512 f2104d1f83595cacf9ba3ce4225dc7044a251255afb62e494a7e3224cfbd280e5f51755c6a5c3452f8208fd8566ec6a11d51cd4453dc66cb8a8b158876fb4eae
-DIST kibana-7.6.2-linux-x86_64.tar.gz 249555386 BLAKE2B e3db49bbf87de5c20dd8ae91a3835d27d10bcfa914b6cf6501eeddb229f896cdfbd78fa712c0ed63498a80a87ae48b0d2bac4218d8e1328c4c228f61e4c9b5d4 SHA512 5a7187f7fd1af3d4009053b904948fca08e171ea5eea36f8120019721d84b1649bdaf1bc606577ebad179bd4d24b014a1733c8221f67b1b7da2c756c68819311
-DIST kibana-7.7.0-linux-x86_64.tar.gz 278962064 BLAKE2B 80ff28fc67d6b5d3b492a957e4cd2847364a86850abd60c468cad7d366fbbd9c406a5fd5c5e40e61ba7b5b333f0ee8c71f7c16f0da3f12fed8c81e20dec620ce SHA512 ea6e7ca12c43be627c54691e365827a2e42458ab443dedeb948a2aa2e63d1506859554a0eaef4ccdb9c03de836d4f2b4afda7daf25a826748351df2d15309b8b
-DIST kibana-7.8.0-linux-x86_64.tar.gz 334236568 BLAKE2B 17a3b593f978858bdf6910962391b3bfecb514f34b9734fb99028a4029a03603965eb3d8dae1e991782362b7963c58546abaab47ed8f3358574de93d50b94d31 SHA512 3c9ffbbfe56b66226ff62740cbe8eae83e43b07a1e3aec2ca845398c7d4418fd9c3cf67bebf5d9dd77c285468265c23c46080762cd90df070cd03ebe92b3ebef
-DIST kibana-oss-6.8.8-linux-x86_64.tar.gz 66262509 BLAKE2B 76531791f024cf98c5ebe6840564f8f49cd3539370889f209ac0b89763ad71cfd23575789c7bdeb1ad0f6adff8ee555ece530e8fdcc6e51e0671e0a4ae0095c8 SHA512 64c839cf8c1bbddf776655f6674640bd01bbe97039b78f9fac0a95f425eea37825c5fa9a06b4e8bad4e8230db02424afa569a3adcd5d36164f3d6aada8b2f4e4
-DIST kibana-oss-7.6.2-linux-x86_64.tar.gz 102252121 BLAKE2B f0b6571733b7eb5379491b8a27ee3b0ab49c643c73fd9ba53b0446f70deb059f788abf789037b9988ff398013c46653570c5ed3e539e76dd424b3ea624280e1c SHA512 639119273e0184640cf25513dd29633939c4bdc173e6577d377d60503db68989980fe09829fad8ba0862695dd7f79fd7dbd0102c3c2f9eb5e762071579a3d424
-DIST kibana-oss-7.7.0-linux-x86_64.tar.gz 138321105 BLAKE2B 148782533116a46bcaa529282ab0f8fe818789538ffac12187e95486db8757f030423e416a810c09ee20ca182e6ce80441208777e891d91961f8fc718926c975 SHA512 ed29806990a032abfeca747edcf9162f4704be5774bbe394bbe6b34c5614c97e27a900a64e9b6e7b242767bdf31729c34903c86e9708fb066f83d8df76966152
-DIST kibana-oss-7.8.0-linux-x86_64.tar.gz 151100745 BLAKE2B d8159f2abe5276afb361e4e799b69190a34c816e8814afa6284882483362e976a6baaea0bddf2b71760410633ee7ada3141a0ecbf2b43f5d543de2e1abef4b91 SHA512 637c291623fdd10cd57a2599afe221d5af1724773a02da08a6ce808a6336a64d8278f7711fdaa95c6e1557c675d417698ec40c92062c5623917b78494dfe3d63
-EBUILD kibana-bin-6.8.8.ebuild 2503 BLAKE2B 1a7338d89c5e63e1610ec3f14f39ec76794e6a07b7f4b31b66106f088dd9eb802de7944a18fe59fed5a3eba8e310e2df383f7682be317828c9327e34f2318d74 SHA512 01efdec9efc4fe2ffe4eb6cff18747115aa4e02ac462aefa0c10bcee8d460c536a04b9be99503675a7adbd1abcc09bcc29959427ac7615fdac55f5525cf55bce
-EBUILD kibana-bin-7.6.2.ebuild 2564 BLAKE2B 578c12f20b535ffaf7ee03a9c2661fd2091563be978dc5f59892c38ccc414c82c644f851cf76d9b517913e358f0db0ace42fb59e4043bb95330f67b32f028ec3 SHA512 4b57683047dfd03b60c52aa1c42af078e98e17fc5c3532a8f88d14f769fd351091d5c24a1ba3ac16044b645b6b01feee5f4f32478b86a8d0696f8869b2fc4932
-EBUILD kibana-bin-7.7.0.ebuild 2564 BLAKE2B e0d08b65a68d61c5b8cc00b10fa9b24f1f4518a51375476c61a383e90be7aa069961f3cb6c3ea2c4375196e013805402ad520cf8921385434011b2f91796908a SHA512 85a7e2cfc48e8d570b6113fd9ce77efa009ef07eeca5805a7866bfa02a7a899e283e5f17ecdef640018e2f7298c14b2a507dfe3b8286a8ca1fe5c632246f3823
-EBUILD kibana-bin-7.8.0.ebuild 2564 BLAKE2B d3805a087535b35b2f786a19ccba63f6e8c83f42287758d48aaf5aca76ebfd72eedf8e112b7f79938780659e44439f76c866c5c7da0de6c9004627e4bab0c428 SHA512 2d3f1649a05d7eede2fa2219e791250b6cac5d80ea6acd338f35489d99c8820d578dc4e0f1f06f1faa53f51c99e181dc6d399dc19b51af727ba9d11d7fc73945
+DIST kibana-6.8.11-linux-x86_64.tar.gz 188165733 BLAKE2B 719b022ad87769d129e7c6e7c6c4aec09da2bd51d079dab203573531d12df1ced9c45bc25fdc0db51d9ac178ef48183a9899ca1f2fcc6b1d3913efa4140c3321 SHA512 f353949af48d1f4a0c6365425cbdc10972a5b7dc1207231f7e6100563af66d40ad78c8904c32ec2b834d7e2e7d7e597deafc0a9be51749afbb00333280a29789
+DIST kibana-7.8.1-linux-x86_64.tar.gz 337517217 BLAKE2B 208933ef5efccea3e718ff5ef1bfa28a08c75ba3a1a91b1eb00020d33ec1df2c17e299d423be4d2f3c2c5bfcb6189a80ebade26753379148aa72d9f7901a2e8d SHA512 92f3717b2f9ea915570ee8587f1ad0c2a428c266e1cd7dcda485b8b81191c5c1b3155872299c56dbba8de93807b2cc67a0d197ecb2e8df44e09060d4fac1d759
+DIST kibana-oss-6.8.11-linux-x86_64.tar.gz 70602922 BLAKE2B 2c435daaa855f1e7961fe933896d96779ada1a49b7dd3d303f8dad5eb020f77a0afb6a6c72f99e00c94a75abfc4a838eff78b381ac646f5b86089b54070921d1 SHA512 4403fa01facddbbd8f56463f80cd588f2f3788b696272f3ad45127d75d589cbc97c62f4dad806ae25901fa3ab195d9e8aa96103bed7c5c76c52c7065c19ea6d2
+DIST kibana-oss-7.8.1-linux-x86_64.tar.gz 154344863 BLAKE2B 19fefe509efd2c803a017d5cc7ea262cfc3065c71a8dae04bbe99f7c2421a1b1a6ee0cbf298d2e7ab8b7283ef67b9f8f2c1db876136dbad7abedcc843b287db4 SHA512 381e467cb6f18892a5d5403e6eab640ffaf6ae2b76bc3e52eb94a377bf773e7dee631d0dc72162e276eafbc10c9c70629c106d25707921b32d2ebb18f69315ba
+EBUILD kibana-bin-6.8.11.ebuild 2503 BLAKE2B 1a7338d89c5e63e1610ec3f14f39ec76794e6a07b7f4b31b66106f088dd9eb802de7944a18fe59fed5a3eba8e310e2df383f7682be317828c9327e34f2318d74 SHA512 01efdec9efc4fe2ffe4eb6cff18747115aa4e02ac462aefa0c10bcee8d460c536a04b9be99503675a7adbd1abcc09bcc29959427ac7615fdac55f5525cf55bce
+EBUILD kibana-bin-7.8.1.ebuild 2564 BLAKE2B d3805a087535b35b2f786a19ccba63f6e8c83f42287758d48aaf5aca76ebfd72eedf8e112b7f79938780659e44439f76c866c5c7da0de6c9004627e4bab0c428 SHA512 2d3f1649a05d7eede2fa2219e791250b6cac5d80ea6acd338f35489d99c8820d578dc4e0f1f06f1faa53f51c99e181dc6d399dc19b51af727ba9d11d7fc73945
 MISC metadata.xml 646 BLAKE2B 761ac91ba7a5c8a1ebdaa4b85a6db083eaca8e26dd00cf753c6cd80daadec79dbf1624a26a601e7e8c1605d9e7c267dcc75455d591c658ac1ab403ac8955786c SHA512 905abb24126c45f0b170bc4073ceb3860bdb21752a2a0315e25c1c5b3baac175e228694e0d51022928d0f05cc48e261a7b5da5792c4faa06ecef16ac105f67cf
diff --git a/www-apps/kibana-bin/kibana-bin-6.8.8.ebuild b/www-apps/kibana-bin/kibana-bin-6.8.11.ebuild
index 43ac4ff48dfc..43ac4ff48dfc 100644
--- a/www-apps/kibana-bin/kibana-bin-6.8.8.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-6.8.11.ebuild
diff --git a/www-apps/kibana-bin/kibana-bin-7.6.2.ebuild b/www-apps/kibana-bin/kibana-bin-7.6.2.ebuild
deleted file mode 100644
index 0c312d1ff10f..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.6.2.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	>=net-libs/nodejs-10.15.2
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove unused directory
-	rm -r data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.7.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.7.0.ebuild
deleted file mode 100644
index b7064ff5a2e1..000000000000
--- a/www-apps/kibana-bin/kibana-bin-7.7.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-MY_PN="${PN%-bin}"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Analytics and search dashboard for Elasticsearch"
-HOMEPAGE="https://www.elastic.co/products/kibana"
-SRC_URI="x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_P}-linux-x86_64.tar.gz )
-	!x-pack? ( https://artifacts.elastic.co/downloads/${MY_PN}/${MY_PN}-oss-${PV}-linux-x86_64.tar.gz )"
-
-# source: LICENSE.txt and NOTICE.txt
-LICENSE="Apache-2.0 Artistic-2 BSD BSD-2 CC-BY-3.0 CC-BY-4.0 icu ISC MIT MPL-2.0 OFL-1.1 openssl public-domain Unlicense WTFPL-2 ZLIB x-pack? ( Elastic )"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="x-pack"
-
-RDEPEND="
-	acct-group/kibana
-	acct-user/kibana
-	>=net-libs/nodejs-10.19.0
-	x-pack? (
-		dev-libs/expat
-		dev-libs/nss
-	)"
-
-S="${WORKDIR}/${MY_P}-linux-x86_64"
-
-src_prepare() {
-	default
-
-	# remove unused directory
-	rm -r data || die
-
-	# remove bundled nodejs
-	rm -r node || die
-	sed -i 's@\(^NODE="\).*@\1/usr/bin/node"@g' \
-		bin/kibana || die
-
-	# move optimize/plugins to /var/lib/kibana
-	rm -r optimize plugins || die
-
-	# handle node.js version with RDEPEND
-	sed -i /node_version_validator/d src/setup_node_env/index.js || die
-}
-
-src_install() {
-	insinto /etc/${MY_PN}
-	doins -r config/.
-	rm -r config || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/${MY_PN}.logrotate ${MY_PN}
-
-	newconfd "${FILESDIR}"/${MY_PN}.confd ${MY_PN}
-	newinitd "${FILESDIR}"/${MY_PN}.initd ${MY_PN}
-	systemd_dounit "${FILESDIR}"/${MY_PN}.service
-
-	insinto /opt/${MY_PN}
-	doins -r .
-
-	fperms -R +x /opt/${MY_PN}/bin
-
-	diropts -m 0750 -o ${MY_PN} -g ${MY_PN}
-	keepdir /var/lib/${MY_PN}/optimize
-	keepdir /var/lib/${MY_PN}/plugins
-	keepdir /var/log/${MY_PN}
-
-	dosym ../../var/lib/kibana/optimize /opt/kibana/optimize # Bug 667214
-	dosym ../../var/lib/kibana/plugins /opt/kibana/plugins
-}
-
-pkg_postinst() {
-	ewarn "Kibana optimize/plugins directories were moved to /var/lib/kibana."
-	ewarn "In case of startup failures (FATAL Error: Cannot find module...),"
-	ewarn "please remove the optimize directory content:"
-	ewarn "rm -r /var/lib/kibana/optimize/*"
-	elog "This version of Kibana is compatible with Elasticsearch $(ver_cut 1-2) and"
-	elog "Node.js 10. Some plugins may fail with other versions of Node.js (Bug #656008)."
-	elog
-	elog "To set a customized Elasticsearch instance:"
-	elog "  OpenRC: set ES_INSTANCE in /etc/conf.d/${MY_PN}"
-	elog "  systemd: set elasticsearch.url in /etc/${MY_PN}/kibana.yml"
-	elog
-	elog "Elasticsearch can run local or remote."
-}
diff --git a/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild b/www-apps/kibana-bin/kibana-bin-7.8.1.ebuild
index 94d5e2d801f5..94d5e2d801f5 100644
--- a/www-apps/kibana-bin/kibana-bin-7.8.0.ebuild
+++ b/www-apps/kibana-bin/kibana-bin-7.8.1.ebuild
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index 9423b24a6b62..d7696e4071e6 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,14 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.5.12.tgz 46771916 BLAKE2B cb22c3a1548d2e01b309375ef3e422faa1a1603cf0205318fc18553e6ad92842c9d38db51fa4739f0b7ba969ce535d91d6c7bc79af954da61bd628cab15701ff SHA512 22c47324a259b98fc28a5f7b8061952b46bd628f2d41f7c9a0952c5d31517584b580284218743da841a8bf17ceb03ad87e1a31495bbcff7cdaac563ac2ef56de
-DIST moodle-3.6.10.tgz 47830177 BLAKE2B f28ce1b32cc4cec2eb256a9a3ad37f224e637e5e4720af4914dff80eec07cdfe738546545e9fc3db7a88517b0c10fc16a942515b3aa011d4d7588fbc2c26fffe SHA512 1ac374b1805f3a2be253279384f81c11d717eb6d9598c42490254912fe3720cba22c31525f3435785d270eda5a4340c79db43070973ebac3059549a322cfdbce
-DIST moodle-3.7.6.tgz 45867618 BLAKE2B 901a0d953e1a3329c817c032610ad797a34458fa9716ab9dcb51775faebdd30593596694ed72cbb0b0a45bb19eeee69a373f4792edce3aa530b3aeeb3cb551a3 SHA512 eaf8eeed256e9a942a5003f24bdd56ec3378d02fd33a4807b06fe2df083c5fe343014bda19d49791d20d038dbc3bc2a86e20a2e2f9fc25b45b3c00d8728c6ff1
-DIST moodle-3.8.3.tgz 53221103 BLAKE2B 7bf36c7affbe71eab027954e6690eb45137a49bad136511efe90f843de00d31b94071cac37a8ddc3f22565df960454047b42f5839ef58177b18d2737317b9c84 SHA512 d68f99717e7283f95a050d39879bffec8fe210f83d970fd5b14655be6546bf0848b75fd44bca3376b1bb7aba274c05a58b0b01d430cfbffebc02355c4a2b3759
-DIST moodle-3.9.tgz 56958303 BLAKE2B 81b4a2adab014d9e67d2a400592db56777dcecf7b16f7495f941472a8a49af74acd732d4198f2821910a1771995c85d998e1fe58ba4d6db7fc3dd4e1892cda41 SHA512 693a77fdd66ecfa9e1418e01c543d575aa8468b267de0a1dcfb6df369adc5b73223c959e57947cb56fafa94d269fbd36fd652ddf0b84ed8d5397702501a86e01
-EBUILD moodle-3.5.12.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
-EBUILD moodle-3.6.10.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
-EBUILD moodle-3.7.6.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
-EBUILD moodle-3.8.3.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
-EBUILD moodle-3.9.ebuild 2809 BLAKE2B 9dffc324aa9b154d95215344eec2c4ed22b197adb34b5d38eee3d4b54970f89f61beb3c64bf8751e8c6adb0c52660bed373c9edbd149ef4aa41ae24e0c3fc976 SHA512 6206687130349734f1731a74ec00419f20c6c34828b76c2b33cc2385a4b09a26efa172b023608252b815de014bd1d7c732d92f52268073e5c357275dc954a437
+DIST moodle-3.5.13.tgz 46770141 BLAKE2B 4e09eb7252b416d9649d698ab231ee0a13b9381b21cb62c04d59c246ce6c7014dfbe05df638fd5b4b01906e30f5fc0a3f8b2d9d4caef19e14865231320d9f65f SHA512 39988c64e86f055368373119d89cdce81308872f885918f57c96bfe76c4eb1a80407ce23d9e95404d1026a1db56794e7a8324354eb3abf614b2e8b20226fec66
+DIST moodle-3.7.7.tgz 45868976 BLAKE2B 060030e7c728f430a3062a3e033bf956fb90ea9b9ec8a43475497db06a4fad756becedc713126d3dff8410c47d83093c6d0a53dfaef5bd8a5ebb5ca7e0fa37da SHA512 5ed1b267f322681fe5895a127566ea0047afdc5799a4de084bfe752a387b4f61bbb7a105d714de2ef37f11762ed57783a1b8958c52231b02817a8205de8fb825
+DIST moodle-3.8.4.tgz 53237580 BLAKE2B e8538edda772bd092d0374676ddb99aca46c35148a8e7704ed25c5e4c641d3618674c354241bedc0a3a06c40e0e4f4ac3e5af20b8b6003df385f17469b6f2de5 SHA512 efcca1091b4ece1eb216955dc407894a31bccad276944caede8392cbfc2b29cc6bf37006e2e3c4ad6267bc24c3307c50da27f49c07496b14ab1790b7ce287191
+DIST moodle-3.9.1.tgz 56964609 BLAKE2B 576477c2b818d27f9e57cca730e2ad127b00b92729421304e3a6b7ff097ab65a2b6f94f760b233df7f8e9a89786b7f71e0f9aab3fa533362a2f1893b792d2509 SHA512 cdb07d92ca56c0a64810a881b8206111885fad9e1d1fb86649ae1bd85f2cb8670362f973447ff2a69a5420d5a56a5184beeb7d6b835c6b8624823f143380e6c2
+EBUILD moodle-3.5.13.ebuild 2809 BLAKE2B 52d5a24a58a517e33ce4a4f99cb1262c015fc769e073403762d67d83524077c98a97f0c72f09dcf5c71c67d841f7e07a8b9905bd7479e8a0d0efee9cded87807 SHA512 f3d584a1c99f2ae1b8e7a855023a2c93c8e5fe0d372c8fb472ce3f7d9a16514cd5adb59ddca25846da01c8e4a1408d4aed21e2b8d443c5202134888041ac510a
+EBUILD moodle-3.7.7.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
+EBUILD moodle-3.8.4.ebuild 2809 BLAKE2B 9f61ee05c8031f69e3585fcaba03e0e9d0a7b8a2c51e37b03575ed8759ecc51a32e7ca316bb0b2941df19dc48a15a55c86512dfcd8cf66621dd1520eb799f37a SHA512 414bdbd09cc39280b99ce545d16ec3f9014cc86350da422806c441b15fa83e2bdb60809c5506786ca79650512a5d3af463005db250910579baba4c5bba4f064d
+EBUILD moodle-3.9.1.ebuild 2809 BLAKE2B 9dffc324aa9b154d95215344eec2c4ed22b197adb34b5d38eee3d4b54970f89f61beb3c64bf8751e8c6adb0c52660bed373c9edbd149ef4aa41ae24e0c3fc976 SHA512 6206687130349734f1731a74ec00419f20c6c34828b76c2b33cc2385a4b09a26efa172b023608252b815de014bd1d7c732d92f52268073e5c357275dc954a437
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.5.12.ebuild b/www-apps/moodle/moodle-3.5.13.ebuild
index 8b94917f96cc..8b94917f96cc 100644
--- a/www-apps/moodle/moodle-3.5.12.ebuild
+++ b/www-apps/moodle/moodle-3.5.13.ebuild
diff --git a/www-apps/moodle/moodle-3.6.10.ebuild b/www-apps/moodle/moodle-3.6.10.ebuild
deleted file mode 100644
index 8b94917f96cc..000000000000
--- a/www-apps/moodle/moodle-3.6.10.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit webapp
-
-MY_BRANCH="stable$(ver_cut 1)$(ver_cut 2)"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="https://moodle.org"
-SRC_URI="https://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-3+"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-7.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	if [[ ${DB_COUNT} -eq 0 ]]; then
-		eerror
-		eerror "No database selected in your USE flags,"
-		eerror "You must select at least one."
-		eerror
-		die
-	fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-apps/moodle/moodle-3.7.6.ebuild b/www-apps/moodle/moodle-3.7.7.ebuild
index 53ac6f44ea4e..53ac6f44ea4e 100644
--- a/www-apps/moodle/moodle-3.7.6.ebuild
+++ b/www-apps/moodle/moodle-3.7.7.ebuild
diff --git a/www-apps/moodle/moodle-3.8.3.ebuild b/www-apps/moodle/moodle-3.8.4.ebuild
index 53ac6f44ea4e..53ac6f44ea4e 100644
--- a/www-apps/moodle/moodle-3.8.3.ebuild
+++ b/www-apps/moodle/moodle-3.8.4.ebuild
diff --git a/www-apps/moodle/moodle-3.9.ebuild b/www-apps/moodle/moodle-3.9.1.ebuild
index 1012b291cbc9..1012b291cbc9 100644
--- a/www-apps/moodle/moodle-3.9.ebuild
+++ b/www-apps/moodle/moodle-3.9.1.ebuild
diff --git a/www-apps/netbox/Manifest b/www-apps/netbox/Manifest
index e9d503c6c57c..fc667732b1de 100644
--- a/www-apps/netbox/Manifest
+++ b/www-apps/netbox/Manifest
@@ -1,33 +1,11 @@
 AUX gunicorn_config.py 116 BLAKE2B 44fa3354dce54136bd031012bad2c6cc5ed6208bd253985a29a0e7c6f76aee4f042b8f707d9c09e1c49be8e61b27e44ff2195b8bdc54f4c51659924717f0cdd9 SHA512 43a065aa044a028334a96a0d22ffe1c35ad1f76b605215c4d5a288943cfeeb03e7e71a6d22116764c55bd95aaea103c1026d6355c9ded9577b4a7aefbc6f71c3
-AUX netbox-2.5.11-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
-AUX netbox-2.5.12-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
-AUX netbox-2.6.1-no-pip.patch 839 BLAKE2B ccee79698c76d6867e9fe1d84a0b3b416dd99fb21dea20fdbd542cd1e620a8d1c28cef8614f56826d2728c900c4c28e2e4784ccd342aa8b53135255c2236266e SHA512 b3f6f0f420a1491a3ac9f6722cf9c65fc9c4033fb97e8d1dc9345763d4d3d9b1924fb06d1d74d1c603815ef027d8d8386bb267c173d38cdc90b22ba40954ee5a
-AUX netbox-2.6.4-no-pip.patch 652 BLAKE2B 22612628cfa2ca10303a4328ed3c09bb7859c84eda1253330639e3b3576470b34b62bd775b2888043f7d01fefff746cb044bfbf0851eb0245009f46d42c2ab5a SHA512 a331b155ee9bed9a77bfd50eb2008f7281294fe16d280a4d7dc4ecc91fcd014a7cf581a7c9d01f02e2085fb6858bb377029906fd1fcdc042610c0bdda5464537
 AUX netbox-2.6.7-no-pip.patch 1062 BLAKE2B c134503d9c65bdc82147dcf045b69531276c021d650842b28407ed92ac6c7811e98be83b73279f93db2838e2edf7c651ab4e2a43f5421487029c708edb5a6f8f SHA512 e0ac02fcb65a5b7a0e199ef1d82993f75018fd45779bd073b3cfa75b18c221b17db390d5f6a81545505771effa5cd7aabfc96da107b3968b8f7e2a8bcbed9ade
 AUX netbox-rqworker.initd 463 BLAKE2B 9a77e8366018cc6d6a3130580df1ce5e84db06f44857a89243f6f7f527c94477669d2da1f1b588386ca341acd2825484761635346e1cd61ff576c85b506525b7 SHA512 881ef3745aeab79f641e5648301d5584b9ebc8e75c550c01ce6f8d78731b5dde4d4f4b47e2f01d55c788f755eea7e633c82b2dd6027b9cd32385f7d66ff3e1ef
 AUX netbox.initd 432 BLAKE2B 500eeb7a042c930e38e5417eab92fb141dae14ae5dcb62257cd0a6ae6ca4fd0034fdf3dada4cc49a259edd9e565571102351eca447f568ab9becbd7e6a86099e SHA512 14e4544717f17d37209a1613a962fad9110ae0ec39512649d50776eaa2270fd8ba8a4456b11fb66941081aa96553668d7b3ebd12f631f56d234784bdd25f9de0
-DIST netbox-2.5.11.tar.gz 2364831 BLAKE2B e5117b2d4c3f33b231715a8b192e7954dc0611fcb270937c5c8abda3abc9f9925bd7db2c7306847428b5a24014d0c0b07ee404294b389a708d0dc7963c250691 SHA512 dfd19af01bf096ee7d8790981853d7e94d8926a4f0eeb00a061f805d56486670c058752b9a9fb23882b0b8d33e4a2d62f50a35b56c28eb2782be47e6f4b13b7d
-DIST netbox-2.5.12.tar.gz 2364874 BLAKE2B efe1360fd7c1105e5c6010ee22a882fb4fc796ff0f907974984dba35a0ab6da7724fd6042b102cebe3e3e291c3a1c65c347a5967edbaf443ece6fe61648a93be SHA512 e105a351f1150139c5bce36527ea650f95504ccc1c7b6a82c41396d69bc8671758cc3b33789c95c81785c5ff54d34c7310cd3e03e65bd006606e85021dcd1795
-DIST netbox-2.6.1.tar.gz 2393902 BLAKE2B 027115458cbb873cb7aa7660a6cd1df46a7768dc05c9280f94c23368336752034b8ede591ed4337f6b65ade1db7fac740533c3c2d932043172cf296ddd2e3f8a SHA512 8cfe4384ed4ad682ff5268e83d72716230683e86e858c857fd694838227a8b3eddfe02c1fc39b00cb36b33519d8cbb942dd4008544943e8b8f7f2d5904c10e5a
-DIST netbox-2.6.12.tar.gz 2463692 BLAKE2B 38386569b651e516cf587561f06c11be0d0e6bb9b5e664ba2403367693d29961e1379b7b0754bb2379b9af636aba03d8c9d1b611d607a2a234467b25a956bd35 SHA512 9ebb540541401a3e81a10a2345b54053c8bcb73c4e217732b2d07badf40d08bd3600b50ada13e83fdf28db447233d710b4cf0989d978117cd16a1f7220b40e4c
-DIST netbox-2.6.4.tar.gz 2408970 BLAKE2B 47fa3473e893e8443aace8b587df0065a3024a34f9509644deddce7c53e5ac8b3832df55604f3328d699f8f703ae15ad5b52312e1af8fcccabb7cd06377c8a09 SHA512 b137ec7f2d33bb7b48bcb38719ac9ea8cc31d7d38e33cedfb3279b8be2078c9a48ede10db1e4b4cab4a08c77e010060936e445cb6a1d2e6247bcc8d935cc9c3a
-DIST netbox-2.6.5.tar.gz 2408180 BLAKE2B d119a1bf8256e0d6265eda7122a1d436ecb0e8e640acd12890d242c2c93768b21b5f8ebdbaecdfa31c0eaab0150edf52f08a1f424102fd940dd359bd8eafd4af SHA512 0b76e5bc3f56effbf7493680d10d549caf36e7769e21a2c24449cbe329379369f3428354c228d0cbbbc153dc62efb5c0e56c4a0d71c99f3267acd2446f48fb8a
-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
 DIST netbox-2.7.6.tar.gz 4949672 BLAKE2B 1847e5a05493f55ca777737c11b4751bc63183d693f742c7f9b9e5d6a498fe786a60619d40394473488881e6ef922a343cacd796126b8c618158eea9ab26216d SHA512 065e9c4338fb876ac626f5dec5c98ba2ee798b2fd6d4d8a8d4e57fff4072c649e51a1db633c2718be9ca10b362e7ead9b70655fa77ae6da9f01706e60135e306
 DIST netbox-2.7.8.tar.gz 5587481 BLAKE2B 9b524ca7acc1d650402a72aa65f75d7205cf29a3a5cfa9256ff47d12f240fc38903a6db76b8cee2b923947f6e31b124ba0bfdfbf4385fb6fd027634b3b8ba675 SHA512 cce73b9bbd79725e4af01a9265c0a9f14a1ac708186123c1a90f267149157a0c174cd32d5e56875b5fdb55ef87b2ec668ec542b1d3a01256544065d6a0457b54
-EBUILD netbox-2.5.11.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
-EBUILD netbox-2.5.12.ebuild 4242 BLAKE2B 48a241e73c060680f375513f59df15bd95ee1c6e1e2f37c9c33999984bc5a1658e685d70106eb715c933572e8144c95d2ae395adf96e9bbae167dff458437d23 SHA512 ddaaf41fdb5b9f78d838e3d297623d3fc1620c6e64ce62c45055c73d0c9124584f224c41dd3183d06b986c03803332856064e76886e5b876fc1813ebf398d869
-EBUILD netbox-2.6.1.ebuild 4449 BLAKE2B 24567d71dfaeeea03349cfa21ce894eedf2ef5ee982163d2e1b26fd589fd57ab8861284f7a3bd0e67e22d276c380e5d3afccc34eb542334c801797bb29e48dc6 SHA512 673f8f45083827a69f5997affc1d688d5e907e7946a5ec9bb91d339735b3f6fb05333ed02d43e5d08c5bbe4ee6cdb1ee5893f0440b7c1ebd62433b0153cda79e
-EBUILD netbox-2.6.12.ebuild 4419 BLAKE2B 6b6d44d739de39dbd0ae9022c2471d7deb246f51d8f20c7550fe3a0f5c83bcb2d0d7cfd253dd4117ae9d18451ec46947ac3a6dae343b4eec888b502b069cd0bb SHA512 562710d0d8733fa8c3e44b58e420b7fbd6d101ba567a00dd04350d27f0b40d98b208b0aa45fe8e2b158f2e55887830aef2b02205b730ea6c48310a18e8349481
-EBUILD netbox-2.6.4.ebuild 4457 BLAKE2B e13c5ee4a071dfa2b75f22b9369657c5e4fad707fa88c668a91eec55b31a5f00c8c7932de57c202157c8496527e189299095f0654b0fd81abb2299db16efbc12 SHA512 6d8614ce6fa21c0c1126f1bca90eeb96cd872bf7d2bd6c0525eb514584eff02b067104a4a67fc77b012a2f548edf87446188a338c6e984814dd97a65d1a4cbc8
-EBUILD netbox-2.6.5.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
-EBUILD netbox-2.6.6.ebuild 4464 BLAKE2B 4c1322abab0988fbfb1a6ff7a765401eb29d5dff881f8698f84e8ff1d1761c0a3738663dffddba3a0b2ce0ee59570851a66fc9a90d0ab4f0571290ee44522551 SHA512 6a6e6a23548ed6586caaac4a7116c825a4b8359a74918d1bc442c35218c1a0ac6208689e2576ba6c3d29f6a2530fc15b7293ebe2815e281eeac6b642e85cca2f
-EBUILD netbox-2.6.7.ebuild 4457 BLAKE2B ca5c253c76db4596ac10d782f4d6e51f479e67a4db4417282c6a8d8e976df9930f1724eb5a38bd1d91a2afff8cc10ea76ac71178caf95bfef007e808e657d36c SHA512 dd70ecd8158c2dd8fadc2efe44f8f90cd38bdecbbc229cd299019cd7ae9203b9f3882383f338a7bbc188b97b0ea53a9a4b6e9d7211cf1f72c62791949f16252c
-EBUILD netbox-2.6.8.ebuild 4464 BLAKE2B 920519600bd479d04b245dd011397acfb994a400af5d1bd4de443eddada71dadd681bf76dc682f381159509327f1440a81764efe22ca27f25178bbbfb9946769 SHA512 76003344da3f5d981f688889a7f83670ae4e1acf3cec631bf58493f0260ca194d3160cb22f39a598e8596d7001ca018d5364c76fc6c80681f144f40ae84df55e
 EBUILD netbox-2.7.2.ebuild 4425 BLAKE2B 667e32b5e472a4e48d70dc784701911836b1ec52057f5d245d1e5cb7def4350379d0dacf9b39be03d424845d6b06de671f5a5fde25e1cd6f64bde4121dede8de SHA512 9a5d44bd4d2efaac8a7f2c13b7c11f9db3caa300ed8f609c6b9874c7507e9d000f055945c853d01625270ad2adf49b8b6f42d2e18de1ebddaa8f354da9e3fc17
 EBUILD netbox-2.7.6.ebuild 4425 BLAKE2B 667e32b5e472a4e48d70dc784701911836b1ec52057f5d245d1e5cb7def4350379d0dacf9b39be03d424845d6b06de671f5a5fde25e1cd6f64bde4121dede8de SHA512 9a5d44bd4d2efaac8a7f2c13b7c11f9db3caa300ed8f609c6b9874c7507e9d000f055945c853d01625270ad2adf49b8b6f42d2e18de1ebddaa8f354da9e3fc17
 EBUILD netbox-2.7.8.ebuild 4485 BLAKE2B 9042ae90733096d06a97eea263b7fbe846efaa9f88cccc3f0598c7efe0ea8357f06b9a6730782f010b409d3c5744c519037770f143ef43975c77c8ce219c74b1 SHA512 526b1fb059ca62952a828f77bd56639b28b457a94753dcca5ae70925e24b7a6954a6e5a0f6ab7e186e2bf0853576e92cf64a50ce7ede8b86926984db2ddd6e25
-MISC metadata.xml 328 BLAKE2B 03603c5bca97aae6d5753f027154ac8bb824639f9f4cae14feb0d50136673e67d1baf0a85d69a09babccd01ba4c48cea035f3f56d11a225ac80daf40ea647c10 SHA512 b40d38d175604c9039a2f3aa2ef3fcdbb626f75ca8128efe16112e03f5bab8d32775e56ad67fb6d20024149b95624cd487703a23726fb904770aa3ad00119c43
+MISC metadata.xml 248 BLAKE2B 5d9c3678c604aac0f24c5d5015e28f02b9ce83bb6a179755a44adeb3d69e4dd50be4acc30a6317649f5be23bcf13ac210bbe4712aa403e9c4cf2de351b39c941 SHA512 dc5b06a888be6367909895d5891a08189f4657bcee602e5ff0021be2ad3677e58ec7387ff244625be66a142138666e7eac790d2a7b1e298f0ad644725b5e57e0
diff --git a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch b/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e6..000000000000
--- a/www-apps/netbox/files/netbox-2.5.11-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch b/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e6..000000000000
--- a/www-apps/netbox/files/netbox-2.5.12-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch b/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
deleted file mode 100644
index 5d1fa595f4e6..000000000000
--- a/www-apps/netbox/files/netbox-2.6.1-no-pip.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 24e79f5b..248e1cb5 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -8,22 +8,6 @@
- PYTHON="python3"
- PIP="pip3"
- 
--# TODO: Remove this in v2.6 as it is no longer needed under Python 3
--# Delete stale bytecode
--COMMAND="find . -name \"*.pyc\" -delete"
--echo "Cleaning up stale Python bytecode ($COMMAND)..."
--eval $COMMAND
--
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/files/netbox-2.6.4-no-pip.patch b/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
deleted file mode 100644
index ba281aaea5d1..000000000000
--- a/www-apps/netbox/files/netbox-2.6.4-no-pip.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/upgrade.sh b/upgrade.sh
-index 793e72cd..8490d713 100755
---- a/upgrade.sh
-+++ b/upgrade.sh
-@@ -10,16 +10,6 @@ cd "$(dirname "$0")"
- PYTHON="python3"
- PIP="pip3"
- 
--# Uninstall any Python packages which are no longer needed
--COMMAND="${PIP} uninstall -r old_requirements.txt -y"
--echo "Removing old Python packages ($COMMAND)..."
--eval $COMMAND
--
--# Install any new Python packages
--COMMAND="${PIP} install -r requirements.txt --upgrade"
--echo "Updating required Python packages ($COMMAND)..."
--eval $COMMAND
--
- # Apply any database migrations
- COMMAND="${PYTHON} netbox/manage.py migrate"
- echo "Applying database migrations ($COMMAND)..."
diff --git a/www-apps/netbox/metadata.xml b/www-apps/netbox/metadata.xml
index f53806a22836..c36c37139fad 100644
--- a/www-apps/netbox/metadata.xml
+++ b/www-apps/netbox/metadata.xml
@@ -5,7 +5,4 @@
 		<email>williamh@gentoo.org</email>
 		<name>William Hubbs</name>
 	</maintainer>
-		<use>
-					<flag name="webhooks">Enable webhooks via django-rq</flag>
-	</use>
 </pkgmetadata>
diff --git a/www-apps/netbox/netbox-2.5.11.ebuild b/www-apps/netbox/netbox-2.5.11.ebuild
deleted file mode 100644
index 64de819ea055..000000000000
--- a/www-apps/netbox/netbox-2.5.11.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-	')
-	webhooks? ( dev-python/django-rq )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/netbox/netbox-2.5.12.ebuild b/www-apps/netbox/netbox-2.5.12.ebuild
deleted file mode 100644
index 64de819ea055..000000000000
--- a/www-apps/netbox/netbox-2.5.12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-2.4.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-1.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-0.23.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.14.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-5.3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.7.6.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.7.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-	')
-	webhooks? ( dev-python/django-rq )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/netbox/netbox-2.6.1.ebuild b/www-apps/netbox/netbox-2.6.1.ebuild
deleted file mode 100644
index 04c487ccf5f5..000000000000
--- a/www-apps/netbox/netbox-2.6.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user readme.gentoo-r1
-
-DESCRIPTION="IP address and data center infrastructure management tool"
-HOMEPAGE="https://github.com/digitalocean/netbox"
-SRC_URI="https://github.com/digitalocean/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="ldap webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/netbox/netbox-2.6.12.ebuild b/www-apps/netbox/netbox-2.6.12.ebuild
deleted file mode 100644
index d6676c7aca58..000000000000
--- a/www-apps/netbox/netbox-2.6.12.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-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 webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	acct-group/netbox
-	acct-user/netbox
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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}
-	use webhooks &&
-		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/netbox/netbox-2.6.4.ebuild b/www-apps/netbox/netbox-2.6.4.ebuild
deleted file mode 100644
index a060ba59442d..000000000000
--- a/www-apps/netbox/netbox-2.6.4.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user 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 webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/netbox/netbox-2.6.5.ebuild b/www-apps/netbox/netbox-2.6.5.ebuild
deleted file mode 100644
index c9b078880e56..000000000000
--- a/www-apps/netbox/netbox-2.6.5.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user 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 webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.4-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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/netbox/netbox-2.6.6.ebuild b/www-apps/netbox/netbox-2.6.6.ebuild
deleted file mode 100644
index c9b078880e56..000000000000
--- a/www-apps/netbox/netbox-2.6.6.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user 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 webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.0.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.4-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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/netbox/netbox-2.6.7.ebuild b/www-apps/netbox/netbox-2.6.7.ebuild
deleted file mode 100644
index 748180d6cc27..000000000000
--- a/www-apps/netbox/netbox-2.6.7.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user 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 webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_USEDEP}] )
-	')"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/netbox/netbox-2.6.8.ebuild b/www-apps/netbox/netbox-2.6.8.ebuild
deleted file mode 100644
index 233c4920008f..000000000000
--- a/www-apps/netbox/netbox-2.6.8.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-inherit python-single-r1 user 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 webhooks"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-RDEPEND="
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		>=dev-python/django-2.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cacheops-4.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-cors-headers-3.0.2[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-debug-toolbar-2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-filter-2.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-mptt-0.9.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-prometheus-1.0.15[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-tables2-2.0.6[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-1.1.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-taggit-serializer-0.1.7[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/django-timezone-field-3.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/djangorestframework-3.9.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/drf-yasg-1.16.0[${PYTHON_MULTI_USEDEP},validation]
-		>=dev-python/graphviz-0.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/jinja-2.10.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/markdown-2.6.11[${PYTHON_MULTI_USEDEP}]
-		<dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/netaddr-0.7.19[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pillow-6.2.0[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/psycopg-2.8.3[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/py-gfm-0.1.4[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/pycryptodome-3.8.2[${PYTHON_MULTI_USEDEP}]
-		www-servers/gunicorn[${PYTHON_MULTI_USEDEP}]
-		ldap? ( >=dev-python/django-auth-ldap-1.7[${PYTHON_MULTI_USEDEP}] )
-		webhooks? ( >=dev-python/django-rq-2.1.0[${PYTHON_MULTI_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 or webhooks, set the
-appropriate use flags when you emerge netbox to install the
-dependencies.
-
-Once that is done, you should be able to add the netbox service to the
-default runlevel and start it.
-
-If you have webhooks turned on,  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/
-"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-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}
-	use webhooks &&
-		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/nextcloud/Manifest b/www-apps/nextcloud/Manifest
index 81f953989886..e76ee8e491b5 100644
--- a/www-apps/nextcloud/Manifest
+++ b/www-apps/nextcloud/Manifest
@@ -1,15 +1,21 @@
 DIST nextcloud-17.0.5.tar.bz2 66618876 BLAKE2B 9d7aabafadc768e72f90180fb0763a16188f09e0ab657fcfea762fffa53af87c5ed546f0176852346973164ecd42edac8acd6120392ce075e96658f70e2c1740 SHA512 b6b5ddd85666ca6542ba945adb4bd0196997d815aa0d232b83fb5e29be2b3cdef891d3fb349c86d2aeef7356fd71c234bcf4b569ce41b0082f86a909148930a1
 DIST nextcloud-17.0.6.tar.bz2 66599870 BLAKE2B dd4c66fcdb8c2aca978ebc1df52970cda189e56b3e48465e5a1ce9191a2e6499cc069910ef894699d9e888206335e5ac59cc813b0f2108cd585e776f88f0e333 SHA512 e97f74d2890815742654af8c3248ae8378f7d8fe57c13657824354cdd90d4a30b99dd2249980b885ec73eaba9d2ed0c1fdc9254f926f3de26f1c2832e36e9344
 DIST nextcloud-17.0.7.tar.bz2 66884867 BLAKE2B 4800a13b0573f61dc380c518b81de216cfbbfccb45ec57e81ef7cbe308cf24e2c59dc30eac30f378123e0c814625d9412f2adbcb85763196a8a2f86e8b913e62 SHA512 52c4c499214e37edf8cc7fffce8ed71b8bc0efaf927507e0f6222503de40c146b62da61671e608f33f809ea0ad9c67dd7275a349aaa61a08ce2de5fb7a2f1e2d
+DIST nextcloud-17.0.8.tar.bz2 66991137 BLAKE2B 8c7d685a7392164c673719733ce14adef90833f862e0fb379defd6d7642d5163fea74380d3359fb382649c7072ad375901edf4337d24e9434120c2786515df77 SHA512 c9a711fb1ad6871233fea581d6cbfe7083e925683235a86023842d3c9d65db6779218bce06c5960743fb277bb779c6cad4eb40eca65ade9e50f8459cbee531c3
 DIST nextcloud-18.0.3.tar.bz2 86636651 BLAKE2B ad73d397dfd8ceaa5b1edc42031a350560fd80c0c55500cff5e394f3a0ffedc0c02a5a0bbdb4579fba2765fe542cae6e8c835c2f6e07755ec368556d207cdecd SHA512 b1f433dee2e7eea800de8cd8131332530050b6194460a397081a134f63b236f65e33758c60cd8e97a43570d0b6a1baac9e0503535d85a9a34cd63abd50041292
 DIST nextcloud-18.0.4.tar.bz2 86677670 BLAKE2B 57675e71a50bffc3953cb41095e41fd5a3ac30c680097fcaded34db40dc8de4b972c1c751da39b2eb500d6a3ea4dba081058b9cda52a1ad3d2dd600d9a55592f SHA512 c9754562153fdb07e0c65d5cc9749871c875a455051cd632403c31b8cb52540b95f3fdf5ba3146d65a175508580b6f3c72d3ac86a90b060baafbca1225dbba95
 DIST nextcloud-18.0.6.tar.bz2 87767296 BLAKE2B 36d775861cf849e32ef9d1cfbf970ae7f3c24d19e99c7c4feb13fb29623e6a24077d384e08c38a0fbea98e1502dec37ee024ee1e6674326230d31021dd3c0c37 SHA512 812af75c893597c2683382362943df1973a78c67463c7f7e93fe721be6d60a98f9a70286c1b06f4d9757373b84a8f0ee8a5aaf21f005c9bdcb1dced2fdd7f270
+DIST nextcloud-18.0.7.tar.bz2 87752820 BLAKE2B 0c54842ea2f90ba7981129feccdcac390ad6ef55bb04ebeefc6e04e1fff8b693c8727c89c314e8fafa0296a85231fe08f0cfc184be830faea926b119065ff221 SHA512 62dc2100e42e7bc1b112efda756a6a8d1dc5d818e3287041d56fbc05ab90f04b2545320715ea39e9018abbe9f9297a02d2432e55720da3fd0b59badf263e8575
 DIST nextcloud-19.0.0.tar.bz2 90077143 BLAKE2B cbffdda9dcf08209f09ca05071d3f27f97fb0b333298ed72f4c71939e2b43657c957f21cf27c0acdcc9aa325e04977262297bc9620bc515eb0343bb105546d22 SHA512 ac98083887ed59a3cf1003773c46270ba03ad631c4b1ed3608a3de349ecaaf32b9e084307d19bf67956d258fbf7acbe8739f32d34ce07db3c518a9bf5f50aa0d
+DIST nextcloud-19.0.1.tar.bz2 90595211 BLAKE2B 72feeca3105d31ada79b16cbc345ec191e37a7e2364cffd6c37ac60c990dbe0345f4c9f1b815ccf3632d1c31b5d561b6fc4d9870ee25dee48c51ae518bbd4a72 SHA512 aa4db108bff2b452123e5513bde03fe4c2f1da58c1987d74a246a69714fedf121ca9ed6151609d87c91dd6109419b764ba02c5c3c1669c5ddd5a49118e68f0c0
 EBUILD nextcloud-17.0.5.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-17.0.6.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-17.0.7.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-17.0.8.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-18.0.3.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-18.0.4.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-18.0.6.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-18.0.7.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 EBUILD nextcloud-19.0.0.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
+EBUILD nextcloud-19.0.1.ebuild 1023 BLAKE2B a3ec5ad68dbd2dfa107ee4ef3ab0a4afcb2b6b271b7498f0fee12fc0c585f729bc3df9ac89119c631ec3bc8c1273c6fdb1782f38a502670303f31d2b6ca2ceb3 SHA512 3eeb817d295fd6128b400aab95a56e05a5d20f611c9cac1685863c82534cd302bf0d011752896d9a61f2777722f44ca46eb02ab1bfa3c26e3a9db91d3b9a6357
 MISC metadata.xml 363 BLAKE2B 4da5b0e27af01e94e1e68b98274da6c9cacbe59ed1d85413038bccfa530af8fd479a7edd89f4d7633dfb07afbad4736cb6c075e021db7dc9761c273ec1256500 SHA512 60195d5859a8b175346a1cd533dbb6496d2787c1ff501d9233b2b1794670ae344c6f9f4cac4fbf86b24686a83692cff27513d05243947e2921e554e065696721
diff --git a/www-apps/nextcloud/nextcloud-17.0.8.ebuild b/www-apps/nextcloud/nextcloud-17.0.8.ebuild
new file mode 100644
index 000000000000..de1b7898efdf
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-17.0.8.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-18.0.7.ebuild b/www-apps/nextcloud/nextcloud-18.0.7.ebuild
new file mode 100644
index 000000000000..de1b7898efdf
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-18.0.7.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nextcloud/nextcloud-19.0.1.ebuild b/www-apps/nextcloud/nextcloud-19.0.1.ebuild
new file mode 100644
index 000000000000..de1b7898efdf
--- /dev/null
+++ b/www-apps/nextcloud/nextcloud-19.0.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Personal cloud that runs on your own server"
+HOMEPAGE="https://nextcloud.com/"
+SRC_URI="https://download.nextcloud.com/server/releases/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="+curl +imagemagick mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND="dev-lang/php[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,truetype,xmlreader,xmlwriter,zip]
+	imagemagick? ( dev-php/pecl-imagick )
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
diff --git a/www-apps/nikola/Manifest b/www-apps/nikola/Manifest
index d79eb678e52c..66b785fb3944 100644
--- a/www-apps/nikola/Manifest
+++ b/www-apps/nikola/Manifest
@@ -2,8 +2,11 @@ AUX nikola-8.0.4-setup-py.patch 1340 BLAKE2B 7eb27b287eaf588dfc50b21b4be27ec7239
 DIST Nikola-7.8.15.tar.gz 4131518 BLAKE2B ea3dca9340852a68b668de82e5deeaa0ecf7bb8597f311721b27409fe0cf820919c79f6e631b030bd3ea4571dd8480c862c607d0b9e6015a8b03023de5a9b93e SHA512 b441ae014539b948d007183ceb574243b89a498be265da7245095f67510d4d7c109c4935e0f9765b4144e82f788a1b66a0eacfba1477a89ce6c2645cb77102d7
 DIST Nikola-8.0.4.tar.gz 4137494 BLAKE2B 04db8b83f34ca9b3cee785c5eed9d0421d27acf750c4f17dc3bec0df6fd4f462af52a65c0c97a07777922da3bf3fa855d58d546479b19bfb152e8190d2f74524 SHA512 eb6774d11be4eab81fbe41115d80e5d0d38694b734431d5d6355fcd3e3d8ae5ff4a02114c5dd0dbbc9e1ea5a625e9ac2b6b91e82f6e017b4376e4ca8d56cfec7
 DIST Nikola-8.1.0.tar.gz 4298799 BLAKE2B 568b6b39506ab78c84bdb5fc1bf66829a714d41e1c88afe40236e915a801ce8214e7913ecfda7816d11af17beb9bdb54a0c60a88ef72ce53f7bdac91d057489d SHA512 b88fdf4848314e6428b7f3c4a891aefe682f1ae6a2cdc8da25de1d6af839f5d6f3410e23d90b76094f082aebe15d7e51b2c9cd079d017960bb979503d62a4b68
+DIST Nikola-8.1.1.tar.gz 4299903 BLAKE2B 75997604e21484bcaab26afa056c3c82f5d19c810e8a388af07aa3c10f8bd341e912c089af5d3aeda51748b6ec17ee07a7c577d5df1a801b032b0bd100188a9a SHA512 a833cb7687077266a20f7043f99b03391f350b48ceea71250158e760b0e44b603de1d6e398a03ec848483775501ad248b6ac45a23ceb250d120a63f110d482b5
 EBUILD nikola-7.8.15-r1.ebuild 2308 BLAKE2B 8255869559c71596870d46e963fd9e62f11dd01d4bc4078b82de8603b6a139e44de8eb3684cb3c1e02c1fa92911bbf5f968b080ae994ddd73709b6d3ad53b4a7 SHA512 6ade40546b0eb338b59fad069070761a09ca8e98217727a7561cc7e78d7e1368c1f1845316267fe1834c755384ca0cdf372069cdbd8defe52b37a5804753d5a5
 EBUILD nikola-7.8.15.ebuild 2396 BLAKE2B e7990b3c204afc29ba7d6f2cc2dc5818dde75c2fe27bbc26bd9b8a56f8660f6203cfb1de37f3e13856795ef4fee277ee60c9bf8828fd3f75e8a6b405f447b1b2 SHA512 202047d568d8549c313d9584ada3a59cddcae3a80fdb663e91101b21d159b1ec997233ef7d869f69254cb999022ea0fc8a231d31991b854eab7ffb3cdb153076
-EBUILD nikola-8.0.4.ebuild 2356 BLAKE2B 96e4d7fa29d2306746af735cb0f3ea8a7140f5190d29749fe2f3cee75f20531e97ec22844e191c43d9667ada2d35ca127ff4a8654dd8b997479691532c80fe26 SHA512 8450b7a9d9cf10ff6339e2c33325e70a3d23dc445cdf1d69ef27543bb4a3a305d4121d4fc1696de26819b8063f9a245bbb9e4c4e8dfced054fbf24c6db55c37b
-EBUILD nikola-8.1.0.ebuild 2306 BLAKE2B f8a1a5606e9f2c7ae19926d543e7008b5066b61771d5f12ed0932af880f100406a30304043413bcbe7b40f9e3ca6ef31b3eb9332ec05747213b657b3e92de523 SHA512 b112a676916bb623845520dcf3fa923ab025b29d69c60f2d33fd30768e3731c20e9780096e48e964c8348c521476cb32f4454116d7b7d4e3ef1698d67dce0559
-MISC metadata.xml 1368 BLAKE2B b24365e67cddf550d9f73f2e4ac933ecae46032690ec1427573a1fa664603c1774ba6cc1dd6771672ecedac32ff815fe786b05ba843dd20b05443895a47af79f SHA512 cf68437e746e5f35fd861be6c4d8bb501489a219fe4e98b725721c81a9c5c3304432d0375130fd8d392b492c25c5196ff7bb402ba6ecba15503641694a818c7d
+EBUILD nikola-8.0.4.ebuild 2362 BLAKE2B b2847302f571510ab4d0c90756ef78a6d9dc106f311a58fc1378ad94dfcd5b5ebac5a4b3d79c8c88e10deddbc8e1dc26cd0ae101d815b99dae9366840b435354 SHA512 52ca4d3ab972b0c0e164be7fa5359865aaf6b1ad28ba75e84737434bb1bae8f8630e08478b0c8fee25beeb1edf76578227c2535f5f21e779564dce4be7793f9b
+EBUILD nikola-8.1.0.ebuild 2312 BLAKE2B d9f6492b5e2a0747ddcac3e81d3b948b980ebb7759171f3c35aee4ccdca42a58d37575617f4207755ce5cf090261289622eb89454fc70523d705e01e7909341f SHA512 ecc9db71946d7f3495452d8c2f13e2a9fb3407abc83b1b1c4f8f334c96d74bd8d38083f34de46b056acc13b85601c2117acc60f0f0899806d0331a5aed5386bd
+EBUILD nikola-8.1.1-r1.ebuild 2192 BLAKE2B 61e1c9eb37ae6fb02ac06de77432920335ae05f93ef347bebb20111e0a8b950fe3fe8f9a738730a1286b3d998db203748fb42d00d0df13aea57fa595328303c7 SHA512 218c21e19811b50a63420c2031cadb7c310d833303aaeb2a33558bf9ab763aaa258988a84dfb7d8a3be92b61d60aec464dbe865c0c39c86064d0d54eace92d51
+EBUILD nikola-8.1.1.ebuild 2312 BLAKE2B d9f6492b5e2a0747ddcac3e81d3b948b980ebb7759171f3c35aee4ccdca42a58d37575617f4207755ce5cf090261289622eb89454fc70523d705e01e7909341f SHA512 ecc9db71946d7f3495452d8c2f13e2a9fb3407abc83b1b1c4f8f334c96d74bd8d38083f34de46b056acc13b85601c2117acc60f0f0899806d0331a5aed5386bd
+MISC metadata.xml 1408 BLAKE2B c23be01555581f4fe904d10b24f098a689546d8a84665427f9fbed15a8676be590e16ef4f129c3eacc3db62eb61576bf86815fd80879d6fe64136ee11243ab17 SHA512 0edc102eae251cd7a095373ac293d0baf2f4eff541a85ebceba3ecf539b51fbe68d8fac9154450d16543af618faa55ac9aa39bdcdda64ade35847bbdb0e78fa8
diff --git a/www-apps/nikola/metadata.xml b/www-apps/nikola/metadata.xml
index 929eafbf40bf..56b283c01d83 100644
--- a/www-apps/nikola/metadata.xml
+++ b/www-apps/nikola/metadata.xml
@@ -7,14 +7,13 @@
   </maintainer>
   <use>
     <flag name="assets">
-      Support web asset management through <pkg>dev-python/assets</pkg>
+      Support web asset management
     </flag>
     <flag name="charts">
       Support chart generation through <pkg>dev-python/pygal</pkg>
     </flag>
     <flag name="ghpages">
-      Add support for direct uploading to github pages thru
-      <pkg>dev-vcs/ghp-import</pkg>
+      Add support for direct uploading to github pages
     </flag>
     <flag name="hyphenation">
       Add hyphenation support through <pkg>dev-python/pyphen</pkg>
@@ -26,6 +25,9 @@
       Add support for <pkg>dev-python/jinja</pkg> as alternative templating
       engine to Mako
     </flag>
+    <flag name="server">
+      Enable support for built-in web server using <pkg>dev-python/aiohttp</pkg>
+    </flag>
     <flag name="watchdog">
       Use <pkg>dev-python/watchdog</pkg> to monitor file system events
     </flag>
diff --git a/www-apps/nikola/nikola-8.0.4.ebuild b/www-apps/nikola/nikola-8.0.4.ebuild
index 903eb3874a75..33b7daf3e3be 100644
--- a/www-apps/nikola/nikola-8.0.4.ebuild
+++ b/www-apps/nikola/nikola-8.0.4.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/www-apps/nikola/nikola-8.1.0.ebuild b/www-apps/nikola/nikola-8.1.0.ebuild
index 642cf090d2e6..0d8e0f950fc1 100644
--- a/www-apps/nikola/nikola-8.1.0.ebuild
+++ b/www-apps/nikola/nikola-8.1.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_{6,7,8} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
diff --git a/www-apps/nikola/nikola-8.1.1-r1.ebuild b/www-apps/nikola/nikola-8.1.1-r1.ebuild
new file mode 100644
index 000000000000..8abf4ceff6cf
--- /dev/null
+++ b/www-apps/nikola/nikola-8.1.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts hyphenation ipython jinja server watchdog webmedia"
+REQUIRED_USE="server? ( watchdog )"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[jpeg,${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	server? ( dev-python/aiohttp[${PYTHON_USEDEP}] )
+	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${ED}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
+	gunzip "${ED}/usr/share/man/man1/${PN}.1.gz" || die
+}
diff --git a/www-apps/nikola/nikola-8.1.1.ebuild b/www-apps/nikola/nikola-8.1.1.ebuild
new file mode 100644
index 000000000000..0d8e0f950fc1
--- /dev/null
+++ b/www-apps/nikola/nikola-8.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+MY_PN="Nikola"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A static website and blog generator"
+HOMEPAGE="https://getnikola.com/"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="MIT Apache-2.0 CC0-1.0 public-domain"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="assets charts ghpages hyphenation ipython jinja watchdog webmedia websocket"
+RESTRICT="test" # needs coveralls
+
+DEPEND=">=dev-python/docutils-0.13[${PYTHON_USEDEP}]" # needs rst2man to build manpage
+RDEPEND="${DEPEND}
+	>=dev-python/Babel-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/blinker-1.3[${PYTHON_USEDEP}]
+	>=dev-python/doit-0.32[${PYTHON_USEDEP}]
+	>=dev-python/lxml-3.3.5[${PYTHON_USEDEP}]
+	>=dev-python/mako-1.0[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/natsort-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/piexif-1.0.3[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/PyRSS2Gen-1.1[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.6.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/unidecode-0.04.16[${PYTHON_USEDEP}]
+	>=dev-python/yapsy-1.11.223[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/cloudpickle[${PYTHON_USEDEP}]
+	assets? ( >=dev-python/webassets-0.10.1[${PYTHON_USEDEP}] )
+	charts? ( >=dev-python/pygal-2.0.1[${PYTHON_USEDEP}] )
+	ghpages? ( >=dev-vcs/ghp-import-0.4.1[${PYTHON_USEDEP}] )
+	hyphenation? ( >=dev-python/pyphen-0.9.1[${PYTHON_USEDEP}] )
+	ipython? ( >=dev-python/ipython-2.0.0[notebook,${PYTHON_USEDEP}] )
+	jinja? ( >=dev-python/jinja-2.7.2[${PYTHON_USEDEP}] )
+	watchdog? ( >=dev-python/watchdog-0.8.3[${PYTHON_USEDEP}] )
+	webmedia? ( >=dev-python/micawber-0.3.0[${PYTHON_USEDEP}] )
+	websocket? ( ~dev-python/ws4py-0.3.4[${PYTHON_USEDEP}] )"
+#	typography? ( >=dev-python/typogrify-2.0.4[${PYTHON_USEDEP}] ) # needs smartypants
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	distutils-r1_src_install
+
+	# hackish way to remove docs that ended up in the wrong place
+	rm -rv "${D}/usr/share/doc/${PN}" || die
+
+	dodoc AUTHORS.txt CHANGES.txt README.rst docs/*.rst
+	gunzip "${D}/usr/share/man/man1/${PN}.1.gz" || die
+}
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
deleted file mode 100644
index 7cc8f3905893..000000000000
--- a/www-apps/otrs/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX otrs.service 246 BLAKE2B 1909aace3a51119d58e6e8296a581771189d1b35f53db525e7574745bcaf0f8f2279e66c2dd39137131c4f7e30bfa0e3c25753712e35c3cfb59da2fb17af0e30 SHA512 52fbaf320b3943ec51b178cf0558f77d208b6f735e3278a790f48c74770bfc0b87888ac9225b43c0f7f3b0149296497b2c405b0424995d1d6f83a33b5d072ae7
-DIST otrs-5.0.25.tar.bz2 20671315 BLAKE2B 045037411039f480434e7c36ab84b63ec0c119e39cc6918ba05d9a7c92e5c940545412dc2824fc427199b384dece34793d2b60fadafec302f67581aabdc5ac82 SHA512 1e68471f071265d963c51ab5a6510a9a9b23d3de87e10eb58b9f9ca937500f4fdf68a7e911f9509244e4cbf43e1658c95dbaba83160d736ea0116167f3361e37
-DIST otrs-6.0.3.tar.bz2 24314514 BLAKE2B 97d794d59269d354b28003879bf0d30cc9b0f7a7d375416df90d85b694ac59e84978fe61183aa058497da18631513c25ecc93e3150f662e2e2efd335014e1e75 SHA512 d7f551e2c9bbe8b303d3de1f7993d76ea22cfd876b61941cfb72a25f2ba7e0a889c275c87aa40c104c1f2e6e1923b7a530cd088bd11b7b575a608b623e2b0541
-DIST otrs-6.0.4.tar.bz2 24355298 BLAKE2B 2f27e7a34b1bad0d58193c834503f051a1a1822afb53dca185ae2f8329d048446acc4e27e823b6f27660c79179bbb48f1976c0b3a6710bc083f791c0a777152c SHA512 23e9a29a6f080c6afa92704d25363687d50073c94192ba81e69ddab55fb9f945a38a5757a4c60c2d46bfc5a0002ca13bbbce1cc0c945f40e23bb864ebc57edd1
-DIST otrs-6.0.5.tar.bz2 24368010 BLAKE2B 20511dfbca16d275a1c4f7f07f8cc9e350c182661c95932f59899400b232612aed95fecac422528e37dd01b772225e78f25464bae40490abd88b391b05ac7b15 SHA512 fe669fb83acef8252cc53b24378757e498201e916a7fc1cb5f509efe777ec2bf36925264a7080f02e50a115285c26429506927390e3b10b35622f3c65a8cd066
-DIST otrs-6.0.7.tar.bz2 24475129 BLAKE2B 595fd84251289ef120b9a35abcde927ef33557adf386dec919e6eb61a973cac3414d148531760f68549a1f0f67faaba258268e761fdfa2be5471a592e96c08b7 SHA512 bb1910a005940f17884da4e8b9b785c9a52aa8a58f434b5c3e65768912b42838d12d69ebb3f7daed2f12dc385829a5a603a1755338d44e0313c35a0a589cbb6f
-EBUILD otrs-5.0.25.ebuild 4103 BLAKE2B 70c0ccaa14ab096e5faa2966e3176b4df9ead85bbd649cd987dbe11d5e02767d937c5959fb25d39c468461fbd5f0303f7c3ca860c18700ec84341fe544f98afc SHA512 677def7d93c191ee5a5210127d22bb4f7d50aadd2be0ecc0bcf0cce033456bd70849d25d4e74e99addf21de8acdc9078d25c21e0d1d234074ddb67b1c25ff4db
-EBUILD otrs-6.0.3.ebuild 4150 BLAKE2B bb4c1aca4a6a9224c2c900ebffc5eb9051ef83cab94d5ff12aba606b3079de0caf279ca642c360c9d021ddcc8b8445cf9ac67e76a851f441d327ea4f5b738530 SHA512 77c5c9334b50419d3184a8ae55c0a4f3bfaa5d1494cddb7c8021570781052a9eeb86cfde31f4d52e12a78510c9f3bf270e05ab069bd6a42d8d63af9c2ae0a846
-EBUILD otrs-6.0.4.ebuild 4150 BLAKE2B bb4c1aca4a6a9224c2c900ebffc5eb9051ef83cab94d5ff12aba606b3079de0caf279ca642c360c9d021ddcc8b8445cf9ac67e76a851f441d327ea4f5b738530 SHA512 77c5c9334b50419d3184a8ae55c0a4f3bfaa5d1494cddb7c8021570781052a9eeb86cfde31f4d52e12a78510c9f3bf270e05ab069bd6a42d8d63af9c2ae0a846
-EBUILD otrs-6.0.5.ebuild 4150 BLAKE2B bb4c1aca4a6a9224c2c900ebffc5eb9051ef83cab94d5ff12aba606b3079de0caf279ca642c360c9d021ddcc8b8445cf9ac67e76a851f441d327ea4f5b738530 SHA512 77c5c9334b50419d3184a8ae55c0a4f3bfaa5d1494cddb7c8021570781052a9eeb86cfde31f4d52e12a78510c9f3bf270e05ab069bd6a42d8d63af9c2ae0a846
-EBUILD otrs-6.0.7.ebuild 4154 BLAKE2B 6d9051c754560f1ab6c3647108e29d93ccb4526d2ea50eee1bff5ddad1045c3b2f29bd21e65d476d1f1a8716351fef70288a3816276ecaf2ebc8d43e65f14bdf SHA512 63f62ce487530e5bbeedf7e6614fe1d47c0b99a2fdd40aad32d9b8536f515c0e10b6fd9fe5fe16df74f52ee93246b74ac9c46e6f5a5efec66ba997e8083b59ae
-MISC metadata.xml 356 BLAKE2B 01ce80250b32ee5bb55945f5753006caa150efe3d771eb5f16eb4ee05e5827ade93ca8d3ba691b08a5a06555d9a8463bbc072662a1c83f838cb94c0a7c32d636 SHA512 f3a9aa7354c5e544f5b904c5b875686c656432f84baf1b769c347057bde6919921fce09162dd6b1eb549fc468e0ac22b0c9709ed52016bfd414e6494f6ba70af
diff --git a/www-apps/otrs/files/otrs.service b/www-apps/otrs/files/otrs.service
deleted file mode 100644
index 546ecdda8f93..000000000000
--- a/www-apps/otrs/files/otrs.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OTRS daemon
-
-[Service]
-Type=forking
-WorkingDirectory=/var/lib/otrs
-User=otrs
-ExecStart=/var/lib/otrs/bin/otrs.Daemon.pl start
-ExecStop=/var/lib/otrs/bin/otrs.Daemon.pl stop
-PrivateTmp=true
-
-[Install]
-WantedBy=multi-user.target
diff --git a/www-apps/otrs/metadata.xml b/www-apps/otrs/metadata.xml
deleted file mode 100644
index b1745fd1cbc0..000000000000
--- a/www-apps/otrs/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>
-	<use>
-		<flag name="mod_perl">Provide all dependencies for use of mod_perl instead of cgi</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-apps/otrs/otrs-5.0.25.ebuild b/www-apps/otrs/otrs-5.0.25.ebuild
deleted file mode 100644
index d79f7804488b..000000000000
--- a/www-apps/otrs/otrs-5.0.25.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit user systemd
-
-DESCRIPTION="An Open source Ticket Request System"
-HOMEPAGE="https://www.otrs.com/"
-SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="media-libs/libpng:0"
-
-RDEPEND="dev-perl/Apache-Reload
-	dev-perl/Archive-Zip
-	dev-perl/DBI
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-XS
-	dev-perl/LWP-UserAgent-Determined
-	dev-perl/Mail-POP3Client
-	dev-perl/Mail-IMAPClient
-	>dev-perl/Net-DNS-0.60
-	dev-perl/Template-Toolkit
-	dev-perl/Text-CSV_XS
-	dev-perl/TimeDate
-	dev-perl/XML-Parser
-	dev-perl/YAML-LibYAML
-	apache2? (
-		mod_perl? (
-			www-servers/apache:2
-			=www-apache/libapreq2-2* www-apache/mod_perl
-		)
-		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
-	)
-	fastcgi? (
-		dev-perl/FCGI
-		virtual/httpd-fastcgi
-	)
-	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
-	gd? (
-		dev-perl/GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	pdf? (
-		>=dev-perl/PDF-API2-0.73
-		virtual/perl-Compress-Raw-Zlib
-	)
-	soap? (
-		dev-perl/SOAP-Lite
-		!=dev-perl/SOAP-Lite-0.711
-		!=dev-perl/SOAP-Lite-0.712
-	)
-	"
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
-	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
-	# so we create the apache user here just in case
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-	enewuser otrs -1 -1 "${OTRS_HOME}" apache
-}
-
-src_prepare() {
-	rm -r "${S}/scripts"/auto_* || die
-
-	pushd Kernel >/dev/null || die
-	local i
-	for i in *.dist; do
-		cp "${i}" $(basename "${i}" .dist) || die
-	done
-	popd >/dev/null || die
-
-	# Fix broken png file (and see pngfix help for exit codes)
-	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
-	if [[ $? -gt 15 ]]; then
-		die "pngfix failed"
-	fi
-	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
-		|| die "sed failed"
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
-		|| die "sed failed"
-
-	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
-		|| die "sed failed"
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
-
-	eapply_user
-}
-
-# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
-pkg_config() {
-	einfo "Installing cronjobs"
-	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
-}
-
-src_install() {
-	dodoc CHANGES.md README*
-
-	insinto "${OTRS_HOME}"
-	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
-		Custom Kernel bin scripts var
-
-	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
-	insinto /usr/share/doc/${PF}/
-	doins "${T}"/crontab
-
-	local a
-	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
-	do
-		keepdir "${OTRS_HOME}/var/${a}"
-	done
-	doenvd "${T}/50${PN}"
-
-	systemd_dounit "${FILESDIR}/otrs.service"
-}
-
-pkg_postinst() {
-	einfo "Setting correct permissions ..."
-	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
-		--otrs-user=otrs \
-		--web-group=apache \
-		|| die "Could not set permissions"
-
-	einfo "Installation done!"
-	elog "1) Rebuild your config now by running the following commands:"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
-	elog ""
-	elog "2) Enable cronjobs with the following command:"
-	elog "crontab -u otrs crontab"
-	elog ""
-	elog "3) systemd users: enable and start OTRS daemon:"
-	elog "systemctl enable otrs"
-	elog "systemctl start otrs"
-}
diff --git a/www-apps/otrs/otrs-6.0.3.ebuild b/www-apps/otrs/otrs-6.0.3.ebuild
deleted file mode 100644
index dca663db8fa9..000000000000
--- a/www-apps/otrs/otrs-6.0.3.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit user systemd
-
-DESCRIPTION="An Open source Ticket Request System"
-HOMEPAGE="https://www.otrs.com/"
-SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="media-libs/libpng:0"
-
-RDEPEND="dev-perl/Apache-Reload
-	dev-perl/Archive-Zip
-	dev-perl/DBI
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-XS
-	dev-perl/LWP-UserAgent-Determined
-	dev-perl/Mail-POP3Client
-	dev-perl/Mail-IMAPClient
-	>dev-perl/Net-DNS-0.60
-	dev-perl/Template-Toolkit
-	dev-perl/Text-CSV_XS
-	dev-perl/TimeDate
-	dev-perl/DateTime
-	dev-perl/XML-LibXML-Simple
-	dev-perl/XML-Parser
-	dev-perl/YAML-LibYAML
-	apache2? (
-		mod_perl? (
-			www-servers/apache:2
-			=www-apache/libapreq2-2* www-apache/mod_perl
-		)
-		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
-	)
-	fastcgi? (
-		dev-perl/FCGI
-		virtual/httpd-fastcgi
-	)
-	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
-	gd? (
-		dev-perl/GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	pdf? (
-		>=dev-perl/PDF-API2-0.73
-		virtual/perl-Compress-Raw-Zlib
-	)
-	soap? (
-		dev-perl/SOAP-Lite
-		!=dev-perl/SOAP-Lite-0.711
-		!=dev-perl/SOAP-Lite-0.712
-	)
-	"
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
-	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
-	# so we create the apache user here just in case
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-	enewuser otrs -1 -1 "${OTRS_HOME}" apache
-}
-
-src_prepare() {
-	rm -r "${S}/scripts"/auto_* || die
-
-	pushd Kernel >/dev/null || die
-	local i
-	for i in *.dist; do
-		cp "${i}" $(basename "${i}" .dist) || die
-	done
-	popd >/dev/null || die
-
-	# Fix broken png file (and see pngfix help for exit codes)
-	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
-	if [[ $? -gt 15 ]]; then
-		die "pngfix failed"
-	fi
-	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
-		|| die "sed failed"
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
-		|| die "sed failed"
-
-	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
-		|| die "sed failed"
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
-
-	eapply_user
-}
-
-# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
-pkg_config() {
-	einfo "Installing cronjobs"
-	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
-}
-
-src_install() {
-	dodoc CHANGES.md README*
-
-	insinto "${OTRS_HOME}"
-	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
-		Custom Kernel bin scripts var
-
-	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
-	insinto /usr/share/doc/${PF}/
-	doins "${T}"/crontab
-
-	local a
-	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
-	do
-		keepdir "${OTRS_HOME}/var/${a}"
-	done
-	doenvd "${T}/50${PN}"
-
-	systemd_dounit "${FILESDIR}/otrs.service"
-}
-
-pkg_postinst() {
-	einfo "Setting correct permissions ..."
-	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
-		--otrs-user=otrs \
-		--web-group=apache \
-		|| die "Could not set permissions"
-
-	einfo "Installation done!"
-	elog "1) Rebuild your config now by running the following commands:"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
-	elog ""
-	elog "2) Enable cronjobs with the following command:"
-	elog "crontab -u otrs crontab"
-	elog ""
-	elog "3) systemd users: enable and start OTRS daemon:"
-	elog "systemctl enable otrs"
-	elog "systemctl start otrs"
-}
diff --git a/www-apps/otrs/otrs-6.0.4.ebuild b/www-apps/otrs/otrs-6.0.4.ebuild
deleted file mode 100644
index dca663db8fa9..000000000000
--- a/www-apps/otrs/otrs-6.0.4.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit user systemd
-
-DESCRIPTION="An Open source Ticket Request System"
-HOMEPAGE="https://www.otrs.com/"
-SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="media-libs/libpng:0"
-
-RDEPEND="dev-perl/Apache-Reload
-	dev-perl/Archive-Zip
-	dev-perl/DBI
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-XS
-	dev-perl/LWP-UserAgent-Determined
-	dev-perl/Mail-POP3Client
-	dev-perl/Mail-IMAPClient
-	>dev-perl/Net-DNS-0.60
-	dev-perl/Template-Toolkit
-	dev-perl/Text-CSV_XS
-	dev-perl/TimeDate
-	dev-perl/DateTime
-	dev-perl/XML-LibXML-Simple
-	dev-perl/XML-Parser
-	dev-perl/YAML-LibYAML
-	apache2? (
-		mod_perl? (
-			www-servers/apache:2
-			=www-apache/libapreq2-2* www-apache/mod_perl
-		)
-		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
-	)
-	fastcgi? (
-		dev-perl/FCGI
-		virtual/httpd-fastcgi
-	)
-	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
-	gd? (
-		dev-perl/GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	pdf? (
-		>=dev-perl/PDF-API2-0.73
-		virtual/perl-Compress-Raw-Zlib
-	)
-	soap? (
-		dev-perl/SOAP-Lite
-		!=dev-perl/SOAP-Lite-0.711
-		!=dev-perl/SOAP-Lite-0.712
-	)
-	"
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
-	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
-	# so we create the apache user here just in case
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-	enewuser otrs -1 -1 "${OTRS_HOME}" apache
-}
-
-src_prepare() {
-	rm -r "${S}/scripts"/auto_* || die
-
-	pushd Kernel >/dev/null || die
-	local i
-	for i in *.dist; do
-		cp "${i}" $(basename "${i}" .dist) || die
-	done
-	popd >/dev/null || die
-
-	# Fix broken png file (and see pngfix help for exit codes)
-	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
-	if [[ $? -gt 15 ]]; then
-		die "pngfix failed"
-	fi
-	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
-		|| die "sed failed"
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
-		|| die "sed failed"
-
-	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
-		|| die "sed failed"
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
-
-	eapply_user
-}
-
-# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
-pkg_config() {
-	einfo "Installing cronjobs"
-	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
-}
-
-src_install() {
-	dodoc CHANGES.md README*
-
-	insinto "${OTRS_HOME}"
-	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
-		Custom Kernel bin scripts var
-
-	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
-	insinto /usr/share/doc/${PF}/
-	doins "${T}"/crontab
-
-	local a
-	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
-	do
-		keepdir "${OTRS_HOME}/var/${a}"
-	done
-	doenvd "${T}/50${PN}"
-
-	systemd_dounit "${FILESDIR}/otrs.service"
-}
-
-pkg_postinst() {
-	einfo "Setting correct permissions ..."
-	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
-		--otrs-user=otrs \
-		--web-group=apache \
-		|| die "Could not set permissions"
-
-	einfo "Installation done!"
-	elog "1) Rebuild your config now by running the following commands:"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
-	elog ""
-	elog "2) Enable cronjobs with the following command:"
-	elog "crontab -u otrs crontab"
-	elog ""
-	elog "3) systemd users: enable and start OTRS daemon:"
-	elog "systemctl enable otrs"
-	elog "systemctl start otrs"
-}
diff --git a/www-apps/otrs/otrs-6.0.5.ebuild b/www-apps/otrs/otrs-6.0.5.ebuild
deleted file mode 100644
index dca663db8fa9..000000000000
--- a/www-apps/otrs/otrs-6.0.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit user systemd
-
-DESCRIPTION="An Open source Ticket Request System"
-HOMEPAGE="https://www.otrs.com/"
-SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="media-libs/libpng:0"
-
-RDEPEND="dev-perl/Apache-Reload
-	dev-perl/Archive-Zip
-	dev-perl/DBI
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-XS
-	dev-perl/LWP-UserAgent-Determined
-	dev-perl/Mail-POP3Client
-	dev-perl/Mail-IMAPClient
-	>dev-perl/Net-DNS-0.60
-	dev-perl/Template-Toolkit
-	dev-perl/Text-CSV_XS
-	dev-perl/TimeDate
-	dev-perl/DateTime
-	dev-perl/XML-LibXML-Simple
-	dev-perl/XML-Parser
-	dev-perl/YAML-LibYAML
-	apache2? (
-		mod_perl? (
-			www-servers/apache:2
-			=www-apache/libapreq2-2* www-apache/mod_perl
-		)
-		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
-	)
-	fastcgi? (
-		dev-perl/FCGI
-		virtual/httpd-fastcgi
-	)
-	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
-	gd? (
-		dev-perl/GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	pdf? (
-		>=dev-perl/PDF-API2-0.73
-		virtual/perl-Compress-Raw-Zlib
-	)
-	soap? (
-		dev-perl/SOAP-Lite
-		!=dev-perl/SOAP-Lite-0.711
-		!=dev-perl/SOAP-Lite-0.712
-	)
-	"
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
-	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
-	# so we create the apache user here just in case
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-	enewuser otrs -1 -1 "${OTRS_HOME}" apache
-}
-
-src_prepare() {
-	rm -r "${S}/scripts"/auto_* || die
-
-	pushd Kernel >/dev/null || die
-	local i
-	for i in *.dist; do
-		cp "${i}" $(basename "${i}" .dist) || die
-	done
-	popd >/dev/null || die
-
-	# Fix broken png file (and see pngfix help for exit codes)
-	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
-	if [[ $? -gt 15 ]]; then
-		die "pngfix failed"
-	fi
-	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
-		|| die "sed failed"
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
-		|| die "sed failed"
-
-	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
-		|| die "sed failed"
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
-
-	eapply_user
-}
-
-# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
-pkg_config() {
-	einfo "Installing cronjobs"
-	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
-}
-
-src_install() {
-	dodoc CHANGES.md README*
-
-	insinto "${OTRS_HOME}"
-	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
-		Custom Kernel bin scripts var
-
-	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
-	insinto /usr/share/doc/${PF}/
-	doins "${T}"/crontab
-
-	local a
-	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
-	do
-		keepdir "${OTRS_HOME}/var/${a}"
-	done
-	doenvd "${T}/50${PN}"
-
-	systemd_dounit "${FILESDIR}/otrs.service"
-}
-
-pkg_postinst() {
-	einfo "Setting correct permissions ..."
-	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
-		--otrs-user=otrs \
-		--web-group=apache \
-		|| die "Could not set permissions"
-
-	einfo "Installation done!"
-	elog "1) Rebuild your config now by running the following commands:"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
-	elog ""
-	elog "2) Enable cronjobs with the following command:"
-	elog "crontab -u otrs crontab"
-	elog ""
-	elog "3) systemd users: enable and start OTRS daemon:"
-	elog "systemctl enable otrs"
-	elog "systemctl start otrs"
-}
diff --git a/www-apps/otrs/otrs-6.0.7.ebuild b/www-apps/otrs/otrs-6.0.7.ebuild
deleted file mode 100644
index ef55412d0707..000000000000
--- a/www-apps/otrs/otrs-6.0.7.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit systemd user
-
-DESCRIPTION="An Open source Ticket Request System"
-HOMEPAGE="https://www.otrs.com/"
-SRC_URI="https://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="AGPL-3+"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-
-REQUIRED_USE="|| ( mysql postgres )"
-
-DEPEND="media-libs/libpng:0"
-
-RDEPEND="
-	dev-perl/Archive-Zip
-	dev-perl/DBI
-	dev-perl/IO-Socket-SSL
-	dev-perl/JSON-XS
-	dev-perl/LWP-UserAgent-Determined
-	dev-perl/Mail-POP3Client
-	dev-perl/Mail-IMAPClient
-	>dev-perl/Net-DNS-0.60
-	dev-perl/Template-Toolkit
-	dev-perl/Text-CSV_XS
-	dev-perl/TimeDate
-	dev-perl/DateTime
-	dev-perl/XML-LibXML-Simple
-	dev-perl/XML-Parser
-	dev-perl/YAML-LibYAML
-	apache2? (
-		mod_perl? (
-			dev-perl/Apache-Reload
-			www-servers/apache:2
-			=www-apache/libapreq2-2* www-apache/mod_perl
-		)
-		!fastcgi? ( !mod_perl? ( www-servers/apache:2[suexec] ) )
-	)
-	fastcgi? (
-		dev-perl/FCGI
-		virtual/httpd-fastcgi
-	)
-	!fastcgi? ( !apache2? ( virtual/httpd-cgi ) )
-	gd? (
-		dev-perl/GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph
-	)
-	ldap? ( dev-perl/perl-ldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	pdf? (
-		>=dev-perl/PDF-API2-0.73
-		virtual/perl-Compress-Raw-Zlib
-	)
-	soap? (
-		dev-perl/SOAP-Lite
-		!=dev-perl/SOAP-Lite-0.711
-		!=dev-perl/SOAP-Lite-0.712
-	)
-	"
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
-	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
-	# so we create the apache user here just in case
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-	enewuser otrs -1 -1 "${OTRS_HOME}" apache
-}
-
-src_prepare() {
-	rm -r "${S}/scripts"/auto_* || die
-
-	pushd Kernel >/dev/null || die
-	local i
-	for i in *.dist; do
-		cp "${i}" $(basename "${i}" .dist) || die
-	done
-	popd >/dev/null || die
-
-	# Fix broken png file (and see pngfix help for exit codes)
-	pngfix -q --out=out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png"
-	if [[ $? -gt 15 ]]; then
-		die "pngfix failed"
-	fi
-	mv -f out.png "${S}/var/httpd/htdocs/skins/Agent/default/img/otrs-verify.png" || die
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
-		|| die "sed failed"
-
-	sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" "${S}"/Kernel/Config/Defaults.pm \
-		|| die "sed failed"
-
-	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${EPREFIX}${OTRS_HOME}:g" \
-		|| die "sed failed"
-
-	echo "CONFIG_PROTECT=\"${EPREFIX}${OTRS_HOME}/Kernel/Config.pm \
-		${EPREFIX}${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}" || die
-
-	eapply_user
-}
-
-# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
-pkg_config() {
-	einfo "Installing cronjobs"
-	crontab -u otrs "${EROOT%/}"/usr/share/doc/${PF}/crontab || die
-}
-
-src_install() {
-	dodoc CHANGES.md README*
-
-	insinto "${OTRS_HOME}"
-	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
-		Custom Kernel bin scripts var
-
-	cat "${S}"/var/cron/*.dist > "${T}"/crontab || die
-	insinto /usr/share/doc/${PF}/
-	doins "${T}"/crontab
-
-	local a
-	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable
-	do
-		keepdir "${OTRS_HOME}/var/${a}"
-	done
-	doenvd "${T}/50${PN}"
-
-	systemd_dounit "${FILESDIR}/otrs.service"
-}
-
-pkg_postinst() {
-	einfo "Setting correct permissions ..."
-	/usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.SetPermissions.pl "${EROOT%/}${OTRS_HOME}" \
-		--otrs-user=otrs \
-		--web-group=apache \
-		|| die "Could not set permissions"
-
-	einfo "Installation done!"
-	elog "1) Rebuild your config now by running the following commands:"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Config::Rebuild"
-	elog "sudo -u otrs /usr/bin/env perl "${EROOT%/}${OTRS_HOME}"/bin/otrs.Console.pl Maint::Cache::Delete"
-	elog ""
-	elog "2) Enable cronjobs with the following command:"
-	elog "crontab -u otrs crontab"
-	elog ""
-	elog "3) systemd users: enable and start OTRS daemon:"
-	elog "systemctl enable otrs"
-	elog "systemctl start otrs"
-}
diff --git a/www-apps/owncloud/Manifest b/www-apps/owncloud/Manifest
index 6f9700671af9..86eff96f7e57 100644
--- a/www-apps/owncloud/Manifest
+++ b/www-apps/owncloud/Manifest
@@ -1,5 +1,7 @@
 DIST owncloud-10.4.0.tar.bz2 20426453 BLAKE2B 7affb3b3ec0d4db810199ef40f96c897c3c0d5d4c1e6e66f6014294dff61226a0d062c1ac70c6d23f377179adebec9c8b9b8afaa5628c7776ea32826f25d373b SHA512 3d95cb0795a33238fc5e3a051699ae831b861a2a9d41111b10fa8347fd06f6f8a3f6b810a2896c81a4de7af4301c6cccda8cad41fcfedb9659ed1ae227e15b20
 DIST owncloud-10.4.1.tar.bz2 20439397 BLAKE2B 1a83d82a3657cb62a69d49293951f8355a156b08791c164c0971505e6be151cd415b0d88157171989162303bf942c6bfce3d22fab291ac18a635fee0e7057343 SHA512 381e31faba9a1853a4c087a218637a2a9c1596189f0867d86b1fa800d7d1488a65d27fdb058b792eed027d0c11a4d582b72044c0b5e751d8509cbd32233c2e85
+DIST owncloud-10.5.0.tar.bz2 23471398 BLAKE2B 6566df51474a22d36da868ab45a7cb679528aecc9a95e0ad20f06adda587563e16c98ee1e942a5fef62e633b132469a6a775d5893754f553aea8a33043daafc3 SHA512 b77183146ee27c97a7f472e1debaec6f5dad168f204a243a65f431cade28ed0551d0db88ff799776bfd26db60357a2216a35cd1b4af6e7e98fc933f325e4336c
 EBUILD owncloud-10.4.0.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
 EBUILD owncloud-10.4.1.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
+EBUILD owncloud-10.5.0.ebuild 1252 BLAKE2B dd9416b52088aa52cc04173536140cd8107c1aa3be3527ddd588d1f38449808b7656b95bf428769c6584f83f53ca3b19c454128b526563792d6a6e3a26ead32a SHA512 3345000e2391005d884272d488c00474058987fdc69b7c8d2c4399a97810cd180dd862a78437ee2f15654f18b28e49fcebeb1f9062da9ba15a72fabfe66fafe8
 MISC metadata.xml 362 BLAKE2B 966b48f98107fc73bd40f9c602962f2c876c1be1f074943452cfb5bbf60eb1c2ca08153294ce4166442da85beebd41395ca9bbe9c98d7832665fa16419db374d SHA512 64c690c6fa8bc6861f673b465e0519d5c5e945d76b66a2d9e7422cbfaa967624e7da287626bd12edbf347f0d0b5296fb9719ede93d15f073542367f5fecf5e99
diff --git a/www-apps/owncloud/owncloud-10.5.0.ebuild b/www-apps/owncloud/owncloud-10.5.0.ebuild
new file mode 100644
index 000000000000..97ad6449db05
--- /dev/null
+++ b/www-apps/owncloud/owncloud-10.5.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit webapp
+
+DESCRIPTION="Web-based storage application where all your data is under your own control"
+HOMEPAGE="https://owncloud.org"
+SRC_URI="https://download.owncloud.org/community/${P}.tar.bz2"
+LICENSE="AGPL-3"
+
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+curl mysql postgres +sqlite"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+DEPEND=""
+RDEPEND=">=dev-lang/php-7.0[curl?,filter,gd,hash(+),intl,json,mysql?,pdo,posix,postgres?,session,simplexml,sqlite?,xmlreader,xmlwriter,zip]
+	virtual/httpd-php"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	webapp_src_preinst
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+	dodir "${MY_HTDOCSDIR}"/data
+
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/apps
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/data
+	webapp_serverowned -R "${MY_HTDOCSDIR}"/config
+	webapp_configfile "${MY_HTDOCSDIR}"/.htaccess
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	elog "Additional applications (calendar, ...) are no longer provided by default."
+	elog "You can install them after login via the applications management page"
+	elog "(check the recommended tab). No application data is lost."
+	webapp_pkg_postinst
+}
diff --git a/www-apps/phpBB/Manifest b/www-apps/phpBB/Manifest
index be4cb91fa900..dc62994f6814 100644
--- a/www-apps/phpBB/Manifest
+++ b/www-apps/phpBB/Manifest
@@ -1,5 +1,5 @@
 AUX permissions 600 BLAKE2B ae5ced85bf5ce72bc6bca533e68ae55499ace30590de37be55c4267efacf03fe752c9c3d96ff1f6ba54beda0df238fa663281195a7c874eb3cea422fb16b5a82 SHA512 ea8f2796a43c825fbe160606dc4a3cdabd6ed8fd6692c841cadb87b06803f448df48446a83366a3af3cfba65a50bb9ed3361c0495bb5058c542b6cac9c7b2a1b
 AUX postinstall-en.txt 554 BLAKE2B 6560cb0c3a95cbbba91932af13790eae010193e6bcca4d46c640eb05b18bcae23645d5962a6be08f28aa721a10668bd128d19f505b9d463119d1a7aff845e732 SHA512 d1d61b525b2746d558f9fa1bd56e92e182d44bb406302f1646a40b0b1f06fc900ae46c3e600e27495edce1fa4188915dcf8f96b4762938ec0f324bdbb8d91759
-DIST phpBB-3.2.8.tar.bz2 4388929 BLAKE2B 8d7b7294a852450400f721cb05d258bb36b88c48133d340292bb2733c4a28da02e3c2038eb269e0549512cc3db286c4e31eb970070edda0493c304185bc303d0 SHA512 467a84917041889eaa7f2e68a0a81d9368f3ee36427883dec7ebd2af72fe21044dbdb08c5a068ab4e67490af2e4b30132db9d3a300382dd5ccc0a54f7ca20a31
-EBUILD phpBB-3.2.8.ebuild 1589 BLAKE2B 4b30f4e792d3eb9aff2cb298774114ce9e20becaa4632dbdf65610aef8cf9950320317027811672df3689f0b924ad9e45ec7ab01dbd5054d4951d1b7c26a3c88 SHA512 002789fbd950e20b80f90aba5bbc084ba3b653df7bf99d1f80f34582479d4c351ee56e2a8abc39d2cf12c70d02dedc2de591e0898bb432a6d8ec3a81b89a7ea2
+DIST phpBB-3.3.1.tar.bz2 4575916 BLAKE2B 5383da8de81664c99156007eee49d01fe661e74cd6c5970fe07359aa341dc2f54c80d01927b60abf2d48ab830cbe42244bfc5432c758becb4363e334f9298d51 SHA512 b3a24b4f326426c174082362e67d1d6c1b67b3b5daa6a86f3117ef1b458aa70c055bdeaa7caf597f530c2fe4b7f6e569f7f1beacfaf346c83c638dc98d2169cf
+EBUILD phpBB-3.3.1.ebuild 1617 BLAKE2B f43a70cd8ece7fb2c9c10118f40244f66da999788297800b7868de2aed3d9f2903517629c8b3f02c0d3a766ea90d55ce615a512b3e181f96f4eff080ac94a66c SHA512 6495e2c0759e1c810c1f79ccddcaa61557fb0e7a575bc637a35539ab5bf4bfafd2956393a2dc193899832f4d406a84d988a067e1e3748de8abb02a9b79791269
 MISC metadata.xml 875 BLAKE2B 1b4bf9ef1b179b5bee6bf42a7b7d1f25b28273f4cbd18ceb830f478c788ed055921d05aa5154512bacd5e86b48ee87b8401c47878ae9adb567ebbc7192235fa2 SHA512 25c485aa4cb248afaf4500c9c7ef1d84e23245ca11f2dbe60eb809da4766d4566a9d76df4e6f9ecf19059b75c05f13fabd5f56e3bd4751a5b5cfcd33529b93a7
diff --git a/www-apps/phpBB/phpBB-3.2.8.ebuild b/www-apps/phpBB/phpBB-3.3.1.ebuild
index 52b9af6e5ebc..92e371c9f13e 100644
--- a/www-apps/phpBB/phpBB-3.2.8.ebuild
+++ b/www-apps/phpBB/phpBB-3.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,8 +19,9 @@ PHP_RDEPEND="(
 )"
 
 RDEPEND="|| (
+	${PHP_RDEPEND//@SLOT@/7.4}
+	${PHP_RDEPEND//@SLOT@/7.3}
 	${PHP_RDEPEND//@SLOT@/7.2}
-	${PHP_RDEPEND//@SLOT@/7.1}
 )"
 
 need_httpd_cgi
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index c78460aef28d..6e84d0aed6b4 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,7 +1,5 @@
-DIST roundup-1.5.1.tar.gz 2618886 BLAKE2B 5ccca10ce7f30b35b0875340c4cae87aa19e5384e6e5973576ea8e2de79eb83d32447580944f472d73e7cdb5f43a4ed7f805d51242e22cc2f756b3deae4004b2 SHA512 d7cdeaafb682ce7f202cacddeb1a42312f22778a2c83b52b4e838c27b1e7141a94b2ac2b670b0edee0efcfe27d74e31e6f267ae1380e90359def27385ca68d58
 DIST roundup-1.6.1.tar.gz 3128618 BLAKE2B 7fa87006582feac74f0fc455bc201f2485326b8f6ed616164f667992da114d45e8d8cef370a825450b5a4cb757ba0453d5fe3ace47164bd83e78a8c6f28b9d05 SHA512 b7666c5515c76baa4fa3ac3d0efea82feace6270af55bbc70e603b2ce0c617b4a303a15133310c1e00d3b6442baa58060d5387f568014652b1b781d9248f0052
-DIST roundup-2.0.0beta0.tar.gz 3461319 BLAKE2B 713f454bf289b27c9a14b4446ab65313a2fb6a0e754ee3e4217bfc2146b8bb2f3ddfce7472fb30041aff2e44e48888893b592b8447945bcb4ad2d3409e8ace84 SHA512 3e9b4a12ee172964f35bbcef6ae07153e76060531e92d78a2c8852d088395067cf933d141e26bdbb6462df15652d5c2a5fa5ee82288c7e85667b87df6a7f55f8
-EBUILD roundup-1.5.1.ebuild 1223 BLAKE2B 7ed134153096b574ae8efd88613d28555055ba10ecde2bbcc47ffb78dc68de813b8fd6e2c8ade791b34fd69ca8ef88a4e7522cf24f26c282c463f87c3e4571af SHA512 226588bc17c7fa2726b1734d6a233c354f684d39b705f47ce3ce2b9792c6ecbe7979075861a677a6434e78caa0f5abede020a329c145ed59e112769591575a62
+DIST roundup-2.0.0.tar.gz 3495554 BLAKE2B 98b7cbfebe969411282ddf6b4bd7b94ea1efb7b1d929daf44ae5f30dc23c05cb327d0f4653b22a5594f7b198dd16a172c45568a15f8704b187cd4c355455ca9c SHA512 5adb0d96be260e70fe098fd37af27bd0abee38cb8fde4ba2e130d2caac7f64af86a3b0ab09de931a693dca8bfbe15c68444db343ccf718d9d25576d49c6d6cbf
 EBUILD roundup-1.6.1-r1.ebuild 1190 BLAKE2B 87f0ca80e23052ba6dd7acfcd62d0d5e6886fc0763de9aeb52ab2f756d650e4b37c403ce183c49175d94acb93609d516de0c822e19a92ccc38b47d67f3446543 SHA512 c588e2211c4ce65cfd6595890348bcb5adb8d57dda2aac87e21d3b1e60cd3403dd396fb0b228c16f98d766fc5269783514cadcaa42a523ea5b984b7506535f92
-EBUILD roundup-2.0.0_beta0.ebuild 1419 BLAKE2B 28a6ab8639a265114634da9ff6440156ed86458985563c38fb020d0d7347db482c88609bbe380776366f2307c58db5724ab7f2a1b61656a7aa6215d7c246ef5f SHA512 7de3a6a6cb00b53caeb7aa18d183ccd47515f9c4bd534f88bd74a8a36bbfbc699531b9f934a232caba583c8ff934847c8c7eb3f7584094664ce102f2002b4b4f
+EBUILD roundup-2.0.0.ebuild 1431 BLAKE2B 6783eaa9b7ec33a7c2c72f5d9deef4bcd7b404a99ac1cdd99533ee98ec13cd6363bf351bc035ad80e5c56820f14ef682283ed05e5fb38d518325823403fc14ff SHA512 46c33c27208605c769600da5194d2fab482c56132ead93b4a42d0c3495089d7da5502484e3ce48cedfd20807ce7cc1dba2de9e92b33545d52bd88d2c0c436911
 MISC metadata.xml 834 BLAKE2B a40da78f8ffe622a906c466eb787d91409641f093da28314c6e959d7822084959534a0750c3a5c1076626c21a23631f1e834730ac4df3a5ecabbbab01eed8685 SHA512 11c911f38d30bc80377c4c510dbd1a33164463cce40d85cd4db7e83660ae0699e1241eba5d25def7016557e42537c2bff1f0c9e74f9ade44c7a01f0ff952c20d
diff --git a/www-apps/roundup/roundup-1.5.1.ebuild b/www-apps/roundup/roundup-1.5.1.ebuild
deleted file mode 100644
index 7a2714a3718d..000000000000
--- a/www-apps/roundup/roundup-1.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Issue-tracking system with command-line, web, and e-mail interfaces"
-HOMEPAGE="http://roundup.sourceforge.net https://pypi.org/project/roundup/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT ZPL"
-SLOT="0"
-KEYWORDS="amd64 ppc sparc x86"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-DOCS="CHANGES.txt doc/*.txt"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-	dohtml -r doc/*
-}
-
-pkg_postinst() {
-	ewarn "As a non privileged user! (not root)"
-	ewarn "Run 'roundup-admin install' to set up a roundup instance"
-	ewarn "Then edit your config.ini file in the tracker home you setup"
-	ewarn "Run 'roundup-admin initialise' to setup the admin pass"
-	ewarn "run /usr/bin/roundup start port host \"your tracker name\" [your tracker home], and all should work!"
-	ewarn "run /usr/bin/roundup stop [your tracker home] to stop the server"
-	ewarn "log is in [tracker home]/roundup.log"
-	ewarn "pid file is in [tracker home]/roundup.pid"
-	ewarn
-	ewarn "See upgrading.txt for upgrading instructions."
-}
diff --git a/www-apps/roundup/roundup-2.0.0_beta0.ebuild b/www-apps/roundup/roundup-2.0.0.ebuild
index a3a4cebf17ba..e5a9ee447a2d 100644
--- a/www-apps/roundup/roundup-2.0.0_beta0.ebuild
+++ b/www-apps/roundup/roundup-2.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6..7} )
+PYTHON_COMPAT=( python3_{6..8} )
 
 inherit distutils-r1
 MY_P=${P/_/}
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="+tz sqlite mysql postgres xapian whoosh ssl jinja pyjwt markdown"
 
 DEPEND=""
diff --git a/www-apps/viewvc/Manifest b/www-apps/viewvc/Manifest
deleted file mode 100644
index 2f2706abff51..000000000000
--- a/www-apps/viewvc/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST viewvc-1.1.26.tar.gz 616103 BLAKE2B e622dbf247641ddcdd68d54a8e10168d4b7506c2cb53f6d2e30b9bac36207520cde57d81875e1e0106287da9b4bf312abc2c69b15d206e557cf93a2b26cae446 SHA512 af70d4344fe92f942debb407b6fad909e250ba2656499f5229e1c2f018dfbd783d0cebd28c49a429bd7b155bb6db02cead602384f91b99b7ced6aa365e32bb8e
-EBUILD viewvc-1.1.26-r1.ebuild 2618 BLAKE2B 421d26caf4a49f2f8a3276a54c920a573797d575e60453dda15f49a8bd5e90d418debef0631a3fab1404309258cc998bd099e5a5d9b0f03043971ed2f67211ac SHA512 a6ff0fcfdecb2ecff6a8e3da98490ed28552cac5bf572d2c414b56ac32048321072e2100cd22acbc4ea0d33d3856b8bd55a7a4f6580818b4665eac07f7a0c423
-MISC metadata.xml 558 BLAKE2B 3e08174918193e922abeea23a32ec3b6732d300380cd01aafd3e15476c1c0eba2bdd9e63750c9fe37addd11ea03c03c03f25cf2184b372b14430b583148eba1d SHA512 9623aa98ccf5ab79b5784e6cf7773ffb769ebd2c73847df3be6f0caa1cfaa59c73b5f820b13a02ccbf0398e3e33e20174f5d81c279ec707d5a574fa0cdde24db
diff --git a/www-apps/viewvc/metadata.xml b/www-apps/viewvc/metadata.xml
deleted file mode 100644
index e3f695364293..000000000000
--- a/www-apps/viewvc/metadata.xml
+++ /dev/null
@@ -1,13 +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>
-	<use>
-		<flag name="cvsgraph">Add <pkg>dev-vcs/cvsgraph</pkg> support to show graphical views of revisions and branches</flag>
-		<flag name="mod_wsgi">Add <pkg>www-apache/mod_wsgi</pkg> support</flag>
-		<flag name="pygments">Add <pkg>dev-python/pygments</pkg> support for syntax highlighting</flag>
-	</use>
-</pkgmetadata>
diff --git a/www-apps/viewvc/viewvc-1.1.26-r1.ebuild b/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
deleted file mode 100644
index fa7bfd6b69c2..000000000000
--- a/www-apps/viewvc/viewvc-1.1.26-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 webapp
-
-WEBAPP_MANUAL_SLOT="yes"
-
-DESCRIPTION="ViewVC, a web interface to CVS and Subversion"
-HOMEPAGE="http://viewvc.org/"
-SRC_URI="http://viewvc.org/downloads/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="cvs cvsgraph mod_wsgi mysql pygments +subversion"
-
-DEPEND=""
-RDEPEND="${PYTHON_DEPS}
-	cvs? ( dev-vcs/rcs )
-
-	mod_wsgi? ( www-apache/mod_wsgi[${PYTHON_SINGLE_USEDEP}] )
-	!mod_wsgi? ( virtual/httpd-cgi )
-
-	cvsgraph? ( >=dev-vcs/cvsgraph-1.5.0 )
-
-	$(python_gen_cond_dep '
-		subversion? ( >=dev-vcs/subversion-1.3.1[python,${PYTHON_MULTI_USEDEP}] )
-
-		mysql? ( >=dev-python/mysql-python-0.9.0[${PYTHON_MULTI_USEDEP}] )
-		pygments? (
-			dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-			app-misc/mime-types
-		)
-	')
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	|| ( cvs subversion )"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	eapply_user
-
-	find bin/ -type f -print0 | xargs -0 sed -i \
-		-e "s|\(^LIBRARY_DIR\)\(.*\$\)|\1 = \"$(python_get_sitedir)/${PN}\"|g" \
-		-e "s|\(^CONF_PATHNAME\)\(.*\$\)|\1 = \"../conf/viewvc.conf\"|g" || die
-
-	sed -i -e "s|\(self\.options\.template_dir\)\(.*\$\)|\1 = \"${MY_APPDIR}/templates\"|" \
-		lib/config.py || die
-
-	sed -i -e "s|^template_dir.*|#&|" conf/viewvc.conf.dist || die
-	sed -i -e "s|^#mime_types_files =.*|mime_types_files = /etc/mime.types|" conf/viewvc.conf.dist || die
-	mv conf/viewvc.conf{.dist,} || die
-	mv conf/cvsgraph.conf{.dist,} || die
-
-	python_fix_shebang .
-}
-
-src_install() {
-	webapp_src_preinst
-
-	newbin bin/standalone.py viewvc-standalone-server
-
-	dodoc CHANGES COMMITTERS INSTALL README
-
-	python_moduleinto viewvc
-	python_domodule lib/.
-
-	insinto "${MY_APPDIR}"
-	doins -r templates/
-	doins -r templates-contrib/
-
-	if use mysql; then
-		exeinto "${MY_HOSTROOTDIR}/bin"
-		doexe bin/{*dbadmin,make-database,loginfo-handler}
-	fi
-
-	insinto "${MY_HOSTROOTDIR}/conf"
-	doins conf/{viewvc,cvsgraph}.conf
-
-	exeinto "${MY_CGIBINDIR}"
-	doexe bin/cgi/viewvc.cgi
-	if use mysql; then
-		doexe bin/cgi/query.cgi
-	fi
-
-	exeinto "${MY_CGIBINDIR}"
-	if use mod_wsgi; then
-		doexe bin/wsgi/viewvc.wsgi
-		if use mysql; then
-			doexe bin/wsgi/query.wsgi
-		fi
-	else
-		doexe bin/wsgi/viewvc.fcgi
-		if use mysql; then
-			doexe bin/wsgi/query.fcgi
-		fi
-	fi
-
-	webapp_configfile "${MY_HOSTROOTDIR}/conf/"{viewvc,cvsgraph}.conf
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-	elog "Now read INSTALL in /usr/share/doc/${PF} to configure ${PN}"
-}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index f7cd2412d15b..9d56a170b28b 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1,5 +1,5 @@
 AUX postinstall-en.txt 1285 BLAKE2B 09a372660022bda4064f2b298e6409be4d8f8943fd06d672e15c6126029acf2551b2eb0447f378a7c9287f757a820787ab6e592556e5cf199b0d8c0dd8f98f18 SHA512 8fa41aa39a1dfead723c87e6b16f979839dd5c585b9f9bb14a8a1ef556b69f9dcab113622b56c24890d1414df045b055b6997be02364ab4d5c7c06db2e4c12b2
 AUX postupgrade-en.txt 963 BLAKE2B c08e2ecca3d462d544549c80fb11abde670251002257d75fa8dd41d890f1327b08f1796c54125663fd35aca999f63b89035b610bdeedc32396c35d9d9b92ce4d SHA512 dbc86a1cf3b5280137322794a344818be8cfc137153f0e634e7bbd856ccb7ac589199353f2ccd5c28a8aa7d35cc2e041137bfc5d812fc6267efc758a1113c2d4
-DIST wordpress-5.4.2.tar.gz 12238031 BLAKE2B 47e80985392540d5cf46c40b3a4e7ef75ca8ee95996b13442e288ee68510d001ec92cb11c7621dfb1148a7a1409fed2418b2c6758555d63e457b19ae6cf43368 SHA512 d1f4366f6e8ec591ce91ed76ea6949feeaf112881c3d742860c79955283b31c1712a04394eda8308d6d5756ff6d20ef4cf2e18559a59469ef195cf2cb437c219
-EBUILD wordpress-5.4.2.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
+DIST wordpress-5.5.tar.gz 12979571 BLAKE2B 085bc56f5b9141591db599ffdaba5ebc5874fcbe4ce0dc207d94f9d4350c2460f931589220e8d97e20775a68c63b2ec3a2dda8a107e45c12b2692eced07fbcee SHA512 1fe7ba37023aef4dae01318be06672621454fba90ed4d881c7483573abc6e6e6ba1c0bce16dcc2f4a6b33fde2cd7710ac99827a0939a51f75917d78263a03865
+EBUILD wordpress-5.5.ebuild 1368 BLAKE2B 45194566d2baf141dc52ed370456ae5bc84e94e0b8424f38093617652224603ec715bb490f992a32d4b3372320e8faa7905e821eeba792168b22e9e59ec59bc7 SHA512 224639d9d5827afab6aaf1f9e9808bb4a064da1cc7f686c5ef3818717f900280b8ded7161c9ae718ce14793f21e4591695a0deae718a54e751881e0bcd3a44cb
 MISC metadata.xml 392 BLAKE2B 736fb06bba21342a9cdd29ce815b1325098bc11798675534a4d299bcbaeb29f46d1eab8bebd90e2539187e82294510d06827ac068611797ad441e7c024bee6b8 SHA512 f63f0ac7c836f4f8c21d69b021d6e4d6f4257f80fd1995f180509379c7ab82028a89d1be22a381e36aad34b21d94e29c2471b48d6b31dd1a634150991e7b6c33
diff --git a/www-apps/wordpress/wordpress-5.4.2.ebuild b/www-apps/wordpress/wordpress-5.5.ebuild
index 6fc0786bf3b1..6fc0786bf3b1 100644
--- a/www-apps/wordpress/wordpress-5.4.2.ebuild
+++ b/www-apps/wordpress/wordpress-5.5.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /www-apps
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)