Bump

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

4 files changed, 11 insertions, 163 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 78fe6abd56f2..4c228e99b7d5 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.53 2012/05/09 03:27:10 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.54 2012/06/07 06:52:47 patrick Exp $
+
+*otrs-3.1.5 (07 Jun 2012)
+
+  07 Jun 2012; Patrick Lauer <patrick@gentoo.org> +otrs-3.1.5.ebuild,
+  -otrs-3.1.2.ebuild, -otrs-3.1.3.ebuild:
+  Bump
 
 *otrs-3.1.4 (09 May 2012)
 
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 71087e8800c6..4ea077a4fb9d 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -2,11 +2,9 @@ AUX apache2.patch 874 RMD160 c3e87de6e20429ed80c2fd08f731aabb198dfa60 SHA1 0847d
 AUX dbi_finish.patch 293 RMD160 7178dee7a8f250733510feb9ffdbe6bd9b044429 SHA1 a4a16eaca625edb53cee172262b93989ab82c7fd SHA256 5ab5d742efb0c6287d4571178f711bcfc18e0bfa700f0efed33576519a02c6d4
 AUX postinstall-en-2.txt 670 RMD160 4d41cebe350ff1b7a726845c22e882e264d096e6 SHA1 44b1fa6fa53364de2b40a01351c47782f12703ea SHA256 46f22f02a567e97794b3b3f2b7aa3810d5daea1afdf1d6730046d659a19dbdc9
 AUX reconfig-2 880 RMD160 eb71fbb7b086e60e648f06828353baf9b3f8bec7 SHA1 442203fc0694b9591ee21baababc697c31ad65e4 SHA256 f08ef6e1258bb64d77fbf34bad33eee2e8556580509706eb17cbd2ae079e0a29
-DIST otrs-3.1.2.tar.bz2 20365355 RMD160 4ffcc4b7c89b34aecea6ae9d393219e717dc5ac2 SHA1 595ac8a1f7c861becee41e2dfb9577565c74c1ec SHA256 6c3c998441bb136fc0a9873eab1dc3d3563b4f4dbd024063b2991cc2c329c5d7
-DIST otrs-3.1.3.tar.bz2 20439409 RMD160 2b570f85eb658c781e2b32a477a1962f1822b5f5 SHA1 c9ac364ffb2e597e8b690df5d669c984175435cc SHA256 e3f146221cdf32ec205b86dc81f8b3abf8f4695be9831f970f4c8734aa082346
 DIST otrs-3.1.4.tar.bz2 23578394 RMD160 6a650b8075d31f83790eed988758c47c68c8765c SHA1 11a20a0dc156ea7aec3b22a541da18edf1b3e734 SHA256 7c07f9905f1f37fe2b685f3a2cc7a5857261e29513d13131d9270212c28134c5
-EBUILD otrs-3.1.2.ebuild 4121 RMD160 9764bf5b3f26d6d6b7a976dbd2408e2195a61ac4 SHA1 a014c4eddaf3e72e57b0d60d93bfb1309e48d80a SHA256 15ab0872d78ea5b424eb8c2799ac697c5af7d6448d868931c28ae9b64de4cdbf
-EBUILD otrs-3.1.3.ebuild 4121 RMD160 29c569a7491d53332e060d5451af0c599bc5aec8 SHA1 995d4c5c25d9669e32c96999f534cac33e9b5c65 SHA256 478e9f9efd3a8a0b6af49143bd6b4734658c451c9398f7e3f095dd01d60ab677
+DIST otrs-3.1.5.tar.bz2 23748816 RMD160 bb36e6904cd39983527bfa565ad3772874debb94 SHA1 3ceacb375ca5dfeb249690fd881a64b316987b2e SHA256 2569f7c1b4efa6270ba4e57cd16b2092d5a4acb77b8c342a51dbfe1acce546ba
 EBUILD otrs-3.1.4.ebuild 4121 RMD160 87c6626b894249f6aa240f36b6af905f40dc0215 SHA1 2a2f282a13557b18c66df43fa7830f66996fe57b SHA256 6e82a439c516321729e53d83741dab5a94742b4ea73a9d2b062b6d5fbd67fe11
-MISC ChangeLog 7722 RMD160 369224af43bc4ca46cec974b0592d6cc8c9d7b9d SHA1 820cb683b3efc8165b1038976f7175f23f8194ae SHA256 749e575459bac33007e3456539544f9014a59ac7e626c2391618304d99bf37bd
+EBUILD otrs-3.1.5.ebuild 4121 RMD160 b8793993dbadb297aa35c72f8b2427d35ae199f6 SHA1 51bcb41ae5d4d5ef868c26d5b0cfcdaf0f02a0a4 SHA256 62eb752920ff25ee8c4ff0d9dc0fb8d9d3b1a3c8ada65aa3aa1c9fe757b54bea
+MISC ChangeLog 7869 RMD160 946a822533748f18bc1a3f9774a44715f23436f4 SHA1 6a699ce3dfb79202a4e183e9879887f470c07b4a SHA256 7d68d70fd0ae85fe198caab909ecf1fa3f8b30a9231b3812a24467c74d410ea7
 MISC metadata.xml 408 RMD160 da50a119f1080b516b98a82a1632c80792e9b828 SHA1 97bfca80134bc2da65b849f472f79a6fa292cd4f SHA256 83cd0c36f1d093461fc9cf081c3801102671ff3da66ed48c5222117daf1c50ca
diff --git a/www-apps/otrs/otrs-3.1.3.ebuild b/www-apps/otrs/otrs-3.1.3.ebuild
deleted file mode 100644
index c0bd3705082e..000000000000
--- a/www-apps/otrs/otrs-3.1.3.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.3.ebuild,v 1.1 2012/04/04 08:16:02 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"
-}
diff --git a/www-apps/otrs/otrs-3.1.2.ebuild b/www-apps/otrs/otrs-3.1.5.ebuild
index 51a5d5a7acfc..db6fd6d9bb94 100644
--- a/www-apps/otrs/otrs-3.1.2.ebuild
+++ b/www-apps/otrs/otrs-3.1.5.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.2.ebuild,v 1.1 2012/03/16 08:57:27 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-3.1.5.ebuild,v 1.1 2012/06/07 06:52:47 patrick Exp $
 
 EAPI=2