version bump wrt #195351; ebuild cleanup wrt #208584

(Portage version: 2.1.4.4)

7 files changed, 98 insertions, 236 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index c1a931e0aad3..5f32c0016ad3 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.54 2008/02/05 15:04:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.55 2008/03/07 14:37:28 hollow Exp $
+
+*rt-3.6.6 (07 Mar 2008)
+
+  07 Mar 2008; Benedikt Böhm <hollow@gentoo.org>
+  -files/3.2.1/postinstall-en.txt, -files/3.2.1/reconfig,
+  -files/rt_apache.conf, -files/rt_apache1_fcgi.conf, metadata.xml,
+  -rt-3.4.5.ebuild, +rt-3.6.6.ebuild:
+  version bump wrt #195351; ebuild cleanup wrt #208584
 
   05 Feb 2008; Benedikt Böhm <hollow@gentoo.org> rt-3.4.5.ebuild,
   rt-3.6.3.ebuild:
diff --git a/www-apps/rt/files/3.2.1/postinstall-en.txt b/www-apps/rt/files/3.2.1/postinstall-en.txt
deleted file mode 100644
index e2f9ad510ff6..000000000000
--- a/www-apps/rt/files/3.2.1/postinstall-en.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-
-***********************************************************
-You now need to edit your local config files,
-which will be located in ${VHOST_ROOT}/rt-config/RT_Config.pm and RT_SiteConfig.pm
-
-BE SURE TO READ /usr/share/doc/${P}/README.gz , especially if
-you'd prefer to use an alias, or if you want to setup RT's e-mail gateway
-				
-RT documentation can be found at http://www.bestpractical.com/rt/docs.html
-If you need more help, consider searching the mailing list (Google site:lists.fsck.com )
-
-***********************************************************
-1. If this is a new install, you now need to initialize RT's database.
-
-For MySQL:
-rt-setup-database --action init --dba root --prompt-for-dba-password
-For PostgreSQL:
-rt-setup-database --action init --dba postgres --prompt-for-dba-password
-
-For this to work, PostgreSQL needs to listen on TCP 5432:
-In your postgresql.conf, set tcpip_socket = true, port = 5432
-
-***********************************************************
-2. Read the README to configure your webserver for RT. For the impatient:
-put this in ${MY_INSTALLDIR}/.htaccess (although you really should put it in
-your Apache configs)
-
-AddDefaultCharset UTF-8
-
-PerlModule Apache::DBI
-PerlRequire /usr/bin/webmux.pl
-
-SetHandler perl-script
-PerlHandler RT::Mason
-PerlSetEnv PERL5LIB /usr/lib
-
-***********************************************************
-3. Restart your webserver (e.g., for Apache: /etc/init.d/apache restart )
-
-***********************************************************
-4. Note that the default login is 'root', and the password is 'password'. It is
-a Good Idea(TM) to change the defaults to something more secure.
diff --git a/www-apps/rt/files/3.2.1/reconfig b/www-apps/rt/files/3.2.1/reconfig
deleted file mode 100644
index 447c5b490234..000000000000
--- a/www-apps/rt/files/3.2.1/reconfig
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-if [ $1 = "start" -o $1 = "install" ]; then
-	# don't fix location - breaks sandbox
-	#sed -i "s|${MY_HOSTROOTDIR}|${VHOST_ROOT}|g" /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm
-	# sed -i "s|${MY_HOSTROOTDIR}|\/usr|" /usr/bin/mason_handler.scgi
-	# sed -i "s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|" /usr/lib/RT.pm /usr/bin/rt-mailgate
-
-	# fix permissions
-	# chown -R  ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} /var/rt
-
-	# check for upgrades
-	cd ${VHOST_ROOT}/rt-config/upgrade
-	echo "You may need to update your database."
-	echo "For each item in the output below"
-	echo "whose name is greater than your previously installed RT version,"
-	echo "rt-setup-database --action schema --datadir ${VHOST_ROOT}/rt-config/upgrade/<version>"
-	echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/rt-config/upgrade/<version>"
-	echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/rt-config/upgrade/<version>"
-	echo "Don't forget to read the README for more details"
-	ls
-
-elif [ $1 = "clean" ]; then
-	echo $1
-	# rm -f /usr/bin/standalone_httpd /usr/bin/rt-crontool /usr/bin/webmux.pl /usr/lib/RT.pm /usr/bin/mason_handler.scgi /usr/bin/rt-mailgate
-	# rm -rf /var/rt
-fi
diff --git a/www-apps/rt/files/rt_apache.conf b/www-apps/rt/files/rt_apache.conf
deleted file mode 100644
index 896f642c55af..000000000000
--- a/www-apps/rt/files/rt_apache.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-<IfDefine PERL>
-    <VirtualHost MY_RT_DOMAIN:80>
-        ServerName MY_RT_DOMAIN
-
-        DocumentRoot HTDOCS
-	ServerAdmin YOUR_EMAIL_HERE
-
-        AddDefaultCharset UTF-8
-	<IfDefine USERDIR>
-	        UserDir disabled
-	</IfDefine>
- 
-        PerlModule Apache::DBI
-        PerlRequire RT_DIR/bin/webmux.pl
- 
-	<Location />
-		SetHandler perl-script
-		PerlHandler RT::Mason
-		PerlSetEnv PERL5LIB /usr/lib
-	</Location>
-
-	<Directory "HTDOCS">
-		Options Indexes FollowSymLinks
-		AllowOverride None
-		Order allow,deny
-		Allow from all
-	</Directory>
-
-    </VirtualHost>
-</IfDefine>
diff --git a/www-apps/rt/files/rt_apache1_fcgi.conf b/www-apps/rt/files/rt_apache1_fcgi.conf
deleted file mode 100644
index 0bff8a0556f9..000000000000
--- a/www-apps/rt/files/rt_apache1_fcgi.conf
+++ /dev/null
@@ -1,41 +0,0 @@
-<IfDefine FASTCGI>
-
-	# Tell FastCGI to put its temporary files somewhere sane.
-	FastCgiIpcDir /tmp
-
-	# Tell FastCGI that it should use apache's "suexec" binary to call any FastCGI script.
-	# This is a GLOBAL setting
-	FastCgiWrapper /usr/sbin/suexec
-
-	# Apache 1.3 discards the user and group parameters on the FastCgiServer line.
-	# Apache 2.0 requires them.
-	FastCgiServer RT_DIR/bin/mason_handler.fcgi -idle-timeout 120 -user rt -group rt -processes 4
-
-
-	<VirtualHost MY_RT_DOMAIN:80>
-		ServerName MY_RT_DOMAIN
-		
-		DocumentRoot HTDOCS
-		ServerAdmin YOUR_EMAIL_HERE
-
-		AddDefaultCharset UTF-8
-		<IfDefine USERDIR>
-			UserDir disabled
-		</IfDefine>
-
-		# Set the rt user and group as the executing user for this virtual host
-		User rt
-		Group rt
-
-		AddHandler fastcgi-script fcgi
-		ScriptAlias / RT_DIR/bin/mason_handler.fcgi/
-
-		 <Directory "HTDOCS">
-			Options Indexes FollowSymLinks
-			AllowOverride None
-			Order allow,deny
-			Allow from all
-		</Directory>
-
-	</VirtualHost>
-</IfDefine>
diff --git a/www-apps/rt/metadata.xml b/www-apps/rt/metadata.xml
index 43819e102566..5e4c3a3a245d 100644
--- a/www-apps/rt/metadata.xml
+++ b/www-apps/rt/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>web-apps</herd>
-<maintainer>
-  <email>rl03@gentoo.org</email>
-</maintainer>
+	<herd>web-apps</herd>
+	<maintainer>
+		<email>rl03@gentoo.org</email>
+	</maintainer>
 </pkgmetadata>
diff --git a/www-apps/rt/rt-3.4.5.ebuild b/www-apps/rt/rt-3.6.6.ebuild
index 0cfbed73427e..30dad35a791b 100644
--- a/www-apps/rt/rt-3.4.5.ebuild
+++ b/www-apps/rt/rt-3.6.6.ebuild
@@ -1,89 +1,82 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.5.ebuild,v 1.19 2008/02/05 15:04:28 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.6.ebuild,v 1.1 2008/03/07 14:37:28 hollow Exp $
 
-inherit webapp eutils depend.apache
-
-IUSE="mysql postgres fastcgi lighttpd"
+inherit webapp eutils depend.apache confutils
 
 DESCRIPTION="RT is an enterprise-grade ticketing system"
 HOMEPAGE="http://www.bestpractical.com/rt/"
 SRC_URI="http://download.bestpractical.com/pub/${PN}/release/${P}.tar.gz"
 
 KEYWORDS="~amd64 ~ppc ~x86"
+LICENSE="GPL-2"
+IUSE="mysql postgres fastcgi lighttpd"
 
 DEPEND="
 	>=dev-lang/perl-5.8.3
 
-	>=dev-perl/Params-Validate-0.02
-	dev-perl/Cache-Cache
-	>=dev-perl/Exception-Class-1.14
-	>dev-perl/HTML-Mason-1.23
-	dev-perl/MLDBM
-	dev-perl/FreezeThaw
-	>=virtual/perl-Digest-MD5-2.27
-	>=virtual/perl-CGI-2.92
-	>=virtual/perl-Storable-2.08
 	>=dev-perl/Apache-Session-1.53
-	>=dev-perl/XML-RSS-1.05
-	>=dev-perl/HTTP-Server-Simple-0.07
-	>=dev-perl/HTTP-Server-Simple-Mason-0.09
-	dev-perl/Text-WikiFormat
-
-	!lighttpd? (
-		>=dev-perl/Apache-DBI-0.92
-		!fastcgi? ( >=www-apache/libapreq2-2.06
-					>=dev-perl/HTML-Mason-1.31 )
-		fastcgi? ( dev-perl/FCGI )
-	)
-	lighttpd? ( dev-perl/FCGI )
-
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.41 )
-
-	>=virtual/perl-Getopt-Long-2.24
-
-	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
-	dev-perl/libwww-perl
-
-	virtual/perl-digest-base
-	>=dev-perl/DBI-1.37
-	dev-perl/Test-Inline
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/Calendar-Simple
 	>=dev-perl/class-returnvalue-0.40
-	>=dev-perl/dbix-searchbuilder-1.35
-	dev-perl/text-template
-	>=virtual/perl-File-Spec-0.8
+	>=dev-perl/CSS-Squish-0.06
+	>=dev-perl/DBI-1.37
+	>=dev-perl/dbix-searchbuilder-1.50
+	dev-perl/GD
+	dev-perl/GDGraph
+	dev-perl/GDTextUtil
+	dev-perl/HTML-Format
+	>dev-perl/HTML-Mason-1.31
 	dev-perl/HTML-Parser
 	>=dev-perl/HTML-Scrubber-0.08
-	virtual/perl-libnet
-	>=dev-perl/log-dispatch-2.0
-	>=dev-perl/locale-maketext-lexicon-0.32
+	dev-perl/HTML-Tree
+	>=dev-perl/HTTP-Server-Simple-0.07
+	>=dev-perl/HTTP-Server-Simple-Mason-0.09
+	dev-perl/libwww-perl
 	dev-perl/locale-maketext-fuzzy
-	>=dev-perl/MIME-tools-5.417
+	>=dev-perl/locale-maketext-lexicon-0.32
+	>=dev-perl/log-dispatch-2.0
 	>=dev-perl/MailTools-1.60
-	dev-perl/text-wrapper
-	dev-perl/Time-modules
-	virtual/perl-File-Temp
+	>=dev-perl/MIME-tools-5.417
+	dev-perl/Module-Versions-Report
+	dev-perl/regexp-common
 	dev-perl/TermReadKey
 	dev-perl/text-autoformat
-	>=dev-perl/Text-Quoted-1.3
+	>=dev-perl/Text-Quoted-2.02
+	dev-perl/text-template
+	>=dev-perl/Text-WikiFormat-0.76
+	dev-perl/text-wrapper
+	dev-perl/TimeDate
+	dev-perl/Time-modules
 	>=dev-perl/Tree-Simple-1.04
+	dev-perl/UNIVERSAL-require
+	>=dev-perl/XML-RSS-1.05
+	>=virtual/perl-CGI-2.92
+	virtual/perl-digest-base
+	>=virtual/perl-Digest-MD5-2.27
+	>=virtual/perl-File-Spec-0.8
+	virtual/perl-File-Temp
+	>=virtual/perl-Getopt-Long-2.24
+	virtual/perl-libnet
+	>=virtual/perl-locale-maketext-1.06
 	virtual/perl-Scalar-List-Utils
-	dev-perl/Module-Versions-Report
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/XML-Simple
-	dev-perl/regexp-common
+	>=virtual/perl-Storable-2.08
+	virtual/perl-Time-HiRes
+
+	!lighttpd? ( dev-perl/Apache-DBI )
+	lighttpd? ( dev-perl/FCGI )
+	fastcgi? ( dev-perl/FCGI )
+	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-perl/DBD-Pg-1.43 )
 "
 
-RDEPEND="
-	${DEPEND}
+RDEPEND="${DEPEND}
 	virtual/mta
 	!lighttpd? ( ${APACHE2_DEPEND} )
 	lighttpd? ( >=www-servers/lighttpd-1.3.13 )
 "
 
-LICENSE="GPL-2"
+need_httpd_cgi
 
 add_user_rt() {
 	# add new user
@@ -128,8 +121,6 @@ add_user_rt() {
 
 pkg_setup() {
 	webapp_pkg_setup
-
-	use mysql && ewarn "RT needs MySQL with innodb support"
 	ewarn
 	ewarn "If you are upgrading from an existing _RT2_ installation,"
 	ewarn "stop this ebuild (Ctrl-C now), download the upgrade tool,"
@@ -139,15 +130,14 @@ pkg_setup() {
 	epause 5
 	enewgroup rt >/dev/null
 	add_user_rt || die "Could not add user"
-
 }
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# add Gentoo-specific layout
-	cat ${FILESDIR}/config.layout-gentoo >> config.layout
+	cat "${FILESDIR}"/config.layout-gentoo >> config.layout
 	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${PF}|
 			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout || die
 
@@ -156,22 +146,20 @@ src_unpack() {
 }
 
 src_compile() {
-
 	local web="apache"
-	useq lighttpd && web="lighttpd"
+	use lighttpd && web="lighttpd"
 
-	local dbtype=""
-	local dba=""
+	local dbtype dba
 
-	if useq mysql; then
+	if use mysql; then
 		dbtype="--with-db-type=mysql"
 		dba="--with-db-dba=root"
 	fi
-	if useq postgres;then
+	if use postgres;then
 		dbtype="--with-db-type=Pg"
 		dba="--with-db-dba=postgres"
 	fi
-	if useq postgres && useq mysql; then
+	if use postgres && use mysql; then
 		ewarn "Both mysql and postgres USE flags enabled, default is mysql."
 		ewarn "You can set the default value in RT_SiteConfig before DB init."
 		dbtype="--with-db-type=mysql"
@@ -188,48 +176,53 @@ src_compile() {
 		${dbtype} ${dba}
 
 	# check for missing deps and ask to report if something is broken
-	local myconf="--verbose $(use_with mysql) \
-		$(use_with postgres pg) \
-		$(use_with fastcgi) \
-		$(use_with lighttpd fastcgi)"
-	if ! useq fastcgi && ! useq lighttpd ; then
+	local myconf="--verbose \
+		$(enable_extension_withonly mysql mysql) \
+		$(enable_extension_withonly postgresql postgres) \
+		$(enable_extension_withonly fastcgi fastcgi) \
+		$(enable_extension_withonly fastcgi lighttpd)" \
+
+	if ! useq fastcgi && ! useq lighttpd; then
 		myconf="${myconf} --with-modperl2"
 	fi
 
-	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > ${T}/t
-	if grep -q "MISSING" ${T}/t; then
+	/usr/bin/perl ./sbin/rt-test-dependencies ${myconf} > "${T}"/t
+	if grep -q "MISSING" "${T}"/t; then
 		ewarn "Missing Perl dependency!"
 		ewarn
-		cat ${T}/t
+		cat "${T}"/t | grep MISSING
 		ewarn
-		ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
-		ewarn "and assign it to rl03@gentoo.org"
+		ewarn "Please run perl-cleaner. If the problem persists,"
+		ewarn "please file a bug in the Gentoo Bugzilla with the information above"
 		die "Missing dependencies."
 	fi
 }
 
 src_install() {
 	webapp_src_preinst
-
-	make install
+	emake install || die
 
 	# make sure we don't clobber existing site configuration
-	rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
+	rm -f "${D}"/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
 
-	# copy upgrade files
-	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF}
+	# fix paths
+	find "${D}" -type f -print0 | xargs -0 dosed
 
-	cd ${D}
-	grep -Rl "${D}" * | xargs dosed
+	# copy upgrade files
+	insinto "${MY_HOSTROOTDIR}/${PF}"
+	doins -r etc/upgrade
 
-	if useq lighttpd; then
-		newinitd ${FILESDIR}/${PN}.init.d ${PN}
-		newconfd ${FILESDIR}/${PN}.conf.d ${PN}
+	if use lighttpd; then
+		newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+		newconfd "${FILESDIR}"/${PN}.conf.d ${PN}
 	else
-		local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
-		cd ${FILESDIR} && cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
+		doins "${FILESDIR}"/{rt_apache2_fcgi.conf,rt_apache2.conf}
 	fi
-	webapp_postinst_txt en ${FILESDIR}/${PV}/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/${PV}/reconfig
+
+	webapp_serverowned "${MY_HOSTROOTDIR}"/${PF}/var
+
+	webapp_postinst_txt en "${FILESDIR}"/3.4.5/postinstall-en.txt
+	webapp_hook_script "${FILESDIR}"/3.4.5/reconfig
+
 	webapp_src_install
 }