Version bump, removing old version

(Portage version: 2.0.51.22-r2)

10 files changed, 166 insertions, 146 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 460cfee94bb8..b70e347a42d4 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.9 2005/08/02 01:37:04 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.10 2005/08/02 01:59:56 rl03 Exp $
+
+*otrs-1.3.2 (02 Aug 2005)
+
+  02 Aug 2005; Renat Lumpau <rl03@gentoo.org> -files/reconfig-1.3.1,
+  -files/postinstall-en-1.3.1.txt, +files/postinstall-en.txt,
+  +files/reconfig, -otrs-1.3.1.ebuild, +otrs-1.3.2.ebuild:
+  Version bump, removing old version
 
 *otrs-2.0.1 (02 Aug 2005)
 
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 316a9ad1c839..68e525aff3ba 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,22 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9aa6925693c83243cb8f0c92d89a1787 otrs-1.3.1.ebuild 2737
 MD5 5b5f80648ff20c9f4d9ff3fa9dcadf0e otrs-2.0.1.ebuild 3338
+MD5 3748d52b59eda20c17a82fb6bb55fe18 otrs-1.3.2.ebuild 2790
 MD5 abc83b75a52e7edfdaf38b3e9feda4e9 ChangeLog 1630
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
-MD5 2dffe94c580dc24f94db0dbdebea29a6 files/postinstall-en-1.3.1.txt 770
+MD5 3f701ce10ed527c36c342e856a4e43de files/postinstall-en.txt 548
 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 17263c3cbe7f693cfdfcceefb18f7970 files/digest-otrs-1.3.2 67
 MD5 927a878d2b9225852b7ad011412719ee files/digest-otrs-2.0.1 67
-MD5 8367089c899a1addff1cee07dc20cf94 files/reconfig-1.3.1 756
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC7s5MEzitwsaoONoRAnDKAJ0Ytwb/AAb03iHAL9GE5QkX0wx6AwCgglHd
-WHzC24tQY+qdk7dER7n/ewQ=
-=x7Qm
------END PGP SIGNATURE-----
+MD5 2f4514fdaa872989724fdc422e7e0e90 files/reconfig 875
diff --git a/www-apps/otrs/files/digest-otrs-1.3.1 b/www-apps/otrs/files/digest-otrs-1.3.1
deleted file mode 100644
index ee117b323e3f..000000000000
--- a/www-apps/otrs/files/digest-otrs-1.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 18205697842efc22fac0b7af2790093e otrs-1.3.1-01.tar.bz2 6248257
diff --git a/www-apps/otrs/files/digest-otrs-1.3.2 b/www-apps/otrs/files/digest-otrs-1.3.2
new file mode 100644
index 000000000000..83e28ffc860c
--- /dev/null
+++ b/www-apps/otrs/files/digest-otrs-1.3.2
@@ -0,0 +1 @@
+MD5 c632dca827a3c5386c92a4a7d4e18d69 otrs-1.3.2-01.tar.bz2 6247213
diff --git a/www-apps/otrs/files/postinstall-en-1.3.1.txt b/www-apps/otrs/files/postinstall-en-1.3.1.txt
deleted file mode 100644
index 8d78f8646c91..000000000000
--- a/www-apps/otrs/files/postinstall-en-1.3.1.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-***********************************************************
-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/postinstall-en.txt b/www-apps/otrs/files/postinstall-en.txt
new file mode 100644
index 000000000000..ebc75e4407bb
--- /dev/null
+++ b/www-apps/otrs/files/postinstall-en.txt
@@ -0,0 +1,13 @@
+
+Your installation is almost complete. 
+1. You now need to edit ${VHOST_ROOT}/${PN}-${PVR}/Kernel/Config.pm and set some
+Kernel::Config options (FQDN, SystemID, TicketHook, Home, ...).
+
+2. Configure and restart your webserver.
+Read /usr/share/doc/${PN}-${PVR}/README.webserver.gz. Sample config files are in
+${VHOST_ROOT}/${PN}-${PVR}/scripts
+
+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.
+If you are upgrading, read /usr/share/doc/${PN}-${PVR}/UPGRADING.gz
diff --git a/www-apps/otrs/files/reconfig b/www-apps/otrs/files/reconfig
new file mode 100644
index 000000000000..04a9feef674c
--- /dev/null
+++ b/www-apps/otrs/files/reconfig
@@ -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/files/reconfig-1.3.1 b/www-apps/otrs/files/reconfig-1.3.1
deleted file mode 100644
index 9875fb790a22..000000000000
--- a/www-apps/otrs/files/reconfig-1.3.1
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/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
-
-	echo "************"
-	echo "Automatic uninstallation disabled until I figure out bug #65850 -- rl03"
-	echo"*************"
-fi
diff --git a/www-apps/otrs/otrs-1.3.1.ebuild b/www-apps/otrs/otrs-1.3.1.ebuild
deleted file mode 100644
index a549e7ccbc23..000000000000
--- a/www-apps/otrs/otrs-1.3.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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-1.3.1.ebuild,v 1.2 2005/05/10 00:25:43 beu 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* =www-apache/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
-}
diff --git a/www-apps/otrs/otrs-1.3.2.ebuild b/www-apps/otrs/otrs-1.3.2.ebuild
new file mode 100644
index 000000000000..cd186bd50bd5
--- /dev/null
+++ b/www-apps/otrs/otrs-1.3.2.ebuild
@@ -0,0 +1,110 @@
+# 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-1.3.2.ebuild,v 1.1 2005/08/02 01:59:56 rl03 Exp $
+
+inherit webapp eutils
+
+S=${WORKDIR}/${PN}
+
+IUSE="mysql postgres 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 =www-apache/mod_perl-2* )
+	!apache2? ( =net-www/apache-1* =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*
+}
+
+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 .mailfilter .procmailrc
+	dohtml doc/manual/{en,de}/html/*
+
+	# copy main files
+	cp -R .fetchmailrc .mailfilter .procmailrc 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.txt
+	webapp_hook_script ${FILESDIR}/reconfig
+	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
+}