--- open-xchange-0.8.1.2.ebuild.old	2005-09-25 11:26:46.000000000 +0200
+++ open-xchange-0.8.1.2.ebuild.old	2005-09-25 11:29:41.000000000 +0200
@@ -132,7 +132,8 @@ 
 
 	myconf="${myconf} --with-servletdir=${SERVLETDIR}"
 
-	if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
+	#servlet-api 2.4 is already provided with tomcat 5
+	if has_version '>=www-servers/tomcat-5' ; 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"
@@ -376,21 +377,21 @@ 
 	local OX_ROOTPW=${OX_ROOTPW-"secret"}
 
 	# Guess base on the installed config
-	if false && [[ -e "${ROOT}/etc/open-xchange/admintools.conf" ]] ; then
+	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}
+		[[ -n ${temp_var} ]] && OX_DBHOST=${temp_var}
 
 		temp_var=$(get_oxvar DEFAULT_SQL_DB)
-		[[ -n ${temp_var} ]] && OX_DBNAME==${temp_var}
+		[[ -n ${temp_var} ]] && OX_DBNAME=${temp_var}
 
 		temp_var=$(get_oxvar DEFAULT_SQL_USER)
-		[[ -n ${temp_var} ]] && OX_DBUSER==${temp_var}
+		[[ -n ${temp_var} ]] && OX_DBUSER=${temp_var}
 
 		temp_var=$(get_oxvar DEFAULT_SQL_PASS)
-		[[ -n ${temp_var} ]] && OX_DBPASS==${temp_var}
+		[[ -n ${temp_var} ]] && OX_DBPASS=${temp_var}
 
 		temp_var=$(get_oxvar ORGA)
 		[[ -n ${temp_var} ]] && OX_ORG=${temp_var}
@@ -399,7 +400,7 @@ 
 		[[ -n ${temp_var} ]] && OX_ROOTDN=${temp_var}
 
 		temp_var=$(get_oxvar BINDPW)
-		[[ -n ${temp_var} ]] && OX_ROOTPW=${OX_ROOTPW_TEMP}
+		[[ -n ${temp_var} ]] && OX_ROOTPW=${temp_var}
 
 		if [[ -e "${ROOT}/etc/open-xchange/groupware/ldap.conf" ]] ; then
 			# taken from admintools.conf self