Version bump, fixes bug #112225 and bug #110170.

(Portage version: 2.1.1_pre3-r3)

4 files changed, 77 insertions, 2 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index b13e071dfcff..b43688d28d83 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2006/05/26 09:51:21 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.8 2006/07/23 09:31:44 nelchael Exp $
+
+*mod_jk-1.2.15 (23 Jul 2006)
+
+  23 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> files/88_mod_jk.conf,
+  +mod_jk-1.2.15.ebuild:
+  Version bump, fixes bug #112225 and bug #110170.
 
   26 May 2006; <nixnut@gentoo.org> mod_jk-1.2.13.ebuild:
   Added ~ppc. bug #134330
diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf
index 4044a18326ac..4ee73d13ef7c 100644
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ b/www-apache/mod_jk/files/88_mod_jk.conf
@@ -22,7 +22,7 @@ JkLogFile	logs/mod_jk.log
 # info log will contains standard mod_jk activity (default).
 # error log will contains also error reports.
 # debug log will contains all informations on mod_jk activity
-#JkLogLevel	info
+JkLogLevel	info
 
 
 ###
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.15 b/www-apache/mod_jk/files/digest-mod_jk-1.2.15
new file mode 100644
index 000000000000..915a2d7dadc5
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.15
@@ -0,0 +1,3 @@
+MD5 b815a666329f7de097775113547539e0 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
+RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
+SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
diff --git a/www-apache/mod_jk/mod_jk-1.2.15.ebuild b/www-apache/mod_jk/mod_jk-1.2.15.ebuild
new file mode 100644
index 000000000000..4e8021bfa884
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.15.ebuild
@@ -0,0 +1,66 @@
+# 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.15.ebuild,v 1.1 2006/07/23 09:31:44 nelchael Exp $
+
+inherit apache-module java-utils-2
+
+MY_P="jakarta-tomcat-connectors-${PV}-src"
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
+HOMEPAGE="http://jakarta.apache.org/tomcat/connectors-doc"
+SRC_URI="mirror://apache/jakarta/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="apache2"
+
+DEPEND=">=virtual/jdk-1.4"
+S="${WORKDIR}/${MY_P}/jk/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}"
+	java_args="--with-java-home=${JAVA_HOME} --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
+	local confdir=""
+	use apache2 && confdir="/etc/apache2"
+	use apache2 || confdir="/etc/apache"
+
+	dodir ${confdir}
+	insinto ${confdir}
+	doins ${FILESDIR}/jk-workers.properties
+
+	# 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."
+}