Version bump (bug #67686, #81257). Use custom Gentoo layout instead of sed. Fix MasonLocalComponentDir (#74680). General clean-up.

Package-Manager: portage-2.0.51.22-r1

7 files changed, 232 insertions, 6 deletions

diff --git a/www-apps/rt/ChangeLog b/www-apps/rt/ChangeLog
index 16b7366292e5..5cf67312a99d 100644
--- a/www-apps/rt/ChangeLog
+++ b/www-apps/rt/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/rt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.7 2005/05/10 00:24:12 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/ChangeLog,v 1.8 2005/06/12 20:03:35 rl03 Exp $
+
+*rt-3.4.2 (12 Jun 2005)
+
+  12 Jun 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-3.4.2,
+  +files/postinstall-en-3.4.2.txt, +files/rt_apache.conf, +rt-3.4.2.ebuild:
+  Version bump (bug #67686, #81257). Use custom Gentoo layout instead of sed.
+  Fix MasonLocalComponentDir (#74680). General clean-up.
 
   10 May 2005; Elfyn McBratney <beu@gentoo.org> rt-3.2.1.ebuild:
   dev-perl/libapreq{,2} -> www-apache
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 12d28af7b769..27a2e0f53bc4 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -2,15 +2,20 @@
 Hash: SHA1
 
 MD5 1c784be45b571bfad5f6d6a78b9ed335 rt-3.2.1.ebuild 4204
+MD5 dd6a33bba8dd5f5259eda8bc59204109 rt-3.4.2.ebuild 3705
+MD5 182905dd8d40249de44d57df5bb5bc91 ChangeLog 1615
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
-MD5 a79d23444d0ee433c185c009b834bbe2 ChangeLog 1308
-MD5 0706d6edcd1c4e23f526d611c9c6b531 files/reconfig 1170
 MD5 15fc088b37155656e008679f3c07eea7 files/postinstall-en.txt 1648
+MD5 f10e5a91df99b3628925509bad35efe0 files/postinstall-en-3.4.2.txt 689
+MD5 85b9344f8e24073b64ab0ecc09033691 files/rt_apache.conf 406
 MD5 5f5c3f76ea4676e743612e38341780fe files/digest-rt-3.2.1 61
+MD5 af335c7cab7bfc09dbd08feba51d2879 files/digest-rt-3.4.2 61
+MD5 cb9bc69c23176e3d72d89f7b04461864 files/reconfig-3.4.2 1345
+MD5 0706d6edcd1c4e23f526d611c9c6b531 files/reconfig 1170
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFCf/81jUHll2nfF60RAnNvAJ9b2ErLZ9uxNwkdo0obShBJAXgdlQCgneDo
-udF057AwzHl7rjxGp1cvDaA=
-=gjQ8
+iD8DBQFCrJUwEzitwsaoONoRAnIqAJ4rMQ/4Tyi8EVKu7lue9o3GfM/UUwCeLb+c
+E1dd7mw1PiV4EGvYgPBO6Do=
+=Iahk
 -----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/digest-rt-3.4.2 b/www-apps/rt/files/digest-rt-3.4.2
new file mode 100644
index 000000000000..550fde369b98
--- /dev/null
+++ b/www-apps/rt/files/digest-rt-3.4.2
@@ -0,0 +1 @@
+MD5 a50158055fff423a557d43335ae1dc81 rt-3.4.2.tar.gz 1359775
diff --git a/www-apps/rt/files/postinstall-en-3.4.2.txt b/www-apps/rt/files/postinstall-en-3.4.2.txt
new file mode 100644
index 000000000000..a9b11f7fca0a
--- /dev/null
+++ b/www-apps/rt/files/postinstall-en-3.4.2.txt
@@ -0,0 +1,19 @@
+
+***********************************************************
+Now you need to configure your RT installation.
+Please follow the Gentoo install guide found at
+http://wiki.bestpractical.com/index.cgi?GentooInstallGuide
+
+Your local config files are located here:
+${VHOST_ROOT}/${P}/etc/RT_Config.pm
+${VHOST_ROOT}/${P}/etc/RT_SiteConfig.pm
+
+If you need more help, consider searching the mailing list (Google site:lists.fsck.com )
+
+***********************************************************
+
+NOTE:
+
+Some file locations have changed. Everything is now installed into
+${VHOST_ROOT}. RT executables are no longer in /usr/bin. 
+You may need to modify your existing configuration files accordingly.
diff --git a/www-apps/rt/files/reconfig-3.4.2 b/www-apps/rt/files/reconfig-3.4.2
new file mode 100644
index 000000000000..8e7f12449da3
--- /dev/null
+++ b/www-apps/rt/files/reconfig-3.4.2
@@ -0,0 +1,36 @@
+#!/bin/bash
+if [ $1 = "install" ]; then
+	# fix location
+	cd ${VHOST_ROOT}/${P}
+	sed -e "s|${MY_HOSTROOTDIR}/${P}|${VHOST_ROOT}/${P}|g
+		s|${MY_HTDOCSDIR}|${MY_INSTALLDIR}|g" -i bin/* lib/RT.pm sbin/*
+
+	# fix Apache config
+	sed -e "s|WEBMUX|${VHOST_ROOT}/${P}/bin/webmux.pl|" -i ${MY_SERVERCONFIGDIR}/apache1-rt_apache.conf
+
+	# fix permissions
+	chown -R  ${VHOST_SERVER_GID}:${VHOST_SERVER_UID} ${VHOST_ROOT}/${P}/var
+
+	# check for upgrades
+	cd ${VHOST_ROOT}/${P}/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}/${P}/upgrade/<version>"
+	echo "rt-setup-database --action acl --datadir ${VHOST_ROOT}/${P}/upgrade/<version>"
+	echo "rt-setup-database --action insert --datadir ${VHOST_ROOT}/${P}/upgrade/<version>"
+	echo "Don't forget to read the online installation guide for more details"
+	ls
+
+elif [ $1 = "clean" ]; then
+	# braindead - set ${P}
+	MY_PV=$(basename $(dirname ${MY_HOSTROOTDIR}))
+	MY_PN=$(basename $(dirname $(dirname ${MY_HOSTROOTDIR})))
+	MY_P="${MY_PN}-${MY_PV}"
+
+	if [ ! "${VHOST_ROOT}${MY_P}a" = "a" ]; then 
+		rm -rf ${VHOST_ROOT}/${MY_P}/bin ${VHOST_ROOT}/${MY_P}/lib/RT.pm ${VHOST_ROOT}/${MY_P}/sbin
+	else
+		echo "Variables not set!"
+	fi
+fi
diff --git a/www-apps/rt/files/rt_apache.conf b/www-apps/rt/files/rt_apache.conf
new file mode 100644
index 000000000000..bea5ffc493c0
--- /dev/null
+++ b/www-apps/rt/files/rt_apache.conf
@@ -0,0 +1,21 @@
+<IfDefine PERL>
+    <VirtualHost MY_RT_DOMAIN:80>
+        ServerName MY_RT_DOMAIN
+
+        DocumentRoot DOCUMENT_ROOT
+	ServerAdmin YOUR_EMAIL_HERE
+
+        AddDefaultCharset UTF-8
+        UserDir disabled
+ 
+        PerlModule Apache::DBI
+        PerlRequire WEBMUX
+ 
+	<Location />
+		SetHandler perl-script
+		PerlHandler RT::Mason
+		PerlSetEnv PERL5LIB /usr/lib
+	</Location>
+
+    </VirtualHost>
+</IfDefine>
diff --git a/www-apps/rt/rt-3.4.2.ebuild b/www-apps/rt/rt-3.4.2.ebuild
new file mode 100644
index 000000000000..01dfda8127d3
--- /dev/null
+++ b/www-apps/rt/rt-3.4.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.4.2.ebuild,v 1.1 2005/06/12 20:03:35 rl03 Exp $
+
+inherit webapp eutils
+
+IUSE="mysql postgres fastcgi"
+#IUSE="mysql postgres fastcgi apache2"
+
+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
+	ftp://ftp.eu.uu.net/pub/unix/ticketing/${PN}/release/${P}.tar.gz
+	ftp://rhinst.ece.cmu.edu/${PN}/release/${P}.tar.gz"
+
+KEYWORDS="~x86"
+
+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
+	>=dev-perl/Apache-Session-1.53
+	dev-perl/XML-RSS
+	>=dev-perl/HTTP-Server-Simple-0.07
+	>=dev-perl/HTTP-Server-Simple-Mason-0.05
+	dev-perl/HTML-Tree
+	dev-perl/HTML-Format
+	dev-perl/libwww-perl
+	>=dev-perl/Apache-DBI-0.92
+	>=dev-perl/DBI-1.37
+	dev-perl/Test-Inline
+	>=dev-perl/class-returnvalue-0.40
+	>=dev-perl/dbix-searchbuilder-1.27
+	dev-perl/text-template
+	dev-perl/HTML-Parser
+	>=dev-perl/HTML-Scrubber-0.08
+	>=dev-perl/log-dispatch-2.0
+	>=dev-perl/locale-maketext-lexicon-0.32
+	dev-perl/locale-maketext-fuzzy
+	>=dev-perl/MIME-tools-5.417
+	>=dev-perl/MailTools-1.60
+	dev-perl/text-wrapper
+	dev-perl/Time-modules
+	dev-perl/TermReadKey
+	>=dev-perl/Text-Quoted-1.3
+	>=dev-perl/Tree-Simple-1.04
+	dev-perl/Module-Versions-Report
+	dev-perl/Cache-Simple-TimedExpiry
+	dev-perl/XML-Simple
+	dev-perl/regexp-common
+	dev-perl/Apache-Test
+	dev-perl/WWW-Mechanize
+	dev-perl/Test-WWW-Mechanize
+	dev-perl/Module-Refresh
+
+	dev-perl/Font-AFM
+	dev-perl/text-autoformat
+	dev-perl/text-reform
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/mta
+	mysql? ( >=dev-db/mysql-4.0.13 >=dev-perl/DBD-mysql-2.1018 )
+	postgres? ( >=dev-db/postgresql-7.4.2-r1 >=dev-perl/DBD-Pg-1.41 )
+	fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+	!fastcgi? ( =www-apache/libapreq-1* )
+	=net-www/apache-1*"
+
+#	apache2? ( >=net-www/apache-2 >=www-apache/libapreq2 )
+#	!apache2? ( =net-www/apache-1* =www-apache/libapreq-1* )
+
+
+LICENSE="GPL-2"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	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,"
+	ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
+	ewarn "and follow the included instructions."
+	ewarn
+	enewgroup rt >/dev/null
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# add Gentoo-specific layout
+	cat ${FILESDIR}/config.layout-gentoo >> config.layout
+	sed -e "s|PREFIX|${D}/${MY_HOSTROOTDIR}/${P}|
+			s|HTMLDIR|${D}/${MY_HTDOCSDIR}|g" -i ./config.layout
+
+}
+
+src_compile() {
+	./configure --enable-layout=Gentoo \
+		--with-web-user=apache \
+		--with-web-group=apache
+
+	# check for missing deps and ask to report if something is broken
+	if `make testdeps | grep "MISSING"`; then
+		ewarn "Missing Perl dependency!"
+		ewarn "Please file a bug in the Gentoo Bugzilla with the information above"
+		ewarn "and assign it to rl03@gentoo.org"
+		die "Missing dependencies."
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	make install
+
+	# copy upgrade files
+	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${P}
+
+	# make sure we don't clobber existing site configuration
+	rm -f ${D}/${MY_HOSTROOTDIR}/${P}/etc/RT_SiteConfig.pm
+
+	cd ${D}
+	grep -Rl "${D}" * | xargs dosed
+	chmod +r ${D}/${MY_HOSTROOTDIR}/${P}/etc/RT*
+
+	webapp_server_configfile apache1 ${FILESDIR}/rt_apache.conf
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-${PV}.txt
+	webapp_hook_script ${FILESDIR}/reconfig-${PV}
+	webapp_src_install
+}