gentoo resync : 25.08.2020

16 files changed, 225 insertions, 347 deletions

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>