Version bump

(Portage version: 2.0.51.22-r2)

8 files changed, 240 insertions, 14 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 695d1a6d8d5f..460cfee94bb8 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-apps/otrs
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.8 2005/05/10 00:25:43 beu Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.9 2005/08/02 01:37:04 rl03 Exp $
+
+*otrs-2.0.1 (02 Aug 2005)
+
+  02 Aug 2005; Renat Lumpau <rl03@gentoo.org> +files/reconfig-2,
+  +files/postinstall-en-2.txt, +files/apache1.patch, +files/apache2.patch,
+  +otrs-2.0.1.ebuild:
+  Version bump
 
   10 May 2005; Elfyn McBratney <beu@gentoo.org> otrs-1.3.1.ebuild:
   dev-perl/libapreq{,2} -> www-apache
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 5f6babff6e2c..7190b0e80795 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,16 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9aa6925693c83243cb8f0c92d89a1787 otrs-1.3.1.ebuild 2737
-MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
+MD5 a1ca2b06c2c5d7b291f5e6854fbe62e3 otrs-2.0.1.ebuild 3337
 MD5 2195339d4bea1cdc08bd08e80995f05c ChangeLog 1424
-MD5 8367089c899a1addff1cee07dc20cf94 files/reconfig-1.3.1 756
-MD5 38bd7a6452e5d03b299c6856c36f00a6 files/digest-otrs-1.3.1 67
+MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 MD5 2dffe94c580dc24f94db0dbdebea29a6 files/postinstall-en-1.3.1.txt 770
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCf/+QjUHll2nfF60RAgNJAKCt1h9Dgn6Our5m6sELU7C2xlkgowCfXPou
-/ROl69bHp7Glp1Lxaduq0yI=
-=qdAp
------END PGP SIGNATURE-----
+MD5 2f4514fdaa872989724fdc422e7e0e90 files/reconfig-2 875
+MD5 998679b77f9c18e33503499e586ca1fa files/postinstall-en-2.txt 660
+MD5 fed75d396b333655a8a8e83e64e27062 files/apache1.patch 529
+MD5 f47d2140cdd984fb31b2f468719d94e9 files/apache2.patch 902
+MD5 38bd7a6452e5d03b299c6856c36f00a6 files/digest-otrs-1.3.1 67
+MD5 927a878d2b9225852b7ad011412719ee files/digest-otrs-2.0.1 67
+MD5 8367089c899a1addff1cee07dc20cf94 files/reconfig-1.3.1 756
diff --git a/www-apps/otrs/files/apache1.patch b/www-apps/otrs/files/apache1.patch
new file mode 100644
index 000000000000..8711c0e396a2
--- /dev/null
+++ b/www-apps/otrs/files/apache1.patch
@@ -0,0 +1,18 @@
+--- apache-httpd.include.conf	2003-10-06 19:16:35.000000000 -0400
++++ apache1.edit	2005-08-01 18:54:44.000000000 -0400
+@@ -16,11 +16,11 @@
+ <Location /otrs>
+ #  ErrorDocument 403 /otrs/customer.pl
+   ErrorDocument 403 /otrs/index.pl
+-  SetHandler  perl-script
+-  PerlHandler Apache::Registry
++#  SetHandler  perl-script
++#  PerlHandler Apache::Registry
+   Options ExecCGI
+-  PerlSendHeader On
+-  PerlSetupEnv On
++#  PerlSendHeader On
++#  PerlSetupEnv On
+ </Location>
+ 
+ # MaxRequestsPerChild (so no apache child will be to big!)
diff --git a/www-apps/otrs/files/apache2.patch b/www-apps/otrs/files/apache2.patch
new file mode 100644
index 000000000000..6df9579226d5
--- /dev/null
+++ b/www-apps/otrs/files/apache2.patch
@@ -0,0 +1,30 @@
+--- apache2-httpd.include.conf	2005-05-01 13:33:51.000000000 -0400
++++ apache2.edit	2005-08-01 18:55:41.000000000 -0400
+@@ -7,21 +7,21 @@
+ Alias /otrs-web/ "/opt/otrs/var/httpd/htdocs/"
+ 
+ # load all otrs modules
+-Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
++#Perlrequire /opt/otrs/scripts/apache2-perl-startup.pl
+ 
+ # Apache::Reload - Reload Perl Modules when Changed on Disk
+-PerlModule Apache::Reload
+-PerlInitHandler Apache::Reload
++#PerlModule Apache::Reload
++#PerlInitHandler Apache::Reload
+ 
+ # set mod_perl2 options
+ <Location /otrs>
+ #  ErrorDocument 403 /otrs/customer.pl
+   AllowOverride None
+   ErrorDocument 403 /otrs/index.pl
+-  SetHandler  perl-script
+-  PerlHandler ModPerl::Registry
++#  SetHandler  perl-script
++#  PerlHandler ModPerl::Registry
+   Options +ExecCGI
+-  PerlOptions +ParseHeaders
++#  PerlOptions +ParseHeaders
+   Order allow,deny
+   Allow from all
+ </Location>
diff --git a/www-apps/otrs/files/digest-otrs-2.0.1 b/www-apps/otrs/files/digest-otrs-2.0.1
new file mode 100644
index 000000000000..eecda899959c
--- /dev/null
+++ b/www-apps/otrs/files/digest-otrs-2.0.1
@@ -0,0 +1 @@
+MD5 a78856e21aeee8096d6836a9c2f82e40 otrs-2.0.1-01.tar.bz2 6276726
diff --git a/www-apps/otrs/files/postinstall-en-2.txt b/www-apps/otrs/files/postinstall-en-2.txt
new file mode 100644
index 000000000000..41179e0a6712
--- /dev/null
+++ b/www-apps/otrs/files/postinstall-en-2.txt
@@ -0,0 +1,18 @@
+
+Your installation is almost complete. 
+1. You now need to edit ${VHOST_ROOT}/otrs-${PVR}/Kernel/Config.pm 
+and set some Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...).
+
+2. Configure and restart your webserver.
+Read /usr/share/doc/otrs-${PVR}/README.webserver.gz. 
+Sample config files are in ${VHOST_ROOT}/otrs-${PVR}/scripts
+
+If you are using FastCGI, don't forget to add -D FASTCGI 
+to your Apache options.
+
+3. Setup your database. Read /usr/share/doc/${PN}-${PVR}/README.database.gz
+
+4. Read /usr/share/doc/${PN}-${PVR}/INSTALL.gz , pp. 9-12, 
+to finish the installation.
+
+If you are upgrading, read /usr/share/doc/${PN}-${PVR}/UPGRADING.gz
diff --git a/www-apps/otrs/files/reconfig-2 b/www-apps/otrs/files/reconfig-2
new file mode 100644
index 000000000000..04a9feef674c
--- /dev/null
+++ b/www-apps/otrs/files/reconfig-2
@@ -0,0 +1,30 @@
+#!/bin/bash
+PF=${PN}-${PVR}
+
+die() {
+	echo "******"
+	echo $1
+	echo "******"
+}
+
+if [ $1 = "install" ]; then
+	# edit Apache configs
+	cd ${VHOST_ROOT}/${PF}/scripts
+	sed -e "s|/opt/otrs/var/httpd/htdocs/|${MY_INSTALLDIR}/|g" -i apache-httpd.include.conf apache2-httpd.include.conf || die "sed 1 failed"
+	
+	# set $HOME
+	grep -lR "/opt" * | xargs sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" || die "sed failed"
+	
+	sed -i "s|/opt/otrs|${VHOST_ROOT}/${PF}|g" ${VHOST_ROOT}/${PF}/Kernel/Config.pm || die "sed failed"
+
+	# set permissions
+	${VHOST_ROOT}/${PF}/bin/SetPermissions.sh  ${VHOST_ROOT}/${PF} otrs apache apache apache > /dev/null || die "Could not set permissions"
+
+
+elif [ $1 = "clean" ]; then
+	echo "Please examine the contents of the following directories"
+	echo "and delete anything that is no longer necessary"
+	echo 
+	echo ${VHOST_ROOT}/${PF}
+	echo ${MY_INSTALLDIR}
+fi
diff --git a/www-apps/otrs/otrs-2.0.1.ebuild b/www-apps/otrs/otrs-2.0.1.ebuild
new file mode 100644
index 000000000000..d8c37eb40bfe
--- /dev/null
+++ b/www-apps/otrs/otrs-2.0.1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.0.1.ebuild,v 1.1 2005/08/02 01:37:04 rl03 Exp $
+
+inherit webapp eutils
+
+S=${WORKDIR}/${PN}
+
+IUSE="mysql postgres fastcgi apache2 ldap gd"
+
+DESCRIPTION="OTRS is an Open source Ticket Request System"
+HOMEPAGE="http://otrs.org/"
+SRC_URI="ftp://ftp.otrs.org/pub/${PN}/${P}-01.tar.bz2"
+
+KEYWORDS="~x86 ~ppc"
+
+DEPEND="
+	=dev-lang/perl-5*
+	>=net-www/webapp-config-1.11-r1
+	dev-perl/Date-Pcalc
+	dev-perl/DBI
+	perl-core/CGI
+	perl-core/Digest-MD5
+	dev-perl/libwww-perl
+	dev-perl/IO-stringy
+	perl-core/MIME-Base64
+	dev-perl/MIME-tools
+	dev-perl/MailTools
+	dev-perl/Net-DNS
+	dev-perl/libnet
+	dev-perl/Authen-SASL
+	dev-perl/XML-Parser
+"
+
+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 )
+	apache2? ( >=net-www/apache-2
+		fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+		!fastcgi? ( =www-apache/mod_perl-2* ) )
+	!apache2? ( =net-www/apache-1*
+		fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+		!fastcgi? ( =www-apache/mod_perl-1* ) )
+	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
+"
+
+LICENSE="GPL-2"
+
+pkg_setup() {
+	webapp_pkg_setup
+	enewuser otrs -1 -1 /dev/null apache
+	if ! use vhosts; then
+		ewarn
+		ewarn "otrs will be installed using webapp-config -d otrs,"
+		ewarn "which may mess up Apache configs."
+		ewarn "If that happens, re-emerge with USE=\"vhosts\""
+		ewarn
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	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}/scripts
+	rm -rf auto_* redhat* suse*
+
+	if use fastcgi; then
+		if ! use apache2; then
+			epatch ${FILESDIR}/apache1.patch
+			sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache-httpd.include.conf
+		fi
+		if use apache2; then
+			epatch ${FILESDIR}/apache2.patch
+			sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf
+		fi
+		sed -e "s|index.pl|index.fpl|" -i ${S}/var/httpd/htdocs/index.html
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+	dodir ${MY_HOSTROOTDIR}/${PF}
+
+	# install documentation
+	dodoc CHANGES CREDITS INSTALL README* TODO UPGRADING \
+		doc/otrs-database.dia doc/test-* doc/X-OTRS-Headers.txt \
+		.fetchmailrc.dist .mailfilter.dist .procmailrc.dist
+	dohtml doc/manual/{en,de}/html/*
+
+	# copy main files
+	cp -R .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE Kernel bin scripts var ${D}/${MY_HOSTROOTDIR}/${PF}
+	mv ${D}/${MY_HOSTROOTDIR}/${PF}/var/httpd/htdocs/* ${D}/${MY_HTDOCSDIR}
+
+	# remove stuff from ${D} that shouldn't be there
+	rm -rf ${D}/${MY_HOSTROOTDIR}/${PF}/var/httpd
+
+	# keep some empty dirs
+	local a
+	local d="article log pics/images pics/stats pics sessions spool tmp"
+	for a in ${d}; do
+		keepdir ${MY_HOSTROOTDIR}/${PF}/var/${a}
+	done
+
+	# helpers
+	webapp_configfile ${MY_HOSTROOTDIR}/${PF}/Kernel/Config.pm
+	webapp_postinst_txt en ${FILESDIR}/postinstall-en-2.txt
+	webapp_hook_script ${FILESDIR}/reconfig-2
+	webapp_src_install
+}
+
+pkg_postinst() {
+	use vhosts && {
+		ewarn
+		ewarn "Don't run webapp-config with -d otrs."
+		ewarn "That will mess up Apache configs."
+		ewarn "Use something like -d ot"
+		ewarn
+	}
+	webapp_pkg_postinst
+}