Bumping package to lastest stable version. Dropped java USE flag, should have been jni, but upstream will be dropping the jni stuff or has.

(Portage version: 2.1.2_rc3-r6)

3 files changed, 75 insertions, 1 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index e42ee7f8fe98..d25adf0213f3 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.12 2006/11/05 23:34:06 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.13 2006/12/21 02:12:10 wltjr Exp $
+
+*mod_jk-1.2.20 (21 Dec 2006)
+
+  21 Dec 2006; William L. Thomson Jr. <wltjr@gentoo.org>
+  +mod_jk-1.2.20.ebuild:
+  Bumping package to lastest stable version. Dropped java USE flag, should
+  have been jni, but upstream will be dropping the jni stuff or has.
 
   05 Nov 2006; Christian Faulhammer <opfer@gentoo.org> mod_jk-1.2.19.ebuild:
   stable x86, bug #151748
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.20 b/www-apache/mod_jk/files/digest-mod_jk-1.2.20
new file mode 100644
index 000000000000..fbc0dafee4d2
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.20
@@ -0,0 +1,3 @@
+MD5 f10709339009b3be9398d3a838d9cabd tomcat-connectors-1.2.20-src.tar.gz 1316612
+RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc tomcat-connectors-1.2.20-src.tar.gz 1316612
+SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610 tomcat-connectors-1.2.20-src.tar.gz 1316612
diff --git a/www-apache/mod_jk/mod_jk-1.2.20.ebuild b/www-apache/mod_jk/mod_jk-1.2.20.ebuild
new file mode 100644
index 000000000000..01d7e84a53b8
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.20.ebuild
@@ -0,0 +1,64 @@
+# 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.20.ebuild,v 1.1 2006/12/21 02:12:10 wltjr Exp $
+
+inherit apache-module autotools
+
+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"
+
+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_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 "make 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
+}
+
+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."
+}