Updated mod_jk to latest releases. Introduced java use flag to control if jni stuff should be built and also installed. Removed ~ppc keyword due to lack of hardware to test on.

(Portage version: 2.1.1)

5 files changed, 95 insertions, 1 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index b43688d28d83..dca813ef005d 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.8 2006/07/23 09:31:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.9 2006/09/17 01:24:35 wltjr Exp $
+
+*mod_jk-1.2.18 (17 Sep 2006)
+
+  17 Sep 2006; William L. Thomson Jr. <wltjr@gentoo.org> metadata.xml,
+  +mod_jk-1.2.18.ebuild:
+  Updated mod_jk to latest releases. Introduced java use flag to control if
+  jni stuff should be built and also installed. Removed ~ppc keyword due to
+  lack of hardware to test on.
 
 *mod_jk-1.2.15 (23 Jul 2006)
 
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.13 b/www-apache/mod_jk/files/digest-mod_jk-1.2.13
index 1bae906455ea..7971710939eb 100644
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.13
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.13
@@ -1 +1,3 @@
 MD5 028e39a84b81847b62d07ed9cd9427ae jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
+RMD160 aa1bc48bb9443d7d4ba019d3aeab4a188a98bd48 jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
+SHA256 4547d2b2f220342a8e373e009a23326073ed0fcfcae7a54466b04d1bc8b9aee9 jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.18 b/www-apache/mod_jk/files/digest-mod_jk-1.2.18
new file mode 100644
index 000000000000..77266e051213
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.18
@@ -0,0 +1,3 @@
+MD5 58e1b9406e0cfe11bd4bc297ba146b4f tomcat-connectors-1.2.18-src.tar.gz 929823
+RMD160 3f9c60d6121271ade71dd0edd5dd88910e13e105 tomcat-connectors-1.2.18-src.tar.gz 929823
+SHA256 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311 tomcat-connectors-1.2.18-src.tar.gz 929823
diff --git a/www-apache/mod_jk/metadata.xml b/www-apache/mod_jk/metadata.xml
index 7303cef96964..2d1988cc06dd 100644
--- a/www-apache/mod_jk/metadata.xml
+++ b/www-apache/mod_jk/metadata.xml
@@ -1,5 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+
 	<herd>java</herd>
+
+	<maintainer>
+		<email>wltjr@gentoo.org</email>
+		<name>William L. Thomson Jr.</name>
+	</maintainer>
+
+	<longdescription>
+		mod_jk is a connector used to connect Tomcat JSP/Servlet 
+		container with web servers such as Apache, Netscape, 
+		Iplanet, SunOne and even IIS using the AJP protocol.
+	</longdescription>
+
 </pkgmetadata>
diff --git a/www-apache/mod_jk/mod_jk-1.2.18.ebuild b/www-apache/mod_jk/mod_jk-1.2.18.ebuild
new file mode 100644
index 000000000000..91610841828c
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.18.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.18.ebuild,v 1.1 2006/09/17 01:24:35 wltjr Exp $
+
+inherit apache-module java-pkg-opt-2
+
+MY_P="tomcat-connectors-${PV}-src"
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
+HOMEPAGE="http://tomcat.apache.org/connectors-doc"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 java"
+
+DEPEND="java? >=virtual/jdk-1.4"
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so"
+APACHE1_MOD_CONF="88_${PN}"
+APACHE1_MOD_DEFINE="JK"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+DOCFILES="CHANGES.txt README"
+
+need_apache
+
+src_compile() {
+	local apxs
+	local java_args
+	use apache2 && apxs="${APXS2}"
+	use apache2 || apxs="${APXS1}"
+	use java && java_args="--with-java-home=${JAVA_HOME} \
+				--with-java-platform=2 --enable-jni"
+
+	econf \
+		--with-apxs=${apxs} \
+		--with-apr-config=/usr/bin/apr-config \
+		${java_args} \
+		|| die "econf failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto ${APACHE_CONFDIR}
+	doins ${FILESDIR}/jk-workers.properties
+
+	# if using java install the jni stuff
+	if use java; then
+		insinto ${APACHE_MODULESDIR}
+		doins ${S}/jni/jk_jnicb.so
+	fi
+
+	# call the nifty default src_install :-)
+	apache-module_src_install
+}
+
+pkg_postinst() {
+	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
+	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
+	einfo "your own."
+}