Stable on amd64, see bug #191741.

(Portage version: 2.1.3.19)

7 files changed, 9 insertions, 217 deletions

diff --git a/www-apache/mod_caucho/ChangeLog b/www-apache/mod_caucho/ChangeLog
index 10648c0cb8ae..54aed07232ee 100644
--- a/www-apache/mod_caucho/ChangeLog
+++ b/www-apache/mod_caucho/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_caucho
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.27 2007/11/10 12:47:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/ChangeLog,v 1.28 2007/11/10 20:57:51 nelchael Exp $
+
+  10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/mod_caucho-3.0.22-gentoo.patch,
+  -files/mod_caucho-3.0.22-java.patch, -files/mod_caucho-3.0.22-ssl.patch,
+  -mod_caucho-3.0.22.ebuild, mod_caucho-3.0.24.ebuild:
+  Stable on amd64, see bug #191741.
 
   10 Nov 2007; Krzysiek Pawlik <nelchael@gentoo.org>
   -files/mod_caucho-3.0.24-disable-sticky-sessions.patch,
diff --git a/www-apache/mod_caucho/files/digest-mod_caucho-3.0.22 b/www-apache/mod_caucho/files/digest-mod_caucho-3.0.22
deleted file mode 100644
index 1803584d207c..000000000000
--- a/www-apache/mod_caucho/files/digest-mod_caucho-3.0.22
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 29770606e396f6c2c0d476ceb54c08c2 resin-3.0.22-src.tar.gz 5467522
-RMD160 093cdcfa8bcd14a30ff54cc9cb8001ace10bbfc6 resin-3.0.22-src.tar.gz 5467522
-SHA256 0da5617b6867a0d40e59d2dfe2518158567506fea2c1273d56290c146a64849a resin-3.0.22-src.tar.gz 5467522
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.22-gentoo.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.22-gentoo.patch
deleted file mode 100644
index 201855b2afce..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.0.22-gentoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru resin-3.0.22.vanilla/modules/c/src/apache2/Makefile.in resin-3.0.22/modules/c/src/apache2/Makefile.in
---- resin-3.0.22.vanilla/modules/c/src/apache2/Makefile.in	2006-08-14 22:44:04.000000000 +0200
-+++ resin-3.0.22/modules/c/src/apache2/Makefile.in	2006-08-14 23:24:00.000000000 +0200
-@@ -36,11 +36,8 @@
- 	$(CC) -c $(INCLUDES) $(CFLAGS) $<
- 
- install	: mod_caucho.la
--	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(apache_libexec)
--	- rm -f $(apache_libexec)/mod_caucho.la
--	- rm -f $(apache_libexec)/mod_caucho.a
--	sh install.sh -conf $(apache_conf) -libexec $(apache_libexec) \
--	   -resin_home $(resin_home)
-+	mkdir -p $(DESTDIR)$(apache_libexec)
-+	$(LIBTOOL) --mode=install $(CP) mod_caucho.la $(DESTDIR)$(apache_libexec)
- 
- clean	:
- 	- rm -r *.o *.lo *.la *.so .libs
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch
deleted file mode 100644
index 953da239d9e5..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.0.22-java.patch
+++ /dev/null
@@ -1,126 +0,0 @@
---- resin-3.0.22.vanilla/configure.in	2007-04-14 22:51:15.000000000 +0200
-+++ resin-3.0.22/configure.in	2007-04-14 22:54:46.000000000 +0200
-@@ -427,54 +427,6 @@
-   fi
- fi
- #
--# --with-java-home
--#
--AC_ARG_WITH(java-home,
--[  --with-java-home=DIR  java home
--], [
--JAVA_HOME=${withval}
--])
--
--if test -z "$JAVA_HOME"; then
--  java=`which java 2>/dev/null`
--  if test $? = "0"; then
--    while test -h "$java"
--    do
--      head=`dirname $java`
--      tail=`/bin/ls -l $java | awk '{ print $NF; }'`
--      if test -f "$tail"; then
--        java=$tail
--      else
--        java=$head/$tail
--      fi
--    done
--
--    javabin=`dirname $java`
--    JAVA_HOME=`cd $javabin/..; pwd`
--
--    # we're in $JAVA_HOME/jre
--    if test -f "$JAVA_HOME/lib/rt.jar"; then
--      JAVA_HOME=`cd $JAVA_HOME/..; pwd`
--    elif test -d "/usr/java"; then
--      JAVA_HOME=/usr/java
--    elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
--      JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
--    fi
--  elif test -d "/usr/java"; then
--    JAVA_HOME=/usr/java
--  elif test -f "/System/Library/Frameworks/JavaVM.framework"; then
--    JAVA_HOME="/System/Library/Frameworks/JavaVM.framework"
--  fi
--fi
--
--echo $ac_n "checking for JAVA_HOME... $JAVA_HOME"
--
--if test ! -d "$JAVA_HOME"; then
--  AC_MSG_ERROR([Can't find valid JAVA_HOME ${JAVA_HOME}])
--fi
--
--AC_SUBST(JAVA_HOME)
--#
- # Resin home
- #
- resin_home=`pwd`
-@@ -870,68 +822,6 @@
- AC_SUBST(SSL_LIBS)
- 
- #
--# --with-jni-include
--#
--AC_ARG_WITH(jni-include,
--[  --with-jni-include="-Idir -Idir"  jni include string
--], [
--JNI_INCLUDE=${withval}
--JNI="yes"
--])
--
--#
--# --enable-jni
--#
--AC_ARG_ENABLE(jni,
--[  --enable-jni    Turn on jni],
--[case "${enableval}" in
-- yes) JNI=true ;;
-- no)  JNI="" ;;
-- *) AC_MSG_ERROR(bad value ${enableval} for --enable-jni) ;;
-- esac],[JNI=""])
--
--if test -n "$JNI_INCLUDE"; then
--  JNI=yes
--elif test -r "$JAVA_HOME/include/jni_md.h"; then
--  JNI_INCLUDE="-I$JAVA_HOME/include"
--  JNI=yes
--  echo "checking for JNI in $JAVA_HOME/include ... found"
--elif test -r "$JAVA_HOME/include/$jni_os/jni_md.h"; then
--  JNI_INCLUDE="-I$JAVA_HOME/include -I$JAVA_HOME/include/$jni_os"
--  JNI=yes
--  echo "checking for JNI in $JAVA_HOME/include/$jni_os ... found"
--elif test -r "/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h"; then
--  # Darwin
--  echo "checking for JNI in /System/Library/Frameworks/JavaVM.framework/Headers ... found"
--  JNI_INCLUDE="-I/System/Library/Frameworks/JavaVM.framework/Headers"
--  JNI=yes
--else
--  JNI=""
--  AC_MSG_WARN([Can't find JNI directory ${JAVA_HOME}/include/$jni_os])
--fi
--
--if test -r "$JAVA_HOME/include/jvmti.h"; then
--  echo "Using JVMTI for class reloading"
--  
--  CFLAGS="$CFLAGS -DHAS_JVMTI"
--fi
--
--if test -r "$JAVA_HOME/include/jvmdi.h"; then
--  echo "Using JVMDI for class reloading"
--  
--  CFLAGS="$CFLAGS -DHAS_JVMDI"
--fi
--	
--if test -n "$JNI"; then
--  plugins="$plugins $resin_plugin resin_os"
--else  
--  echo "Can't JNI include files in JAVA_HOME: $JAVA_HOME"
--fi
--
--AC_SUBST(JNI)
--AC_SUBST(JNI_INCLUDE)
--	
--#
- # --enable-ssl
- #
- AC_ARG_ENABLE(ssl,
diff --git a/www-apache/mod_caucho/files/mod_caucho-3.0.22-ssl.patch b/www-apache/mod_caucho/files/mod_caucho-3.0.22-ssl.patch
deleted file mode 100644
index fc6a0b5ac878..000000000000
--- a/www-apache/mod_caucho/files/mod_caucho-3.0.22-ssl.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Nru resin-3.0.22.vanilla/modules/c/src/apache2/mod_caucho.c resin-3.0.22/modules/c/src/apache2/mod_caucho.c
---- resin-3.0.22.vanilla/modules/c/src/apache2/mod_caucho.c	2007-04-13 15:41:18.000000000 +0200
-+++ resin-3.0.22/modules/c/src/apache2/mod_caucho.c	2007-04-13 16:00:24.000000000 +0200
-@@ -582,6 +582,16 @@
-     }
-   }
- #endif  
-+  /* Add SSL Client certificate: (requires SSLOptions +StdEnvVars) */
-+  {
-+    int i;
-+    char **env = (char **)ap_create_environment(r->pool, r->subprocess_env);
-+    for (i = 0; env[i]; ++i) {
-+      char *name = strsep(&(env[i]), "=");
-+	  if (strncmp(name, "SSL_CLIENT_CERT", 16) == 0)
-+		  cse_write_string(s, CSE_CLIENT_CERT, env[i]);
-+    }
-+  }
- }
- 
- /**
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
deleted file mode 100644
index 6c8597d22e68..000000000000
--- a/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.22.ebuild,v 1.9 2007/11/10 11:21:02 nelchael Exp $
-
-inherit eutils apache-module autotools
-
-KEYWORDS="amd64 ~ppc x86"
-
-DESCRIPTION="mod_caucho connects Resin and Apache2."
-HOMEPAGE="http://www.caucho.com/"
-SRC_URI="http://www.caucho.com/download/resin-${PV}-src.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/resin-${PV}"
-
-# See apache-module.eclass for more information.
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="CAUCHO"
-
-need_apache2
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-gentoo.patch"
-	epatch "${FILESDIR}/${P}-ssl.patch"
-	epatch "${FILESDIR}/${P}-java.patch"
-	eautoreconf
-	chmod 755 ./configure
-}
-
-src_compile() {
-	econf --with-apxs=${APXS2} || die "econf failed"
-
-	emake -j1 -C "${S}/modules/c/src/apache2/" || die "emake failed"
-}
-
-src_install() {
-	cd "${S}/modules/c/src/apache2"
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	insinto "${APACHE2_MODULES_CONFDIR}"
-	doins "${FILESDIR}/${APACHE2_MOD_CONF}.conf" \
-	|| die "internal ebuild error: ${APACHE2_MOD_CONF}.conf not found."
-}
diff --git a/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild b/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild
index 04d0a8a737d8..0e1fc12daf56 100644
--- a/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild
+++ b/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild,v 1.8 2007/11/10 12:47:38 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_caucho/mod_caucho-3.0.24.ebuild,v 1.9 2007/11/10 20:57:51 nelchael Exp $
 
 inherit eutils apache-module autotools
 
-KEYWORDS="~amd64 ppc ~ppc64 x86"
+KEYWORDS="amd64 ppc ~ppc64 x86"
 
 DESCRIPTION="mod_caucho connects Resin and Apache2."
 HOMEPAGE="http://www.caucho.com/"