Version Bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

3 files changed, 85 insertions, 14 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 419d9fc47333..ef87db2085c1 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_jk
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.64 2009/10/30 17:56:06 betelgeuse Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.65 2010/03/17 10:16:32 ali_bush Exp $
+
+*mod_jk-1.2.30 (16 Mar 2010)
+
+  16 Mar 2010; Alistair Bush <ali_bush@gentoo.org> +mod_jk-1.2.30.ebuild:
+  Version Bump.
 
   30 Oct 2009; Petteri Räty <betelgeuse@gentoo.org>
   mod_jk-1.2.28-r1.ebuild:
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 34b0fcf25ae1..fae2f12f9a34 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,17 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 88_mod_jk.conf 5443 RMD160 71170b45e6a3bab604ac4911d0c6675416302471 SHA1 276e34c4b02e3ea221a0ccec2708583b7ab9848d SHA256 07cc24b0bd11cc4b7dfeee01eae191710086711827a527952c6fc2bad99c6a53
 AUX jk-workers.properties 1034 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f SHA1 c1a1619fd51b8825fc1c464aeabd5a7597515733 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d
 DIST tomcat-connectors-1.2.28-src.tar.gz 1541956 RMD160 4f8fc5a16614bb47c97ede8b95c41438d32b1010 SHA1 0e022e242d88f4d42cbbfa42883d02e14ad16929 SHA256 898fddced320754121b53b3292d1d20a31bebc6733d5aeb92367143f8941fe6f
+DIST tomcat-connectors-1.2.30-src.tar.gz 1566749 RMD160 deb97a888f57cca8d038a61d57967074fcc8d53e SHA1 a60dbb23556ce1fc769fe16a66555e3c8ed89c04 SHA256 7c7b39f045168e4a220e05f4e962edf48aaa235c13ed4c51bcc6dfba2c270aea
 EBUILD mod_jk-1.2.28-r1.ebuild 1984 RMD160 8d113cd9e018cad1d7a34057abcabd5012d4ba04 SHA1 861ddfb87a2244be02104953789e4c280331639a SHA256 4efd6fb298588e57769f888f0e0449ee68bc7391ddefa88dc5cc8b9b44489bc7
-MISC ChangeLog 10492 RMD160 3b3ea3c6db2a5c929ea083572cb770fd4f60681b SHA1 07124480c7f7b5f1618f32d35dad99017a48a8e8 SHA256 6580b5eccc2e0e945e4164c93c82ba6001b501b9cf47cca765654f34b7c5a298
+EBUILD mod_jk-1.2.30.ebuild 1982 RMD160 c2ab679bbc027abbaa9e6aa96d845f9008db49e8 SHA1 99c86f4d8879a33729fbdc505e14a2805ee991f0 SHA256 08d7f53ecfe49e72cce6258d0638aa99ec8f47ab97c6d431ba5763950489cebf
+MISC ChangeLog 10611 RMD160 3fcfa5eb888c96f92f59d269622da21085c90ee0 SHA1 460724f2f0fd5cdfe6572d37993945c8beaff977 SHA256 5d63da6e1bbe4b8ef17e8b380b62297999540ebdd13d0ae2416ada73d61dcbb8
 MISC metadata.xml 526 RMD160 7ad086f1c883e675de1916e7cff2a8a2e5e90d4d SHA1 032c8da47cbe3a7332eb0a4b1dfe9c650f0c3dfb SHA256 72b982a4c55bd7fd2a0646a1705cd578d2d6ed1506910bbafc413efdb6f45a2e
-MISC mod_jk-1.2.28.ebuild.orig 1813 RMD160 1eacdc754639e218998d2e7517a08cc9f20efdba SHA1 5a03ef14c2e423c5f409cbc917de1f4a4b5bd7df SHA256 ab6bd6491b1c4a6ae0a26395cbe825f373bdfb52ed709a99a52c12465c44592b
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAkrrKLoACgkQcxLzpIGCsLSHtwCgjrGmbmApop+31WYDW2sM380h
-AzIAnjaYTClT+VSAUyGqVnl6Hx9jnID9
-=Cl1d
------END PGP SIGNATURE-----
diff --git a/www-apache/mod_jk/mod_jk-1.2.30.ebuild b/www-apache/mod_jk/mod_jk-1.2.30.ebuild
new file mode 100644
index 000000000000..560d60db204a
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.30.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2010 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.30.ebuild,v 1.1 2010/03/17 10:16:32 ali_bush Exp $
+
+EAPI="2"
+
+inherit apache-module java-pkg-2
+
+MY_P="tomcat-connectors-${PV}-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"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+DOCFILES="CHANGES"
+CONF_DIR="${WORKDIR}/${MY_P}/conf"
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=""
+
+need_apache
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+}
+
+src_configure() {
+	econf \
+		--with-apxs=${APXS} \
+		--with-apr-config=/usr/bin/apr-config \
+		|| die "econf failed"
+}
+
+src_compile() {
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto "${APACHE_CONFDIR}"
+	newins "${CONF_DIR}/workers.properties.minimal" \
+		jk-workers-minimal.properties || die
+	newins "${CONF_DIR}/workers.properties" \
+		jk-workers.properties || die
+	doins "${CONF_DIR}/uriworkermap.properties" || die
+
+	# call the nifty default src_install :-)
+	apache-module_src_install
+}
+
+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."
+
+	elog "Advanced Directives and Options can be found at: "
+	elog "http://tomcat.apache.org/connectors-doc/reference/workers.html"
+
+	elog ""
+	elog "JNI Worker Deprecation:"
+	elog "Workers of type jni are broken since a long time."
+	elog "Since there is no more use for them, they have been deprecated now,"
+	elog "and will be removed in a future release."
+}