Version bump

(Portage version: 2.1.2_rc4-r4)
 (Signed Manifest commit)

3 files changed, 16 insertions, 138 deletions

diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 775b20ca459f..94c728ebdd18 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -22,19 +22,19 @@ MD5 5e6c7c1e995fa5c26613ded275a2a453 files/reconfig-2 880
 RMD160 eb71fbb7b086e60e648f06828353baf9b3f8bec7 files/reconfig-2 880
 SHA256 f08ef6e1258bb64d77fbf34bad33eee2e8556580509706eb17cbd2ae079e0a29 files/reconfig-2 880
 DIST otrs-2.0.4-01.tar.bz2 11560233 RMD160 f68650e86273cffe82382de57a6d4efa6b080d68 SHA1 251bd2507147a1d150caeaf58916d082663bde40 SHA256 6d3a357e4beee75c0267e6dc3dd16cf31d94946a75063b15081db0d2864d1866
-DIST otrs-2.1.4.tar.bz2 12619461 RMD160 c7dc66fca9af6cd004eb5d1c7d61a2ce51956a6d SHA1 0c046b89522bef5b79ba2b35c1ea6b386d1b23bd SHA256 8b2e4cd708ba394cf95969d5351a25598afe2edd7ce574748efe935468e4b811
+DIST otrs-2.1.5.tar.bz2 12621955 RMD160 579b90c850e813a6f3c625020e42a762e2817a25 SHA1 dfe21c3840ca9d0725c2ebc3e5fee5210aae42e5 SHA256 857a2b79ce37e54f7b1870ec4d148aa8083498609e02967b74adddfe3e54f350
 EBUILD otrs-2.0.4.ebuild 3120 RMD160 c33e6a7110540f0f9aedcce40848c8f2c7c955dd SHA1 22c566ed7ddc65e692624bb9cf3700de9f0789ee SHA256 121d0ea6873d7308e48ad0e6530591f4271d5a4ad21787353136be52706ec2e6
 MD5 b5ee1577d65fc4b78f43fcf21bbd3bc0 otrs-2.0.4.ebuild 3120
 RMD160 c33e6a7110540f0f9aedcce40848c8f2c7c955dd otrs-2.0.4.ebuild 3120
 SHA256 121d0ea6873d7308e48ad0e6530591f4271d5a4ad21787353136be52706ec2e6 otrs-2.0.4.ebuild 3120
-EBUILD otrs-2.1.4.ebuild 3235 RMD160 884a6595202e04418b04cb40e05447cfd3d96c78 SHA1 533d06324c0d38d4c5bd3f2906476d075523f551 SHA256 355ffb5c57249cca0e43465cf98d6af0c22f7d3d52af29fbd38a2c7b098be6f1
-MD5 20900f449a2fd04314e74195b79ecabc otrs-2.1.4.ebuild 3235
-RMD160 884a6595202e04418b04cb40e05447cfd3d96c78 otrs-2.1.4.ebuild 3235
-SHA256 355ffb5c57249cca0e43465cf98d6af0c22f7d3d52af29fbd38a2c7b098be6f1 otrs-2.1.4.ebuild 3235
-MISC ChangeLog 4367 RMD160 5b06ac5810959857e38b82ee4b1e1fe12c70905e SHA1 d32ec6906951db2d66a8327c30cc8edf4a872dab SHA256 193e6a7f366a8575284a86d66b336933511c0a7fb324fb13afdd3b8921844805
-MD5 4d9f65deb13152c1e92ebff248f226c9 ChangeLog 4367
-RMD160 5b06ac5810959857e38b82ee4b1e1fe12c70905e ChangeLog 4367
-SHA256 193e6a7f366a8575284a86d66b336933511c0a7fb324fb13afdd3b8921844805 ChangeLog 4367
+EBUILD otrs-2.1.5.ebuild 3230 RMD160 5937bcba3b7f8e6d878a9060ba0f17203a61c632 SHA1 10391bd74a21b0b7084eba445d9379045938041a SHA256 a1bf4c5109b16b1cbec18ab99add65fda1a8d7797aaa4aa5e436af0a5ac2a21e
+MD5 663c581c46c3e243ec2b59a3899c9404 otrs-2.1.5.ebuild 3230
+RMD160 5937bcba3b7f8e6d878a9060ba0f17203a61c632 otrs-2.1.5.ebuild 3230
+SHA256 a1bf4c5109b16b1cbec18ab99add65fda1a8d7797aaa4aa5e436af0a5ac2a21e otrs-2.1.5.ebuild 3230
+MISC ChangeLog 4493 RMD160 018156eb290cb8537383b6c5ba35207e42ee8e21 SHA1 476b3228d26b7e143faff4e2265633e5b86ed929 SHA256 7de0611a6782cb7998f380af2ab8e18689a0ed05deb19b92a52134d244cb2ce4
+MD5 378d09e047dfb169e7e9b68acd45bf32 ChangeLog 4493
+RMD160 018156eb290cb8537383b6c5ba35207e42ee8e21 ChangeLog 4493
+SHA256 7de0611a6782cb7998f380af2ab8e18689a0ed05deb19b92a52134d244cb2ce4 ChangeLog 4493
 MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 metadata.xml 221
@@ -42,13 +42,13 @@ SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a metadata
 MD5 28503328adf792c03224e7023dc20cff files/digest-otrs-2.0.4 250
 RMD160 bef7718610a4957d8eebd3eef514b4020a55564d files/digest-otrs-2.0.4 250
 SHA256 ba143ebe67b4b67ab15e9718bbf6b789b02597e47c9312d5454b5f17d70ec361 files/digest-otrs-2.0.4 250
-MD5 a99a7983523e34af71d5061b90ca85af files/digest-otrs-2.1.4 241
-RMD160 104316f06cfbbb2110597191943c03d1f6eb0cf1 files/digest-otrs-2.1.4 241
-SHA256 fd97b40ec7b2fdf19cd95d643dd3b4edd34f1d5d7e05c5a35682cd3e700c30c8 files/digest-otrs-2.1.4 241
+MD5 7dbbe6f37fb7d55f0bef93fdbbe32e56 files/digest-otrs-2.1.5 241
+RMD160 ca123ddfa807ed21e54edc16a9e8fd5f5f667364 files/digest-otrs-2.1.5 241
+SHA256 f9f5315427953d284a21ceb8d244620d4b0f0ec56dfa0ca9c00e38ff84f44fbf files/digest-otrs-2.1.5 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFsjG+tG5z4I8BtQoRApUkAJ4tplm/WbLEmMIyOs4pTt0fIhL1vwCfQ1J9
-pLcFYb0gWIRYGnjW+tq5xlU=
-=Uk1C
+iD8DBQFFw9Y0EzitwsaoONoRAonCAJsHMkXEWTLPlZnaTOfwpCq4oQGyWACgx1D8
+FGPTkXOnjlSJXdZk1g3RIjA=
+=vVRW
 -----END PGP SIGNATURE-----
diff --git a/www-apps/otrs/files/digest-otrs-2.1.4 b/www-apps/otrs/files/digest-otrs-2.1.4
deleted file mode 100644
index daf8cd8f4fc1..000000000000
--- a/www-apps/otrs/files/digest-otrs-2.1.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 572990c4fe9881514ac46a2bd1d817f7 otrs-2.1.4.tar.bz2 12619461
-RMD160 c7dc66fca9af6cd004eb5d1c7d61a2ce51956a6d otrs-2.1.4.tar.bz2 12619461
-SHA256 8b2e4cd708ba394cf95969d5351a25598afe2edd7ce574748efe935468e4b811 otrs-2.1.4.tar.bz2 12619461
diff --git a/www-apps/otrs/otrs-2.1.4.ebuild b/www-apps/otrs/otrs-2.1.4.ebuild
deleted file mode 100644
index f2135fe2c351..000000000000
--- a/www-apps/otrs/otrs-2.1.4.ebuild
+++ /dev/null
@@ -1,119 +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.1.4.ebuild,v 1.4 2007/01/20 15:14:00 mcummings Exp $
-
-inherit webapp eutils
-
-IUSE="mysql postgres fastcgi apache2 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 ~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 )
-	apache2? ( >=net-www/apache-2
-		fastcgi? ( dev-perl/FCGI )
-		!fastcgi? ( =www-misc/libapreq2-2* ) )
-	!apache2? ( =net-www/apache-1*
-		fastcgi? ( dev-perl/FCGI )
-		!fastcgi? ( =www-misc/libapreq-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
-}
-
-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
-		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() {
-	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
-	# webapp_pkg_postinst
-}