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.

Package-Manager: portage-2.1.1

6 files changed, 115 insertions, 23 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/Manifest b/www-apache/mod_jk/Manifest
index c9d2161339f6..072af69d0c1d 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 88_mod_jk.conf 5391 RMD160 840beec20a576b630c571d26fbf3e61722991810 SHA1 dbbf75f2d9427441496786c6767b62231deb12db SHA256 1f78a0766aac425e994da81aa26632aa359db92ced09dc443dc207049d9d38cf
 MD5 eecf40590474fbcdb54010d1f8525e49 files/88_mod_jk.conf 5391
 RMD160 840beec20a576b630c571d26fbf3e61722991810 files/88_mod_jk.conf 5391
@@ -10,8 +7,9 @@ MD5 83e37c0f3e893815403a6f9e4efde4f1 files/jk-workers.properties 1034
 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f files/jk-workers.properties 1034
 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk-workers.properties 1034
 DIST jakarta-tomcat-connectors-1.2.10-src.tar.gz 825352
-DIST jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
+DIST jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067 RMD160 aa1bc48bb9443d7d4ba019d3aeab4a188a98bd48 SHA1 2b2e1a612b133824548dad7858c10fd986da3722 SHA256 4547d2b2f220342a8e373e009a23326073ed0fcfcae7a54466b04d1bc8b9aee9
 DIST jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463 RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 SHA1 c9a67de4e03d6d7780cf0b14284f62d30bb78156 SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641
+DIST tomcat-connectors-1.2.18-src.tar.gz 929823 RMD160 3f9c60d6121271ade71dd0edd5dd88910e13e105 SHA1 cb7286f3f773d9ed2111cdcc7760445899f7bcd5 SHA256 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311
 EBUILD mod_jk-1.2.10.ebuild 1623 RMD160 211eed7a717ba2b4b4f42e45e36312fe3d3f4753 SHA1 ce8cfe4232a724b37eb3c3f1e19fbe6a51f722a4 SHA256 054ee3e14468c6e543efed3f2ea0870fb52ece4641746a24299a8ddf61433603
 MD5 8e8673e565394d4acade788257281555 mod_jk-1.2.10.ebuild 1623
 RMD160 211eed7a717ba2b4b4f42e45e36312fe3d3f4753 mod_jk-1.2.10.ebuild 1623
@@ -24,27 +22,27 @@ EBUILD mod_jk-1.2.15.ebuild 1746 RMD160 241d0406d88a3392aeac55e29602c2781d1e0278
 MD5 097f26a843471eaaf31f6bd28e32f81d mod_jk-1.2.15.ebuild 1746
 RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 mod_jk-1.2.15.ebuild 1746
 SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c mod_jk-1.2.15.ebuild 1746
-MISC ChangeLog 1608 RMD160 cc5d1fa6208c747b6d26051f8ddbc2b18bfa4f94 SHA1 f7449f044113c85d432972bdce6caec9018e4a43 SHA256 c9b48f9e9a26868046ee53528b791d393992ed263357599a70a44c162c1ea180
-MD5 b60bd1cd5df055a8c93a02ece6894d25 ChangeLog 1608
-RMD160 cc5d1fa6208c747b6d26051f8ddbc2b18bfa4f94 ChangeLog 1608
-SHA256 c9b48f9e9a26868046ee53528b791d393992ed263357599a70a44c162c1ea180 ChangeLog 1608
-MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
-MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
-RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
-SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata.xml 158
+EBUILD mod_jk-1.2.18.ebuild 1788 RMD160 ede03b6d719217e3a47eacdb12c4764e2a1e9828 SHA1 c9891db2be75ef73095e5f2354a5e21f052b2f22 SHA256 df70fc7558c7beb6ab22c18ce7cd30d4ff2b609cd934926f4bf8e1575c6d5445
+MD5 b10ef5cbe0791df11c59083aca4fc972 mod_jk-1.2.18.ebuild 1788
+RMD160 ede03b6d719217e3a47eacdb12c4764e2a1e9828 mod_jk-1.2.18.ebuild 1788
+SHA256 df70fc7558c7beb6ab22c18ce7cd30d4ff2b609cd934926f4bf8e1575c6d5445 mod_jk-1.2.18.ebuild 1788
+MISC ChangeLog 1915 RMD160 5e4464af1ab5f04b49004fa43d0810b9631f9bdd SHA1 b754cc29a99ff814a0bbef6ebafcd203ef742b09 SHA256 89d902a413961f67a4dd89dd85d652a9bc4fb34a05129b1cac80f107043e6bf6
+MD5 0bd7e5b792d5fa0ec438b54a59ed2512 ChangeLog 1915
+RMD160 5e4464af1ab5f04b49004fa43d0810b9631f9bdd ChangeLog 1915
+SHA256 89d902a413961f67a4dd89dd85d652a9bc4fb34a05129b1cac80f107043e6bf6 ChangeLog 1915
+MISC metadata.xml 473 RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 SHA1 719bc65c876fdef4ef13af0f4e4a27259e342815 SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101
+MD5 49773dac392214840f81ce9ed35bedf2 metadata.xml 473
+RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 metadata.xml 473
+SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101 metadata.xml 473
 MD5 4816b7fbdd754d6ad17f967ec252ea39 files/digest-mod_jk-1.2.10 88
 RMD160 5301ce4cb4e361fd99287c826860d917258cf08b files/digest-mod_jk-1.2.10 88
 SHA256 4a5e0ad580f0cb449794bcd03b44e65f2de6654906fdf9a9f2ad8d232cb29951 files/digest-mod_jk-1.2.10 88
-MD5 0a5d4f7b9130e9a14216fc10df29468a files/digest-mod_jk-1.2.13 88
-RMD160 2b9e6a07650770cdcc074d33f0286783ad607767 files/digest-mod_jk-1.2.13 88
-SHA256 70ec509a789992879712625d0479c2fa127a1aa9f30dbf7111808661908074bc files/digest-mod_jk-1.2.13 88
+MD5 38fc3dcf03f305ff7100787b1a4e10e9 files/digest-mod_jk-1.2.13 310
+RMD160 2f2ea640784d7faedc32140e8998e67b38c4b370 files/digest-mod_jk-1.2.13 310
+SHA256 44c52dd456b2c68fdef71fd5a9be938924160131c581420d439c5626cacd081f files/digest-mod_jk-1.2.13 310
 MD5 fa8b71d1318001ec36b73186933aa981 files/digest-mod_jk-1.2.15 310
 RMD160 712417003278d59d32ba493341b560731169342d files/digest-mod_jk-1.2.15 310
 SHA256 b55d2fe0be88cba01f44b72caa4e53bf33cd39269bda8cf885359f282e875718 files/digest-mod_jk-1.2.15 310
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEw0IKgo/w9rxVVVERAml1AJ49+j3rOJERFbAFsGKTig4b1WUXmgCgplq9
-rV5JypT3ySfQNxvFqZ/xfkk=
-=Viid
------END PGP SIGNATURE-----
+MD5 2aa593598d06e901e2b389bef195e19e files/digest-mod_jk-1.2.18 286
+RMD160 54dc2c15e7e7d0c02f584c85f214563c6fc92e92 files/digest-mod_jk-1.2.18 286
+SHA256 4039bf46d18e2840dce0a0ccb2a5f40dc9f69e6f98928869b2db5db57778bf02 files/digest-mod_jk-1.2.18 286
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."
+}