3 files changed, 22 insertions, 267 deletions
diff --git a/www-apps/rt/Manifest b/www-apps/rt/Manifest
index 3e5ec6a63961..46e0bb2b11d4 100644
--- a/www-apps/rt/Manifest
+++ b/www-apps/rt/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 3.2.1/postinstall-en.txt 1648 RMD160 9c815e52de1437f2dffaf21dfdb9e385c9304542 SHA1 e55e498670fe2897b22af8c292d4a0b34c67d94a SHA256 fb97b5637b5f02679b937b6113c28370ed06389d3527598f0a2887928a300d66
 MD5 15fc088b37155656e008679f3c07eea7 files/3.2.1/postinstall-en.txt 1648
 RMD160 9c815e52de1437f2dffaf21dfdb9e385c9304542 files/3.2.1/postinstall-en.txt 1648
@@ -44,7 +47,7 @@ RMD160 a59e337ff39bf9a1cb8793d63f5cc6583f2a0615 files/rt_apache2_fcgi.conf 993
 SHA256 166f5a60e443351228ba215a460603b106074e6f150e878a34ccd18b825026aa files/rt_apache2_fcgi.conf 993
 DIST rt-3.2.1.tar.gz 1201592 RMD160 31e7dd475a61a33454fc9ce06ebb545fbf216a82 SHA1 b1ce672b99cebe19895d1b9d3536c74fbcddbbb6 SHA256 b12241e83575d78dcb1e4dea50d3c8d6545a97eb10efec9c45a84a65304739a9
 DIST rt-3.4.5.tar.gz 1410154 RMD160 aa86f6cd4039ce6f6fdfaabf0e2807e93d0786b5 SHA1 a2609ffc168829a179bea70006e57aee6d6367f9 SHA256 20eb89af3245b7021e53cdefd0ed0716443c3a4f9e8536e0c2c29b901942e917
-DIST rt-3.6.0.tar.gz 1525865 RMD160 13f5656f966664a31274bb60a894a0ae125415c0 SHA1 bffa726c6b8cba4d80ab709cc6444e08be7207fc SHA256 22c8e0596f863b7ad016824afbc1090d28a3eb4e24a1a07be222fb67f510ca8b
+DIST rt-3.6.1.tar.gz 1545708 RMD160 8e5803bcff40fd4b61bbe3b3e4f249088c1c6552 SHA1 5fa78f2cfb30a361f78a22e921846ea6a98c4901 SHA256 0925018dc29d2fa1a6d91480c0ea4d1a517ddfd4e3094db3525a30fb2a04b467
 EBUILD rt-3.2.1.ebuild 4362 RMD160 9762ad63416c1d1b40fa3bb458dfd8df23869905 SHA1 37728067e5b10e8b25e99944152d22b28e3a0e5f SHA256 a54d76fd63e036ef880857b543c3b769ac3866272199cad19aa6ec6b4084a769
 MD5 939107934a799efb520c62c057341273 rt-3.2.1.ebuild 4362
 RMD160 9762ad63416c1d1b40fa3bb458dfd8df23869905 rt-3.2.1.ebuild 4362
@@ -53,14 +56,14 @@ EBUILD rt-3.4.5.ebuild 6430 RMD160 20aba21482e5fa1242044f10c3c76a89a0d94c32 SHA1
 MD5 02cd9bd379e820c7f6411b3c55c7cc45 rt-3.4.5.ebuild 6430
 RMD160 20aba21482e5fa1242044f10c3c76a89a0d94c32 rt-3.4.5.ebuild 6430
 SHA256 f6d124886904bffad413ffae0b71872043cf7a9334f1b59aa379af3a3f9fdc08 rt-3.4.5.ebuild 6430
-EBUILD rt-3.6.0.ebuild 6538 RMD160 87b6756d8ea7ae0874ac187a8b4363ca4342095e SHA1 9e95988cb10de6e7ccf41b4106371e5d585bb3d9 SHA256 2d80de8b5f2d9a0ac71a16565a2acffaf7f981e8b7cb04ff06d65a19d0abdd9e
-MD5 ddce4c28600b53cb1868b384328b80a4 rt-3.6.0.ebuild 6538
-RMD160 87b6756d8ea7ae0874ac187a8b4363ca4342095e rt-3.6.0.ebuild 6538
-SHA256 2d80de8b5f2d9a0ac71a16565a2acffaf7f981e8b7cb04ff06d65a19d0abdd9e rt-3.6.0.ebuild 6538
-MISC ChangeLog 6318 RMD160 058b44a75e9c4a8c41c5fae82219e8f060d9788c SHA1 c26ab313e4369b87c96809437cf71f840adcee37 SHA256 0e5f59cf4775f425a0906f60f3a5ab21c7dca4588d4aca94edfdbe55c270afdb
-MD5 d3f66868eafd8c854e69f498550f7587 ChangeLog 6318
-RMD160 058b44a75e9c4a8c41c5fae82219e8f060d9788c ChangeLog 6318
-SHA256 0e5f59cf4775f425a0906f60f3a5ab21c7dca4588d4aca94edfdbe55c270afdb ChangeLog 6318
+EBUILD rt-3.6.1.ebuild 6549 RMD160 2df9bf194325d7dcec5b946cf195cd0604c7c14b SHA1 b1f6978db97b07637cda2224677ab55400a0536b SHA256 b43b74cd0d87725564a5b99e158d3ee4af8ef0e7697e1131d7a8844b96fbc27d
+MD5 e89ca4e817a279ce8d95a33c5dffae7e rt-3.6.1.ebuild 6549
+RMD160 2df9bf194325d7dcec5b946cf195cd0604c7c14b rt-3.6.1.ebuild 6549
+SHA256 b43b74cd0d87725564a5b99e158d3ee4af8ef0e7697e1131d7a8844b96fbc27d rt-3.6.1.ebuild 6549
+MISC ChangeLog 6443 RMD160 c82742c8011e34d2b47658ec10a437e87cb348bb SHA1 f032cc7548e67a3f90140f1184a921f4f60bdcda SHA256 4fab99dac5f3e4c2d5d4660dbf328feb8e79cd068e9be5fa8eb503e672864406
+MD5 f381ae2e4643ba539d369590f0882546 ChangeLog 6443
+RMD160 c82742c8011e34d2b47658ec10a437e87cb348bb ChangeLog 6443
+SHA256 4fab99dac5f3e4c2d5d4660dbf328feb8e79cd068e9be5fa8eb503e672864406 ChangeLog 6443
 MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 metadata.xml 221
@@ -71,6 +74,13 @@ SHA256 91a4f4a4b54017091ca8bb736deb6d25ca840574f2a0da7398b42c6d0bffb0ed files/di
 MD5 344efb41e7d9b208c17507b446e9169f files/digest-rt-3.4.5 229
 RMD160 387a7902e7e37ea8fb3fa41b1f19c2794dc62b67 files/digest-rt-3.4.5 229
 SHA256 f8d66759e366aa8d9a0a629072bd4f0557474da2110540cd45390fc62e38d510 files/digest-rt-3.4.5 229
-MD5 bd2866f655b230c9e0245ec09aade8c3 files/digest-rt-3.6.0 229
-RMD160 4856875b87cdd14c690c3658f12c70933b4ed1d6 files/digest-rt-3.6.0 229
-SHA256 dc83845cea9294ef43c9f083452de339d1ad32c8d089c0bb1b921fcad9aba4ba files/digest-rt-3.6.0 229
+MD5 a56a7436d29f942bf845253a4f0c91fe files/digest-rt-3.6.1 229
+RMD160 7d1ad3cb718ef28bc420b1e3ebb4835c7fda160d files/digest-rt-3.6.1 229
+SHA256 056b807ec21f7dc235a958e6f72fc792335723f872161b7ab24d55d8a87f00f9 files/digest-rt-3.6.1 229
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.3 (GNU/Linux)
+
+iD8DBQFE8k0kEzitwsaoONoRAte0AKCJtZhyVX5mH/zqZXsl1o2bKqZQmQCgz1Pu
+nbAEw+/YV56OwC+M5C5V/ks=
+=JYsT
+-----END PGP SIGNATURE-----
diff --git a/www-apps/rt/files/digest-rt-3.6.0 b/www-apps/rt/files/digest-rt-3.6.0
deleted file mode 100644
index 57d7a7ac0129..000000000000
--- a/www-apps/rt/files/digest-rt-3.6.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b363dab7fa5e1af10d150783c02e3935 rt-3.6.0.tar.gz 1525865
-RMD160 13f5656f966664a31274bb60a894a0ae125415c0 rt-3.6.0.tar.gz 1525865
-SHA256 22c8e0596f863b7ad016824afbc1090d28a3eb4e24a1a07be222fb67f510ca8b rt-3.6.0.tar.gz 1525865
diff --git a/www-apps/rt/rt-3.6.0.ebuild b/www-apps/rt/rt-3.6.0.ebuild
deleted file mode 100644
index 27bf4d5324d4..000000000000
--- a/www-apps/rt/rt-3.6.0.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/rt/rt-3.6.0.ebuild,v 1.3 2006/08/10 14:10:48 cardoe Exp $
-
-inherit webapp eutils
-
-IUSE="mysql postgres fastcgi apache2 lighttpd"
-
-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"
-
-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/GD
-	dev-perl/GDGraph
-	dev-perl/GDTextUtil
-	>=dev-perl/Text-WikiFormat-0.76
-
-	!lighttpd? (
-		>=dev-perl/Apache-DBI-0.92
-		apache2? (
-			!fastcgi? ( >=www-apache/libapreq2-2.06
-						>=dev-perl/HTML-Mason-1.31 )
-			fastcgi? ( dev-perl/FCGI ) )
-		!apache2? (
-			fastcgi? ( dev-perl/FCGI )
-			!fastcgi? ( =www-apache/libapreq-1* ) ) )
-	lighttpd? ( dev-perl/FCGI )
-
-	mysql? ( >=dev-perl/DBD-mysql-2.1018 )
-	postgres? ( >=dev-perl/DBD-Pg-1.43 )
-
-	>=virtual/perl-Getopt-Long-2.24
-
-	dev-perl/HTML-Tree
-	dev-perl/HTML-Format
-	dev-perl/libwww-perl
-
-	dev-perl/Calendar-Simple
-	virtual/perl-digest-base
-	>=dev-perl/DBI-1.37
-	dev-perl/Test-Inline
-	>=dev-perl/class-returnvalue-0.40
-	>=dev-perl/dbix-searchbuilder-1.39
-	dev-perl/text-template
-	>=virtual/perl-File-Spec-0.8
-	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/locale-maketext-fuzzy
-	>=dev-perl/MIME-tools-5.417
-	>=dev-perl/MailTools-1.60
-	dev-perl/text-wrapper
-	dev-perl/Time-modules
-	virtual/perl-Time-HiRes
-	virtual/perl-File-Temp
-	dev-perl/TermReadKey
-	dev-perl/text-autoformat
-	>=dev-perl/Text-Quoted-1.3
-	>=dev-perl/Tree-Simple-1.04
-	virtual/perl-Scalar-List-Utils
-	dev-perl/Module-Versions-Report
-	dev-perl/Cache-Simple-TimedExpiry
-	dev-perl/XML-Simple
-	dev-perl/regexp-common
-"
-
-RDEPEND="
-	${DEPEND}
-	virtual/mta
-	mysql? ( >=dev-db/mysql-4.0.13 )
-	postgres? ( >=dev-db/postgresql-7.4.2-r1 )
-	!lighttpd? (
-		apache2? ( >=net-www/apache-2
-			fastcgi? ( net-www/mod_fastcgi )
-		!apache2? ( =net-www/apache-1* ) ) )
-	lighttpd? ( >=www-servers/lighttpd-1.3.13 )
-"
-
-LICENSE="GPL-2"
-
-add_user_rt() {
-	# add new user
-	# suexec2 requires uid >= 1000; enewuser is of no help here
-	# From: Mike Frysinger <vapier@gentoo.org>
-	# Date: Fri, 17 Jun 2005 08:41:44 -0400
-	# i'd pick a 5 digit # if i were you
-
-	local euser="rt"
-
-	# first check if username rt exists
-	if [[ ${euser} == $(egetent passwd "${euser}" | cut -d: -f1) ]] ; then
-		# check uid
-		rt_uid=$(egetent passwd "${euser}" | cut -d: -f3)
-		if $(expr ${rt_uid} '<' 1000 > /dev/null); then
-			ewarn "uid of user rt is less than 1000. suexec2 will not work."
-			ewarn "If you want to use FastCGI, please delete the user 'rt'"
-			ewarn "from your system and re-emerge www-apps/rt"
-			epause
-		fi
-		return 0 # all is well
-	fi
-
-	# add user
-	# stolen from enewuser
-	local pwrange euid
-
-	pwrange=$(seq 10001 11001)
-	for euid in ${pwrange} ; do
-		[[ -z $(egetent passwd ${euid}) ]] && break
-	done
-	if [[ ${euid} == "11001" ]]; then
-		# she gets around, doesn't she?
-		die "No available uid's found"
-	fi
-
-	elog " - Userid: ${euid}"
-
-	enewuser rt ${euid} -1 /dev/null rt > /dev/null
-	return 0
-}
-
-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,"
-	ewarn "http://bestpractical.com/pub/rt/devel/rt2-to-rt3.tar.gz"
-	ewarn "and follow the included instructions."
-	ewarn
-	epause 5
-	enewgroup rt >/dev/null
-	add_user_rt || die "Could not add user"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# add Gentoo-specific 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
-
-	# don't need to check dev dependencies
-	sed -e "s|\$args{'with-DEV'} =1;|#\$args{'with-DEV'} =1;|" -i sbin/rt-test-dependencies.in || die
-}
-
-src_compile() {
-
-	local web="apache"
-	useq lighttpd && web="lighttpd"
-
-	local dbtype=""
-	local dba=""
-
-	if useq mysql; then
-		dbtype="--with-db-type=mysql"
-		dba="--with-db-dba=root"
-	fi
-	if useq postgres;then
-		dbtype="--with-db-type=Pg"
-		dba="--with-db-dba=postgres"
-	fi
-	if useq postgres && useq 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"
-		dba="--with-db-dba=root"
-	fi
-
-	./configure --enable-layout=Gentoo \
-		--with-bin-owner=rt \
-		--with-libs-owner=rt \
-		--with-libs-group=rt \
-		--with-rt-group=rt \
-		--with-web-user=${web} \
-		--with-web-group=${web} \
-		${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
-		myconf="${myconf} $(use_with apache2 modperl2)"
-		! useq apache2 && myconf="${myconf} --with-modperl1"
-	fi
-
-	/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
-		ewarn
-		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
-
-	# make sure we don't clobber existing site configuration
-	rm -f ${D}/${MY_HOSTROOTDIR}/${PF}/etc/RT_SiteConfig.pm
-
-	# copy upgrade files
-	cp -R etc/upgrade ${D}/${MY_HOSTROOTDIR}/${PF}
-
-	cd ${D}
-	grep -Rl "${D}" * | xargs dosed
-
-	if useq lighttpd; then
-		newinitd ${FILESDIR}/${PN}.init.d ${PN}
-		newconfd ${FILESDIR}/${PN}.conf.d ${PN}
-	else
-		if useq apache2; then
-			local CONF="rt_apache2_fcgi.conf rt_apache2.conf"
-		else
-			local CONF="rt_apache1_fcgi.conf rt_apache.conf"
-		fi
-		cd ${FILESDIR} && cp ${CONF} ${D}/${MY_HOSTROOTDIR}/${PF}/etc
-	fi
-	webapp_postinst_txt en ${FILESDIR}/3.4.5/postinstall-en.txt
-	webapp_hook_script ${FILESDIR}/3.4.5/reconfig
-	webapp_src_install
-}