gentoo resync : 23.09.2020

31 files changed, 46 insertions, 991 deletions

diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 28dea71560c5..e440ce0bcef1 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/blazeblogger/Manifest b/www-apps/blazeblogger/Manifest
index 2b73ddac32ee..5ada1c114f30 100644
--- a/www-apps/blazeblogger/Manifest
+++ b/www-apps/blazeblogger/Manifest
@@ -1,5 +1,6 @@
 AUX blazeblogger-1.2.0-bash-completion.patch 2058 BLAKE2B 461fc806002d2c6075248c3291f6f6f0d68674a2ea9b85a9ded5182dfd86403e72978000cb8c3c84d583ef6137a919b8093f4ee812946405bddd8a68287ecd3e SHA512 f69b75f16f87c3cf7e16765eb6f237a6c32a046244770b457a94a189a9d2e612933907dc43143a86167252b0a51280eab045fd3e9bf92a00cfe3519393ed9db2
+AUX blazeblogger-1.2.0-makefile.patch 305 BLAKE2B 23ec7554251a0c072c0d02fb9d754d4223423b8c3ab4cc1cfe8d29e8ef37dd8552abade0276af7ca8f3cdb6ce58f00c1350f0345c792309d1ee3128079325b7f SHA512 2ffc851a571e0b25d2f257772aa4bee4ccabe86acadb1fbea1f7ef03cce32225e1a804b259a8cdc9431774eee856d33935290eff482667a08a432122fae2a0fb
 DIST blazeblogger-1.2.0.tar.gz 81340 BLAKE2B 08415245ea7114ecfad7f5817eae4c2a9216178b7ec7ffdd5e72dc9467853dcecce71612c40e0395f88a3358d67e63eaf47cfecf7b84e8e832eff05deaba5406 SHA512 c0fb7d3493933e405c78e871baa0eba7bbf6245d98174ae1f80d215bc413a836a0872fef067ca0622bbb155b54d90e7e81d99e6d10e93aec3bce098677a827bd
 DIST blazeblogger-doc-1.2.0.tar.gz 191467 BLAKE2B 501981679a16b3cd592b6f2fd55c2d8192944106b507ce3119828a3266fe27d49e18887cabb072cece273475b1ccb2321e043195276e53bcb651317839655cd7 SHA512 135d77ae30fa090207cf1147188ceb3552582fcba28d548ed8b104d86d0cff1beb6a3209e4e7cc8984f698e927ab96437254277d96b9dff371d90866c5657989
-EBUILD blazeblogger-1.2.0-r1.ebuild 822 BLAKE2B 02d0fa7f918d0d1e534d629bfc4c2d67eee2bd23c2b953a00c9c8b53e82a1dad5960813b486ac0d37cc7fba34c2d171081d57a296229edff3fd136b9c4177f87 SHA512 21c6bd49895658dc2bb1e7c2c6d05c744ba01a955c0e3dd61a4a5f2ec723d33b66c06f856a754b541aea78a5d8de9f907ee45105a1cb62530bf36e9e175ad809
+EBUILD blazeblogger-1.2.0-r1.ebuild 849 BLAKE2B d580fab40dcd4a658c4130460c8732fa6f32d68c60510a3c05560b2968ba319161eb06b2e186276efa02d7cba32fa29657ecf9340a1e170a71309e19a52e12e6 SHA512 68a5a2adaf12feaf3beddedf77e7f7e29c716c52c710d4e10da3a08478d91a169d4be260993ddf64a3fb851182fa7e9c97d1a28658d177ae941fd7c9ed63d20f
 MISC metadata.xml 249 BLAKE2B 91cbef2ed101800f4cf8640ce7e6eccabbea893a436b81fbcf7a4d79914b80390e9ad90811eaac53a05f8a45eceeb939f32fff9b41bf9f086a0f51ccfe1f6e16 SHA512 276f06c4a1bea09c70d260c03dc673a0e0826484806b084761ed6f98506f37b551a84ff6a6b293988df9d29ad30f207bdf4206b666dcdd5286415fea1257480d
diff --git a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
index 798b095bb8bc..0c268da869c0 100644
--- a/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
+++ b/www-apps/blazeblogger/blazeblogger-1.2.0-r1.ebuild
@@ -1,13 +1,14 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils
+inherit bash-completion-r1
 
 DESCRIPTION="Simple, capable content management system for producing static content"
 HOMEPAGE="http://blaze.blackened.cz/"
-SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz
+SRC_URI="
+	https://${PN}.googlecode.com/files/${P}.tar.gz
 	doc? ( https://${PN}.googlecode.com/files/${PN}-doc-${PV}.tar.gz ) "
 
 LICENSE="FDL-1.3 GPL-3"
@@ -18,17 +19,21 @@ IUSE="doc"
 RDEPEND="dev-lang/perl"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	sed -e '/-m 644 COPYING/d' \
-		-e '/-m 644 INSTALL/d' \
-		-i Makefile || die
-
-	epatch "${FILESDIR}"/${P}-bash-completion.patch #bug 417953
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-bash-completion.patch #bug 417953
+	"${FILESDIR}"/${P}-makefile.patch
+)
 
 src_install() {
-	emake prefix="${D}/usr" config="${D}/etc" \
-		compdir="${D}/usr/share/bash-completion" install
-
-	use doc && dohtml -r "${WORKDIR}"/${PN}-doc-${PV}/*
+	emake \
+		prefix="${ED}"/usr \
+		config="${ED}"/etc \
+		compdir="${D}"/$(get_bashcompdir) \
+		docsdir="${ED}"/usr/share/doc/${PF} \
+		install
+
+	if use doc; then
+		docinto html
+		dodoc -r "${WORKDIR}"/${PN}-doc-${PV}/.
+	fi
 }
diff --git a/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch b/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch
new file mode 100644
index 000000000000..6fde1018c2d2
--- /dev/null
+++ b/www-apps/blazeblogger/files/blazeblogger-1.2.0-makefile.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -84,8 +84,6 @@
+ 	$(INSTALL) -m 644 TODO $(docsdir)
+ 	$(INSTALL) -m 644 README $(docsdir)
+ 	$(INSTALL) -m 644 AUTHORS $(docsdir)
+-	$(INSTALL) -m 644 COPYING $(docsdir)
+-	$(INSTALL) -m 644 INSTALL $(docsdir)
+ 	-$(INSTALL) -m 644 ChangeLog $(docsdir)
+ 
+ install_man: $(MAN1)
diff --git a/www-apps/cgp/Manifest b/www-apps/cgp/Manifest
index 55ccf8375536..182ae3cc8d93 100644
--- a/www-apps/cgp/Manifest
+++ b/www-apps/cgp/Manifest
@@ -1,6 +1,4 @@
 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
+EBUILD cgp-1_p20190510.ebuild 1321 BLAKE2B 42e7174c0f5fd2f1e03817dfcf6b73be45a37a89034ed475c06914ecc49372e31cbefa5a84fa16fc12e98b8ed1284bbc3deada82772556810a996938e149bdf3 SHA512 89e6f9777090f03419097deb444dd2d73b75976bd0eab5d787e3fbbc2e31df141c4d9683a9ab802a90cb5af6a3ea41aadd28c2ea9f4ec182491cc9cbd7e31807
 MISC metadata.xml 558 BLAKE2B a2ef24fdd53e577774517c18e6030b08a375cf342aa003fc2f82fa7c73065cd9703f67ba6a2113a6e605280a6239fc7eaeca8f5d0827d587bbfcc9e49b4dc351 SHA512 87e53979d5f382d585ba2c8dbe30ed21402abc270ecad1a6bcc1147aaf7ccf9aba8090c3acfde20fd23b4cf57b4c3621f8e863d9ce175564949619a3c7853576
diff --git a/www-apps/cgp/cgp-1_p20181209.ebuild b/www-apps/cgp/cgp-1_p20181209.ebuild
deleted file mode 100644
index fa08218c3b69..000000000000
--- a/www-apps/cgp/cgp-1_p20181209.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit webapp
-
-MY_PN="${PN^^}"
-MY_PV="72acfcbffd51da1e77a56517618da68252485ed6"
-
-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" )
-
-src_install() {
-	webapp_src_preinst
-
-	einstalldocs
-
-	# Since the docs are already installed, remove them from htdocs
-	# The file doc/CHANGELOG is needed, as CGP reads from there it's version
-	rm -r .gitignore doc/LICENSE doc/nginx.conf || die
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	einfo "The command shell_exec must not be disabled"
-	einfo "through the disable_functions php.ini directive."
-	einfo "It must allow execution of the rrdtool program."
-	einfo ""
-	einfo "An configuration file for www-servers/nginx"
-	einfo "has been installed as an example."
-}
diff --git a/www-apps/cgp/cgp-1_p20190510.ebuild b/www-apps/cgp/cgp-1_p20190510.ebuild
index 4821fa570298..bb9ba9912901 100644
--- a/www-apps/cgp/cgp-1_p20190510.ebuild
+++ b/www-apps/cgp/cgp-1_p20190510.ebuild
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	dev-lang/php[json]
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index 0f010bcae9ee..addd053938a8 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,24 +1,10 @@
 AUX postinstall-en.txt 1730 BLAKE2B b335309795d753c7689338c5e94b596efa5f66dc8dee17ad30b1a2d10b694a7bc288597b526239ea1d443887b45b8cd8ef89b499b79e86ab5df1c195ee85d4a0 SHA512 4ae14616c49e6aa61dc781350b5a75defefc2f894b98422a5b69a5827e367eb00fce140e6a45bcc02c90f068fc31970512d2632bbbf398cbe34f947933990050
-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.8.9.tar.gz 19509081 BLAKE2B 862837559b25e162c2d1d148ac7485e0212f1007ed01b7aabbc96e97c2841db943d494270d3276f4c9ae43587c218e1412bae014cff3ffdde051f529703028b2 SHA512 33c314726d41ac192353e1d99975eccfee79708aec70ba6892d1a9082665c6e163be0212a5ca91ea832ed213b4e616dd2dba594096efd5f3a7680e560afac945
-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-8.9.5.tar.gz 19791019 BLAKE2B 7bbc099b2d7483a4e777f1466d9996895918ebfd0591488eb88ae878f7eb5cafa9142e86c94cd9b6f4b6d962ae152b1f7aada003cdbfb6e39d6bdf8720914499 SHA512 7c1bcd4bf2744b7806e77a1bfed811d5c70c334befe2b817c296bff04ae3427b9b73a12f6a404d8252449b13a14c9203ccc7d187a678f74e3b1feecdc1c1ae0a
-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
-DIST drupal-9.0.5.tar.gz 16858369 BLAKE2B 81a02d60b8a93f28bba282240bdea2dd3a571a08895aa7886af55aa92f75306721633a1666e334292d188a6ee4774e1b1b1d067d6ad21024c41ee3d3da76c891 SHA512 fce77bb45983e6d3b6a43c293fc03729d22a5b1722fa712b4d5c78a74d78a64be655f873b24a93e933e1338f28bec5540baa6a4ab9a1bab7678ae0214aecaaf8
-EBUILD drupal-7.72.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
-EBUILD drupal-8.8.8.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
-EBUILD drupal-8.8.9.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-8.9.5.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
-EBUILD drupal-9.0.5.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+DIST drupal-7.73.tar.gz 3324289 BLAKE2B 85b40994ef336e8a155175597aaf36652850118400533b531d5bfe4ffd797abb9b362ccfb2a52cdf2e326fa4865492406c3ed4cf1a59a4e0aff0613c337c4301 SHA512 45f518ef8bc085eafc2292f6a41c17c2d034fa9261ba8c61549a46adb194020e036355c322abc64a355ff81d00ecd1f0acf0834d46ec028aac506c81f7297849
+DIST drupal-8.8.10.tar.gz 19510031 BLAKE2B daae5669bdaa79ad1ae56a52993a390127fff56307b0256c0dfd9d118f1b09d3e8414b71334c74b01f9e9609870f75b25936bf72a78d051f543862d848daedb8 SHA512 1ebfb7f1f3d29ef00bd560e4ff4d236ee739bafb4f9687bce77dcd6da9746d42db4423a278b22a1b394bbf7eb769975eb69eaeeb16f4ea601cc13d9209309425
+DIST drupal-8.9.6.tar.gz 19789145 BLAKE2B aaa2c5e866fd74dc4e5d19bb4f00eae3333cb86b2b54969f31936cb627e2af0cc14b0e6d1d26b1366040cb3860752d3507b82341d706490fef35ff6ed5ca2316 SHA512 3938cca2736eb2a0fa5c2b12c0d8543f54d0480bbb42b51283f694aa67e7785b94e6d3b2bbeadfd304e9fc429c57b73c12243b178813b658537c42c1303c0d81
+DIST drupal-9.0.6.tar.gz 16857960 BLAKE2B 0e85e16330b5c3df70443d2f516b0a5d4854db4c3e101dc29a04af7e76cb913b0349deb82643644e722d90c78f7ba4497b8712f229b4eede2fb867c95469d57f SHA512 ee5b0ab3f0fd25c70b6a44e10a2e54c945a3843c460d5769ba5022a82fc2726909f2c34b9823c5f82ee01d8145b739daf2fed3a78ef22454ad0db7f08a0812f1
+EBUILD drupal-7.73.ebuild 1546 BLAKE2B 68d9ef0e5c84e8413ab72d8d1f7427316885419b1e19086d2d27d293a98fff1c4f7f889ae68decf1083d98e228dc6778794bf7e61d82f7d3002cd2a92ca0d844 SHA512 366ec13e1ae23222f5b5bbe04f2f3ee0fec8c70e68d542582bb01c67ed5fda76b28dd3ae0072bef3c19c76bbf85e34ce505986226edb76755092b2cc8d299a63
+EBUILD drupal-8.8.10.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-8.9.6.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
+EBUILD drupal-9.0.6.ebuild 2084 BLAKE2B fe134b960a3b75878a1a0ecb83f540d430a8bb65f4790968ef7fd593d8a2da8a9938f794d6bbe36ce68b4520a33436f6c5cd72a02ab0cd2396b3598166072049 SHA512 f8b086f10913ddaa8acbecfec3a750370a04785a1da424a7211fb1dd143c7f0d251541b1bcfbff9de7674e887086aa9156b3028b63daafd205881753d207d995
 MISC metadata.xml 350 BLAKE2B 6142fb739e77e5ea96afb08fc4874d79efcac28348eb84333b77010fe74286d2939e160ad4ae0bbc7ca1630a73683d6d956ea1dc804b602f7fb925fff3e4b814 SHA512 10953373bc06435a35f07b9f0950c7e930c6c23cd3e6d35393eb98e581a3daeecf9b6c1f26bf1343e9ff4be84b7db3a6967c5c61bae78dc5cc7a8b786a93d6c4
diff --git a/www-apps/drupal/drupal-7.72.ebuild b/www-apps/drupal/drupal-7.73.ebuild
index 4fd21d3cac4f..4fd21d3cac4f 100644
--- a/www-apps/drupal/drupal-7.72.ebuild
+++ b/www-apps/drupal/drupal-7.73.ebuild
diff --git a/www-apps/drupal/drupal-8.8.8.ebuild b/www-apps/drupal/drupal-8.8.10.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.8.8.ebuild
+++ b/www-apps/drupal/drupal-8.8.10.ebuild
diff --git a/www-apps/drupal/drupal-8.9.2.ebuild b/www-apps/drupal/drupal-8.9.2.ebuild
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-8.9.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-8.9.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.5.ebuild b/www-apps/drupal/drupal-8.9.5.ebuild
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-8.9.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.8.9.ebuild b/www-apps/drupal/drupal-8.9.6.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.8.9.ebuild
+++ b/www-apps/drupal/drupal-8.9.6.ebuild
diff --git a/www-apps/drupal/drupal-9.0.1.ebuild b/www-apps/drupal/drupal-9.0.1.ebuild
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-9.0.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-9.0.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-9.0.3.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.5.ebuild b/www-apps/drupal/drupal-9.0.5.ebuild
deleted file mode 100644
index 50acdd30770d..000000000000
--- a/www-apps/drupal/drupal-9.0.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# 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.1.ebuild b/www-apps/drupal/drupal-9.0.6.ebuild
index 50acdd30770d..50acdd30770d 100644
--- a/www-apps/drupal/drupal-8.9.1.ebuild
+++ b/www-apps/drupal/drupal-9.0.6.ebuild
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 62561e1b3569..c53e535261cf 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1,5 +1,4 @@
 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
diff --git a/www-apps/gitea/files/gitea-logflags.patch b/www-apps/gitea/files/gitea-logflags.patch
deleted file mode 100644
index bbe6e5501c81..000000000000
--- a/www-apps/gitea/files/gitea-logflags.patch
+++ /dev/null
@@ -1,139 +0,0 @@
-
-#Patch to make gitea logging less verbose.
-
-diff --git a/modules/log/flags.go b/modules/log/flags.go
-index 992fc62dd..5578a1b6b 100644
---- a/modules/log/flags.go
-+++ b/modules/log/flags.go
-@@ -31,7 +31,7 @@ const (
- 	Lmedfile = Lshortfile | Llongfile
- 
- 	// LstdFlags is the initial value for the standard logger
--	LstdFlags = Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial
-+	LstdFlags = Ldate | Ltime | Llevelinitial
- )
- 
- var flagFromString = map[string]int{
-
-
-#Just patching the tests to keep working with the patch above (avoid using LstdFlags)
-
-diff --git a/modules/log/conn_test.go b/modules/log/conn_test.go
-index cc3d758fa..295bee37f 100644
---- a/modules/log/conn_test.go
-+++ b/modules/log/conn_test.go
-@@ -40,7 +40,7 @@ func TestConnLogger(t *testing.T) {
- 
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 
- 	logger := NewConn()
- 	connLogger := logger.(*ConnLogger)
-@@ -112,7 +112,7 @@ func TestConnLoggerCloseBeforeSend(t *testing.T) {
- 
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 
- 	logger := NewConn()
- 
-@@ -126,7 +126,7 @@ func TestConnLoggerFailConnect(t *testing.T) {
- 
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 
- 	logger := NewConn()
- 
-@@ -169,7 +169,7 @@ func TestConnLoggerClose(t *testing.T) {
- 
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 
- 	logger := NewConn()
- 	connLogger := logger.(*ConnLogger)
-diff --git a/modules/log/console_test.go b/modules/log/console_test.go
-index a028b5b87..e4fec760a 100644
---- a/modules/log/console_test.go
-+++ b/modules/log/console_test.go
-@@ -33,7 +33,7 @@ func TestConsoleLoggerMinimalConfig(t *testing.T) {
- 			},
- 		}
- 		prefix := ""
--		flags := LstdFlags
-+        flags := LstdFlags
- 
- 		cw := NewConsoleLogger()
- 		realCW := cw.(*ConsoleLogger)
-@@ -64,7 +64,7 @@ func TestConsoleLogger(t *testing.T) {
- 	}
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 
- 	cw := NewConsoleLogger()
- 	realCW := cw.(*ConsoleLogger)
-diff --git a/modules/log/file_test.go b/modules/log/file_test.go
-index 38279315a..dc8d291ed 100644
---- a/modules/log/file_test.go
-+++ b/modules/log/file_test.go
-@@ -24,7 +24,7 @@ func TestFileLoggerFails(t *testing.T) {
- 
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 	//filename := filepath.Join(tmpDir, "test.log")
- 
- 	fileLogger := NewFileLogger()
-@@ -52,7 +52,7 @@ func TestFileLogger(t *testing.T) {
- 
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 	filename := filepath.Join(tmpDir, "test.log")
- 
- 	fileLogger := NewFileLogger()
-@@ -155,7 +155,7 @@ func TestCompressFileLogger(t *testing.T) {
- 
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 	filename := filepath.Join(tmpDir, "test.log")
- 
- 	fileLogger := NewFileLogger()
-diff --git a/modules/log/smtp_test.go b/modules/log/smtp_test.go
-index 216d55521..15075dd41 100644
---- a/modules/log/smtp_test.go
-+++ b/modules/log/smtp_test.go
-@@ -17,7 +17,7 @@ import (
- func TestSMTPLogger(t *testing.T) {
- 	prefix := "TestPrefix "
- 	level := INFO
--	flags := LstdFlags | LUTC | Lfuncname
-+    flags :=  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC | Lfuncname
- 	username := "testuser"
- 	password := "testpassword"
- 	host := "testhost"
-diff --git a/modules/log/writer_test.go b/modules/log/writer_test.go
-index 886dd58fb..df2f6e698 100644
---- a/modules/log/writer_test.go
-+++ b/modules/log/writer_test.go
-@@ -41,7 +41,7 @@ func TestBaseLogger(t *testing.T) {
- 	b := WriterLogger{
- 		out:    c,
- 		Level:  INFO,
--		Flags:  LstdFlags | LUTC,
-+		Flags:  Ldate | Ltime | Lmedfile | Lshortfuncname | Llevelinitial | LUTC,
- 		Prefix: prefix,
- 	}
- 	location, _ := time.LoadLocation("EST")
diff --git a/www-apps/roundup/Manifest b/www-apps/roundup/Manifest
index 6e84d0aed6b4..6553b2fe6d30 100644
--- a/www-apps/roundup/Manifest
+++ b/www-apps/roundup/Manifest
@@ -1,5 +1,3 @@
-DIST roundup-1.6.1.tar.gz 3128618 BLAKE2B 7fa87006582feac74f0fc455bc201f2485326b8f6ed616164f667992da114d45e8d8cef370a825450b5a4cb757ba0453d5fe3ace47164bd83e78a8c6f28b9d05 SHA512 b7666c5515c76baa4fa3ac3d0efea82feace6270af55bbc70e603b2ce0c617b4a303a15133310c1e00d3b6442baa58060d5387f568014652b1b781d9248f0052
 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.ebuild 1431 BLAKE2B 6783eaa9b7ec33a7c2c72f5d9deef4bcd7b404a99ac1cdd99533ee98ec13cd6363bf351bc035ad80e5c56820f14ef682283ed05e5fb38d518325823403fc14ff SHA512 46c33c27208605c769600da5194d2fab482c56132ead93b4a42d0c3495089d7da5502484e3ce48cedfd20807ce7cc1dba2de9e92b33545d52bd88d2c0c436911
+EBUILD roundup-2.0.0.ebuild 1431 BLAKE2B 2d86ec791470f9a79b8b3a8ff2dee9c663be9543419e8a41452fee5bf4230d42cb90a4502e10ef81658f7b21318c080f9ec83b1c1bc387cea9bc1e456cd5a232 SHA512 e5af334b91139403b78ad1e7cb05efd0d951d1fe23ba9d816c57128df46fabd5c80509c712a4ad0bb3281c50b00ff0641cf5b0e7295ee5efa2f5b81ad020adb9
 MISC metadata.xml 834 BLAKE2B a40da78f8ffe622a906c466eb787d91409641f093da28314c6e959d7822084959534a0750c3a5c1076626c21a23631f1e834730ac4df3a5ecabbbab01eed8685 SHA512 11c911f38d30bc80377c4c510dbd1a33164463cce40d85cd4db7e83660ae0699e1241eba5d25def7016557e42537c2bff1f0c9e74f9ade44c7a01f0ff952c20d
diff --git a/www-apps/roundup/roundup-1.6.1-r1.ebuild b/www-apps/roundup/roundup-1.6.1-r1.ebuild
deleted file mode 100644
index 7d88bde098f4..000000000000
--- a/www-apps/roundup/roundup-1.6.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-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"
-IUSE="+tz sqlite mysql postgres xapian whoosh ssl"
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	tz? ( dev-python/pytz[$PYTHON_USEDEP] )
-	sqlite? ( dev-lang/python:*[sqlite] )
-	mysql? ( dev-python/mysql-python[$PYTHON_USEDEP] )
-	postgres? (
-		>=dev-python/psycopg-1.1.21[$PYTHON_USEDEP]
-		<dev-python/psycopg-2.8[$PYTHON_USEDEP]
-	)
-	xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,$PYTHON_USEDEP] )
-	whoosh? ( >=dev-python/whoosh-2.5.7[$PYTHON_USEDEP] )
-	ssl? ( dev-python/pyopenssl[$PYTHON_USEDEP] )"
-
-DOCS="CHANGES.txt doc/*.txt"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	rm -r "${ED}"/usr/share/doc/${PN} || die
-}
-
-pkg_postinst() {
-	ewarn "See installation.txt for initialisation instructions."
-	ewarn "See upgrading.txt for upgrading instructions."
-}
diff --git a/www-apps/roundup/roundup-2.0.0.ebuild b/www-apps/roundup/roundup-2.0.0.ebuild
index e5a9ee447a2d..bc6b341c9ce2 100644
--- a/www-apps/roundup/roundup-2.0.0.ebuild
+++ b/www-apps/roundup/roundup-2.0.0.ebuild
@@ -14,13 +14,13 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="MIT ZPL"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ppc sparc x86"
 IUSE="+tz sqlite mysql postgres xapian whoosh ssl jinja pyjwt markdown"
 
 DEPEND=""
 RDEPEND="${DEPEND}
 	tz? ( dev-python/pytz[$PYTHON_USEDEP] )
-	sqlite? ( dev-lang/python:*[sqlite] )
+	sqlite? ( $(python_gen_impl_dep sqlite) )
 	mysql? ( dev-python/mysqlclient[$PYTHON_USEDEP] )
 	postgres? ( >=dev-python/psycopg-2.8[$PYTHON_USEDEP] )
 	xapian? ( >=dev-libs/xapian-bindings-1.0.0[python,$PYTHON_USEDEP] )
diff --git a/www-apps/trac/Manifest b/www-apps/trac/Manifest
deleted file mode 100644
index a538699e1e17..000000000000
--- a/www-apps/trac/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX postinst-en.txt 1331 BLAKE2B 45313107abc05238160eeda67db0aab4917d18ee0e4d7882cecf66ecd287fed4c9f3798b2c7588e2514f6406fb3949ebfddc73695e48c6bf53781784a06364f1 SHA512 6bde40a16545462ef0d8654ffc860e031f5978a253b0fe68df24b18a281f396fd560e4b39a6c53ecee52c9be941ca83dccd1aee9a98dccf570a9f5b0f0c6bbaf
-AUX postupgrade-en.txt 665 BLAKE2B a504090cabc4d8645c31d1aecc7419059b84b8ba9a7b42331f53fe1953d3e5bb44ed0327411acbc711eb31a06e4bc83b7577d6d7d054ee74bfbccfadb58685ea SHA512 bc4684dff491d6140d7d97a1de6cc2773d5f834054bc3d8c122c5d6777f543a08f93e4142c50dcbda862d75ba5c19ffd49ca37876e57df4ee19869099a346a4f
-AUX tracd.confd 359 BLAKE2B 5bf14f9828f3eb22c39a27dd20da219032cc3157d45b16a54a0a6530923c694f7a424c08c09458fdf9e422a3819a7e30619a1c82966ac5aafa2355528e666e3f SHA512 38a961fe59b690eb91e20143aaea6aa1becda8c2afa103599d14ff86c7aae88f06b57b342302de1f067dac5d99024b9cc72896a84349e09b3ff40c9a20f97bb1
-AUX tracd.initd 823 BLAKE2B 4325de1322cda7885539859c2b2ea3d27acaf636bde728c50fcc4c769acec308e6b56d3449109171ce9bdd2bdda9f9364f93c7069debd0a0ecb1009ce0bbf29b SHA512 88a2c92fc1f947d794e68b158db1786cd9c2891de5d3d0d5b738e1245f35998e17741176ecd2a9562d21058f480668cfa61628c7a7b4bccf62e1373728db5be6
-DIST Trac-1.2.5.tar.gz 5333965 BLAKE2B 51a58773fc037db66b748abddc4905738f2766c3aef87913cb2acd66cc6fcff14be288322ed1bc92435a7a7ab8de6020259a3363459ef1363518cdacf1ac4c0e SHA512 ee8faa6950f5148fe8adca9381f3228dc9f198457b2c44fad8331ca87a1e3ab15906b25c7b01fa8face4e93a366fdf12c27843198db6a9642481820e7456a76c
-EBUILD trac-1.2.5.ebuild 2673 BLAKE2B 48eccc6077daa1c2d7aa7aec6b9b5f9ddc51c736c7e20b54fabf005196750fb6c1c49e12de2155962c2df529a6e46c84b436b58ad08192703438041b07872af3 SHA512 915a038309ca53e97705d51cdb095bef792aea56f1350c36d44c0ab457d7e93b9b594441815dcd7acd4ba6507a2dd0adeddbfcabcd8dfa23be41042f9edb1775
-MISC metadata.xml 506 BLAKE2B 4b408bc9a05c2bddccf9c733ea9f58c6f2be64f3dc8b04f4a3f3330b3ac21157f3468144a62f6473c253e8e8019c759a3d2bfbd1ad36633c3097bc061b88a8b4 SHA512 06c8b9589b20dfa824822b3129d7f62bc2aaad12f37b16e735604469a94ed51c6c8b57cce53efb1e81d748bae56ae90d74837d60667a4826ac53044e2afdf048
diff --git a/www-apps/trac/files/postinst-en.txt b/www-apps/trac/files/postinst-en.txt
deleted file mode 100644
index 2a4012b9034d..000000000000
--- a/www-apps/trac/files/postinst-en.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-Install Instructions
-====================
-
-This is brief and generic information about Trac.
-
-See the releases notes at http://trac.edgewall.org/wiki/TracDev/ReleaseNotes
-for the Trac version you have installed to learn about software changes and
-possible caveats.
-
-Web Server
-----------
-
-Trac installation depends on the web server you are using.
-
-FastCGI users: see http://trac.edgewall.org/wiki/TracFastCgi
-
-CGI users: see http://trac.edgewall.org/wiki/TracCgi
-
-Apache 2 and mod_python users: you have to manually emerge
-www-apache/mod_python. See http://trac.edgewall.org/wiki/TracModPython
-
-You can also use Trac without having to install a web server. See
-http://trac.edgewall.org/wiki/TracStandalone to know more.
-
-Trac relies on the web server for users authentication. Please refer to the
-Trac wiki and to your web server documentation to set up authentication.
-
-Trac environments
------------------
-
-To complete the install, create your first Trac environment by running this
-command:
-
-	trac-admin /var/lib/trac/<project-name> initenv
-
-Don't forget to review the configuration file! It is located at
-/var/lib/trac/<project-name>/conf/trac.ini. Consult its reference at
-http://trac.edgewall.org/wiki/TracIni
-
-See http://trac.edgewall.org/wiki/TracEnvironment to know more about Trac
-environments and how to configure them.
diff --git a/www-apps/trac/files/postupgrade-en.txt b/www-apps/trac/files/postupgrade-en.txt
deleted file mode 100644
index 1f5c8ea21a05..000000000000
--- a/www-apps/trac/files/postupgrade-en.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Upgrade Instructions
-====================
-
-This is brief and generic information about Trac.
-
-See the releases notes at http://trac.edgewall.org/wiki/TracDev/ReleaseNotes
-for the Trac version you have installed to learn about software changes and
-possible caveats.
-
-If you are upgrading from a previous Trac version, please follow the
-instructions here:
-
-	http://trac.edgewall.org/wiki/TracUpgrade
-
-You will need to run trac-admin commands (upgrade, wiki upgrade...) for each
-Trac environment you have.
-
-You might also want to check for new configuration options by comparing trac.ini
-file with trac.ini.sample file in the conf/ directory in each Trac environment.
diff --git a/www-apps/trac/files/tracd.confd b/www-apps/trac/files/tracd.confd
deleted file mode 100644
index 2cb9d292a7cb..000000000000
--- a/www-apps/trac/files/tracd.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# The commented variables in this file are the defaults that are used
-# in the init-script.  You don't need to uncomment them except to
-# customize them to different values.
-
-# Port for tracd
-#TRACD_PORT="8000"
-
-# Options for tracd
-#TRACD_OPTS="--env-parent-dir /var/lib/trac/"
-
-# User and group as which to run tracd
-#TRACD_USER="tracd"
-#TRACD_GROUP="tracd"
diff --git a/www-apps/trac/files/tracd.initd b/www-apps/trac/files/tracd.initd
deleted file mode 100644
index c5a5432f2c06..000000000000
--- a/www-apps/trac/files/tracd.initd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-depend() {
-	need net
-}
-
-start() {
-	ebegin "Starting tracd"
-	# tracd fails to create pidfile if started as non-root user, thus we are asking
-	# s-s-d to do that. To have correct pid we avoid -d option of tracd and use
-	# --background option of s-s-d.
-	start-stop-daemon --start --user ${TRACD_USER:-tracd} --group ${TRACD_GROUP:-tracd} \
-                --pidfile /var/run/tracd.pid --make-pidfile --background \
-		--env PYTHON_EGG_CACHE="/var/lib/trac/egg-cache" \
-		--exec /usr/bin/tracd -- \
-		-p ${TRACD_PORT:-8000} ${TRACD_OPTS:---env-parent-dir /var/lib/trac/}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping tracd"
-	start-stop-daemon --stop --quiet --pidfile /var/run/tracd.pid
-	eend $?
-}
diff --git a/www-apps/trac/metadata.xml b/www-apps/trac/metadata.xml
deleted file mode 100644
index 821a978fec31..000000000000
--- a/www-apps/trac/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="i18n">Enable support for i18n with dev-python/Babel</flag>
-    <flag name="highlight">Enable syntax highlighting</flag>
-    <flag name="restructuredtext">Enable support for reStructuredText for wiki formatting</flag>
-  </use>
-</pkgmetadata>
diff --git a/www-apps/trac/trac-1.2.5.ebuild b/www-apps/trac/trac-1.2.5.ebuild
deleted file mode 100644
index 4ab68e7395e5..000000000000
--- a/www-apps/trac/trac-1.2.5.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='sqlite?'
-
-DISTUTILS_SINGLE_IMPL=Yes
-DISTUTILS_USE_SETUPTOOLS=rdepend
-inherit distutils-r1 eutils user webapp
-
-MY_PV=${PV/_p/.post}
-MY_P=Trac-${MY_PV}
-
-DESCRIPTION="Enhanced wiki and issue tracking system for software development projects"
-HOMEPAGE="https://trac.edgewall.com/ https://pypi.org/project/Trac/"
-SRC_URI="https://download.edgewall.org/trac/Trac-${MY_PV}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="cgi fastcgi i18n +highlight +restructuredtext mysql postgres +sqlite subversion"
-REQUIRED_USE="|| ( mysql postgres sqlite )"
-
-RDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-		dev-python/genshi[${PYTHON_MULTI_USEDEP}]
-		dev-python/pytz[${PYTHON_MULTI_USEDEP}]
-		i18n? ( >=dev-python/Babel-0.9.5[${PYTHON_MULTI_USEDEP}] )
-		highlight? (
-			|| (
-				dev-python/pygments[${PYTHON_MULTI_USEDEP}]
-				app-text/silvercity
-				app-text/pytextile
-				app-text/enscript
-			)
-		)
-		restructuredtext? ( dev-python/docutils[${PYTHON_MULTI_USEDEP}] )
-		mysql? ( dev-python/mysql-python[${PYTHON_MULTI_USEDEP}] )
-		postgres? ( >=dev-python/psycopg-2[${PYTHON_MULTI_USEDEP}] )
-		sqlite? ( >=dev-db/sqlite-3.3.4:3 )
-		subversion? ( dev-vcs/subversion[python,${PYTHON_MULTI_USEDEP}] )
-	')
-	"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-# Tests depend on twill, a broken package
-RESTRICT="test"
-
-WEBAPP_MANUAL_SLOT="yes"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	webapp_pkg_setup
-
-	enewgroup tracd
-	enewuser tracd -1 -1 -1 tracd
-}
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	distutils-r1_src_test
-}
-
-python_test() {
-	PYTHONPATH=. "${PYTHON}" trac/test.py || die "Tests fail with ${EPYTHON}"
-}
-
-python_test_all() {
-	if use i18n; then
-		make check
-	fi
-}
-
-# the default src_compile just calls setup.py build
-# currently, this switches i18n catalog compilation based on presence of Babel
-
-src_install() {
-	webapp_src_preinst
-	distutils-r1_src_install
-
-	# project environments might go in here
-	keepdir /var/lib/trac
-
-	# Use this as the egg-cache for tracd
-	dodir /var/lib/trac/egg-cache
-	keepdir /var/lib/trac/egg-cache
-	fowners tracd:tracd /var/lib/trac/egg-cache
-
-	# documentation
-	dodoc -r contrib
-
-	# tracd init script
-	newconfd "${FILESDIR}"/tracd.confd tracd
-	newinitd "${FILESDIR}"/tracd.initd tracd
-
-	for lang in en; do
-		webapp_postinst_txt ${lang} "${FILESDIR}"/postinst-${lang}.txt
-		webapp_postupgrade_txt ${lang} "${FILESDIR}"/postupgrade-${lang}.txt
-	done
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-}