Bump for #433770

(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)

3 files changed, 8 insertions, 158 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 65f5daad4a78..6af88c409cf5 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/otrs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.58 2012/08/23 03:50:04 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.59 2012/09/03 10:56:20 patrick Exp $
+
+*otrs-3.1.10 (03 Sep 2012)
+
+  03 Sep 2012; Patrick Lauer <patrick@gentoo.org> +otrs-3.1.10.ebuild,
+  -otrs-3.1.8.ebuild, -otrs-3.1.9.ebuild:
+  Bump for #433770
 
 *otrs-3.1.9 (23 Aug 2012)
 
diff --git a/www-apps/otrs/otrs-3.1.8.ebuild b/www-apps/otrs/otrs-3.1.10.ebuild
index 5af7296246d5..1094a8ffdb23 100644
--- a/www-apps/otrs/otrs-3.1.8.ebuild
+++ b/www-apps/otrs/otrs-3.1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.1.8.ebuild,v 1.1 2012/08/17 06:29:29 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.1.10.ebuild,v 1.1 2012/09/03 10:56:20 patrick Exp $
 
 EAPI=2
 
diff --git a/www-apps/otrs/otrs-3.1.9.ebuild b/www-apps/otrs/otrs-3.1.9.ebuild
deleted file mode 100644
index 35b2ed8d13eb..000000000000
--- a/www-apps/otrs/otrs-3.1.9.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.1.9.ebuild,v 1.1 2012/08/23 03:50:04 patrick Exp $
-
-EAPI=2
-
-inherit eutils confutils
-
-DESCRIPTION="OTRS is an Open source Ticket Request System"
-HOMEPAGE="http://otrs.org/"
-SRC_URI="http://ftp.otrs.org/pub/${PN}/${P}.tar.bz2"
-
-LICENSE="AGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 fastcgi +gd ldap mod_perl +mysql pdf postgres soap"
-SLOT="0"
-#WEBAPP_MANUAL_SLOT="yes"
-
-# FIXME add oracle/mssql/DB2 DB support
-# FIXME #cjk? ( >=dev-perl/Encode-HanExtra-0.23 ) unsatisfied dep
-
-DEPEND=""
-RDEPEND="${DEPEND}
-	dev-perl/Authen-SASL
-	dev-perl/Crypt-PasswdMD5
-	dev-perl/CSS-Minifier
-	dev-perl/Date-Pcalc
-	mysql? ( dev-perl/DBD-mysql )
-	postgres? ( dev-perl/DBD-Pg )
-	dev-perl/DBI
-	gd? ( dev-perl/GD
-		dev-perl/GDTextUtil
-		dev-perl/GDGraph )
-	dev-perl/IO-Socket-SSL
-	>=dev-perl/JavaScript-Minifier-1.05
-	>=dev-perl/JSON-2.21
-	dev-perl/JSON-XS
-	dev-perl/LWP-UserAgent-Determined
-	dev-perl/Mail-POP3Client
-	dev-perl/MailTools
-	>=dev-perl/MIME-tools-5.427
-	dev-perl/NetxAP
-	dev-perl/Net-IMAP-Simple-SSL
-	>dev-perl/Net-DNS-0.60
-	dev-perl/Net-SMTP-SSL
-	dev-perl/Net-SMTP-TLS
-	dev-perl/IO-stringy
-	pdf? ( >=dev-perl/PDF-API2-0.73
-		virtual/perl-Compress-Raw-Zlib )
-	ldap? ( dev-perl/perl-ldap )
-	soap? (
-		dev-perl/SOAP-Lite
-		!=dev-perl/SOAP-Lite-0.711
-		!=dev-perl/SOAP-Lite-0.712 )
-	dev-perl/Text-CSV
-	dev-perl/Text-CSV_XS
-	dev-perl/TimeDate
-	dev-perl/XML-Parser
-
-	virtual/perl-MIME-Base64
-	>=virtual/perl-CGI-3.33
-	virtual/perl-libnet
-	virtual/perl-Digest-MD5
-	>=virtual/perl-Digest-SHA-5.48
-
-	virtual/mta
-
-	apache2? ( mod_perl? ( www-servers/apache:2
-					=www-apache/libapreq2-2* www-apache/mod_perl )
-		fastcgi? ( || ( www-apache/mod_fcgid www-apache/mod_fastcgi )
-				www-servers/apache:2[suexec] )
-		!fastcgi? (
-			!mod_perl? ( www-servers/apache:2[suexec] ) )
-			)
-	fastcgi? ( dev-perl/FCGI virtual/httpd-fastcgi )
-	!fastcgi? (
-		!apache2? ( virtual/httpd-cgi ) )"
-
-#   dev-perl/libwww-perl
-
-OTRS_HOME="/var/lib/otrs"
-
-pkg_setup() {
-	# The enewuser otrs will fail if apache isn't there, but it's an optional dep
-	# so we create the apache user here just in case
-	enewgroup apache 81
-	enewuser apache 81 -1 /var/www apache
-	enewuser otrs -1 -1 ${OTRS_HOME} apache
-	confutils_require_any mysql postgres
-}
-
-src_prepare() {
-	rm -fr "${S}/scripts"/{auto_*,redhat*,suse*,*.spec} || die
-	cp Kernel/Config.pm{.dist,} || die
-	# procmail/fetchmail/mailfilter
-#	local mailrc=".fetchmailrc .mailfilter .procmailrc"
-#	for i in ${mailrc}; do
-#		mv ${i}{.dist,} || die
-#	done
-#	fperms 600 ${mailrc} || die
-#	fowners otrs ${mailrc} || die
-
-	sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" "${S}"/Kernel/Config.pm \
-		|| die "sed failed"
-
-	grep -lR "/opt" "${S}"/scripts | \
-		xargs sed -i -e "s:/opt/otrs:${OTRS_HOME}:g" \
-		|| die "sed failed"
-
-	cd Kernel/Config/ || die
-	for i in *.dist; do
-		cp ${i} $(basename ${i} .dist) || die
-	done
-
-	perl "${S}"/bin/otrs.SetPermissions.pl \
-		--otrs-user=otrs \
-		--web-user=apache \
-		--otrs-group=apache \
-		--web-group=apache "${S}" \
-		|| die "Could not set permissions"
-
-	echo "CONFIG_PROTECT=\"${OTRS_HOME}/Kernel/Config.pm \
-		${OTRS_HOME}/Kernel/Config/GenericAgent.pm\"" > "${T}/50${PN}"
-
-}
-
-src_install() {
-	dodoc CHANGES CREDITS INSTALL README* UPGRADING \
-	 	doc/X-OTRS-Headers.txt || die
-
-	dodoc doc/manual/en/otrs_admin_book.pdf
-
-	insinto "${OTRS_HOME}"
-	doins -r .fetchmailrc.dist .mailfilter.dist .procmailrc.dist RELEASE \
-		Custom Kernel bin scripts var || die "doins failed"
-
-	cat "${S}"/var/cron/*.dist > crontab
-	insinto /usr/share/doc/${PF}/
-	doins crontab
-
-	for a in article log pics/images pics/stats pics sessions spool tmp tmp/CacheFileStorable; do
-		keepdir "${OTRS_HOME}/var/${a}"
-	done
-	doenvd "${T}/50${PN}" || die
-}
-
-# This is too automagic, either einfo telling user or installing to /etc/cron.d/ should be preferred
-pkg_config() {
-	einfo "Installing cronjobs"
-	crontab -u otrs /usr/share/doc/${PF}/crontab
-}
-
-pkg_postinst() {
-	elog "Enable cronjobs with the following command:"
-	elog "crontab -u otrs crontab"
-}