Bump for #433770

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

4 files changed, 16 insertions, 168 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/Manifest b/www-apps/otrs/Manifest
index 899608153d36..a45599584a89 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -1,10 +1,8 @@
-AUX apache2.patch 874 SHA256 fbad80b193717c42d7b1daf9a5026772e20ddb39d985e5042f50dbfd1876c4ad SHA512 7099bb3f077dd31ed17fd15fbb06d41a92a344e4653413db9a649cd49422725948bfa7288e7c3afa802c8b0e2df1aa552cb4a4cd367c1585a609dff36ccbcf4e WHIRLPOOL a7511e5e80a7ba0d4439b9e49a8c72ffad517176e91621a0972afe3491e4a435e91379084d72b9b19101d5c76403e5c5fc3e1d159e8b612ff5dd42b32b4eff11
-AUX dbi_finish.patch 293 SHA256 5ab5d742efb0c6287d4571178f711bcfc18e0bfa700f0efed33576519a02c6d4 SHA512 0c631560bbdb42e78d9a34c7451d6515efe94e2f8d7b35b99cf0fdbb3b2fcfe1ea8868d1ae3c5a1198e146d87f87fe959aeda37bdfb385780761b6208b87a6b7 WHIRLPOOL 9f8fc50f745b0b5a09ecf977cd1c2a54fe4e8ec0805f4e92a2fc8eec3e5b82441bf2e1777610ff0e5f3b0e450ae30c05d4321ca68da6ce303ce9686d57d86c7a
-AUX postinstall-en-2.txt 670 SHA256 46f22f02a567e97794b3b3f2b7aa3810d5daea1afdf1d6730046d659a19dbdc9 SHA512 ce2b186c83f3ef33f4342479a7c30fdeabfcd310e343f7ce5706c8731c731e730cf3784dea583454035bc0856449780eaea16bf333d6a80ed9c830ee50cd91c0 WHIRLPOOL c7a04bc0e561ac1381c4c623f44ef7fdcf81d9e0576eab4a59c52fbb7820238a87dd6207b8a2ce46ac4cc3d55a45fb7ef94cd01b006636bf28eaefa49dfdd112
-AUX reconfig-2 880 SHA256 f08ef6e1258bb64d77fbf34bad33eee2e8556580509706eb17cbd2ae079e0a29 SHA512 e9b62f875fad059983a7dbe66a7966502b38610bdc0ca4bdab952644f69c22c7b3ad0dcf04c6a9f76273c4a6ffa330162af436573844d0bf0caa02d9ae5889c2 WHIRLPOOL ac711e5e44b7d6eccf32bb531c3eac555161a567b140589eb081784532e5b15a928ecc613c7c12c77e1d452f746107f33d781fa6241ac5cb45ee75c01bf659d1
-DIST otrs-3.1.8.tar.bz2 23804808 SHA256 a80285bb818fc32ba3f077a800da842be3f0a2e81e2542a9d7300d1709b61a9e SHA512 f679d0e55d4b3e5d224c986a111a61a54cfac3f54ad079be2f19f511bfbff470446ca3cece9046ab953798b931e0d1e461d85fa944a0b4190091a6fe499b984c WHIRLPOOL a4bafe6640d1951d0f79b1fe0823e3a127630f88a6d3265e805d9bf7a2831c4a497f4bdf867d904b68bcf6be5c6f86b24b5604ef871f968db0c2e7fdcd3b56b8
-DIST otrs-3.1.9.tar.bz2 23782055 SHA256 9691c106789013e31f8f7f16085df9478dff28f3667d0fe4d33965b7ae1fc49d SHA512 de3b817ba181a558975174c89dea6a26e1f72959c199f43a942e2fc0328364a457f0b78faee93470ce54f4baef22d71b3d28dffae53f6294b6d1030edce882da WHIRLPOOL ea546f81a2c4cb86c513aed6f190f099131cb3945228403f34d4d51130ceedd38cb3de44dc07253dea3e928d1dd7734c60c0957980f8c5a26a417718fc1f1661
-EBUILD otrs-3.1.8.ebuild 4121 SHA256 d5be3b4fbf7bb94944f4805e22ebca4e66d8de929e8bbc86c216911e2443a27b SHA512 a7b521196e433832f77cc7b25570ebacb509f006636cb62c90ac07fdd4f9b1a5d6ece29a731e54ccd5f8217a2048a2a9795832ed6d17e9601a9c0e4bdf244608 WHIRLPOOL 97c24fb6394b818961a507a53e1a113acf59a4f201372f4ea54444772deb83c84d5e8624251daede7a6c9cf19f1bc28f0c40e3e3c9e04cdfcf47a1f028b657b4
-EBUILD otrs-3.1.9.ebuild 4121 SHA256 06a73b316649e6f7cd2918a5bee98d323afc244a390b272462629f97d72668fc SHA512 3916ca3e322dc02e3e48d03ab138c1b5e42404d788472f3a66ac7de6e0a750eaada267f4c6beb2bcaa27f3b28781f38f336051986c44ccf4b543c57d44a76f3f WHIRLPOOL 174520536f7befd63a06d1e35774efc27b2dc9a61bfe063239dd55da3693dac9d4e8a46837632a0510fbaaffbea0c8ab52d96e2ac23918275cd808ad43f13264
-MISC ChangeLog 8376 SHA256 c90244483d87d43f71674fdba55b2531c41fb456459fb04e0dcb6411e9ba0e40 SHA512 54e0814c8cb2871e6b31f51267472cf5786c2122333165b66db7cf256251cf9fd02b888603f616727b3b976deb8d7b8048ebd1779b3433a24da9d0731aa9e0f8 WHIRLPOOL e1bc679ec0b3b13c68ee703b162f78a527b97a47d6862311d21be3032f17744ae1cdcae994aba33e8d62ca59d4aba70dc72942ae72601a2f7fcf15b5c072c75b
-MISC metadata.xml 408 SHA256 83cd0c36f1d093461fc9cf081c3801102671ff3da66ed48c5222117daf1c50ca SHA512 b1620943f9b37afbbf4df56c3442647298f6dfdb9426ab8c1e5e90f536e9a27912a98f9a3cd828de3d6397e3613bab1bd996210c1908d9f81ac9ef03dd65e490 WHIRLPOOL 9608a3b2702b408a097786644cc24e85bdf0cdf877a55d136bfd4ed85c05ce4c36f14fd899758cc778b074af223a1e44b9842848337a217f5a88d13519dad07e
+AUX apache2.patch 874 RMD160 c3e87de6e20429ed80c2fd08f731aabb198dfa60 SHA1 0847d39c32fead0a19716dcd9bdb4d83c56d089e SHA256 fbad80b193717c42d7b1daf9a5026772e20ddb39d985e5042f50dbfd1876c4ad
+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.10.tar.bz2 23778412 RMD160 36183dac816875046c16f2ac73a74ee2f1156bd2 SHA1 b63fb6868d9d6eca537aa4a6ab59384e358d11fa SHA256 20ad2ecbfbe659b4e360d4571fcf41561dbb13ae7a74d56d7e65c7dda4cc7983
+EBUILD otrs-3.1.10.ebuild 4122 RMD160 224c08f70f0f1fe8bbb924e0e9a4f176d7831c02 SHA1 aca7a591c57549a0cc49b0ec17b22bf2a3c0e857 SHA256 3a38861887b321a35f3c8bf1fd4a8c7d835022a39caf004e210b1d8f7ce37d85
+MISC ChangeLog 8537 RMD160 79293547a8590afa90374f75724c009e72bd4a6d SHA1 5a1c440a8986897d50e3235787f21a39b688001e SHA256 9a11b6b0146c51009a8000a8e4794c4e69939a49553d0da2b8e64bd92df5674d
+MISC metadata.xml 408 RMD160 da50a119f1080b516b98a82a1632c80792e9b828 SHA1 97bfca80134bc2da65b849f472f79a6fa292cd4f SHA256 83cd0c36f1d093461fc9cf081c3801102671ff3da66ed48c5222117daf1c50ca
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"
-}