Version bumps. Remove old/unmaintained versions. Fixes bug 314381 and bug 365545. Fix licenses. Add init.d/conf.d script for jobqueue.pl. Do tests.

(Portage version: 2.2.0_alpha41/cvs/Linux x86_64)

29 files changed, 152 insertions, 685 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index 82f86fdc467f..e08245ebe03a 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,28 @@
 # ChangeLog for www-apps/bugzilla
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.198 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.199 2011/06/17 10:38:41 idl0r Exp $
+
+*bugzilla-4.0.1 (17 Jun 2011)
+*bugzilla-3.6.5 (17 Jun 2011)
+*bugzilla-3.4.11 (17 Jun 2011)
+
+  17 Jun 2011; Christian Ruppert <idl0r@gentoo.org> -bugzilla-2.20.6.ebuild,
+  -bugzilla-2.22.7.ebuild, -bugzilla-3.0.11.ebuild, -bugzilla-3.2.9.ebuild,
+  -bugzilla-3.2.10.ebuild, -bugzilla-3.4.9.ebuild, -bugzilla-3.4.10.ebuild,
+  +bugzilla-3.4.11.ebuild, -bugzilla-3.6.3.ebuild, bugzilla-3.6.4.ebuild,
+  -bugzilla-3.6.4-r1.ebuild, +bugzilla-3.6.5.ebuild, +bugzilla-4.0.1.ebuild,
+  -files/2.20/apache.htaccess, -files/2.20/bugzilla.cron.daily,
+  -files/2.20/bugzilla.cron.tab, -files/2.20/postinstall-en.txt,
+  -files/2.20/reconfig, -files/2.22/apache.htaccess,
+  -files/2.22/bugzilla.cron.daily, -files/2.22/bugzilla.cron.tab,
+  -files/2.22/postinstall-en.txt, -files/2.22/reconfig,
+  -files/3.0/bugzilla.cron.daily, -files/3.0/bugzilla.cron.tab,
+  -files/3.0/postinstall-en.txt, -files/3.0/reconfig,
+  +files/4.0/bugzilla.cron.daily, +files/4.0/bugzilla.cron.tab,
+  +files/4.0/bugzilla-queue.confd, +files/4.0/bugzilla-queue.initd,
+  +files/4.0/postinstall-en.txt, +files/4.0/reconfig, metadata.xml:
+  Version bumps. Remove old/unmaintained versions. Fixes bug 314381 and bug
+  365545. Fix licenses. Add init.d/conf.d script for jobqueue.pl. Do tests.
 
   13 Feb 2011; Raúl Porcel <armin76@gentoo.org> bugzilla-2.20.6.ebuild,
   bugzilla-2.22.7.ebuild, bugzilla-3.0.11.ebuild, bugzilla-3.2.9.ebuild,
diff --git a/www-apps/bugzilla/bugzilla-2.20.6.ebuild b/www-apps/bugzilla/bugzilla-2.20.6.ebuild
deleted file mode 100644
index 90a43449eb3b..000000000000
--- a/www-apps/bugzilla/bugzilla-2.20.6.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.6.ebuild,v 1.8 2011/02/13 17:26:40 armin76 Exp $
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	virtual/mta
-	>=dev-lang/perl-5.6.1
-
-	>=dev-perl/AppConfig-1.52
-	>=dev-perl/Chart-2.3
-	>=dev-perl/DBI-1.38
-	>=dev-perl/GD-1.20
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	>=dev-perl/MailTools-1.67
-	dev-perl/MIME-tools
-	>=dev-perl/PatchReader-0.9.4
-	dev-perl/perl-ldap
-	>=dev-perl/Template-Toolkit-2.08
-	>=virtual/perl-Text-Tabs+Wrap-2001.0131
-	>=dev-perl/TimeDate-1.16
-	dev-perl/XML-Parser
-	>=virtual/perl-CGI-2.93
-	>=virtual/perl-File-Spec-0.84
-	virtual/perl-File-Temp
-	virtual/perl-Storable
-
-	graphviz? ( media-gfx/graphviz )
-	mysql? ( <=dev-perl/DBD-mysql-3.0002 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-"
-
-need_apache2
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	newins "${FILESDIR}"/${MY_PB}/apache.htaccess .htaccess
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	for f in $(find -type d -printf "%p/* "); do
-		webapp_serverowned "${MY_HTDOCSDIR}"/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/www-apps/bugzilla/bugzilla-2.22.7.ebuild b/www-apps/bugzilla/bugzilla-2.22.7.ebuild
deleted file mode 100644
index 5e20dd4d6e02..000000000000
--- a/www-apps/bugzilla/bugzilla-2.22.7.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.22.7.ebuild,v 1.8 2011/02/13 17:26:40 armin76 Exp $
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.6.1
-
-	>=dev-perl/AppConfig-1.52
-	>=dev-perl/DBI-1.38
-	>=dev-perl/MailTools-1.67
-	dev-perl/MIME-tools
-	>=dev-perl/Template-Toolkit-2.13
-	>=virtual/perl-Text-Tabs+Wrap-2001.0131
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-2.93
-	>=virtual/perl-File-Spec-0.84
-	virtual/perl-File-Temp
-	>=virtual/perl-MIME-Base64-3.01
-	virtual/perl-Storable
-
-	extras? (
-		>=dev-perl/Chart-2.3
-		>=dev-perl/GD-1.20
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		dev-perl/HTML-Scrubber
-		>=dev-perl/PatchReader-0.9.4
-		dev-perl/perl-ldap
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		dev-util/patchutils
-	)
-
-	graphviz? ( media-gfx/graphviz )
-	mysql? ( >=dev-perl/DBD-mysql-3.0007 )
-	postgres? ( >=dev-perl/DBD-Pg-1.45 )
-"
-
-need_apache2
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	newins "${FILESDIR}"/${MY_PB}/apache.htaccess .htaccess
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-}
diff --git a/www-apps/bugzilla/bugzilla-3.0.11.ebuild b/www-apps/bugzilla/bugzilla-3.0.11.ebuild
deleted file mode 100644
index 32c7e802ad0e..000000000000
--- a/www-apps/bugzilla/bugzilla-3.0.11.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.0.11.ebuild,v 1.8 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.19
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-	)
-"
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.2.10.ebuild b/www-apps/bugzilla/bugzilla-3.2.10.ebuild
deleted file mode 100644
index 6608f0736417..000000000000
--- a/www-apps/bugzilla/bugzilla-3.2.10.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.2.10.ebuild,v 1.7 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=3.0
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.19
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-	)
-"
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.2.9.ebuild b/www-apps/bugzilla/bugzilla-3.2.9.ebuild
deleted file mode 100644
index 8449d79a3281..000000000000
--- a/www-apps/bugzilla/bugzilla-3.2.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.2.9.ebuild,v 1.7 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=3.0
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-KEYWORDS="amd64 ppc ppc64 x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.19
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-	)
-"
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f}
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.4.10.ebuild b/www-apps/bugzilla/bugzilla-3.4.10.ebuild
deleted file mode 100644
index 87cd08cbf612..000000000000
--- a/www-apps/bugzilla/bugzilla-3.4.10.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.4.10.ebuild,v 1.2 2011/02/13 17:26:40 armin76 Exp $
-
-EAPI="2"
-
-inherit webapp depend.apache versionator eutils
-
-MY_PB=$(get_version_component_range 1-2)
-
-DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
-SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
-HOMEPAGE="http://www.bugzilla.org"
-
-LICENSE="MPL-1.1 NPL-1.1"
-# KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-IUSE="modperl extras graphviz mysql postgres"
-
-RDEPEND="
-	virtual/httpd-cgi
-	>=dev-lang/perl-5.8.8
-
-	>=dev-perl/DBI-1.601
-	>=dev-perl/DateTime-0.50
-	>=dev-perl/DateTime-Locale-0.43
-	>=dev-perl/DateTime-TimeZone-0.71
-	>=dev-perl/URI-1.38
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
-	>=dev-perl/Template-Toolkit-2.22
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.29
-	>=virtual/perl-Digest-SHA-5.46
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
-
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
-	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
-
-	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
-		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
-		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/libwww-perl
-		>=dev-perl/PatchReader-0.9.5
-		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
-		dev-perl/TheSchwartz
-		dev-perl/Daemon-Generic
-	)
-"
-# from extras we miss:
-# (nothing)
-
-want_apache modperl
-
-pkg_setup() {
-	depend.apache_pkg_setup modperl
-	webapp_pkg_setup
-}
-
-src_prepare() {
-	ecvs_clean
-}
-
-src_install () {
-	webapp_src_preinst
-
-	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f} || die
-	done
-
-	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
-	webapp_src_install
-
-	# bug #124282
-	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
-	# configuration must be executable
-	chmod u+x "${D}${MY_HTDOCSDIR}"/checksetup.pl
-}
diff --git a/www-apps/bugzilla/bugzilla-3.4.9.ebuild b/www-apps/bugzilla/bugzilla-3.4.11.ebuild
index 4b07bfd526d2..12d2cc56a0e5 100644
--- a/www-apps/bugzilla/bugzilla-3.4.9.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.4.11.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.4.9.ebuild,v 1.2 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.4.11.ebuild,v 1.1 2011/06/17 10:38:41 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit webapp depend.apache versionator eutils
 
@@ -12,7 +12,7 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
+LICENSE="MPL-1.1"
 # KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS="~amd64 ~ppc ~x86"
 
@@ -63,7 +63,7 @@ RDEPEND="
 		dev-perl/SOAP-Lite
 		dev-perl/Template-GD
 		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
 	)
@@ -86,7 +86,7 @@ src_install () {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r .
+	doins -r . || die
 	for f in bugzilla.cron.daily bugzilla.cron.tab; do
 		doins "${FILESDIR}"/${MY_PB}/${f} || die
 	done
diff --git a/www-apps/bugzilla/bugzilla-3.6.4.ebuild b/www-apps/bugzilla/bugzilla-3.6.4.ebuild
index 27a32678b562..e39dbf2bd871 100644
--- a/www-apps/bugzilla/bugzilla-3.6.4.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.4.ebuild,v 1.6 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.4.ebuild,v 1.7 2011/06/17 10:38:41 idl0r Exp $
 
 EAPI="2"
 
@@ -12,7 +12,7 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
+LICENSE="MPL-1.1"
 # KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 KEYWORDS="amd64 ppc ppc64 x86"
 
@@ -65,7 +65,7 @@ RDEPEND="
 		dev-perl/Template-GD
 		dev-perl/Test-Taint
 		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
 	)
diff --git a/www-apps/bugzilla/bugzilla-3.6.4-r1.ebuild b/www-apps/bugzilla/bugzilla-3.6.5.ebuild
index 968471a4da22..b25361e82b35 100644
--- a/www-apps/bugzilla/bugzilla-3.6.4-r1.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.6.5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.4-r1.ebuild,v 1.1 2011/02/08 08:14:01 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.5.ebuild,v 1.1 2011/06/17 10:38:41 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit webapp depend.apache versionator eutils
 
@@ -12,7 +12,7 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
+LICENSE="MPL-1.1"
 KEYWORDS="~amd64 ~x86"
 
 IUSE="modperl extras graphviz mysql postgres"
@@ -64,7 +64,7 @@ RDEPEND="
 		dev-perl/Template-GD
 		dev-perl/Test-Taint
 		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
 		dev-perl/Math-Random-Secure
@@ -90,7 +90,7 @@ src_install () {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r .
+	doins -r . || die
 	for f in bugzilla.cron.daily bugzilla.cron.tab; do
 		doins "${FILESDIR}"/${MY_PB}/${f} || die
 	done
diff --git a/www-apps/bugzilla/bugzilla-3.6.3.ebuild b/www-apps/bugzilla/bugzilla-4.0.1.ebuild
index f22e2a18237b..b89c47d637f5 100644
--- a/www-apps/bugzilla/bugzilla-3.6.3.ebuild
+++ b/www-apps/bugzilla/bugzilla-4.0.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.6.3.ebuild,v 1.5 2011/02/13 17:26:40 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-4.0.1.ebuild,v 1.1 2011/06/17 10:38:41 idl0r Exp $
 
-EAPI="2"
+EAPI="3"
 
 inherit webapp depend.apache versionator eutils
 
@@ -12,66 +12,74 @@ DESCRIPTION="Bugzilla is the Bug-Tracking System from the Mozilla project"
 SRC_URI="http://ftp.mozilla.org/pub/mozilla.org/webtools/${P}.tar.gz"
 HOMEPAGE="http://www.bugzilla.org"
 
-LICENSE="MPL-1.1 NPL-1.1"
-# KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
+LICENSE="MPL-1.1"
+KEYWORDS="~amd64 ~x86"
 
 IUSE="modperl extras graphviz mysql postgres"
 
+DEPEND="test? ( >=dev-lang/perl-5.8.8 )"
 RDEPEND="
 	virtual/httpd-cgi
 	>=dev-lang/perl-5.8.8
 
-	>=dev-perl/DBI-1.601
+	>=virtual/perl-CGI-3.510
+	virtual/perl-Digest-SHA
+	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DateTime-0.50
-	>=dev-perl/DateTime-Locale-0.43
 	>=dev-perl/DateTime-TimeZone-0.71
-	>=dev-perl/URI-1.38
-	>=dev-perl/Email-MIME-1.900
-	>=dev-perl/Email-MIME-Encodings-1.313
-	>=dev-perl/Email-Send-2.190
-	>=dev-perl/MIME-tools-5.427
+	>=dev-perl/DBI-1.601
 	>=dev-perl/Template-Toolkit-2.22
-	>=dev-perl/TimeDate-1.16
-	>=virtual/perl-CGI-3.33
-	>=virtual/perl-Digest-SHA-5.46
-	>=virtual/perl-File-Spec-3.27.01
-	>=virtual/perl-MIME-Base64-3.07
+	>=dev-perl/Email-Send-2.190
+	>=dev-perl/Email-MIME-1.904
+	dev-perl/URI
+	>=dev-perl/List-MoreUtils-0.22
 
-	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
 	postgres? ( >=dev-perl/DBD-Pg-1.49 )
-	graphviz? ( media-gfx/graphviz )
-
-	modperl? (
-		>=dev-perl/Apache-DBI-1.06
-		www-apache/mod_perl:1
-	)
+	mysql? ( >=dev-perl/DBD-mysql-4.00.5 )
 
 	extras? (
-		dev-perl/Authen-SASL
-		>=dev-perl/Chart-2.4.1
-		dev-perl/Email-MIME-Attachment-Stripper
-		dev-perl/Email-Reply
 		>=dev-perl/GD-2.35
-		dev-perl/GDGraph
+		>=dev-perl/Chart-2.4.1
+		dev-perl/Template-GD
 		dev-perl/GDTextUtil
-		>=dev-perl/HTML-Parser-3.60
-		dev-perl/HTML-Scrubber
-		dev-perl/JSON-RPC
+		dev-perl/GDGraph
+		dev-perl/XML-Twig
+		>=dev-perl/MIME-tools-5.427
 		dev-perl/libwww-perl
 		>=dev-perl/PatchReader-0.9.5
 		dev-perl/perl-ldap
-		dev-perl/SOAP-Lite
-		dev-perl/Template-GD
+		dev-perl/Authen-SASL
+		>=dev-perl/SOAP-Lite-0.712
+		dev-perl/JSON-RPC
+		>=dev-perl/JSON-XS-2.0
 		dev-perl/Test-Taint
-		dev-perl/XML-Twig
-		media-gfx/imagemagick[perl]
+		>=dev-perl/HTML-Parser-3.60
+		dev-perl/HTML-Scrubber
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
 		dev-perl/TheSchwartz
 		dev-perl/Daemon-Generic
+		>=dev-perl/Math-Random-Secure-0.50
+
+		|| ( media-gfx/imagemagick[perl] media-gfx/graphicsmagick[imagemagick,perl] )
+		dev-perl/MIME-tools
 	)
+
+	modperl? (
+		www-apache/mod_perl:1
+		>=dev-perl/Apache-SizeLimit-0.93
+	)
+
+	virtual/perl-File-Path
+	virtual/perl-Scalar-List-Utils
+
+	>=virtual/perl-File-Spec-3.27.01
+	>=virtual/perl-MIME-Base64-3.07
+
+	graphviz? ( media-gfx/graphviz )
 "
-# from extras we miss:
-# (nothing)
+
+# RadiusPerl for extras? bug 252128
 
 want_apache modperl
 
@@ -81,22 +89,34 @@ pkg_setup() {
 }
 
 src_prepare() {
-	ecvs_clean
+	# Get a rid of the bzr files
+	rm -rf .bzr*
+
+	# Remove bundled perl modules
+	rm -rf lib/
+}
+
+src_test() {
+	# Shall we remove runtests.pl and t/,xt/ on install?
+	perl runtests.pl || die
 }
 
 src_install () {
 	webapp_src_preinst
 
 	insinto "${MY_HTDOCSDIR}"
-	doins -r .
-	for f in bugzilla.cron.daily bugzilla.cron.tab; do
-		doins "${FILESDIR}"/${MY_PB}/${f} || die
-	done
+	doins -r . || die
+	doins "${FILESDIR}"/${MY_PB}/bugzilla.cron.{daily,tab} || die
 
 	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
 	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
 	webapp_src_install
 
+	if use extras; then
+		newconfd "${FILESDIR}"/${MY_PB}/bugzilla-queue.confd bugzilla-queue || die
+		newinitd "${FILESDIR}"/${MY_PB}/bugzilla-queue.initd bugzilla-queue || die
+	fi
+
 	# bug #124282
 	chmod +x "${D}${MY_HTDOCSDIR}"/*.cgi
 	# configuration must be executable
diff --git a/www-apps/bugzilla/files/2.20/apache.htaccess b/www-apps/bugzilla/files/2.20/apache.htaccess
deleted file mode 100644
index eb747223ccec..000000000000
--- a/www-apps/bugzilla/files/2.20/apache.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-AddHandler cgi-script .cgi
-Options +Indexes +ExecCGI +FollowSymLinks
-DirectoryIndex index.cgi
diff --git a/www-apps/bugzilla/files/2.20/bugzilla.cron.tab b/www-apps/bugzilla/files/2.20/bugzilla.cron.tab
deleted file mode 100644
index 0ac2ef6d65a6..000000000000
--- a/www-apps/bugzilla/files/2.20/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * *      /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.22/apache.htaccess b/www-apps/bugzilla/files/2.22/apache.htaccess
deleted file mode 100644
index eb747223ccec..000000000000
--- a/www-apps/bugzilla/files/2.22/apache.htaccess
+++ /dev/null
@@ -1,3 +0,0 @@
-AddHandler cgi-script .cgi
-Options +Indexes +ExecCGI +FollowSymLinks
-DirectoryIndex index.cgi
diff --git a/www-apps/bugzilla/files/2.22/bugzilla.cron.daily b/www-apps/bugzilla/files/2.22/bugzilla.cron.daily
deleted file mode 100644
index e3e86589891d..000000000000
--- a/www-apps/bugzilla/files/2.22/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/2.22/bugzilla.cron.tab b/www-apps/bugzilla/files/2.22/bugzilla.cron.tab
deleted file mode 100644
index 0ac2ef6d65a6..000000000000
--- a/www-apps/bugzilla/files/2.22/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * *      /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.22/postinstall-en.txt b/www-apps/bugzilla/files/2.22/postinstall-en.txt
deleted file mode 100644
index 9e7a6225d186..000000000000
--- a/www-apps/bugzilla/files/2.22/postinstall-en.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-0. Bugzilla has been installed into ${MY_INSTALLDIR}
-
-1. To finish the installation, please read
-   http://www.bugzilla.org/docs/2.22/html/installation.html
-   You will need to run ${MY_INSTALLDIR}/checksetup.pl
-
-   IMPORTANT: If you have customized the values in your Status/Resolution
-   field, you must edit checksetup.pl BEFORE YOU RUN IT. Please see the
-   Release Notes for more details.
-
-2. Please read the Release Notes, especially if you are upgrading:
-   http://www.bugzilla.org/releases/2.22/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
-   http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride for more info.
diff --git a/www-apps/bugzilla/files/2.22/reconfig b/www-apps/bugzilla/files/2.22/reconfig
deleted file mode 100644
index 71b0acea2585..000000000000
--- a/www-apps/bugzilla/files/2.22/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/files/3.0/bugzilla.cron.daily b/www-apps/bugzilla/files/3.0/bugzilla.cron.daily
deleted file mode 100644
index e3e86589891d..000000000000
--- a/www-apps/bugzilla/files/3.0/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/3.0/bugzilla.cron.tab b/www-apps/bugzilla/files/3.0/bugzilla.cron.tab
deleted file mode 100644
index 0ac2ef6d65a6..000000000000
--- a/www-apps/bugzilla/files/3.0/bugzilla.cron.tab
+++ /dev/null
@@ -1 +0,0 @@
-0 0  * * *      /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/3.0/postinstall-en.txt b/www-apps/bugzilla/files/3.0/postinstall-en.txt
deleted file mode 100644
index 2f1c1a34c5b9..000000000000
--- a/www-apps/bugzilla/files/3.0/postinstall-en.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-0. Bugzilla has been installed into ${MY_INSTALLDIR}
-
-1. To finish the installation, please read
-   http://www.bugzilla.org/docs/3.0/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/3.0/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
-   http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride for more info.
diff --git a/www-apps/bugzilla/files/3.0/reconfig b/www-apps/bugzilla/files/3.0/reconfig
deleted file mode 100644
index 71b0acea2585..000000000000
--- a/www-apps/bugzilla/files/3.0/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/files/4.0/bugzilla-queue.confd b/www-apps/bugzilla/files/4.0/bugzilla-queue.confd
new file mode 100644
index 000000000000..2eec355a0986
--- /dev/null
+++ b/www-apps/bugzilla/files/4.0/bugzilla-queue.confd
@@ -0,0 +1,4 @@
+#JOBQUEUE_USER=bugzilla
+#JOBQUEUE_GROUP=bugzilla
+
+JOBQUEUE_PATH=/var/www/bugzilla/jobqueue.pl
diff --git a/www-apps/bugzilla/files/4.0/bugzilla-queue.initd b/www-apps/bugzilla/files/4.0/bugzilla-queue.initd
new file mode 100644
index 000000000000..118f738b8073
--- /dev/null
+++ b/www-apps/bugzilla/files/4.0/bugzilla-queue.initd
@@ -0,0 +1,39 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/files/4.0/bugzilla-queue.initd,v 1.1 2011/06/17 10:38:41 idl0r Exp $
+
+PIDFILE="/var/run/bugzilla/${SVCNAME}.pid"
+JOBQUEUE_USER=${JOBQUEUE_USER:-root}
+JOBQUEUE_GROUP=${JOBQUEUE_GROUP:-root}
+
+checkconfig() {
+	[[ -z "${JOBQUEUE_USER}" || -z "$(getent passwd ${JOBQUEUE_USER})" ]] && { eerror "JOBQUEUE_USER not set or doesn't exist"; return 1; }
+	[[ -z "${JOBQUEUE_GROUP}" || -z "$(getent group ${JOBQUEUE_GROUP})" ]] && { eerror "JOBQUEUE_GROUP not set or doesn't exist"; return 1; }
+	[[ -z "${JOBQUEUE_PATH}" && ! -x "${JOBQUEUE_PATH}" ]] && { eerror "JOBQUEUE_PATH not set or not executable"; return 1; }
+	return 0
+}
+
+start() {
+	ebegin "Starting ${SVCNAME}"
+	checkconfig || return 1
+
+	piddir="${PIDFILE%/*}"
+	if [ ! -d "${piddir}" ]; then
+		checkpath -q -d -o $JOBQUEUE_USER:$JOBQUEUE_GROUP -m 0770 "${piddir}" || {
+			eend 1
+			return 1
+		}
+	fi
+
+	start-stop-daemon --start --pidfile $PIDFILE --user $JOBQUEUE_USER --group $JOBQUEUE_GROUP \
+		--exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME start 1>/dev/null
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping ${SVCNAME}"
+	checkconfig || return 1
+	start-stop-daemon --pidfile $PIDFILE --stop --exec $JOBQUEUE_PATH -- -p $PIDFILE -n $SVCNAME stop
+	eend $?
+}
diff --git a/www-apps/bugzilla/files/2.20/bugzilla.cron.daily b/www-apps/bugzilla/files/4.0/bugzilla.cron.daily
index e3e86589891d..e3e86589891d 100644
--- a/www-apps/bugzilla/files/2.20/bugzilla.cron.daily
+++ b/www-apps/bugzilla/files/4.0/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/4.0/bugzilla.cron.tab b/www-apps/bugzilla/files/4.0/bugzilla.cron.tab
new file mode 100644
index 000000000000..3cf2d4a66240
--- /dev/null
+++ b/www-apps/bugzilla/files/4.0/bugzilla.cron.tab
@@ -0,0 +1 @@
+0 0  * * * /var/www/bugzilla/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/2.20/postinstall-en.txt b/www-apps/bugzilla/files/4.0/postinstall-en.txt
index 3eeb24d5a89b..2d18de0b810f 100644
--- a/www-apps/bugzilla/files/2.20/postinstall-en.txt
+++ b/www-apps/bugzilla/files/4.0/postinstall-en.txt
@@ -1,12 +1,13 @@
 0. Bugzilla has been installed into ${MY_INSTALLDIR}
 
 1. To finish the installation, please read
-   http://www.bugzilla.org/docs/2.20/html/installation.html
+   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/2.20/release-notes.html
+   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
-   http://httpd.apache.org/docs/2.0/mod/core.html#allowoverride for more info.
+   http://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/2.20/reconfig b/www-apps/bugzilla/files/4.0/reconfig
index 71b0acea2585..71b0acea2585 100644
--- a/www-apps/bugzilla/files/2.20/reconfig
+++ b/www-apps/bugzilla/files/4.0/reconfig
diff --git a/www-apps/bugzilla/metadata.xml b/www-apps/bugzilla/metadata.xml
index f0d123704687..f3f65a1e4fe3 100644
--- a/www-apps/bugzilla/metadata.xml
+++ b/www-apps/bugzilla/metadata.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<use>
-	<flag name='extras'>Optional Perl modules</flag>
-	<flag name='modperl'>Enable <pkg>www-apache/mod_perl</pkg> support</flag>
-</use>
+	<herd>web-apps</herd>
+	<use>
+		<flag name="extras">Optional Perl modules</flag>
+		<flag name="modperl">Enable <pkg>www-apache/mod_perl</pkg> support</flag>
+	</use>
 </pkgmetadata>