version bump; major ebuild cleanup wrt #208584

(Portage version: 2.1.4.1)

7 files changed, 235 insertions, 106 deletions

diff --git a/www-apps/bugzilla/ChangeLog b/www-apps/bugzilla/ChangeLog
index 23d61e7b9192..d22a836e22c7 100644
--- a/www-apps/bugzilla/ChangeLog
+++ b/www-apps/bugzilla/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apps/bugzilla
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.106 2008/02/05 15:20:39 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/ChangeLog,v 1.107 2008/02/17 22:37:41 hollow Exp $
+
+*bugzilla-3.0.3 (17 Feb 2008)
+
+  17 Feb 2008; Benedikt Böhm <hollow@gentoo.org>
+  +files/3.0/bugzilla.cron.daily, +files/3.0/bugzilla.cron.tab,
+  -files/bugzilla.cron.daily, -files/bugzilla.cron.tab,
+  bugzilla-2.20.5.ebuild, bugzilla-2.22.3.ebuild, bugzilla-3.0.2.ebuild,
+  +bugzilla-3.0.3.ebuild:
+  version bump; major ebuild cleanup wrt #208584
 
   05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> bugzilla-2.20.5.ebuild,
   bugzilla-2.22.3.ebuild:
diff --git a/www-apps/bugzilla/bugzilla-2.20.5.ebuild b/www-apps/bugzilla/bugzilla-2.20.5.ebuild
index 02fdf0101dca..afe266113f07 100644
--- a/www-apps/bugzilla/bugzilla-2.20.5.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.20.5.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.5.ebuild,v 1.8 2008/02/05 15:20:39 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.20.5.ebuild,v 1.9 2008/02/17 22:37:41 hollow Exp $
 
-inherit webapp depend.apache
+inherit webapp depend.apache versionator
+
+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"
@@ -14,55 +16,58 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="graphviz mysql postgres"
 
 RDEPEND="
+	virtual/httpd-cgi
+	virtual/mta
 	>=dev-lang/perl-5.6.1
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-	mysql? ( <=dev-perl/DBD-mysql-3.0002 )
-	graphviz? ( media-gfx/graphviz )
+
 	>=dev-perl/AppConfig-1.52
-	>=virtual/perl-CGI-2.93
-	>=dev-perl/TimeDate-1.16
+	>=dev-perl/Chart-2.3
 	>=dev-perl/DBI-1.38
-	>=virtual/perl-File-Spec-0.84
-	virtual/perl-File-Temp
-	>=dev-perl/Template-Toolkit-2.08
-	>=dev-perl/Text-Tabs+Wrap-2001.0131
-	>=dev-perl/MailTools-1.67
-	virtual/perl-Storable
 	>=dev-perl/GD-1.20
-	>=dev-perl/Chart-2.3
 	dev-perl/GDGraph
 	dev-perl/GDTextUtil
-	dev-perl/XML-Parser
-	>=dev-perl/PatchReader-0.9.4
+	>=dev-perl/MailTools-1.67
 	dev-perl/MIME-tools
+	>=dev-perl/PatchReader-0.9.4
 	dev-perl/perl-ldap
-	virtual/mta
+	>=dev-perl/Template-Toolkit-2.08
+	>=dev-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
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	# remove CVS directories
-	find . -type d -name 'CVS' -print | xargs rm -rf
+	find . -type d -name 'CVS' -prune -exec rm -rf {} \;
 }
 
 src_install () {
 	webapp_src_preinst
 
-	cp -r ${S}/* ${D}/${MY_HTDOCSDIR} || die
-	for file in `find -type d -printf "%p/* "`; do
-		webapp_serverowned "${MY_HTDOCSDIR}/${file}"
+	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
 
-	cp ${FILESDIR}/2.20/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
-
-	local FILE="bugzilla.cron.daily bugzilla.cron.tab"
-	cd ${FILESDIR}/2.20
-	cp ${FILE} ${D}/${MY_HTDOCSDIR}
+	for f in $(find -type d -printf "%p/* "); do
+		webapp_serverowned ${MY_HTDOCSDIR}/${f}
+	done
 
-	webapp_hook_script ${FILESDIR}/2.20/reconfig
-	webapp_postinst_txt en ${FILESDIR}/2.20/postinstall-en.txt
+	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.3.ebuild b/www-apps/bugzilla/bugzilla-2.22.3.ebuild
index e6b1244fd6f0..744118e8de82 100644
--- a/www-apps/bugzilla/bugzilla-2.22.3.ebuild
+++ b/www-apps/bugzilla/bugzilla-2.22.3.ebuild
@@ -1,8 +1,10 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.22.3.ebuild,v 1.7 2008/02/05 15:20:39 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-2.22.3.ebuild,v 1.8 2008/02/17 22:37:41 hollow Exp $
 
-inherit webapp depend.apache
+inherit webapp depend.apache versionator
+
+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"
@@ -14,61 +16,64 @@ KEYWORDS="~alpha ~amd64 ia64 ppc ppc64 sparc x86"
 IUSE="extras graphviz mysql postgres"
 
 RDEPEND="
+	virtual/httpd-cgi
 	>=dev-lang/perl-5.6.1
-	postgres? ( >=dev-perl/DBD-Pg-1.45 )
-	mysql? ( >=dev-perl/DBD-mysql-3.0007 )
-	graphviz? ( media-gfx/graphviz )
+
 	>=dev-perl/AppConfig-1.52
-	>=virtual/perl-CGI-2.93
-	>=dev-perl/TimeDate-1.16
 	>=dev-perl/DBI-1.38
-	>=virtual/perl-File-Spec-0.84
-	virtual/perl-File-Temp
+	>=dev-perl/MailTools-1.67
+	dev-perl/MIME-tools
 	>=dev-perl/Template-Toolkit-2.13
 	>=dev-perl/Text-Tabs+Wrap-2001.0131
-	>=dev-perl/MailTools-1.67
+	>=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
-	dev-perl/MIME-tools
 	virtual/perl-Storable
 
 	extras? (
-	dev-perl/HTML-Scrubber
-	dev-perl/Template-GD
-	>=dev-perl/Chart-2.3
-	>=dev-perl/GD-1.20
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/perl-ldap
-	>=dev-perl/PatchReader-0.9.4
-	dev-util/patchutils
-	dev-perl/XML-Twig )
+		>=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 )
 "
-# dev-util/patchutils needed for interdiff
 
 need_apache2
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
+
 	# remove CVS directories
-	find . -type d -name 'CVS' -print | xargs rm -rf
+	find . -type d -name 'CVS' -prune -exec rm -rf {} \;
 }
 
 src_install () {
 	webapp_src_preinst
 
-	cp -r ${S}/* ${D}/${MY_HTDOCSDIR} || die
-
-	cp ${FILESDIR}/2.22/apache.htaccess ${D}/${MY_HTDOCSDIR}/.htaccess
-
-	local FILE="bugzilla.cron.daily bugzilla.cron.tab"
-	cd ${FILESDIR}/2.22
-	cp ${FILE} ${D}/${MY_HTDOCSDIR}
+	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}/2.22/reconfig
-	webapp_postinst_txt en ${FILESDIR}/2.22/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
 	webapp_src_install
 
 	# bug #124282
-	chmod -R +x ${D}/${MY_HTDOCSDIR}/*.cgi
+	chmod +x "${D}"${MY_HTDOCSDIR}/*.cgi
 }
diff --git a/www-apps/bugzilla/bugzilla-3.0.2.ebuild b/www-apps/bugzilla/bugzilla-3.0.2.ebuild
index 70c67de19d47..f9fbb801b802 100644
--- a/www-apps/bugzilla/bugzilla-3.0.2.ebuild
+++ b/www-apps/bugzilla/bugzilla-3.0.2.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.0.2.ebuild,v 1.7 2007/12/10 16:46:49 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.0.2.ebuild,v 1.8 2008/02/17 22:37:41 hollow Exp $
 
 inherit webapp depend.apache versionator eutils
 
 GZ_PV="3.0.1"
+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
-	linguas_de? ( http://ganderbay.net/dl/germzilla-${GZ_PV}-1.utf-8.tar.gz  )"
+	linguas_de? ( http://ganderbay.net/dl/germzilla-${GZ_PV}-1.utf-8.tar.gz )"
 HOMEPAGE="http://www.bugzilla.org"
 
 LICENSE="MPL-1.1 NPL-1.1"
@@ -17,45 +18,48 @@ KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
 IUSE="modperl extras graphviz mysql postgres linguas_de"
 
 RDEPEND="
+	virtual/httpd-cgi
 	>=dev-lang/perl-5.8.0
+
+	>=dev-perl/DBI-1.41
+	dev-perl/Email-MIME-Modifier
+	>=dev-perl/Email-Send-2.00
+	dev-perl/MIME-tools
+	>=dev-perl/Template-Toolkit-2.13
+	>=dev-perl/TimeDate-1.16
+	>=virtual/perl-CGI-2.93
+	>=virtual/perl-File-Spec-0.84
+	>=virtual/perl-MIME-Base64-3.01
+
 	mysql? ( >=dev-perl/DBD-mysql-3.0007 )
 	postgres? ( >=dev-perl/DBD-Pg-1.45 )
 	graphviz? ( media-gfx/graphviz )
-	>=virtual/perl-CGI-2.93
+
 	modperl? (
+		>=dev-perl/Apache-DBI-0.96
 		>=virtual/perl-CGI-3.11
 		=www-apache/mod_perl-2*
-		>=dev-perl/Apache-DBI-0.96
 	)
 
-	>=dev-perl/TimeDate-1.16
-	>=dev-perl/DBI-1.41
-	>=virtual/perl-File-Spec-0.84
-	>=dev-perl/Template-Toolkit-2.13
-	>=virtual/perl-MIME-Base64-3.01
-	dev-perl/MIME-tools
-	>=dev-perl/Email-Send-2.00
-	dev-perl/Email-MIME-Modifier
-
 	extras? (
-	>=dev-perl/GD-1.20
-	dev-perl/Template-GD
-	>=dev-perl/Chart-2.3
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	dev-perl/XML-Twig
-	dev-perl/libwww-perl
-	>=dev-perl/PatchReader-0.9.4
-	dev-perl/perl-ldap
-	dev-perl/SOAP-Lite
-	>=dev-perl/HTML-Parser-3.40
-	dev-perl/HTML-Scrubber
-	dev-perl/Email-MIME-Attachment-Stripper
-	dev-perl/Email-Reply
+		>=dev-perl/Chart-2.3
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
+		>=dev-perl/GD-1.20
+		dev-perl/GDGraph
+		dev-perl/GDTextUtil
+		>=dev-perl/HTML-Parser-3.40
+		dev-perl/HTML-Scrubber
+		dev-perl/libwww-perl
+		>=dev-perl/PatchReader-0.9.4
+		dev-perl/perl-ldap
+		dev-perl/SOAP-Lite
+		dev-perl/Template-GD
+		dev-perl/XML-Twig
 	)
 "
 
-want_apache
+want_apache modperl
 
 pkg_setup() {
 	webapp_pkg_setup
@@ -66,36 +70,37 @@ pkg_setup() {
 			elog "to convert BMP attachments to PNG"
 		fi
 	fi
+
 }
 
 src_unpack() {
 	unpack ${A}
+	cd "${S}"
+
+	# remove CVS directories
+	find . -type d -name 'CVS' -prune -exec rm -rf {} \;
 
 	if use linguas_de ; then
-		mv de ${P}/template
+		mv ../de template/
 		elog "Installing German translation pack"
 		elog "Be sure to read http://wiki.ganderbay.net/wde/Germzilla-Installation"
 		elog "for installation instructions"
 	fi
-
-	# remove CVS directories
-	cd "${S}"
-	find . -type d -name 'CVS' -print | xargs rm -rf
 }
 
 src_install () {
 	webapp_src_preinst
 
-	cp -r "${S}"/* "${D}"/${MY_HTDOCSDIR} || die
-
-	local FILE="bugzilla.cron.daily bugzilla.cron.tab"
-	cd "${FILESDIR}"
-	cp ${FILE} "${D}/${MY_HTDOCSDIR}"
+	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}"/$(get_version_component_range 1-2)/reconfig
-	webapp_postinst_txt en "${FILESDIR}"/$(get_version_component_range 1-2)/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/${MY_PB}/reconfig
+	webapp_postinst_txt en "${FILESDIR}"/${MY_PB}/postinstall-en.txt
 	webapp_src_install
 
 	# bug #124282
-	chmod -R +x "${D}"/${MY_HTDOCSDIR}/*.cgi
+	chmod +x "${D}"${MY_HTDOCSDIR}/*.cgi
 }
diff --git a/www-apps/bugzilla/bugzilla-3.0.3.ebuild b/www-apps/bugzilla/bugzilla-3.0.3.ebuild
new file mode 100644
index 000000000000..ac0abd94d3a2
--- /dev/null
+++ b/www-apps/bugzilla/bugzilla-3.0.3.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/bugzilla/bugzilla-3.0.3.ebuild,v 1.1 2008/02/17 22:37:41 hollow 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
+	linguas_de? ( http://ganderbay.net/dl/germzilla-${PV}-1.utf-8.tar.gz )"
+HOMEPAGE="http://www.bugzilla.org"
+
+LICENSE="MPL-1.1 NPL-1.1"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="modperl extras graphviz mysql postgres linguas_de"
+
+RDEPEND="
+	virtual/httpd-cgi
+	>=dev-lang/perl-5.8.0
+
+	>=dev-perl/DBI-1.41
+	dev-perl/Email-MIME-Modifier
+	>=dev-perl/Email-Send-2.00
+	dev-perl/MIME-tools
+	>=dev-perl/Template-Toolkit-2.13
+	>=dev-perl/TimeDate-1.16
+	>=virtual/perl-CGI-2.93
+	>=virtual/perl-File-Spec-0.84
+	>=virtual/perl-MIME-Base64-3.01
+
+	mysql? ( >=dev-perl/DBD-mysql-3.0007 )
+	postgres? ( >=dev-perl/DBD-Pg-1.45 )
+	graphviz? ( media-gfx/graphviz )
+
+	modperl? (
+		>=dev-perl/Apache-DBI-0.96
+		>=virtual/perl-CGI-3.11
+		=www-apache/mod_perl-2*
+	)
+
+	extras? (
+		>=dev-perl/Chart-2.3
+		dev-perl/Email-MIME-Attachment-Stripper
+		dev-perl/Email-Reply
+		>=dev-perl/GD-1.20
+		dev-perl/GDGraph
+		dev-perl/GDTextUtil
+		>=dev-perl/HTML-Parser-3.40
+		dev-perl/HTML-Scrubber
+		dev-perl/libwww-perl
+		>=dev-perl/PatchReader-0.9.4
+		dev-perl/perl-ldap
+		dev-perl/SOAP-Lite
+		dev-perl/Template-GD
+		dev-perl/XML-Twig
+	)
+"
+
+want_apache modperl
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	if use extras ; then
+		if ! has_version media-gfx/imagemagick || ! built_with_use media-gfx/imagemagick perl ; then
+			elog "Consider installing media-gfx/imagemagick with USE=\"perl\""
+			elog "to convert BMP attachments to PNG"
+		fi
+	fi
+
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# remove CVS directories
+	find . -type d -name 'CVS' -prune -exec rm -rf {} \;
+
+	if use linguas_de ; then
+		mv ../de template/
+		elog "Installing German translation pack"
+		elog "Be sure to read http://wiki.ganderbay.net/wde/Germzilla-Installation"
+		elog "for installation instructions"
+	fi
+}
+
+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
+}
diff --git a/www-apps/bugzilla/files/bugzilla.cron.daily b/www-apps/bugzilla/files/3.0/bugzilla.cron.daily
index e3e86589891d..e3e86589891d 100644
--- a/www-apps/bugzilla/files/bugzilla.cron.daily
+++ b/www-apps/bugzilla/files/3.0/bugzilla.cron.daily
diff --git a/www-apps/bugzilla/files/bugzilla.cron.tab b/www-apps/bugzilla/files/3.0/bugzilla.cron.tab
index 0ac2ef6d65a6..0ac2ef6d65a6 100644
--- a/www-apps/bugzilla/files/bugzilla.cron.tab
+++ b/www-apps/bugzilla/files/3.0/bugzilla.cron.tab