From: Jeremy Huddleston <eradicator@gentoo.org>
Date: Wed, 30 Nov 2005 22:46:20 +0000 (+0000)
Subject: Version bump.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a3f8d1014b6c46ca81ecc3bd73b6e96af23f68e3;p=gentoo.git

Version bump.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/www-apps/open-xchange/ChangeLog b/www-apps/open-xchange/ChangeLog
index bfd981c2a5c1..3af024f96bd0 100644
--- a/www-apps/open-xchange/ChangeLog
+++ b/www-apps/open-xchange/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-apps/open-xchange
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.10 2005/11/20 16:59:49 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.11 2005/11/30 22:46:20 eradicator Exp $
+
+*open-xchange-0.8.1.5 (30 Nov 2005)
+
+  30 Nov 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  -files/open-xchange-0.8.1.2-reply.patch,
+  +files/open-xchange-0.8.1.5-oxFolder.patch, +files/ox_reminder.sql,
+  open-xchange-0.8.0.6.ebuild, -open-xchange-0.8.1.2.ebuild,
+  -open-xchange-0.8.1.3.ebuild, -open-xchange-0.8.1.3-r1.ebuild,
+  +open-xchange-0.8.1.5.ebuild:
+  Version bump.
 
   20 Nov 2005; Stuart Herbert <stuart@gentoo.org> open-xchange-0.8.0.6.ebuild,
   open-xchange-0.8.1.2.ebuild, open-xchange-0.8.1.3-r1.ebuild,
diff --git a/www-apps/open-xchange/Manifest b/www-apps/open-xchange/Manifest
index 7027a0de30e1..8e8a506590f1 100644
--- a/www-apps/open-xchange/Manifest
+++ b/www-apps/open-xchange/Manifest
@@ -1,16 +1,23 @@
-MD5 7f5e1fd37dafbd470db23082f75bec44 ChangeLog 2026
-MD5 a339b15041bb6d450a7535f3df1fcc4c metadata.xml 247
-MD5 b8aa72c558406ead126ebc80b0e3a190 open-xchange-0.8.1.2.ebuild 21768
-MD5 77b42974858361e1f5400203c4ff8977 open-xchange-0.8.1.3.ebuild 21671
-MD5 2f0f8a27fcb26fd1ee44317fbcae53dd open-xchange-0.8.0.6.ebuild 22299
-MD5 7cacbe6ec67fc6217308ae3257a9d393 open-xchange-0.8.1.3-r1.ebuild 22302
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 07160f6b6760098cb517bfaa2434ea1c ChangeLog 2412
 MD5 cfa72c4f5e62b779052acf1cd629234b files/88_mod_jk.ox.conf 1228
-MD5 ec8d72f6da3dbefde48787a53fa071bf files/digest-open-xchange-0.8.1.2 138
-MD5 6c1195bc1dd228bf7108e508aa8ef20f files/digest-open-xchange-0.8.1.3 138
+MD5 9bc76a01ee94faa11aaf1e5b47f59236 files/digest-open-xchange-0.8.0.6 138
+MD5 33e4a0d6040f26db82ba3de6f9e4f7d4 files/digest-open-xchange-0.8.1.5 138
 MD5 5388f979621c5e4d333aef5cd37f0062 files/init.d.open-xchange 1877
 MD5 b9bb53f0dd8125a862c1cbc45ab7c06f files/open-xchange-0.8.1.2-login.patch 638
-MD5 aba374392dbfe403d7b11f84e8a33a31 files/open-xchange-0.8.1.2-reply.patch 750
+MD5 f7cf85b70e2c9930e965a10daf42d695 files/open-xchange-0.8.1.5-oxFolder.patch 676
 MD5 7d1504e4241974d3583575b3827b0f5a files/open-xchange-htaccess 174
+MD5 4c772a7e944bed0e5f8e17b99cb32939 files/ox_reminder.sql 178
 MD5 2ad5cb7b97eca4314016247cde421449 files/slapd.ox.inc 2019
-MD5 9bc76a01ee94faa11aaf1e5b47f59236 files/digest-open-xchange-0.8.0.6 138
-MD5 a1eab7fcc69e1e1c85072befb227fc41 files/digest-open-xchange-0.8.1.3-r1 138
+MD5 a339b15041bb6d450a7535f3df1fcc4c metadata.xml 247
+MD5 897f33f32e7bc95a602c3ddcf3a7f6eb open-xchange-0.8.0.6.ebuild 21246
+MD5 b3b53f1297c1003133a13aa839f65c1e open-xchange-0.8.1.5.ebuild 21469
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDjivOOpjtAl+gMRURAo9IAJ49iM+sdqMTBLXMgCPGRbC0mPFDvQCeNWQ0
+B7Wrz5VjECnJxkao1163ojw=
+=3Gco
+-----END PGP SIGNATURE-----
diff --git a/www-apps/open-xchange/files/digest-open-xchange-0.8.1.2 b/www-apps/open-xchange/files/digest-open-xchange-0.8.1.2
deleted file mode 100644
index 1bcc92b02f45..000000000000
--- a/www-apps/open-xchange/files/digest-open-xchange-0.8.1.2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8ee51d4f56e32a3fdc0b5b381abafd91 open-xchange-0.8.1-2.tar.bz2 1619275
-MD5 0c390658072367c892ce5ff423a02def Crystal_OX_Theme.tgz 53788
diff --git a/www-apps/open-xchange/files/digest-open-xchange-0.8.1.3 b/www-apps/open-xchange/files/digest-open-xchange-0.8.1.3
deleted file mode 100644
index 56ecbbc17605..000000000000
--- a/www-apps/open-xchange/files/digest-open-xchange-0.8.1.3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 aee324c4957ba4ea465df0b8bbefbe8d open-xchange-0.8.1-3.tar.bz2 1639837
-MD5 0c390658072367c892ce5ff423a02def Crystal_OX_Theme.tgz 53788
diff --git a/www-apps/open-xchange/files/digest-open-xchange-0.8.1.3-r1 b/www-apps/open-xchange/files/digest-open-xchange-0.8.1.3-r1
deleted file mode 100644
index 258510ad17eb..000000000000
--- a/www-apps/open-xchange/files/digest-open-xchange-0.8.1.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 0c390658072367c892ce5ff423a02def Crystal_OX_Theme.tgz 53788
-MD5 aee324c4957ba4ea465df0b8bbefbe8d open-xchange-0.8.1-3.tar.bz2 1639837
diff --git a/www-apps/open-xchange/files/digest-open-xchange-0.8.1.5 b/www-apps/open-xchange/files/digest-open-xchange-0.8.1.5
new file mode 100644
index 000000000000..aafef5d614aa
--- /dev/null
+++ b/www-apps/open-xchange/files/digest-open-xchange-0.8.1.5
@@ -0,0 +1,2 @@
+MD5 0c390658072367c892ce5ff423a02def Crystal_OX_Theme.tgz 53788
+MD5 444e6e06649ddfa8095de01e4a68e68d open-xchange-0.8.1-5.tar.bz2 1685487
diff --git a/www-apps/open-xchange/files/open-xchange-0.8.1.2-reply.patch b/www-apps/open-xchange/files/open-xchange-0.8.1.2-reply.patch
deleted file mode 100644
index 38a1ff2c05d7..000000000000
--- a/www-apps/open-xchange/files/open-xchange-0.8.1.2-reply.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- open-xchange-0.8.1-2.orig/src/com/openexchange/webmail/ComposeMessage.java	2005-08-26 08:08:58.000000000 -0700
-+++ open-xchange-0.8.1-2/src/com/openexchange/webmail/ComposeMessage.java	2005-10-01 11:38:34.000000000 -0700
-@@ -408,8 +408,8 @@ public class ComposeMessage {
- 		    
- 		} else if (!wms.draft && tmp_wms.getFrom() != null) {
- 		    String rht = no.getCode("reply_header_text");
--		    rht = rht.replaceAll("${date}", tmp_wms.getSentDate());
--		    rht = rht.replaceAll("${from}", WebmailTools.htmlFormat(tmp_wms.getFrom()));
-+		    rht = rht.replaceAll("\\$\\{date\\}", tmp_wms.getSentDate());
-+		    rht = rht.replaceAll("\\$\\{from\\}", WebmailTools.htmlFormat(tmp_wms.getFrom()));
- 		    mailtext.append(rht + "\n\n");
- 		    
- 		}
diff --git a/www-apps/open-xchange/files/open-xchange-0.8.1.5-oxFolder.patch b/www-apps/open-xchange/files/open-xchange-0.8.1.5-oxFolder.patch
new file mode 100644
index 000000000000..52433544f2fd
--- /dev/null
+++ b/www-apps/open-xchange/files/open-xchange-0.8.1.5-oxFolder.patch
@@ -0,0 +1,14 @@
+--- system/www/groupware/javascript/oxFolder.js.old	2005-11-28 22:31:25.000000000 +0100
++++ system/www/groupware/javascript/oxFolder.js	2005-11-28 22:05:18.000000000 +0100
+@@ -24,9 +24,9 @@
+     menuSelection=ediv[2];
+     selectedFolderID=ediv[3];
+     selectedFolder=selectedElement;
+-    if (selectedElement.id.indexOf("|txt") != -1)
++    if (selectedElement.id.indexOf("|txt") == -1)
+        selectedFolder=document.getElementById(selectedElement.id+"|txt");
+-    selectedFolderName=selectedFolder.firstChild.nodeValue;
++    selectedFolderName=(selectedFolder ? selectedFolder.firstChild.nodeValue : "unkown");
+   }
+   if (window.Event && !document.all) {
+     x=e.pageX;
diff --git a/www-apps/open-xchange/files/ox_reminder.sql b/www-apps/open-xchange/files/ox_reminder.sql
new file mode 100644
index 000000000000..84e6c1e912b5
--- /dev/null
+++ b/www-apps/open-xchange/files/ox_reminder.sql
@@ -0,0 +1,10 @@
+CREATE TABLE "reminder" (
+		"object_id" int,
+		"target_id" text,
+		"module" int,
+		"username" text,
+		"alarm" timestamp with time zone,
+		"description" text,
+		"folder" text
+);
+
diff --git a/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild b/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild
index 893a356104b8..9a59b252fbe8 100644
--- a/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild,v 1.2 2005/11/20 16:59:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.0.6.ebuild,v 1.3 2005/11/30 22:46:20 eradicator Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 RESTRICT="primaryuri"
 
-IUSE="ssl doc webdav mysql postgres"
+IUSE="ssl doc webdav"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -37,9 +37,8 @@ RDEPEND=">=virtual/jre-1.4
 	 dev-perl/Authen-SASL
 	 dev-perl/Convert-ASN1
 	 dev-perl/perl-ldap
-	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
-	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
-	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
+	 net-www/webapp-config
+	 ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql
 	 ssl? ( dev-libs/openssl dev-perl/IO-Socket-SSL )"
 
 # COMMENT: Why is the jdbc requirement set to 7.4.5 and not >=7.4.5?
@@ -53,7 +52,9 @@ RDEPEND="${RDEPEND}
 	 app-admin/sudo"
 
 use_postgres() {
-	use postgres || ! use mysql
+	true
+	# MySQL not yet supported
+	# use postgres || ! use mysql
 }
 
 #parameter $1 == 1 for config part or == 0 for preinst
@@ -185,8 +186,10 @@ ox_setup_tomcat(){
 		local PROFILE="$(sed -n "s:^PROFILE=\(.*\):\1:p" /etc/conf.d/tomcat-5)"
 		local CATALINA_BASE="$(sed -n "s:^CATALINA_BASE=\(.*\)/$.*:\1:p" /etc/conf.d/tomcat-5)"
 		SERVLETDIR="${CATALINA_BASE}/${PROFILE}/webapps"
+		TOMCAT_SHARED_LIB="${CATALINA_BASE}/${PROFILE}/shared/lib"
 	else
 		SERVLETDIR="${TOMCAT_DIR}/webapps"
+		TOMCAT_SHARED_LIB="${TOMCAT_DIR}/shared/lib"
 	fi
 }
 
@@ -241,33 +244,13 @@ src_compile() {
 	local myconf
 	local tempvar
 
-	if use_postgres ; then
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc3-postgresql/lib/jdbc3-postgresql.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=org.postgresql.Driver"
-	else
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc-mysql/lib/mysql-connector-java-3.0.11-stable-bin.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=com.mysql.jdbc.Driver"
-	fi
-
+	myconf="${myconf} --with-jdbcjar=$(java-config -p jdbc3-postgresql)"
 	myconf="${myconf} $(use_enable doc) $(use_enable webdav) $(use_enable ssl)"
-
 	myconf="${myconf} --with-servletdir=${SERVLETDIR}"
-
 	myconf="${myconf} --with-jsdkjar=${TOMCAT_DIR}/common/lib/servlet-api.jar"
-
 	myconf="${myconf} --with-mailjar=/usr/share/sun-javamail-bin/lib/mail.jar"
 	myconf="${myconf} --with-activationjar=/usr/share/sun-jaf-bin/lib/activation.jar"
-	myconf="${myconf} --with-jdomjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdom[^]]*\).*:\1:p" | head -n 1))"
+	myconf="${myconf} --with-jdomjar=$(java-config -p jdom-1.0)"
 	myconf="${myconf} --with-xercesjar=/usr/share/xerces-2/lib/xercesImpl.jar"
 	myconf="${myconf} --with-jni-dir=$(java-config -O)/include"
 	myconf="${myconf} --with-runuid=tomcat"
@@ -336,13 +319,14 @@ src_install() {
 	if has_version '<www-servers/tomcat-5.0.28-r4' ; then
 		dosed 's:tomcat-5:tomcat5:' /etc/init.d/open-xchange
 	fi
-
+	
+	
 	insinto ${SERVLETDIR}
 	doins lib/*.war
 
 	# chown of war-files or tomcat gets problems with stopping itself
 	for x in umin.war servlet.war ; do
-		fowners tomcat:tomcat ${SERVLETDIR}${x}
+		fowners tomcat:tomcat ${SERVLETDIR}/${x}
 	done
 
 	# Change default icon theme
@@ -364,9 +348,15 @@ src_install() {
 	dosym ../../../etc/openldap/schema/openxchange.schema /usr/share/open-xchange/openxchange.schema
 	dosym ../../openldap/ldap.conf /etc/open-xchange/groupware/ldap.conf
 	dosym ../../openldap/ldap.conf /etc/open-xchange/webmail/ldap.conf
-	#create symlink to ssl directory for webmail
-	dosym /etc/open-xchange/groupware/sslcerts /etc/open-xchange/webmail/sslcerts
-
+	
+	if use ssl ; then
+	    #create symlink to ssl directory for webmail
+	    dosym /etc/open-xchange/groupware/sslcerts /etc/open-xchange/webmail/sslcerts
+	    #and to get the setup part working
+		dodir ${TOMCAT_SHARED_LIB}
+	    dosym /usr/lib/open-xchange/liboxssl.so ${TOMCAT_SHARED_LIB}/liboxssl.so
+	fi
+	
 	for x in settings/intranet settings/webmail filespool drafts webmailupload dictionary ; do
 		keepdir /var/open-xchange/${x}
 		fowners tomcat:tomcat /var/open-xchange/${x}
@@ -423,12 +413,15 @@ pkg_preinst(){
 		# copying the groupware-key and -cert the way ox would like it to have
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarekey.pem
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarecert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarereq.pem
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondkey.pem
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondcert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondreq.pem
 		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.pem
 		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.pem
+		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.csr
+		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.csr
+		
+		chown -R tomcat:apache ${D}/etc/open-xchange/groupware/sslcerts
+		find ${D}/etc/open-xchange/groupware/sslcerts -name '*.pem' -exec chmod 440 {} \;
 	fi
 }
 
@@ -487,6 +480,7 @@ get_user_config() {
 pkg_config() {
 	ox_setup_tomcat
 	#execute ox_setup from pkg_config(1)
+	## at first automatially change config in init_ldap.ldif and configuration-files
 	ox_setup 1
 
 	chown -R tomcat:tomcat ${ROOT}/etc/open-xchange
@@ -509,40 +503,30 @@ pkg_config() {
 	einfo "======================"
 
 	echo
-	einfo "And set JAVA_OPTS in /etc/conf.d/tomcat5 (or tomcat-5):"
+	einfo "Set JAVA_OPTS in /etc/conf.d/tomcat5 (or tomcat-5):"
 	einfo "JAVA_OPTS=\"-Dopenexchange.propfile=${ROOT}etc/open-xchange/groupware/system.properties\""
+	if use ssl ; then
+	    einfo "CATALINA_OPTS=\"\${CATALINA_OPTS} -Djava.library.path=${TOMCAT_SHARED_LIB}\""
+	fi
 
 	echo
-	einfo "And setup /etc/conf.d/apache2"
+	einfo "Setup /etc/conf.d/apache2"
 	einfo "APACHE2_OPTS=\"-D JK\""
 
 	echo
-	einfo "And setup /etc/conf.d/postgresql"
+	einfo "Setup /etc/conf.d/postgresql"
 	einfo "PGOPTS=\"-i\""
 
 	# Tell the user how to propegate ldap and the db
-	## at first automatially change config in init_ldap.ldif and configuration-files
-
 	## create ox-dbuser
 	echo
 	einfo "HOWTO: Setup database (following commands)"
 	einfo "++++++++++++++++++++++++++++++++++++++++++"
 
-	if use_postgres ; then
-		einfo "echo \"CREATE USER ${OX_DBUSER} WITH PASSWORD '${OX_DBPASS}' CREATEDB NOCREATEUSER\" | psql -h localhost -U postgres template1 -f -"
-		einfo "echo \"CREATE DATABASE ${OX_DBNAME} WITH OWNER=${OX_DBUSER} ENCODING='UNICODE'\" | psql -h localhost -U postgres template1 -f -"
-		einfo "psql -U ${OX_DBUSER} ${OX_DBNAME} < ${ROOT}usr/share/open-xchange/init_database.sql"
-		einfo "/usr/sbin/dbinit_ox"
-	else
-		# COMMENT: we should tell them how to setup mysql also...
-		einfo "MySQL instructions coming soon..."
-		# some pre information
-		# add user
-		# INSERT INTO user (Host, User, Password) VALUES ('localhost','${OX_DBUSER}',PASSWORD('${OX_DBPASS}'));
-		# FLUSH PRIVILIGES;
-		# add database
-		# CREATE DATABASE ${OX_DBNAME};
-	fi
+	einfo "echo \"CREATE USER ${OX_DBUSER} WITH PASSWORD '${OX_DBPASS}' CREATEDB NOCREATEUSER\" | psql -h localhost -U postgres template1 -f -"
+	einfo "echo \"CREATE DATABASE ${OX_DBNAME} WITH OWNER=${OX_DBUSER} ENCODING='UNICODE'\" | psql -h localhost -U postgres template1 -f -"
+	einfo "psql -U ${OX_DBUSER} ${OX_DBNAME} < ${ROOT}usr/share/open-xchange/init_database.sql"
+	einfo "/usr/sbin/dbinit_ox"
 
 	## initialise database with ox, after configurations have been changed	
 	echo
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
deleted file mode 100644
index 6fec1bcfd719..000000000000
--- a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
+++ /dev/null
@@ -1,565 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.8 2005/11/20 16:59:50 stuart Exp $
-
-inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
-
-MY_PV=$(replace_version_separator 3 '-')
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A Collaboration and Integration Server Environment"
-HOMEPAGE="http://www.open-xchange.org/"
-SRC_URI="http://mirror.open-xchange.org/download/${MY_P}.tar.bz2
-	 http://www.mikefetherston.ca/OX/Crystal_OX_Theme.tgz"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-RESTRICT="primaryuri"
-
-IUSE="ssl doc webdav mysql postgres"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=virtual/jre-1.4
-	 >=dev-java/java-config-1.2
-	 >=www-servers/tomcat-5.0.27-r6
-	 dev-perl/Net-SSLeay
-	 dev-java/jdom
-	 net-nds/openldap
-	 app-text/ispell
-	 dev-java/sun-javamail-bin
-	 dev-perl/XML-NamespaceSupport
-	 dev-perl/XML-SAX-Base
-	 dev-perl/Authen-SASL
-	 dev-perl/Convert-ASN1
-	 dev-perl/perl-ldap
-	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
-	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
-	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
-	 ssl? ( dev-libs/openssl dev-perl/IO-Socket-SSL )"
-
-# COMMENT: Why is the jdbc requirement set to 7.4.5 and not >=7.4.5?
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.4"
-
-RDEPEND="${RDEPEND}
-	 www-apache/mod_jk
-	 app-admin/sudo"
-
-use_postgres() {
-	use postgres || ! use mysql
-}
-
-pkg_setup() {
-	TOMCAT_DIR=`java-config -g CATALINA_HOME`
-	if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
-		# it is now installed to the profile-directory choosen from /etc/conf.d/tomcat-5
-		local PROFILE="$(sed -n "s:^PROFILE=\(.*\):\1:p" /etc/conf.d/tomcat-5)"
-		local CATALINA_BASE="$(sed -n "s:^CATALINA_BASE=\(.*\)/$.*:\1:p" /etc/conf.d/tomcat-5)"
-		SERVLETDIR="${CATALINA_BASE}/${PROFILE}/webapps"
-	else
-		SERVLETDIR="${TOMCAT_DIR}/webapps"
-	fi
-
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=734
-	epatch ${FILESDIR}/${P}-login.patch
-
-	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=762
-	epatch ${FILESDIR}/${P}-reply.patch
-
-	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=656
-	sed -i "s|\${DESTDIR}|\$(DESTDIR)|g" Makefile.am
-
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die
-	aclocal -I m4 || die
-	automake -a -f -c || die
-	autoheader || die
-	autoconf || die
-
-	# doing all preconfigure which can be done here
-	# correct ispell-handling of german dictionary
-	sed -i "s|-ddeutsch|-dgerman|g" conf/webmail/spellcheck.cfg
-
-	if use ssl; then
-		# change login.pm-script if ssl should be used
-		sed -i "s|connection_mode = 3;|connection_mode = 2;|g" src/misc/login/login.pm.in
-	fi
-
-	# change image- and link- to the open-xchange location
-	find groupware/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	find templates/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	find webmail/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-
-	find templates/ -regex '.*\.lang' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-
-	find system/www/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	find system/www/ -regex '.*\.js' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-
-	sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g" conf/groupware/system.properties.in
-	sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g" conf/webmail/system.properties.in
-}
-
-src_compile() {
-	local myconf
-	local tempvar
-
-	if use_postgres ; then
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc3-postgresql/lib/jdbc3-postgresql.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=org.postgresql.Driver"
-	else
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc-mysql/lib/mysql-connector-java-3.0.11-stable-bin.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=com.mysql.jdbc.Driver"
-	fi
-
-	myconf="${myconf} $(use_enable doc) $(use_enable webdav) $(use_enable ssl)"
-
-	myconf="${myconf} --with-servletdir=${SERVLETDIR}"
-
-#	if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
-		myconf="${myconf} --with-jsdkjar=${TOMCAT_DIR}/common/lib/servlet-api.jar"
-#	else
-#		myconf="${myconf} --with-jsdkjar=/usr/share/servletapi-2.4/lib/servlet-api.jar"
-#	fi
-
-	myconf="${myconf} --with-mailjar=/usr/share/sun-javamail-bin/lib/mail.jar"
-	myconf="${myconf} --with-activationjar=/usr/share/sun-jaf-bin/lib/activation.jar"
-	myconf="${myconf} --with-jdomjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdom[^]]*\).*:\1:p" | head -n 1))"
-	myconf="${myconf} --with-xercesjar=/usr/share/xerces-2/lib/xercesImpl.jar"
-	myconf="${myconf} --with-jni-dir=$(java-config -O)/include"
-	myconf="${myconf} --with-runuid=tomcat"
-	myconf="${myconf} --with-rungid=tomcat"
-	myconf="${myconf} --with-tomcatuser=tomcat"
-	myconf="${myconf} --with-htdocsdir=${MY_HTDOCSDIR}"
-	myconf="${myconf} --with-cgibindir=${MY_CGIBINDIR}"
-	myconf="${myconf} --sysconfdir=/etc/open-xchange"
-	myconf="${myconf} --datadir=/usr/share/open-xchange"
-	myconf="${myconf} --includedir=/usr/include/open-xchange"
-	myconf="${myconf} --libdir=/usr/$(get_libdir)/open-xchange"
-	myconf="${myconf} --localstatedir=/var/open-xchange"
-
-	econf ${myconf} || die "bad ./configure"
-
-	# replace the string "jikes" with "modern". We dont want to see all jikes warnings
-	sed -i "s|jikes|modern|g" build.xml
-
-	emake -j1 || die "make failed"
-
-	# use sudo instead of su for the startup script and
-	# correct var-log
-	for foo in groupware sessiond webmail ; do
-		sed -i "s:^\([\t ]*\)\(su \$USER.*$\):\1#\2:gI;s:^\([\t ]*\)#\(sudo -u \$USER.*\)$:\1\2:gI" system/etc/init.d/${foo}
-		sed -i "s|open-xchange/log|log/open-xchange|g" system/etc/init.d/${foo}
-	done
-
-	sed -i "s|open-xchange/log|log/open-xchange|g" conf/groupware/system.properties
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-
-	# Install this big thing
-	cd ${S}
-	make DESTDIR=${D} install || die "Failed on make install"
-
-	# copy the ldif.in file for better config-abilities in pkg_preinst
-	cp ${S}/system/setup/init_ldap.ldif.in ${D}/usr/share/open-xchange/init_ldap.ldif
-
-	# remove obsolete log-files they should be saved in /var/log/open-xchange
-	rm ${D}/var/open-xchange/log/groupware.log
-	rm ${D}/var/open-xchange/log/jserv.log
-	rm ${D}/var/open-xchange/log/sessiond.log
-	rm ${D}/var/open-xchange/log/webmail.log
-	rmdir ${D}/var/open-xchange/log/
-
-	# create log-dir
-	keepdir /var/log/open-xchange
-
-	# remove unessary war-files, they are needed for deploying application
-	rm ${D}/usr/lib/open-xchange/*.war
-
-	# remove empty include-dir
-	rmdir ${D}/usr/include/open-xchange/
-	rmdir ${D}/usr/include/
-
-	# remove unneeded init-script - not used by gentoo
-	rm ${D}/etc/open-xchange/init.d/openexchange
-
-	# Init script
-	newinitd "${FILESDIR}/init.d.open-xchange" open-xchange || die "newinitd failed"
-
-	if has_version '<www-servers/tomcat-5.0.28-r4' ; then
-		dosed 's:tomcat-5:tomcat5:' /etc/init.d/open-xchange
-	fi
-
-	insinto ${SERVLETDIR}
-	doins lib/*.war
-
-	# chown of war-files or tomcat gets problems with stopping itself
-	for x in umin.war servlet.war ; do
-		fowners tomcat:tomcat ${SERVLETDIR}${x}
-	done
-
-	# Change default icon theme
-	insinto ${MY_HTDOCSDIR}/cfintranet/images/top/EN/
-	insopts -m0644
-	doins ${WORKDIR}/*.png
-	insinto ${MY_HTDOCSDIR}/cfintranet/images/top/DE/
-	doins ${WORKDIR}/*.png
-
-	# now mark all items with meta-info for webapp-script
-	cd ${D}${MY_HTDOCSDIR}
-	for x in $(find . -type f -print) ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	# Put the schema in etc and symlink.  This way it's protected.
-	dodir /etc/openldap/schema
-	mv ${D}/usr/share/open-xchange/openxchange.schema ${D}/etc/openldap/schema
-	dosym ../../../etc/openldap/schema/openxchange.schema /usr/share/open-xchange/openxchange.schema
-	dosym ../../openldap/ldap.conf /etc/open-xchange/groupware/ldap.conf
-	dosym ../../openldap/ldap.conf /etc/open-xchange/webmail/ldap.conf
-
-	for x in settings/intranet settings/webmail filespool drafts webmailupload dictionary ; do
-		keepdir /var/open-xchange/${x}
-		fowners tomcat:tomcat /var/open-xchange/${x}
-	done
-
-	# Copy mod_jk file
-	insinto ${APACHE2_MODULES_CONFDIR}
-	doins ${FILESDIR}/88_mod_jk.ox.conf
-
-	# copy ldap-aci-file
-	insinto /etc/openldap/
-	doins ${FILESDIR}/slapd.ox.inc
-
-	# .htacces file
-	insinto ${MY_HTDOCSDIR}
-	newins ${FILESDIR}/${PN}-htaccess .htaccess
-
-	# Install webapp
-	webapp_src_install
-}
-
-pkg_preinst(){
-	# create user mailadmin, needed for mailsupport
-	enewuser mailadmin -1 -1 /dev/null users
-	_UID=`getent passwd mailadmin | awk -F : '{print $3}'`
-
-	# get the default guid of the group 'users'
-	OX_STDGID=`getent group users | awk -F : '{print $3}'`
-
-	# replace the SuSE group id 500 of users with the gentoo group id of the group 'users' for the mailadmin in ldif + uid
-	sed -i "s|500|${OX_STDGID}|g" ${D}/usr/share/open-xchange/init_ldap.ldif
-	sed -i "s|501|${_UID}|g" ${D}/usr/share/open-xchange/init_ldap.ldif
-
-	# configuring admintools.conf
-
-	# replace the SuSE standard group id 500 with the gentoo group id of the group 'users'
-	sed -i "s|500|${OX_STDGID}|g" ${D}/etc/open-xchange/admintools.conf
-	OX_STDGID=`expr ${OX_STDGID} + 1`
-	sed -i "s|501|${OX_STDGID}|g" ${D}/etc/open-xchange/admintools.conf
-
-	if use ssl ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Open Xchange}"
-		insinto /etc/open-xchange/groupware/sslcerts/oxCERTS
-		docert groupware sessiond
-
-		# copying the CA-certificate
-		dodir /etc/open-xchange/groupware/sslcerts/oxCA
-		cp ${T}/*ca.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCA/cacert.pem
-
-		# copying the groupware-key and -cert the way ox would like it to have
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarekey.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarecert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarereq.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondkey.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondcert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondreq.pem
-		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.pem
-		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.pem
-	fi
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	chgrp -R apache /var/open-xchange/*
-	einfo
-	einfo
-	einfo " ==========================================================="
-	einfo
-	einfo "        You have successfully installed Open-Xchange"
-	einfo
-	einfo " ==========================================================="
-	einfo
-	einfo "   o FILE LOCATIONS"
-	einfo "        1.  Configuration: /etc/open-xchange"
-	einfo "        2.  HTML Files: 	  /usr/share/open-xchange"
-	einfo
-	einfo "   o STARTING and STOPPING the Open-Xchange"
-	einfo "        /etc/init.d/openexchange start"
-	einfo "        /etc/init.d/openexchange stop"
-	einfo "        /etc/init.d/openexchange restart"
-	einfo
-	einfo "Execute the following command"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial open-xchange environment."
-	einfo
-
-	if has_version '=net-nds/openldap-2.1*' ; then
-		ewarn "You have got OpenLDAP-2.1.* installed."
-		ewarn "Please make sure you've got enabled aci support for this package."
-		ewarn "For more information: http://gentoo-wiki.com/HOWTO_Open-Xchange#OpenLDAP"
-		ewarn
-		ewarn "If you already have this done, ignore this warning"
-	fi
-}
-
-get_oxvar() {
-	local var=$1
-	more /etc/open-xchange/admintools.conf | sed -n "s:^\s*${var}=\"\(.*\)\":\1:p" | head -n 1
-}
-
-get_user_config() {
-	local default=$1
-	local desc=$2
-	local read_val;
-
-	echo -n "${desc}? [${default}] " 1>&2
-	read readval
-	if [[ -z ${readval} ]] ; then
-		echo ${default}
-	else
-		echo ${readval}
-	fi
-}
-
-pkg_config() {
-	pkg_setup
-
-	chown -R tomcat:tomcat ${ROOT}/etc/open-xchange
-
-	if use ssl ; then
-		chown -R tomcat:apache ${ROOT}/etc/open-xchange ${ROOT}/etc/open-xchange/groupware/sslcerts
-		find ${ROOT}/etc/open-xchange/groupware/sslcerts -name '*.pem' -exec chmod 440 {} \;
-	fi
-
-	# Simple defaults
-	local OX_DBHOST=${OX_DBHOST-"localhost"}
-	local OX_DBNAME=${OX_DBNAME-"open_xchange"}
-	local OX_DBUSER=${OX_DBUSER-"open_xchange"}
-	local OX_DBPASS=${OX_DBPASS-"secret"}
-	local OX_ORG=${OX_ORG-"My Organization"}
-	local OX_DOMAIN=${OX_DOMAIN-"example.org"}
-	local OX_LDAPSERVER=${OX_LDAPSERVER-"localhost"}
-	local OX_BASEDN=${OX_BASEDN-"dc=example,dc=org"}
-	local OX_ROOTDN=${OX_ROOTDN-"cn=Manager,${OX_BASEDN}"}
-	local OX_ROOTPW=${OX_ROOTPW-"secret"}
-
-	# Guess base on the installed config
-	if [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then
-		local temp_var
-		echo "Installation of OX detected"
-
-		temp_var=$(get_oxvar DEFAULT_SQL_HOST)
-		[[ -n ${temp_var} ]] && OX_DBHOST=${temp_var}
-
-		temp_var=$(get_oxvar DEFAULT_SQL_DB)
-		[[ -n ${temp_var} ]] && OX_DBNAME=${temp_var}
-
-		temp_var=$(get_oxvar DEFAULT_SQL_USER)
-		[[ -n ${temp_var} ]] && OX_DBUSER=${temp_var}
-
-		temp_var=$(get_oxvar DEFAULT_SQL_PASS)
-		[[ -n ${temp_var} ]] && OX_DBPASS=${temp_var}
-
-		temp_var=$(get_oxvar ORGA)
-		[[ -n ${temp_var} ]] && OX_ORG=${temp_var}
-
-		temp_var=$(get_oxvar BINDDN)
-		[[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var}
-
-		temp_var=$(get_oxvar BINDPW)
-		[[ -n ${temp_var} ]] && OX_ROOTPW=${temp_var}
-
-		if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then
-			# taken from admintools.conf self
-			temp_var=`grep -v '^#' ${ROOT}/etc/open-xchange/groupware/ldap.conf | grep -i BASE | head -n 1 | awk {'print $2'}`
-			[[ -n ${temp_var} ]] && OX_BASEDN=${temp_var}
-		fi
-	fi
-
-	# Now asking the user
-	einfo "If values are correct just press enter else enter the new value"
-
-	OX_DBHOST=$(get_user_config "${OX_DBHOST}" "Database Host")
-	OX_DBNAME=$(get_user_config "${OX_DBNAME}" "Database Name")
-	OX_DBUSER=$(get_user_config "${OX_DBUSER}" "Database User")
-	OX_DBPASS=$(get_user_config "${OX_DBPASS}" "Database User's Password")
-	OX_ORG=$(get_user_config "${OX_ORG}" "Organization")
-	OX_DOMAIN=$(get_user_config "${OX_DOMAIN}" "Domain")
-	OX_LDAPSERVER=$(get_user_config "${OX_LDAPSERVER}" "LDAP Server")
-	OX_BASEDN=$(get_user_config "${OX_BASEDN}" "LDAP Base DN")
-	OX_ROOTDN=$(get_user_config "${OX_ROOTDN}" "LDAP Root DN")
-	OX_ROOTPW=$(get_user_config "${OX_ROOTPW}" "LDAP Root Password")
-
-	einfo "Finished - now writing config"
-
-	# patching umin.war, somehow dirty
-	[[ -d "${T}/ox_war" ]] && rm -rf ${T}/ox_war
-	mkdir -p ${T}/ox_war
-	unzip ${ROOT}/${SERVLETDIR}/umin.war -d ${T}/ox_war
-
-	sed -i "s|LDAP_SERVER=.*|LDAP_SERVER=${OX_LDAPSERVER}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|LDAP_BASEDN=.*|LDAP_BASEDN=${OX_BASEDN}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE=.*|SQL_SERVER_GROUPWARE=${OX_DBHOST}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_NAME=.*|SQL_SERVER_GROUPWARE_DATABASE_NAME=${OX_DBNAME}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_USERNAME=.*|SQL_SERVER_GROUPWARE_DATABASE_USERNAME=${OX_DBUSER}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_PASSWORD=.*|SQL_SERVER_GROUPWARE_DATABASE_PASSWORD=${OX_DBPASS}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|CSS_PATH=/cfintranet/css/stylesheet.css|CSS_PATH=/open-xchange/cfintranet/css/stylesheet.css|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-
-	cd ${T}/ox_war
-	zip -r -9 umin.war *
-	cp umin.war ${ROOT}/${SERVLETDIR}
-	cd ${ROOT}
-	rm -rf ${T}/ox_war
-
-	## now create configs with the right values
-	# starting with ldap
-	sed -i "s|@basedn@|${OX_BASEDN}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-	sed -i "s|@domain@|${OX_DOMAIN}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-	sed -i "s|@organization@|${OX_ORG}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-
-	local OX_BASEDC="`echo ${OX_BASEDN} | sed -n 's:dc=\([-A-Za-z_]*\).*:\1:p'|head -n 1`"
-	sed -i "s|@basedc@|${OX_BASEDC}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-
-	sed -i "s|ORGA=\".*\"|ORGA=\"${OX_ORG}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|BINDDN=\".*\"|BINDDN=\"${OX_ROOTDN}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|BINDPW=\".*\"|BINDPW=\"${OX_ROOTPW}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_HOST=\".*\"|DEFAULT_SQL_HOST=\"${OX_DBHOST}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_DB=\".*\"|DEFAULT_SQL_DB=\"${OX_DBNAME}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_USER=\".*\"|DEFAULT_SQL_USER=\"${OX_DBUSER}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_PASS=\".*\"|DEFAULT_SQL_PASS=\"${OX_DBPASS}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-
-	# setup correct acis
-	sed -i "s|@basedn@|${OX_BASEDN}|g" ${ROOT}/etc/openldap/slapd.ox.inc
-	chown ldap:ldap ${ROOT}/etc/openldap/slapd.ox.inc
-
-	# groupware : server.conf
-	for f in /etc/open-xchange/groupware/server.conf /etc/open-xchange/webmail/server.conf ; do
-		sed -i "s|NAS_CON_CLASS_NAME: jdbc:\(.*\)://.*|NAS_CON_CLASS_NAME: jdbc:\1://${OX_DBHOST}/${OX_DBNAME}|g" ${ROOT}/${f}
-		sed -i "s|NAS_CON_USER:.*|NAS_CON_USER: ${OX_DBUSER}|g" ${ROOT}/${f}
-		sed -i "s|NAS_CON_PASS:.*|NAS_CON_PASS: ${OX_DBPASS}|g" ${ROOT}/${f}
-		sed -i "s|NAS_CON_PASS:.*|NAS_CON_PASS: ${OX_DBPASS}|g" ${ROOT}/${f}
-	done
-
-	correctfilespool
-	echo
-	echo
-	einfo "======================"
-	einfo "Finished configuration"
-	einfo "======================"
-
-	echo
-	einfo "And set JAVA_OPTS in /etc/conf.d/tomcat5 (or tomcat-5):"
-	einfo "JAVA_OPTS=\"-Dopenexchange.propfile=${ROOT}/etc/open-xchange/groupware/system.properties\""
-
-	echo
-	einfo "And setup /etc/conf.d/apache2"
-	einfo "APACHE2_OPTS=\"-D JK\""
-
-	echo
-	einfo "And setup /etc/conf.d/postgresql"
-	einfo "PGOPTS=\"-i\""
-
-	# Tell the user how to propegate ldap and the db
-	## at first automatially change config in init_ldap.ldif and configuration-files
-
-	## create ox-dbuser
-	echo
-	einfo "HOWTO: Setup database (following commands)"
-	einfo "++++++++++++++++++++++++++++++++++++++++++"
-
-	if use_postgres ; then
-		einfo "echo \"CREATE USER ${OX_DBUSER} WITH PASSWORD '${OX_DBPASS}' CREATEDB NOCREATEUSER\" | psql -h localhost -U postgres template1 -f -"
-		einfo "echo \"CREATE DATABASE ${OX_DBNAME} WITH OWNER=${OX_DBUSER} ENCODING='UNICODE'\" | psql -h localhost -U postgres template1 -f -"
-		einfo "psql -U ${OX_DBUSER} ${OX_DBNAME} < ${ROOT}/usr/share/open-xchange/init_database.sql"
-		einfo "/usr/sbin/dbinit_ox"
-	else
-		# COMMENT: we should tell them how to setup mysql also...
-		einfo "MySQL instructions coming soon..."
-		# some pre information
-		# add user
-		# INSERT INTO user (Host, User, Password) VALUES ('localhost','${OX_DBUSER}',PASSWORD('${OX_DBPASS}'));
-		# FLUSH PRIVILIGES;
-		# add database
-		# CREATE DATABASE ${OX_DBNAME};
-	fi
-
-	## initialise database with ox, after configurations have been changed	
-	echo
-	echo
-	einfo "HOWTO: Setup OpenLDAP"
-	ewarn "Please make sure to STOP slapd to maintain database consistency (from slapadd(8c))!!!"
-	einfo "+++++++++++++++++++++++++++++++++"
-	einfo "/etc/init.d/slapd stop"
-	einfo
-	einfo "Add this to /etc/openldap/slapd.conf:"
-	einfo "include         /etc/openldap/schema/cosine.schema"
-	einfo "include         /etc/openldap/schema/inetorgperson.schema"
-	einfo "include         /etc/openldap/schema/misc.schema"
-	einfo "include         /etc/openldap/schema/nis.schema"
-	einfo "include         /etc/openldap/schema/openldap.schema"
-	einfo "include         /etc/openldap/schema/openxchange.schema"
-	einfo
-	einfo "If you want an initial set of access rights (enables your user, editing their password, ...)"
-	einfo "you should also add the following line:"
-	einfo "include         /etc/openldap/slapd.ox.inc"
-	einfo
-	einfo "slapadd -l /usr/share/open-xchange/init_ldap.ldif"
-	einfo
-	einfo "/etc/init.d/slapd start"
-
-	echo
-	echo
-	einfo "HOWTO: Add a group"
-	einfo "++++++++++++++++++"
-	einfo "This is suggested for correct webdav-access"
-	einfo "/usr/sbin/addgroup_ox --group=NEWGROUPNAME"
-
-	echo
-	echo
-	einfo "HOWTO: Add a user"
-	einfo "+++++++++++++++++"
-	einfo "/usr/sbin/adduser_ox --username=MYUSERNAME --password=MYPASSWORD --name=FORENAME --sname=SURENAME --maildomain=${OX_DOMAIN} --ox_timezone=\"Europe/Berlin\""
-	einfo "Now you can add the user to a group."
-	einfo "/usr/sbin/addusertogroup_ox --user=MYUSERNAME --group=NEWGROUPNAME"
-	echo
-	einfo "If you encounter any problems with this commands probably your ldap or database configuration is not correct"
-	echo
-	echo
-	einfo "Web Access:"
-	einfo "To access open-xchange via the web, point your browser to: http://localhost/cgi-bin/login.pl"
-}
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild
deleted file mode 100644
index 80da9fa6a8c3..000000000000
--- a/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild
+++ /dev/null
@@ -1,562 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.3.ebuild,v 1.3 2005/11/20 16:59:50 stuart Exp $
-
-inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
-
-MY_PV=$(replace_version_separator 3 '-')
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="A Collaboration and Integration Server Environment"
-HOMEPAGE="http://www.open-xchange.org/"
-SRC_URI="http://mirror.open-xchange.org/download/${MY_P}.tar.bz2
-	 http://www.mikefetherston.ca/OX/Crystal_OX_Theme.tgz"
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-RESTRICT="primaryuri"
-
-IUSE="ssl doc webdav mysql postgres"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=virtual/jre-1.4
-	 >=dev-java/java-config-1.2
-	 >=www-servers/tomcat-5.0.27-r6
-	 dev-perl/Net-SSLeay
-	 dev-java/jdom
-	 net-nds/openldap
-	 app-text/ispell
-	 dev-java/sun-javamail-bin
-	 dev-perl/XML-NamespaceSupport
-	 dev-perl/XML-SAX-Base
-	 dev-perl/Authen-SASL
-	 dev-perl/Convert-ASN1
-	 dev-perl/perl-ldap
-	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
-	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
-	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
-	 ssl? ( dev-libs/openssl dev-perl/IO-Socket-SSL )"
-
-# COMMENT: Why is the jdbc requirement set to 7.4.5 and not >=7.4.5?
-
-DEPEND="${RDEPEND}
-	app-arch/zip
-	>=virtual/jdk-1.4"
-
-RDEPEND="${RDEPEND}
-	 www-apache/mod_jk
-	 app-admin/sudo"
-
-use_postgres() {
-	use postgres || ! use mysql
-}
-
-pkg_setup() {
-	TOMCAT_DIR=`java-config -g CATALINA_HOME`
-	if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
-		# it is now installed to the profile-directory choosen from /etc/conf.d/tomcat-5
-		local PROFILE="$(sed -n "s:^PROFILE=\(.*\):\1:p" /etc/conf.d/tomcat-5)"
-		local CATALINA_BASE="$(sed -n "s:^CATALINA_BASE=\(.*\)/$.*:\1:p" /etc/conf.d/tomcat-5)"
-		SERVLETDIR="${CATALINA_BASE}/${PROFILE}/webapps"
-	else
-		SERVLETDIR="${TOMCAT_DIR}/webapps"
-	fi
-
-	webapp_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=734
-	epatch ${FILESDIR}/${PN}-0.8.1.2-login.patch
-
-	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=656
-	sed -i "s|\${DESTDIR}|\$(DESTDIR)|g" Makefile.am
-
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-	libtoolize --force --copy || die
-	aclocal -I m4 || die
-	automake -a -f -c || die
-	autoheader || die
-	autoconf || die
-
-	# doing all preconfigure which can be done here
-	# correct ispell-handling of german dictionary
-	sed -i "s|-ddeutsch|-dgerman|g" conf/webmail/spellcheck.cfg
-
-	if use ssl; then
-		# change login.pm-script if ssl should be used
-		sed -i "s|connection_mode = 3;|connection_mode = 2;|g" src/misc/login/login.pm.in
-	fi
-
-	# change image- and link- to the open-xchange location
-	find groupware/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	find templates/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	find webmail/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-
-	find templates/ -regex '.*\.lang' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-
-	find system/www/ -regex '.*\.htm' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-	find system/www/ -regex '.*\.js' |xargs sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g"
-
-	sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g" conf/groupware/system.properties.in
-	sed -i "s|/cfintranet/|/open-xchange/cfintranet/|g" conf/webmail/system.properties.in
-}
-
-src_compile() {
-	local myconf
-	local tempvar
-
-	if use_postgres ; then
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc3-postgresql/lib/jdbc3-postgresql.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=org.postgresql.Driver"
-	else
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc-mysql/lib/mysql-connector-java-3.0.11-stable-bin.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=com.mysql.jdbc.Driver"
-	fi
-
-	myconf="${myconf} $(use_enable doc) $(use_enable webdav) $(use_enable ssl)"
-
-	myconf="${myconf} --with-servletdir=${SERVLETDIR}"
-
-#	if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
-		myconf="${myconf} --with-jsdkjar=${TOMCAT_DIR}/common/lib/servlet-api.jar"
-#	else
-#		myconf="${myconf} --with-jsdkjar=/usr/share/servletapi-2.4/lib/servlet-api.jar"
-#	fi
-
-	myconf="${myconf} --with-mailjar=/usr/share/sun-javamail-bin/lib/mail.jar"
-	myconf="${myconf} --with-activationjar=/usr/share/sun-jaf-bin/lib/activation.jar"
-	myconf="${myconf} --with-jdomjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdom[^]]*\).*:\1:p" | head -n 1))"
-	myconf="${myconf} --with-xercesjar=/usr/share/xerces-2/lib/xercesImpl.jar"
-	myconf="${myconf} --with-jni-dir=$(java-config -O)/include"
-	myconf="${myconf} --with-runuid=tomcat"
-	myconf="${myconf} --with-rungid=tomcat"
-	myconf="${myconf} --with-tomcatuser=tomcat"
-	myconf="${myconf} --with-htdocsdir=${MY_HTDOCSDIR}"
-	myconf="${myconf} --with-cgibindir=${MY_CGIBINDIR}"
-	myconf="${myconf} --sysconfdir=/etc/open-xchange"
-	myconf="${myconf} --datadir=/usr/share/open-xchange"
-	myconf="${myconf} --includedir=/usr/include/open-xchange"
-	myconf="${myconf} --libdir=/usr/$(get_libdir)/open-xchange"
-	myconf="${myconf} --localstatedir=/var/open-xchange"
-
-	econf ${myconf} || die "bad ./configure"
-
-	# replace the string "jikes" with "modern". We dont want to see all jikes warnings
-	sed -i "s|jikes|modern|g" build.xml
-
-	emake -j1 || die "make failed"
-
-	# use sudo instead of su for the startup script and
-	# correct var-log
-	for foo in groupware sessiond webmail ; do
-		sed -i "s:^\([\t ]*\)\(su \$USER.*$\):\1#\2:gI;s:^\([\t ]*\)#\(sudo -u \$USER.*\)$:\1\2:gI" system/etc/init.d/${foo}
-		sed -i "s|open-xchange/log|log/open-xchange|g" system/etc/init.d/${foo}
-	done
-
-	sed -i "s|open-xchange/log|log/open-xchange|g" conf/groupware/system.properties
-}
-
-src_install() {
-	webapp_src_preinst
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README
-
-	# Install this big thing
-	cd ${S}
-	make DESTDIR=${D} install || die "Failed on make install"
-
-	# copy the ldif.in file for better config-abilities in pkg_preinst
-	cp ${S}/system/setup/init_ldap.ldif.in ${D}/usr/share/open-xchange/init_ldap.ldif
-
-	# remove obsolete log-files they should be saved in /var/log/open-xchange
-	rm ${D}/var/open-xchange/log/groupware.log
-	rm ${D}/var/open-xchange/log/jserv.log
-	rm ${D}/var/open-xchange/log/sessiond.log
-	rm ${D}/var/open-xchange/log/webmail.log
-	rmdir ${D}/var/open-xchange/log/
-
-	# create log-dir
-	keepdir /var/log/open-xchange
-
-	# remove unessary war-files, they are needed for deploying application
-	rm ${D}/usr/lib/open-xchange/*.war
-
-	# remove empty include-dir
-	rmdir ${D}/usr/include/open-xchange/
-	rmdir ${D}/usr/include/
-
-	# remove unneeded init-script - not used by gentoo
-	rm ${D}/etc/open-xchange/init.d/openexchange
-
-	# Init script
-	newinitd "${FILESDIR}/init.d.open-xchange" open-xchange || die "newinitd failed"
-
-	if has_version '<www-servers/tomcat-5.0.28-r4' ; then
-		dosed 's:tomcat-5:tomcat5:' /etc/init.d/open-xchange
-	fi
-
-	insinto ${SERVLETDIR}
-	doins lib/*.war
-
-	# chown of war-files or tomcat gets problems with stopping itself
-	for x in umin.war servlet.war ; do
-		fowners tomcat:tomcat ${SERVLETDIR}${x}
-	done
-
-	# Change default icon theme
-	insinto ${MY_HTDOCSDIR}/cfintranet/images/top/EN/
-	insopts -m0644
-	doins ${WORKDIR}/*.png
-	insinto ${MY_HTDOCSDIR}/cfintranet/images/top/DE/
-	doins ${WORKDIR}/*.png
-
-	# now mark all items with meta-info for webapp-script
-	cd ${D}${MY_HTDOCSDIR}
-	for x in $(find . -type f -print) ; do
-		webapp_serverowned ${MY_HTDOCSDIR}/$x
-	done
-
-	# Put the schema in etc and symlink.  This way it's protected.
-	dodir /etc/openldap/schema
-	mv ${D}/usr/share/open-xchange/openxchange.schema ${D}/etc/openldap/schema
-	dosym ../../../etc/openldap/schema/openxchange.schema /usr/share/open-xchange/openxchange.schema
-	dosym ../../openldap/ldap.conf /etc/open-xchange/groupware/ldap.conf
-	dosym ../../openldap/ldap.conf /etc/open-xchange/webmail/ldap.conf
-
-	for x in settings/intranet settings/webmail filespool drafts webmailupload dictionary ; do
-		keepdir /var/open-xchange/${x}
-		fowners tomcat:tomcat /var/open-xchange/${x}
-	done
-
-	# Copy mod_jk file
-	insinto ${APACHE2_MODULES_CONFDIR}
-	doins ${FILESDIR}/88_mod_jk.ox.conf
-
-	# copy ldap-aci-file
-	insinto /etc/openldap/
-	doins ${FILESDIR}/slapd.ox.inc
-
-	# .htacces file
-	insinto ${MY_HTDOCSDIR}
-	newins ${FILESDIR}/${PN}-htaccess .htaccess
-
-	# Install webapp
-	webapp_src_install
-}
-
-pkg_preinst(){
-	# create user mailadmin, needed for mailsupport
-	enewuser mailadmin -1 -1 /dev/null users
-	_UID=`getent passwd mailadmin | awk -F : '{print $3}'`
-
-	# get the default guid of the group 'users'
-	OX_STDGID=`getent group users | awk -F : '{print $3}'`
-
-	# replace the SuSE group id 500 of users with the gentoo group id of the group 'users' for the mailadmin in ldif + uid
-	sed -i "s|500|${OX_STDGID}|g" ${D}/usr/share/open-xchange/init_ldap.ldif
-	sed -i "s|501|${_UID}|g" ${D}/usr/share/open-xchange/init_ldap.ldif
-
-	# configuring admintools.conf
-
-	# replace the SuSE standard group id 500 with the gentoo group id of the group 'users'
-	sed -i "s|500|${OX_STDGID}|g" ${D}/etc/open-xchange/admintools.conf
-	OX_STDGID=`expr ${OX_STDGID} + 1`
-	sed -i "s|501|${OX_STDGID}|g" ${D}/etc/open-xchange/admintools.conf
-
-	if use ssl ; then
-		SSL_ORGANIZATION="${SSL_ORGANIZATION:-Open Xchange}"
-		insinto /etc/open-xchange/groupware/sslcerts/oxCERTS
-		docert groupware sessiond
-
-		# copying the CA-certificate
-		dodir /etc/open-xchange/groupware/sslcerts/oxCA
-		cp ${T}/*ca.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCA/cacert.pem
-
-		# copying the groupware-key and -cert the way ox would like it to have
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarekey.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarecert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarereq.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondkey.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondcert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondreq.pem
-		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.pem
-		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.pem
-	fi
-}
-
-pkg_postinst() {
-	webapp_pkg_postinst
-
-	chgrp -R apache /var/open-xchange/*
-	einfo
-	einfo
-	einfo " ==========================================================="
-	einfo
-	einfo "        You have successfully installed Open-Xchange"
-	einfo
-	einfo " ==========================================================="
-	einfo
-	einfo "   o FILE LOCATIONS"
-	einfo "        1.  Configuration: /etc/open-xchange"
-	einfo "        2.  HTML Files: 	  /usr/share/open-xchange"
-	einfo
-	einfo "   o STARTING and STOPPING the Open-Xchange"
-	einfo "        /etc/init.d/openexchange start"
-	einfo "        /etc/init.d/openexchange stop"
-	einfo "        /etc/init.d/openexchange restart"
-	einfo
-	einfo "Execute the following command"
-	einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
-	einfo "to setup the initial open-xchange environment."
-	einfo
-
-	if has_version '=net-nds/openldap-2.1*' ; then
-		ewarn "You have got OpenLDAP-2.1.* installed."
-		ewarn "Please make sure you've got enabled aci support for this package."
-		ewarn "For more information: http://gentoo-wiki.com/HOWTO_Open-Xchange#OpenLDAP"
-		ewarn
-		ewarn "If you already have this done, ignore this warning"
-	fi
-}
-
-get_oxvar() {
-	local var=$1
-	more /etc/open-xchange/admintools.conf | sed -n "s:^\s*${var}=\"\(.*\)\":\1:p" | head -n 1
-}
-
-get_user_config() {
-	local default=$1
-	local desc=$2
-	local read_val;
-
-	echo -n "${desc}? [${default}] " 1>&2
-	read readval
-	if [[ -z ${readval} ]] ; then
-		echo ${default}
-	else
-		echo ${readval}
-	fi
-}
-
-pkg_config() {
-	pkg_setup
-
-	chown -R tomcat:tomcat ${ROOT}/etc/open-xchange
-
-	if use ssl ; then
-		chown -R tomcat:apache ${ROOT}/etc/open-xchange ${ROOT}/etc/open-xchange/groupware/sslcerts
-		find ${ROOT}/etc/open-xchange/groupware/sslcerts -name '*.pem' -exec chmod 440 {} \;
-	fi
-
-	# Simple defaults
-	local OX_DBHOST=${OX_DBHOST-"localhost"}
-	local OX_DBNAME=${OX_DBNAME-"open_xchange"}
-	local OX_DBUSER=${OX_DBUSER-"open_xchange"}
-	local OX_DBPASS=${OX_DBPASS-"secret"}
-	local OX_ORG=${OX_ORG-"My Organization"}
-	local OX_DOMAIN=${OX_DOMAIN-"example.org"}
-	local OX_LDAPSERVER=${OX_LDAPSERVER-"localhost"}
-	local OX_BASEDN=${OX_BASEDN-"dc=example,dc=org"}
-	local OX_ROOTDN=${OX_ROOTDN-"cn=Manager,${OX_BASEDN}"}
-	local OX_ROOTPW=${OX_ROOTPW-"secret"}
-
-	# Guess base on the installed config
-	if [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then
-		local temp_var
-		echo "Installation of OX detected"
-
-		temp_var=$(get_oxvar DEFAULT_SQL_HOST)
-		[[ -n ${temp_var} ]] && OX_DBHOST=${temp_var}
-
-		temp_var=$(get_oxvar DEFAULT_SQL_DB)
-		[[ -n ${temp_var} ]] && OX_DBNAME=${temp_var}
-
-		temp_var=$(get_oxvar DEFAULT_SQL_USER)
-		[[ -n ${temp_var} ]] && OX_DBUSER=${temp_var}
-
-		temp_var=$(get_oxvar DEFAULT_SQL_PASS)
-		[[ -n ${temp_var} ]] && OX_DBPASS=${temp_var}
-
-		temp_var=$(get_oxvar ORGA)
-		[[ -n ${temp_var} ]] && OX_ORG=${temp_var}
-
-		temp_var=$(get_oxvar BINDDN)
-		[[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var}
-
-		temp_var=$(get_oxvar BINDPW)
-		[[ -n ${temp_var} ]] && OX_ROOTPW=${temp_var}
-
-		if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then
-			# taken from admintools.conf self
-			temp_var=`grep -v '^#' ${ROOT}/etc/open-xchange/groupware/ldap.conf | grep -i BASE | head -n 1 | awk {'print $2'}`
-			[[ -n ${temp_var} ]] && OX_BASEDN=${temp_var}
-		fi
-	fi
-
-	# Now asking the user
-	einfo "If values are correct just press enter else enter the new value"
-
-	OX_DBHOST=$(get_user_config "${OX_DBHOST}" "Database Host")
-	OX_DBNAME=$(get_user_config "${OX_DBNAME}" "Database Name")
-	OX_DBUSER=$(get_user_config "${OX_DBUSER}" "Database User")
-	OX_DBPASS=$(get_user_config "${OX_DBPASS}" "Database User's Password")
-	OX_ORG=$(get_user_config "${OX_ORG}" "Organization")
-	OX_DOMAIN=$(get_user_config "${OX_DOMAIN}" "Domain")
-	OX_LDAPSERVER=$(get_user_config "${OX_LDAPSERVER}" "LDAP Server")
-	OX_BASEDN=$(get_user_config "${OX_BASEDN}" "LDAP Base DN")
-	OX_ROOTDN=$(get_user_config "${OX_ROOTDN}" "LDAP Root DN")
-	OX_ROOTPW=$(get_user_config "${OX_ROOTPW}" "LDAP Root Password")
-
-	einfo "Finished - now writing config"
-
-	# patching umin.war, somehow dirty
-	[[ -d "${T}/ox_war" ]] && rm -rf ${T}/ox_war
-	mkdir -p ${T}/ox_war
-	unzip ${ROOT}/${SERVLETDIR}/umin.war -d ${T}/ox_war
-
-	sed -i "s|LDAP_SERVER=.*|LDAP_SERVER=${OX_LDAPSERVER}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|LDAP_BASEDN=.*|LDAP_BASEDN=${OX_BASEDN}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE=.*|SQL_SERVER_GROUPWARE=${OX_DBHOST}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_NAME=.*|SQL_SERVER_GROUPWARE_DATABASE_NAME=${OX_DBNAME}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_USERNAME=.*|SQL_SERVER_GROUPWARE_DATABASE_USERNAME=${OX_DBUSER}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|SQL_SERVER_GROUPWARE_DATABASE_PASSWORD=.*|SQL_SERVER_GROUPWARE_DATABASE_PASSWORD=${OX_DBPASS}|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-	sed -i "s|CSS_PATH=/cfintranet/css/stylesheet.css|CSS_PATH=/open-xchange/cfintranet/css/stylesheet.css|g" ${T}/ox_war/WEB-INF/classes/oxuserminconfig.properties
-
-	cd ${T}/ox_war
-	zip -r -9 umin.war *
-	cp umin.war ${ROOT}/${SERVLETDIR}
-	cd ${ROOT}
-	rm -rf ${T}/ox_war
-
-	## now create configs with the right values
-	# starting with ldap
-	sed -i "s|@basedn@|${OX_BASEDN}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-	sed -i "s|@domain@|${OX_DOMAIN}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-	sed -i "s|@organization@|${OX_ORG}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-
-	local OX_BASEDC="`echo ${OX_BASEDN} | sed -n 's:dc=\([-A-Za-z_]*\).*:\1:p'|head -n 1`"
-	sed -i "s|@basedc@|${OX_BASEDC}|g" ${ROOT}/usr/share/open-xchange/init_ldap.ldif
-
-	sed -i "s|ORGA=\".*\"|ORGA=\"${OX_ORG}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|BINDDN=\".*\"|BINDDN=\"${OX_ROOTDN}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|BINDPW=\".*\"|BINDPW=\"${OX_ROOTPW}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_HOST=\".*\"|DEFAULT_SQL_HOST=\"${OX_DBHOST}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_DB=\".*\"|DEFAULT_SQL_DB=\"${OX_DBNAME}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_USER=\".*\"|DEFAULT_SQL_USER=\"${OX_DBUSER}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-	sed -i "s|DEFAULT_SQL_PASS=\".*\"|DEFAULT_SQL_PASS=\"${OX_DBPASS}\"|g" ${ROOT}/etc/open-xchange/admintools.conf
-
-	# setup correct acis
-	sed -i "s|@basedn@|${OX_BASEDN}|g" ${ROOT}/etc/openldap/slapd.ox.inc
-	chown ldap:ldap ${ROOT}/etc/openldap/slapd.ox.inc
-
-	# groupware : server.conf
-	for f in /etc/open-xchange/groupware/server.conf /etc/open-xchange/webmail/server.conf ; do
-		sed -i "s|NAS_CON_CLASS_NAME: jdbc:\(.*\)://.*|NAS_CON_CLASS_NAME: jdbc:\1://${OX_DBHOST}/${OX_DBNAME}|g" ${ROOT}/${f}
-		sed -i "s|NAS_CON_USER:.*|NAS_CON_USER: ${OX_DBUSER}|g" ${ROOT}/${f}
-		sed -i "s|NAS_CON_PASS:.*|NAS_CON_PASS: ${OX_DBPASS}|g" ${ROOT}/${f}
-		sed -i "s|NAS_CON_PASS:.*|NAS_CON_PASS: ${OX_DBPASS}|g" ${ROOT}/${f}
-	done
-
-	correctfilespool
-	echo
-	echo
-	einfo "======================"
-	einfo "Finished configuration"
-	einfo "======================"
-
-	echo
-	einfo "And set JAVA_OPTS in /etc/conf.d/tomcat5 (or tomcat-5):"
-	einfo "JAVA_OPTS=\"-Dopenexchange.propfile=${ROOT}/etc/open-xchange/groupware/system.properties\""
-
-	echo
-	einfo "And setup /etc/conf.d/apache2"
-	einfo "APACHE2_OPTS=\"-D JK\""
-
-	echo
-	einfo "And setup /etc/conf.d/postgresql"
-	einfo "PGOPTS=\"-i\""
-
-	# Tell the user how to propegate ldap and the db
-	## at first automatially change config in init_ldap.ldif and configuration-files
-
-	## create ox-dbuser
-	echo
-	einfo "HOWTO: Setup database (following commands)"
-	einfo "++++++++++++++++++++++++++++++++++++++++++"
-
-	if use_postgres ; then
-		einfo "echo \"CREATE USER ${OX_DBUSER} WITH PASSWORD '${OX_DBPASS}' CREATEDB NOCREATEUSER\" | psql -h localhost -U postgres template1 -f -"
-		einfo "echo \"CREATE DATABASE ${OX_DBNAME} WITH OWNER=${OX_DBUSER} ENCODING='UNICODE'\" | psql -h localhost -U postgres template1 -f -"
-		einfo "psql -U ${OX_DBUSER} ${OX_DBNAME} < ${ROOT}/usr/share/open-xchange/init_database.sql"
-		einfo "/usr/sbin/dbinit_ox"
-	else
-		# COMMENT: we should tell them how to setup mysql also...
-		einfo "MySQL instructions coming soon..."
-		# some pre information
-		# add user
-		# INSERT INTO user (Host, User, Password) VALUES ('localhost','${OX_DBUSER}',PASSWORD('${OX_DBPASS}'));
-		# FLUSH PRIVILIGES;
-		# add database
-		# CREATE DATABASE ${OX_DBNAME};
-	fi
-
-	## initialise database with ox, after configurations have been changed	
-	echo
-	echo
-	einfo "HOWTO: Setup OpenLDAP"
-	ewarn "Please make sure to STOP slapd to maintain database consistency (from slapadd(8c))!!!"
-	einfo "+++++++++++++++++++++++++++++++++"
-	einfo "/etc/init.d/slapd stop"
-	einfo
-	einfo "Add this to /etc/openldap/slapd.conf:"
-	einfo "include         /etc/openldap/schema/cosine.schema"
-	einfo "include         /etc/openldap/schema/inetorgperson.schema"
-	einfo "include         /etc/openldap/schema/misc.schema"
-	einfo "include         /etc/openldap/schema/nis.schema"
-	einfo "include         /etc/openldap/schema/openldap.schema"
-	einfo "include         /etc/openldap/schema/openxchange.schema"
-	einfo
-	einfo "If you want an initial set of access rights (enables your user, editing their password, ...)"
-	einfo "you should also add the following line:"
-	einfo "include         /etc/openldap/slapd.ox.inc"
-	einfo
-	einfo "slapadd -l /usr/share/open-xchange/init_ldap.ldif"
-	einfo
-	einfo "/etc/init.d/slapd start"
-
-	echo
-	echo
-	einfo "HOWTO: Add a group"
-	einfo "++++++++++++++++++"
-	einfo "This is suggested for correct webdav-access"
-	einfo "/usr/sbin/addgroup_ox --group=NEWGROUPNAME"
-
-	echo
-	echo
-	einfo "HOWTO: Add a user"
-	einfo "+++++++++++++++++"
-	einfo "/usr/sbin/adduser_ox --username=MYUSERNAME --password=MYPASSWORD --name=FORENAME --sname=SURENAME --maildomain=${OX_DOMAIN} --ox_timezone=\"Europe/Berlin\""
-	einfo "Now you can add the user to a group."
-	einfo "/usr/sbin/addusertogroup_ox --user=MYUSERNAME --group=NEWGROUPNAME"
-	echo
-	einfo "If you encounter any problems with this commands probably your ldap or database configuration is not correct"
-	echo
-	echo
-	einfo "Web Access:"
-	einfo "To access open-xchange via the web, point your browser to: http://localhost/cgi-bin/login.pl"
-}
diff --git a/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild b/www-apps/open-xchange/open-xchange-0.8.1.5.ebuild
similarity index 87%
rename from www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild
rename to www-apps/open-xchange/open-xchange-0.8.1.5.ebuild
index 5f0e0da44691..be364fbf0357 100644
--- a/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.3-r1.ebuild,v 1.3 2005/11/20 16:59:50 stuart Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.5.ebuild,v 1.1 2005/11/30 22:46:20 eradicator Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -20,7 +20,7 @@ LICENSE="GPL-2"
 KEYWORDS="~x86"
 RESTRICT="primaryuri"
 
-IUSE="ssl doc webdav mysql postgres"
+IUSE="ssl doc webdav"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -30,16 +30,14 @@ RDEPEND=">=virtual/jre-1.4
 	 dev-perl/Net-SSLeay
 	 dev-java/jdom
 	 net-nds/openldap
-	 app-text/ispell
+	 app-text/aspell
 	 dev-java/sun-javamail-bin
 	 dev-perl/XML-NamespaceSupport
 	 dev-perl/XML-SAX-Base
 	 dev-perl/Authen-SASL
 	 dev-perl/Convert-ASN1
 	 dev-perl/perl-ldap
-	 mysql? ( !postgres? ( dev-java/jdbc-mysql >=dev-db/mysql-4.1 ) )
-	 !mysql? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
-	 postgres? ( ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql )
+	 ~dev-java/jdbc3-postgresql-7.4.5 dev-db/postgresql
 	 ssl? ( dev-libs/openssl dev-perl/IO-Socket-SSL )"
 
 # COMMENT: Why is the jdbc requirement set to 7.4.5 and not >=7.4.5?
@@ -52,10 +50,6 @@ RDEPEND="${RDEPEND}
 	 www-apache/mod_jk
 	 app-admin/sudo"
 
-use_postgres() {
-	use postgres || ! use mysql
-}
-
 #parameter $1 == 1 for config part or == 0 for preinst
 ox_setup(){
 	local config=$1
@@ -185,8 +179,10 @@ ox_setup_tomcat(){
 		local PROFILE="$(sed -n "s:^PROFILE=\(.*\):\1:p" /etc/conf.d/tomcat-5)"
 		local CATALINA_BASE="$(sed -n "s:^CATALINA_BASE=\(.*\)/$.*:\1:p" /etc/conf.d/tomcat-5)"
 		SERVLETDIR="${CATALINA_BASE}/${PROFILE}/webapps"
+		TOMCAT_SHARED_LIB="${CATALINA_BASE}/${PROFILE}/shared/lib"
 	else
 		SERVLETDIR="${TOMCAT_DIR}/webapps"
+		TOMCAT_SHARED_LIB="${TOMCAT_DIR}/shared/lib"
 	fi
 }
 
@@ -202,6 +198,7 @@ src_unpack() {
 
 	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=734
 	epatch ${FILESDIR}/${PN}-0.8.1.2-login.patch
+	epatch ${FILESDIR}/${PN}-0.8.1.5-oxFolder.patch
 
 	# http://www.open-xchange.org/cgi-bin/bugzilla/show_bug.cgi?id=656
 	sed -i "s|\${DESTDIR}|\$(DESTDIR)|g" Makefile.am
@@ -241,33 +238,13 @@ src_compile() {
 	local myconf
 	local tempvar
 
-	if use_postgres ; then
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-postgresql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc3-postgresql/lib/jdbc3-postgresql.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=org.postgresql.Driver"
-	else
-		tempvar="$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		if [[ -f "${tempvar}" && "${tempvar}" != "" ]]; then
-			myconf="${myconf} --with-jdbcjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdbc[^-]*-mysql[^]]*\).*:\1:p" | head -n 1))"
-		else
-			myconf="${myconf} --with-jdbcjar=/usr/share/jdbc-mysql/lib/mysql-connector-java-3.0.11-stable-bin.jar"
-		fi
-		myconf="${myconf} --with-dbdriver=com.mysql.jdbc.Driver"
-	fi
-
+	myconf="${myconf} --with-jdbcjar=$(java-config -p jdbc3-postgresql)"
 	myconf="${myconf} $(use_enable doc) $(use_enable webdav) $(use_enable ssl)"
-
 	myconf="${myconf} --with-servletdir=${SERVLETDIR}"
-
 	myconf="${myconf} --with-jsdkjar=${TOMCAT_DIR}/common/lib/servlet-api.jar"
-
 	myconf="${myconf} --with-mailjar=/usr/share/sun-javamail-bin/lib/mail.jar"
 	myconf="${myconf} --with-activationjar=/usr/share/sun-jaf-bin/lib/activation.jar"
-	myconf="${myconf} --with-jdomjar=$(java-config --classpath=$(java-config -l | sed -n "s:^\[\(jdom[^]]*\).*:\1:p" | head -n 1))"
+	myconf="${myconf} --with-jdomjar=$(java-config -p jdom-1.0)"
 	myconf="${myconf} --with-xercesjar=/usr/share/xerces-2/lib/xercesImpl.jar"
 	myconf="${myconf} --with-jni-dir=$(java-config -O)/include"
 	myconf="${myconf} --with-runuid=tomcat"
@@ -336,13 +313,14 @@ src_install() {
 	if has_version '<www-servers/tomcat-5.0.28-r4' ; then
 		dosed 's:tomcat-5:tomcat5:' /etc/init.d/open-xchange
 	fi
-
+	
+	
 	insinto ${SERVLETDIR}
 	doins lib/*.war
 
 	# chown of war-files or tomcat gets problems with stopping itself
 	for x in umin.war servlet.war ; do
-		fowners tomcat:tomcat ${SERVLETDIR}${x}
+		fowners tomcat:tomcat ${SERVLETDIR}/${x}
 	done
 
 	# Change default icon theme
@@ -364,9 +342,15 @@ src_install() {
 	dosym ../../../etc/openldap/schema/openxchange.schema /usr/share/open-xchange/openxchange.schema
 	dosym ../../openldap/ldap.conf /etc/open-xchange/groupware/ldap.conf
 	dosym ../../openldap/ldap.conf /etc/open-xchange/webmail/ldap.conf
-	#create symlink to ssl directory for webmail
-	dosym /etc/open-xchange/groupware/sslcerts /etc/open-xchange/webmail/sslcerts
-
+	
+	if use ssl ; then
+	    #create symlink to ssl directory for webmail
+	    dosym /etc/open-xchange/groupware/sslcerts /etc/open-xchange/webmail/sslcerts
+	    #and to get the setup part working
+		dodir ${TOMCAT_SHARED_LIB}
+	    dosym /usr/lib/open-xchange/liboxssl.so ${TOMCAT_SHARED_LIB}/liboxssl.so
+	fi
+	
 	for x in settings/intranet settings/webmail filespool drafts webmailupload dictionary ; do
 		keepdir /var/open-xchange/${x}
 		fowners tomcat:tomcat /var/open-xchange/${x}
@@ -379,6 +363,10 @@ src_install() {
 	# copy ldap-aci-file
 	insinto /etc/openldap/
 	doins ${FILESDIR}/slapd.ox.inc
+	
+	# copy sql update file
+	insinto /usr/share/open-xchange/
+	doins ${FILESDIR}/ox_reminder.sql
 
 	# .htacces file
 	insinto ${MY_HTDOCSDIR}
@@ -423,12 +411,15 @@ pkg_preinst(){
 		# copying the groupware-key and -cert the way ox would like it to have
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarekey.pem
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarecert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupwarereq.pem
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.key ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondkey.pem
 		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.crt ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondcert.pem
-		mv ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.csr ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiondreq.pem
 		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.pem
 		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.pem
+		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/sessiond.csr
+		rm ${D}/etc/open-xchange/groupware/sslcerts/oxCERTS/groupware.csr
+		
+		chown -R tomcat:apache ${D}/etc/open-xchange/groupware/sslcerts
+		find ${D}/etc/open-xchange/groupware/sslcerts -name '*.pem' -exec chmod 440 {} \;
 	fi
 }
 
@@ -450,11 +441,14 @@ pkg_postinst() {
 	if has_version '<=sys-apps/portage-2.0.51*' ; then
 	    einfo "ebuild /var/db/pkg/${CATEGORY}/${PF}/${PF}.ebuild config"
 	else
-	    einfo "emerge --config ${CATEGORY}/${PN}"
+	    einfo "emerge --config =${CATEGORY}/${PN}-${PV}"
 	fi
 
 	einfo "to setup the initial open-xchange environment."
 	einfo
+	
+	ewarn "If you upgrade from a prior version you should execute the following command."
+	ewarn "psql -U ${OX_DBUSER} ${OX_DBNAME} < ${ROOT}usr/share/open-xchange/ox_reminder.sql"
 
 	if has_version '=net-nds/openldap-2.1*' ; then
 		ewarn "You have got OpenLDAP-2.1.* installed."
@@ -487,6 +481,7 @@ get_user_config() {
 pkg_config() {
 	ox_setup_tomcat
 	#execute ox_setup from pkg_config(1)
+	## at first automatially change config in init_ldap.ldif and configuration-files
 	ox_setup 1
 
 	chown -R tomcat:tomcat ${ROOT}/etc/open-xchange
@@ -509,40 +504,30 @@ pkg_config() {
 	einfo "======================"
 
 	echo
-	einfo "And set JAVA_OPTS in /etc/conf.d/tomcat5 (or tomcat-5):"
+	einfo "Set JAVA_OPTS in /etc/conf.d/tomcat5 (or tomcat-5):"
 	einfo "JAVA_OPTS=\"-Dopenexchange.propfile=${ROOT}etc/open-xchange/groupware/system.properties\""
+	if use ssl ; then
+	    einfo "CATALINA_OPTS=\"\${CATALINA_OPTS} -Djava.library.path=${TOMCAT_SHARED_LIB}\""
+	fi
 
 	echo
-	einfo "And setup /etc/conf.d/apache2"
+	einfo "Setup /etc/conf.d/apache2"
 	einfo "APACHE2_OPTS=\"-D JK\""
 
 	echo
-	einfo "And setup /etc/conf.d/postgresql"
+	einfo "Setup /etc/conf.d/postgresql"
 	einfo "PGOPTS=\"-i\""
 
 	# Tell the user how to propegate ldap and the db
-	## at first automatially change config in init_ldap.ldif and configuration-files
-
 	## create ox-dbuser
 	echo
 	einfo "HOWTO: Setup database (following commands)"
 	einfo "++++++++++++++++++++++++++++++++++++++++++"
 
-	if use_postgres ; then
-		einfo "echo \"CREATE USER ${OX_DBUSER} WITH PASSWORD '${OX_DBPASS}' CREATEDB NOCREATEUSER\" | psql -h localhost -U postgres template1 -f -"
-		einfo "echo \"CREATE DATABASE ${OX_DBNAME} WITH OWNER=${OX_DBUSER} ENCODING='UNICODE'\" | psql -h localhost -U postgres template1 -f -"
-		einfo "psql -U ${OX_DBUSER} ${OX_DBNAME} < ${ROOT}usr/share/open-xchange/init_database.sql"
-		einfo "/usr/sbin/dbinit_ox"
-	else
-		# COMMENT: we should tell them how to setup mysql also...
-		einfo "MySQL instructions coming soon..."
-		# some pre information
-		# add user
-		# INSERT INTO user (Host, User, Password) VALUES ('localhost','${OX_DBUSER}',PASSWORD('${OX_DBPASS}'));
-		# FLUSH PRIVILIGES;
-		# add database
-		# CREATE DATABASE ${OX_DBNAME};
-	fi
+	einfo "echo \"CREATE USER ${OX_DBUSER} WITH PASSWORD '${OX_DBPASS}' CREATEDB NOCREATEUSER\" | psql -h localhost -U postgres template1 -f -"
+	einfo "echo \"CREATE DATABASE ${OX_DBNAME} WITH OWNER=${OX_DBUSER} ENCODING='UNICODE'\" | psql -h localhost -U postgres template1 -f -"
+	einfo "psql -U ${OX_DBUSER} ${OX_DBNAME} < ${ROOT}usr/share/open-xchange/init_database.sql"
+	einfo "/usr/sbin/dbinit_ox"
 
 	## initialise database with ox, after configurations have been changed	
 	echo