Version bump (bug #65217), reorganized install location

6 files changed, 142 insertions, 4 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index c2c11d7f51ab..9e8aff5762da 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/otrs
 # Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.4 2004/09/03 17:17:21 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.5 2004/09/26 12:40:40 rl03 Exp $
+
+*otrs-1.3.1 (26 Sep 2004)
+
+  26 Sep 2004; Renat Lumpau <rl03@gentoo.org> +files/postinstall-en-1.3.1.txt,
+  +files/reconfig-1.3.1, +otrs-1.3.1.ebuild:
+  Version bump. Closes bug #65217. Reorganized install locations, everything is
+  now contained in ${VHOST_ROOT}
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> otrs-1.2.4.ebuild:
   Masked otrs-1.2.4.ebuild stable for ppc
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 476d9292f819..4201f55a0ab3 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,6 +1,10 @@
-MD5 79cabd0970cee1695b4e4f8c0a23022c ChangeLog 707
-MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
+MD5 d092b25c7b1dc9a449aec8080363b306 otrs-1.3.1.ebuild 2740
 MD5 8a4ece066b650cf0589d7b383a2866a7 otrs-1.2.4.ebuild 2872
-MD5 c85b5ad5614552631d0e4ac09131e6ff files/digest-otrs-1.2.4 67
+MD5 0e7a99f98dcba73b8ed324ab2b325a59 ChangeLog 972
+MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
+MD5 2dffe94c580dc24f94db0dbdebea29a6 files/postinstall-en-1.3.1.txt 770
 MD5 0802fdb74ba58ad4bf68831073f5e437 files/postinstall-en.txt 755
+MD5 c85b5ad5614552631d0e4ac09131e6ff files/digest-otrs-1.2.4 67
+MD5 38bd7a6452e5d03b299c6856c36f00a6 files/digest-otrs-1.3.1 67
+MD5 6c0246b62071a940173aa036a496610d files/reconfig-1.3.1 629
 MD5 32d1f40e697cb807ec6ab1cf95edb8ea files/reconfig 216
diff --git a/www-apps/otrs/files/digest-otrs-1.3.1 b/www-apps/otrs/files/digest-otrs-1.3.1
new file mode 100644
index 000000000000..ee117b323e3f
--- /dev/null
+++ b/www-apps/otrs/files/digest-otrs-1.3.1
@@ -0,0 +1 @@
+MD5 18205697842efc22fac0b7af2790093e otrs-1.3.1-01.tar.bz2 6248257
diff --git a/www-apps/otrs/files/postinstall-en-1.3.1.txt b/www-apps/otrs/files/postinstall-en-1.3.1.txt
new file mode 100644
index 000000000000..8d78f8646c91
--- /dev/null
+++ b/www-apps/otrs/files/postinstall-en-1.3.1.txt
@@ -0,0 +1,19 @@
+
+
+***********************************************************
+Your installation is almost complete. 
+1. You now need to edit ${VHOST_ROOT}/${P}/Kernel/Config.pm and set some
+Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...).
+
+***********************************************************
+2. Configure and restart your webserver.
+Read /usr/share/doc/${P}/README.webserver.gz. Sample config files are in
+${VHOST_ROOT}/${P}/scripts
+
+***********************************************************
+3. Setup your database. Read /usr/share/doc/${P}/README.database.gz
+
+***********************************************************
+
+4. Read /usr/share/doc/${P}/INSTALL.gz , pp. 9-12, to finish the installation.
+If you are upgrading, read /usr/share/doc/${P}/UPGRADING.gz
diff --git a/www-apps/otrs/files/reconfig-1.3.1 b/www-apps/otrs/files/reconfig-1.3.1
new file mode 100644
index 000000000000..021ff84fb0bf
--- /dev/null
+++ b/www-apps/otrs/files/reconfig-1.3.1
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+if [ $1 = "install" ]; then
+	# set $HOME
+	sed -i "s|/opt/otrs|${VHOST_ROOT}/${P}|" ${VHOST_ROOT}/${P}/Kernel/Config.pm ${VHOST_ROOT}/${P}/scripts/*
+	# set permissions
+	${VHOST_ROOT}/${P}/bin/SetPermissions.sh  ${VHOST_ROOT}/${P} otrs apache apache apache > /dev/null
+	# set libdir
+	sed -e "s|\$Bin/\.\./\.\.|${VHOST_ROOT}/${P}|g" -i ${VHOST_CGIBINDIR}/${PN}/*
+
+elif [ $1 = "clean" ]; then
+	rm -rf ${VHOST_ROOT}/${P}/Kernel/Config.pm.dist	${VHOST_ROOT}/${P}/scripts/*
+	rm -rf ${VHOST_CGIBINDIR}/${PN}
+	cd ${VHOST_ROOT}/${P}
+	rm -rf bin doc scripts var Kernel/Config Kernel/Language* Modules Output	System cpan-lib
+fi
diff --git a/www-apps/otrs/otrs-1.3.1.ebuild b/www-apps/otrs/otrs-1.3.1.ebuild
new file mode 100644
index 000000000000..594395fab0f4
--- /dev/null
+++ b/www-apps/otrs/otrs-1.3.1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-1.3.1.ebuild,v 1.1 2004/09/26 12:40:40 rl03 Exp $
+
+inherit webapp eutils
+
+S=${WORKDIR}/${PN}
+
+IUSE="mysql postgres fastcgi apache2 ldap"
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="http://otrs.org/"
+SRC_URI="ftp://ftp.gwdg.de/pub/misc/${PN}/${P}-01.tar.bz2
+	http://otrs.behrsolutions.com/${P}-01.tar.bz2
+	ftp://ftp.samurai.com/pub/${PN}/${P}-01.tar.bz2
+	ftp://ftp.otrs.org/pub/${PN}/${P}-01.tar.bz2
+	http://ftp.gwdg.de/pub/misc/${PN}/${P}-01.tar.bz2"
+
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="
+	=dev-lang/perl-5*
+	dev-perl/Date-Pcalc
+	dev-perl/DBI
+	dev-perl/Email-Valid
+	dev-perl/IO-stringy
+	dev-perl/MIME-tools
+	dev-perl/MailTools
+	dev-perl/Net-DNS
+	dev-perl/Authen-SASL
+	dev-perl/GD
+	dev-perl/GDTextUtil
+	dev-perl/GDGraph
+"
+
+RDEPEND="
+	${DEPEND}
+	virtual/mta
+	ldap? ( dev-perl/perl-ldap net-nds/openldap )
+	mysql? ( =dev-db/mysql-4* dev-perl/DBD-mysql )
+	postgres? ( dev-db/postgresql dev-perl/DBD-Pg )
+	fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+	apache2? ( >=net-www/apache-2 dev-perl/FCGI net-www/mod_fastcgi )
+	!apache2? ( =net-www/apache-1* =dev-perl/libapreq-1* )
+	"
+
+LICENSE="GPL-2"
+
+pkg_setup() {
+	webapp_pkg_setup
+	einfo
+	einfo "File locations have changed. OTRS now installs into"
+	einfo "/var/www/<YOURHOST>/${P}, /var/www/<YOURHOST>/cgi-bin/${PN}, and "
+	einfo "/var/www/<YOURHOST>/htdocs/${PN}"
+	einfo
+	enewuser otrs -1 /bin/false /dev/null apache
+
+	use apache2 && ewarn "mod_perl2 isn't ready for prime time, fastcgi will be used instead"
+}
+
+src_compile() {
+	# check dependenices
+	cp ${S}/Kernel/Config.pm.dist ${S}/Kernel/Config.pm
+	cd ${S}/Kernel/Config/
+	for foo in *.dist; do cp ${foo} `basename ${foo} .dist`; done
+
+	cd ${S}
+	if ! perl -cw bin/cgi-bin/index.pl 2>&1 | grep -q "syntax OK"; then die "Unresolved Perl dependencies"; fi
+	if ! perl -cw bin/PostMaster.pl 2>&1 | grep -q "syntax OK"; then die "Unresolved Perl dependencies"; fi
+}
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_HOSTROOTDIR}/${P} ${MY_CGIBINDIR}/${PN}
+
+	# install documentation
+	dodoc CHANGES CREDITS INSTALL README* TODO UPGRADING
+	dohtml doc/manual/en/html/*
+
+	cp -R Kernel bin scripts var \
+		.fetchmailrc .mailfilter .procmailrc ${D}/${MY_HOSTROOTDIR}/${P}
+	cp -R bin/cgi-bin/* ${D}/${MY_CGIBINDIR}/${PN}
+	mv ${D}/${MY_HOSTROOTDIR}/${P}/var/httpd/htdocs/* ${D}/${MY_HTDOCSDIR}
+	rm -rf ${D}/${MY_HOSTROOTDIR}/${P}/var/httpd ${D}/${MY_HOSTROOTDIR}/${P}/bin/cgi-bin
+
+	webapp_configfile ${MY_HOSTROOTDIR}/${P}/Kernel/Config.pm
+
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-${PV}.txt
+	webapp_hook_script ${FILESDIR}/reconfig-${PV}
+	webapp_src_install
+}