Using tomcat servelet classpath.

Package-Manager: portage-2.0.52-r1

diff --git a/www-apps/open-xchange/ChangeLog b/www-apps/open-xchange/ChangeLog
index d39a388f4180fc98e114218010852d5307bce42b..2d6c6e1cbfc436be38365a77d0619bcff146a7bd 100644 (file)
--- a/www-apps/open-xchange/ChangeLog
+++ b/www-apps/open-xchange/ChangeLog
@@ -1,6 +1,10 @@
 # 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.4 2005/10/01 18:40:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/ChangeLog,v 1.5 2005/10/01 18:57:13 eradicator Exp $
+
+  01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
+  open-xchange-0.8.1.2.ebuild:
+  Using tomcat servelet classpath.
 
   01 Oct 2005; Jeremy Huddleston <eradicator@gentoo.org>
   +files/open-xchange-0.8.1.2-reply.patch, open-xchange-0.8.1.2.ebuild:

diff --git a/www-apps/open-xchange/Manifest b/www-apps/open-xchange/Manifest
index a1a1c6dc3a48940779c81857702b43dc2c20f5f7..1c66dcfd87830a5b450e8c38d097d3270bbbb2e9 100644 (file)
--- a/www-apps/open-xchange/Manifest
+++ b/www-apps/open-xchange/Manifest
@@ -1,6 +1,6 @@
-MD5 6b0fe240b030ce01badb623840655ade open-xchange-0.8.1.2.ebuild 21778
+MD5 b6b79b6dc66a0bd056d59570a026711a open-xchange-0.8.1.2.ebuild 21782
 MD5 a339b15041bb6d450a7535f3df1fcc4c metadata.xml 247
-MD5 e919244becc3d4c0544c9e81ba78bae9 ChangeLog 1064
+MD5 0bd3a40216f9da6a036ccd31c7e39c93 ChangeLog 1188
 MD5 2ad5cb7b97eca4314016247cde421449 files/slapd.ox.inc 2019
 MD5 ec8d72f6da3dbefde48787a53fa071bf files/digest-open-xchange-0.8.1.2 138
 MD5 5388f979621c5e4d333aef5cd37f0062 files/init.d.open-xchange 1877

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
index bc98d5b40d354b3be85f43eea78e5bf5ee9781ab..343f98da1d4723942b29cc7622d0a36145b767ea 100644 (file)
--- a/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild
+++ b/www-apps/open-xchange/open-xchange-0.8.1.2.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.2.ebuild,v 1.5 2005/10/01 18:40:02 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apps/open-xchange/open-xchange-0.8.1.2.ebuild,v 1.6 2005/10/01 18:57:13 eradicator Exp $
 
 inherit eutils webapp ssl-cert toolchain-funcs java-pkg versionator depend.apache
 
@@ -38,7 +38,7 @@ RDEPEND=">=virtual/jre-1.4
         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 now >=7.4.5?
+# COMMENT: Why is the jdbc requirement set to 7.4.5 and not >=7.4.5?
 
 DEPEND="${RDEPEND}
        >=virtual/jdk-1.4"
@@ -135,11 +135,11 @@ src_compile() {
 
        myconf="${myconf} --with-servletdir=${SERVLETDIR}"
 
-       if has_version '>=www-servers/tomcat-5.0.28-r4' ; then
+#      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
+#      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"