Bumped to latest development version, added sed to change paths from apache2 -> apache depending on use. Paths were set/hard coded to fix bug #164838. Could cause issues for apache (!apache2) users < 1.2.21. But no worse than present :)

(Portage version: 2.1.2-r11)

4 files changed, 88 insertions, 4 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index d8556842be08..87de5d15b08d 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.19 2007/02/03 19:20:49 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.20 2007/02/26 19:27:44 wltjr Exp $
+
+*mod_jk-1.2.21 (26 Feb 2007)
+
+  26 Feb 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  files/88_mod_jk.conf, +mod_jk-1.2.21.ebuild:
+  Bumped to latest development version, added sed to change paths from apache2
+  -> apache depending on use. Paths were set/hard coded to fix bug #164838.
+  Could cause issues for apache (!apache2) users < 1.2.21. But no worse than
+  present :)
 
   03 Feb 2007; Steve Dibb <beandog@gentoo.org> mod_jk-1.2.20.ebuild:
   amd64 stable, bug 162949
diff --git a/www-apache/mod_jk/files/88_mod_jk.conf b/www-apache/mod_jk/files/88_mod_jk.conf
index 4ee73d13ef7c..b868205be592 100644
--- a/www-apache/mod_jk/files/88_mod_jk.conf
+++ b/www-apache/mod_jk/files/88_mod_jk.conf
@@ -6,14 +6,14 @@ LoadModule jk_module    modules/mod_jk.so
 ###
 # JkWorkersFile specify the location where mod_jk will find
 # the workers definitions.
-JkWorkersFile	conf/jk-workers.properties
+JkWorkersFile	/etc/apache2/jk-workers.properties
 
 
 ###
 ### Where to put mod_jk logs
 ###
 # specify the location where mod_jk is going to place its log file.
-JkLogFile	logs/mod_jk.log
+JkLogFile	/etc/apache2/logs/mod_jk.log
 
 
 ###
@@ -152,7 +152,7 @@ JkRequestLogFormat "%w %V %T"
 # reponsible for serving static html files. All requests of files with
 # the ending .jsp will be redirected to a default Tomcat installation which
 # uses the default profile. Change this to fit your needs.
-jkAutoAlias /var/lib/tomcat-5/default/webapps/
+jkAutoAlias /var/lib/tomcat-5.5/default/webapps/
 jkMount /*.jsp ajp13
 
 </IfDefine>
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.21 b/www-apache/mod_jk/files/digest-mod_jk-1.2.21
new file mode 100644
index 000000000000..b972ead03699
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.21
@@ -0,0 +1,3 @@
+MD5 04e30a859373525a08a1fead7a900d56 tomcat-connectors-1.2.21-dev-511864-src.tar.gz 1333812
+RMD160 ec8dd9e66299508ce37a0d8ac68e668f11c568c4 tomcat-connectors-1.2.21-dev-511864-src.tar.gz 1333812
+SHA256 f37b0b3197772ec52bc93900d505a0412d848fb731702dd91b22c27d13983ca6 tomcat-connectors-1.2.21-dev-511864-src.tar.gz 1333812
diff --git a/www-apache/mod_jk/mod_jk-1.2.21.ebuild b/www-apache/mod_jk/mod_jk-1.2.21.ebuild
new file mode 100644
index 000000000000..23128b703098
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.21.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2007 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.21.ebuild,v 1.1 2007/02/26 19:27:44 wltjr Exp $
+
+inherit apache-module autotools
+
+#MY_P="tomcat-connectors-${PV}-src"
+MY_P="tomcat-connectors-${PV}-dev-511864-src"
+
+KEYWORDS="~amd64 ~ppc ~x86"
+
+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"
+SRC_URI="http://people.apache.org/~rjung/mod_jk-dev/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
+APACHE1_MOD_CONF="88_${PN}"
+APACHE1_MOD_DEFINE="JK"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+DOCFILES="CHANGES.txt README"
+
+need_apache
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	eautoreconf
+}
+
+src_compile() {
+	local apxs
+	use apache2 && apxs="${APXS2}"
+	use apache2 || apxs="${APXS1}"
+
+	econf \
+		--with-apxs=${apxs} \
+		--with-apr-config=/usr/bin/apr-config \
+		|| die "econf failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto "${APACHE_CONFDIR}"
+	doins "${FILESDIR}/jk-workers.properties"
+
+	# call the nifty default src_install :-)
+	apache-module_src_install
+
+	if ! use apache2 ; then
+		sed -i -e 's:/apache2/:/apache/:' "${D}${APACHE_CONFDIR}/modules.d/88_${PN}.conf" \
+			|| die "Could not update jk-workers.properties for apache"
+	fi
+}
+
+pkg_postinst() {
+	elog "Tomcat is not a dependency of mod_jk any longer, if you intend"
+	elog "to use it with Tomcat, you have to merge www-servers/tomcat on"
+	elog "your own."
+}