Version bump, bug #150863.

Package-Manager: portage-2.1.2_pre1

5 files changed, 158 insertions, 8 deletions

diff --git a/www-apps/otrs/ChangeLog b/www-apps/otrs/ChangeLog
index 59bb6e469273..16f63e3d07b3 100644
--- a/www-apps/otrs/ChangeLog
+++ b/www-apps/otrs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apps/otrs
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.22 2006/10/20 02:45:53 rl03 Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/ChangeLog,v 1.23 2006/10/27 15:12:25 rl03 Exp $
+
+*otrs-2.1.2 (27 Oct 2006)
+
+  27 Oct 2006; Renat Lumpau <rl03@gentoo.org> +files/dbi_finish.patch,
+  +otrs-2.1.2.ebuild:
+  Version bump, bug #150863.
 
   20 Oct 2006; Renat Lumpau <rl03@gentoo.org> -files/postinstall-en.txt,
   -files/reconfig, -otrs-1.3.2.ebuild, -otrs-2.0.3.ebuild,
diff --git a/www-apps/otrs/Manifest b/www-apps/otrs/Manifest
index 089f9a3b3e35..ae2afa5a7431 100644
--- a/www-apps/otrs/Manifest
+++ b/www-apps/otrs/Manifest
@@ -9,6 +9,10 @@ AUX apache2.patch 902 RMD160 31b347629f98345347e3da00c8bd0cc9a1b37402 SHA1 d19ef
 MD5 f47d2140cdd984fb31b2f468719d94e9 files/apache2.patch 902
 RMD160 31b347629f98345347e3da00c8bd0cc9a1b37402 files/apache2.patch 902
 SHA256 ec41ed9e0d851d5f6546acaedd22677aad43f7944449944d6cf73989aaa37b3c files/apache2.patch 902
+AUX dbi_finish.patch 293 RMD160 7178dee7a8f250733510feb9ffdbe6bd9b044429 SHA1 a4a16eaca625edb53cee172262b93989ab82c7fd SHA256 5ab5d742efb0c6287d4571178f711bcfc18e0bfa700f0efed33576519a02c6d4
+MD5 be69c6e96d4c057dceb28c7a24b1355a files/dbi_finish.patch 293
+RMD160 7178dee7a8f250733510feb9ffdbe6bd9b044429 files/dbi_finish.patch 293
+SHA256 5ab5d742efb0c6287d4571178f711bcfc18e0bfa700f0efed33576519a02c6d4 files/dbi_finish.patch 293
 AUX postinstall-en-2.txt 658 RMD160 c84a3fd4903cb275cd9c03f2b4b4d6d3712d6e8a SHA1 498330839a1e3c48cd0c3814c8bb0502e04ebb71 SHA256 da29ef51be6ea4558583854ad988476a20ea1b3a9e3c6074d6b1c6480e919ff9
 MD5 85b123d401ced4533fb3c308145c3164 files/postinstall-en-2.txt 658
 RMD160 c84a3fd4903cb275cd9c03f2b4b4d6d3712d6e8a files/postinstall-en-2.txt 658
@@ -18,14 +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.2.tar.bz2 12570909 RMD160 bb097eae5709ebe64287ed62907bea8a399224bd SHA1 faf9e94010995633e27a486b176ed72239f51aa2 SHA256 c2f5f2691f13803cb4e99113d96f52da157cf9d58393acd75179e314ca536440
 EBUILD otrs-2.0.4.ebuild 3193 RMD160 b7ce08f9d6aefaf2a1f32bade0ad38a86999f16f SHA1 4927de4409d22262485561211c3e4fc0b9fae28e SHA256 947594b61a2032533f2514f4b02aaa2a210b04368df4b41ba55b41ecb1bda7f9
 MD5 cba48e780f519e6fd67212e2fcf37a4e otrs-2.0.4.ebuild 3193
 RMD160 b7ce08f9d6aefaf2a1f32bade0ad38a86999f16f otrs-2.0.4.ebuild 3193
 SHA256 947594b61a2032533f2514f4b02aaa2a210b04368df4b41ba55b41ecb1bda7f9 otrs-2.0.4.ebuild 3193
-MISC ChangeLog 3384 RMD160 fcc7179896e7f2c404c404a2125934dba5a03402 SHA1 52369128df0797c2108f721f282f56d6e9d2aa38 SHA256 ef2bf009ce9e1798277dd22da5477b6023d2887724c8166a2f2d6f6c0137bfde
-MD5 1c3a3496cfe49766e09c163b2f0164cc ChangeLog 3384
-RMD160 fcc7179896e7f2c404c404a2125934dba5a03402 ChangeLog 3384
-SHA256 ef2bf009ce9e1798277dd22da5477b6023d2887724c8166a2f2d6f6c0137bfde ChangeLog 3384
+EBUILD otrs-2.1.2.ebuild 3309 RMD160 9434bb860d975fc8a1dc19245347f131b72faeaa SHA1 963ee1ac052b96e76b81abe6c01a8d1e4422e7d9 SHA256 53930b808cccd09382214a04bfd95e7e2bfabd36e0416d89eecc4d50a26484f2
+MD5 a96d3156d2fcd890e2cd6371f8399e79 otrs-2.1.2.ebuild 3309
+RMD160 9434bb860d975fc8a1dc19245347f131b72faeaa otrs-2.1.2.ebuild 3309
+SHA256 53930b808cccd09382214a04bfd95e7e2bfabd36e0416d89eecc4d50a26484f2 otrs-2.1.2.ebuild 3309
+MISC ChangeLog 3534 RMD160 0bfee20b9d96450dfd1655e66d69b7528c31193a SHA1 f8a888a14541236f05f0b05ac420d9ebf163aea5 SHA256 767ba30a9947205b1b82f97db43f044dced057ff1b1b591fc778753028ddcaab
+MD5 86fe41073755dbf646620e4658c3d703 ChangeLog 3534
+RMD160 0bfee20b9d96450dfd1655e66d69b7528c31193a ChangeLog 3534
+SHA256 767ba30a9947205b1b82f97db43f044dced057ff1b1b591fc778753028ddcaab ChangeLog 3534
 MISC metadata.xml 221 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 SHA1 0f301c536f2b097bd3ff21cc1dd05fe6d8f4713e SHA256 e9d20baa1edc4def48ad57c9620d3d0ee361888408261619ff9ea9edb47ce67a
 MD5 224c312cc23d02aa06c26a4da3cc1f90 metadata.xml 221
 RMD160 cb776d24349e87dce7784e24e35d9d84f91da1f7 metadata.xml 221
@@ -33,10 +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 8c9831f3be2830a34e0dd0871f76e384 files/digest-otrs-2.1.2 241
+RMD160 11520ecc287763be667d3e7fcf9214f129a796f6 files/digest-otrs-2.1.2 241
+SHA256 f5e26b5d9725d90a2318b1e8877a01bb415681431c982c09370894f8054ba4ea files/digest-otrs-2.1.2 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFFODhxEzitwsaoONoRAmhDAKCwfTaR4yPYsGFWjTDYStPVd/I5pgCg0gAt
-rrsoy00j/yfTt5ueAyAKYD8=
-=bQi8
+iD8DBQFFQiHjEzitwsaoONoRAp1RAJ9zyC/Tw1u1pdKLg5ExQIxBo2ZEwwCgmJJu
+fKjIaD9ky7Q4fAljAdj/Y1c=
+=5wmM
 -----END PGP SIGNATURE-----
diff --git a/www-apps/otrs/files/dbi_finish.patch b/www-apps/otrs/files/dbi_finish.patch
new file mode 100644
index 000000000000..3817d586b966
--- /dev/null
+++ b/www-apps/otrs/files/dbi_finish.patch
@@ -0,0 +1,10 @@
+--- Kernel/System/DB.pm.old	Wed Jun 14 15:45:49 2006
++++ Kernel/System/DB.pm	Wed Jun 14 15:43:12 2006
+@@ -217,6 +217,7 @@
+         );
+     }
+     # do disconnect
++    $Self->{Curser}->finish() if (defined($Self->{Curser}));
+     $Self->{dbh}->disconnect() if ($Self->{dbh});
+     return 1;
+ }
diff --git a/www-apps/otrs/files/digest-otrs-2.1.2 b/www-apps/otrs/files/digest-otrs-2.1.2
new file mode 100644
index 000000000000..0c38975091d6
--- /dev/null
+++ b/www-apps/otrs/files/digest-otrs-2.1.2
@@ -0,0 +1,3 @@
+MD5 64f4fe22a089d848736c3ca72bf3c932 otrs-2.1.2.tar.bz2 12570909
+RMD160 bb097eae5709ebe64287ed62907bea8a399224bd otrs-2.1.2.tar.bz2 12570909
+SHA256 c2f5f2691f13803cb4e99113d96f52da157cf9d58393acd75179e314ca536440 otrs-2.1.2.tar.bz2 12570909
diff --git a/www-apps/otrs/otrs-2.1.2.ebuild b/www-apps/otrs/otrs-2.1.2.ebuild
new file mode 100644
index 000000000000..9b17033ae4cb
--- /dev/null
+++ b/www-apps/otrs/otrs-2.1.2.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apps/otrs/otrs-2.1.2.ebuild,v 1.1 2006/10/27 15:12:25 rl03 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-db/mysql-4* dev-perl/DBD-mysql )
+	postgres? ( dev-db/postgresql dev-perl/DBD-Pg )
+	apache2? ( >=net-www/apache-2
+		fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+		!fastcgi? ( =www-apache/libapreq2-2* ) )
+	!apache2? ( =net-www/apache-1*
+		fastcgi? ( dev-perl/FCGI net-www/mod_fastcgi )
+		!fastcgi? ( =www-apache/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
+}