Added www-apps/otrs-2.3.3, removed otrs-2.2.2, -2.2.3. (#228607)

(Portage version: 2.1.4.5)

3 files changed, 47 insertions, 167 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 710f4a54fb15..7f38a22f226b 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/otrs
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.39 2008/04/03 11:08:59 hollow Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.40 2008/10/31 06:40:42 wrobel Exp $
+
+*otrs-2.3.3 (31 Oct 2008)
+
+  31 Oct 2008; Gunnar Wrobel <wrobel@gentoo.org> -otrs-2.2.2.ebuild,
+  -otrs-2.2.3.ebuild, +otrs-2.3.3.ebuild:
+  Added www-apps/otrs-2.3.3, removed otrs-2.2.2, -2.2.3. (#228607)
 
 *otrs-2.2.6 (03 Apr 2008)
 
diff --git a/www-apps/otrs/otrs-2.2.3.ebuild b/www-apps/otrs/otrs-2.2.3.ebuild
deleted file mode 100644
index 8005da1f360e..000000000000
--- a/www-apps/otrs/otrs-2.2.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.2.3.ebuild,v 1.1 2007/09/18 12:29:04 wrobel Exp $
-
-inherit webapp eutils depend.apache
-
-IUSE="mysql postgres fastcgi ldap gd pdf"
-
-DESCRIPTION="OTRS is an Open source Ticket Request System"
-HOMEPAGE="http://otrs.org/"
-SRC_URI="ftp://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	${DEPEND}
-	=dev-lang/perl-5*
-	dev-perl/Date-Pcalc
-	dev-perl/TimeDate
-	dev-perl/Crypt-PasswdMD5
-	dev-perl/DBI
-	virtual/perl-CGI
-	virtual/perl-Digest-MD5
-	dev-perl/libwww-perl
-	dev-perl/IO-stringy
-	virtual/perl-MIME-Base64
-	dev-perl/MIME-tools
-	dev-perl/MailTools
-	dev-perl/Net-DNS
-	virtual/perl-libnet
-	dev-perl/Authen-SASL
-	dev-perl/XML-Parser
-	virtual/mta
-	pdf? ( dev-perl/PDF-API2 )
-	ldap? ( dev-perl/perl-ldap net-nds/openldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	fastcgi? ( dev-perl/FCGI )
-	apache2? ( =www-apache/libapreq2-2* )
-	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
-"
-
-want_apache
-
-LICENSE="GPL-2"
-
-pkg_setup() {
-	webapp_pkg_setup
-	if use apache2; then
-		enewuser otrs -1 -1 /dev/null apache
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cp ${S}/Kernel/Config.pm.dist ${S}/Kernel/Config.pm
-
-	# http://bugs.otrs.org/show_bug.cgi?id=1231
-	cd ${S}
-	epatch ${FILESDIR}/dbi_finish.patch
-
-	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
-		epatch ${FILESDIR}/apache2.patch
-		sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf
-		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() {
-	ewarn "webapp-config will not be run automatically"
-	ewarn "That messes up Apache configs"
-	ewarn "Don't run webapp-config with -d otrs. Instead, try"
-	ewarn "webapp-config -I -h <host> -d ot ${PN} ${PVR}"
-	ewarn
-	if ! use apache2; then
-		ewarn "You did not activate the USE-flag apache2 which means you"
-		ewarn "will need to create the otrs user yourself. Make this user"
-		ewarn "a member of your webserver group."
-	fi
-	# webapp_pkg_postinst
-}
diff --git a/www-apps/otrs/otrs-2.2.2.ebuild b/www-apps/otrs/otrs-2.3.3.ebuild
index 5e2f8411b5db..b32ad1b41807 100644
--- a/www-apps/otrs/otrs-2.2.2.ebuild
+++ b/www-apps/otrs/otrs-2.3.3.ebuild
@@ -1,49 +1,48 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.2.2.ebuild,v 1.2 2007/09/16 05:38:02 wrobel Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.3.3.ebuild,v 1.1 2008/10/31 06:40:42 wrobel Exp $
 
 inherit webapp eutils depend.apache
 
-IUSE="mysql postgres fastcgi ldap gd pdf"
-
 DESCRIPTION="OTRS is an Open source Ticket Request System"
 HOMEPAGE="http://otrs.org/"
 SRC_URI="ftp://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
 
+LICENSE="GPL-2"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="mysql postgres fastcgi ldap gd pdf"
 
-RDEPEND="
-	${DEPEND}
+RDEPEND="${DEPEND}
+	virtual/mta
 	=dev-lang/perl-5*
-	dev-perl/Date-Pcalc
-	dev-perl/TimeDate
+
+	dev-perl/Authen-SASL
 	dev-perl/Crypt-PasswdMD5
 	dev-perl/DBI
-	virtual/perl-CGI
-	virtual/perl-Digest-MD5
-	dev-perl/libwww-perl
+	dev-perl/Date-Pcalc
 	dev-perl/IO-stringy
-	virtual/perl-MIME-Base64
 	dev-perl/MIME-tools
 	dev-perl/MailTools
 	dev-perl/Net-DNS
-	virtual/perl-libnet
-	dev-perl/Authen-SASL
+	dev-perl/TimeDate
 	dev-perl/XML-Parser
-	virtual/mta
-	pdf? ( dev-perl/PDF-API2 )
-	ldap? ( dev-perl/perl-ldap net-nds/openldap )
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	fastcgi? ( dev-perl/FCGI )
+	dev-perl/libwww-perl
+	virtual/perl-CGI
+	virtual/perl-Digest-MD5
+	virtual/perl-MIME-Base64
+	virtual/perl-libnet
+
 	apache2? ( =www-apache/libapreq2-2* )
+	fastcgi? ( dev-perl/FCGI )
 	gd? ( dev-perl/GD dev-perl/GDTextUtil dev-perl/GDGraph )
+	ldap? ( dev-perl/perl-ldap net-nds/openldap )
+	mysql? ( >=dev-perl/DBD-mysql-3.0005 )
+	pdf? ( dev-perl/PDF-API2 )
+	postgres? ( dev-perl/DBD-Pg )
 "
 
 want_apache
 
-LICENSE="GPL-2"
-
 pkg_setup() {
 	webapp_pkg_setup
 	if use apache2; then
@@ -53,53 +52,46 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cp ${S}/Kernel/Config.pm.dist ${S}/Kernel/Config.pm
+	cp "${S}"/Kernel/Config.pm{.dist,}
 
-	# http://bugs.otrs.org/show_bug.cgi?id=1231
-	cd ${S}
-	epatch ${FILESDIR}/dbi_finish.patch
-
-	cd ${S}/Kernel/Config/
-	for foo in *.dist; do cp ${foo} $(basename ${foo} .dist); done
+	cd "${S}"/Kernel/Config/
+	for i in *.dist; do
+		cp ${i} $(basename ${i} .dist)
+	done
 
-	cd ${S}/scripts
+	cd "${S}"/scripts
 	rm -rf auto_* redhat* suse*
 
 	if use fastcgi; then
-		epatch ${FILESDIR}/apache2.patch
-		sed -e "s|cgi-bin|fcgi-bin|" -i ${S}/scripts/apache2-httpd.include.conf
-		sed -e "s|index.pl|index.fpl|" -i ${S}/var/httpd/htdocs/index.html
+		epatch "${FILESDIR}"/apache2.patch
+		sed -e "s|cgi-bin|fcgi-bin|" -i "${S}"/scripts/apache2-httpd.include.conf
+		sed -e "s|index.pl|index.fpl|" -i "${S}"/var/httpd/htdocs/index.html
 	fi
 }
 
 src_install() {
 	webapp_src_preinst
-	dodir ${MY_HOSTROOTDIR}/${PF}
+	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}
+	insinto "${MY_HOSTROOTDIR}"/${PF}
+	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE Kernel bin scripts var
 
-	# remove stuff from ${D} that shouldn't be there
-	rm -rf ${D}/${MY_HOSTROOTDIR}/${PF}/var/httpd
+	mv "${D}/${MY_HOSTROOTDIR}"/${PF}/var/httpd/htdocs/* "${D}/${MY_HTDOCSDIR}"
+	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"
+	local a d="article log pics/images pics/stats pics sessions spool tmp"
 	for a in ${d}; do
-		keepdir ${MY_HOSTROOTDIR}/${PF}/var/${a}
+		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_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
 }