Bump

Package-Manager: portage-2.2.0_alpha137/cvs/Linux x86_64

3 files changed, 93 insertions, 22 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index dba81a406aa9..3373c6059a27 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.72 2012/03/08 11:38:32 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.73 2012/10/12 06:35:22 patrick Exp $
+
+*mod_jk-1.2.37 (12 Oct 2012)
+
+  12 Oct 2012; Patrick Lauer <patrick@gentoo.org> +mod_jk-1.2.37.ebuild:
+  Bump
 
   08 Mar 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> mod_jk-1.2.32.ebuild:
   x86 stable wrt bug #400519
@@ -323,4 +328,3 @@
   +files/88_mod_jk.conf, +files/jk-workers.properties, +mod_jk-1.2.10.ebuild:
   Inital import. Ebuild is based on the apache-module.eclass, fixes #19094.
   Special thanks to trapni and beu for offering that much help.
-
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 2ff5eb8cd34c..f3a7743b6da5 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,20 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
-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
-DIST tomcat-connectors-1.2.32-src.tar.gz 1545588 RMD160 9d5cac54b49a20586a8c22bb805658198da2c4a5 SHA1 f7eb958897134eabc26c0f83baab422eec125903 SHA256 512a5d4ae06fd6d6aa7ba6f177b7c9ba1c8297c676b3c33686c1ffacb83035b6
-EBUILD mod_jk-1.2.28-r1.ebuild 1984 RMD160 8d113cd9e018cad1d7a34057abcabd5012d4ba04 SHA1 861ddfb87a2244be02104953789e4c280331639a SHA256 4efd6fb298588e57769f888f0e0449ee68bc7391ddefa88dc5cc8b9b44489bc7
-EBUILD mod_jk-1.2.30.ebuild 1977 RMD160 f6f977f181ac966c99e04225d71597a00f88dc7d SHA1 114c20914a6dea82d17728df5d902062334d2a88 SHA256 b04d86372b39c07df80a9c05e55de626eed4b3a18e166ac41f8fdb56c8be3747
-EBUILD mod_jk-1.2.32.ebuild 1965 RMD160 ff6a5582445fa27818454a411978b0b9128f6a7d SHA1 6deb8db2441daa68d2836910c052836112020f16 SHA256 d5323266433b10dd4031f50e63cbb1c2dd7c72bf90e775191a03a4eeb2149689
-MISC ChangeLog 11385 RMD160 8bd979b09dd48b1009ab5b817b20798a163d60e7 SHA1 d20bae88ca2f90509a4c2ef8ba9f38bdad3960c7 SHA256 f6e2535c8de67c39acdfd8fc8d46aa945f4c32566bfac120d095387dbac8f8f8
-MISC metadata.xml 526 RMD160 7ad086f1c883e675de1916e7cff2a8a2e5e90d4d SHA1 032c8da47cbe3a7332eb0a4b1dfe9c650f0c3dfb SHA256 72b982a4c55bd7fd2a0646a1705cd578d2d6ed1506910bbafc413efdb6f45a2e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk9Ymj8ACgkQuUQtlDBCeQL0kwCeIZMIdK/YpYfutfQF8UoYDosh
-HEUAoIFIh8GfJoW88Q2Ld4z9N5HbS6Fo
-=uHdJ
------END PGP SIGNATURE-----
+AUX 88_mod_jk.conf 5443 SHA256 07cc24b0bd11cc4b7dfeee01eae191710086711827a527952c6fc2bad99c6a53 SHA512 3fa5a4b596a7a968275eedcdc4d480efe6d9ac850bbc90f5cd4fcd1ca691fd1165ff34174de9397deb110906a51f62890590a1df83f941e4aaf4572a245f3cba WHIRLPOOL f2a2cde91c50467d78905fec3bf3e008ea05e7ebc2dc731123277e95b18708a5c3c0374540c107376c7f89820a22ca2da303113bb0e59ee6001d7b3d0f75ffa3
+AUX jk-workers.properties 1034 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d SHA512 0c2603f9b689c1a395c7ff3973921424a3310b0b1a7c2c79f6053ad438412cabd71f1d125981a320f29de607ea0a67b229a629916ccca7ad78cd833027a80268 WHIRLPOOL 24f62190e9c90da629aee21bbaa9a683035b86f81b0743b13d5744585821eec41cfce4eca44c2783d6f2335840defce511bfa85247c5b223eb8560934a152750
+DIST tomcat-connectors-1.2.28-src.tar.gz 1541956 SHA256 898fddced320754121b53b3292d1d20a31bebc6733d5aeb92367143f8941fe6f
+DIST tomcat-connectors-1.2.30-src.tar.gz 1566749 SHA256 7c7b39f045168e4a220e05f4e962edf48aaa235c13ed4c51bcc6dfba2c270aea
+DIST tomcat-connectors-1.2.32-src.tar.gz 1545588 SHA256 512a5d4ae06fd6d6aa7ba6f177b7c9ba1c8297c676b3c33686c1ffacb83035b6
+DIST tomcat-connectors-1.2.37-src.tar.gz 1528647 SHA256 38a92623ddd28b85bbf54cf77f4c867ccbebafb71233131471623691e4e751f9 SHA512 96d0d3baba661a14a2235424ad7bdd78b8b44db168cabd015cba328a200f3df00aa922fd6afb4cd3cff896591e7aeb65cdde16c641ccff5bdcb84518d8d0862f WHIRLPOOL 4d6b7b24610309f0fa44951dca81e0638aa92646e171df95fa225d1f813841592c687d6204dd0be4fb03303ad84ccee3f2adf54b542ee365877e74caaa5581d4
+EBUILD mod_jk-1.2.28-r1.ebuild 1984 SHA256 4efd6fb298588e57769f888f0e0449ee68bc7391ddefa88dc5cc8b9b44489bc7 SHA512 647afa542850d5aae7c6e2486a7ab26d7f81c2a8759fa9e588c07c131095602ccecb0bbf3db98124e1901e4f0ab8bb2732e78cb06f698ff84ad519cb0a563468 WHIRLPOOL f3258dbc9f1180cb67e67838152148fb92579e4e41e8dbf6ee03425016f98d7e5f58f5ee20038a7b6836ae0a775cdf06c373b120c2f53232ebbcdaa01f392e86
+EBUILD mod_jk-1.2.30.ebuild 1977 SHA256 b04d86372b39c07df80a9c05e55de626eed4b3a18e166ac41f8fdb56c8be3747 SHA512 c294b325fc270a3d0d53d076757d1b826f325eff7026f078d3745fc02f6b0029b3cbf62fd1f48fe8ae0d6d0f58136dd1077a0085f9123fde68362f63260c4b1e WHIRLPOOL 3966b645ec45417ebacf2f13b4f0224b8e1b89c4e7c04df92717818649e5201ce4b0796cb06e80c88e81eac0d17360f660321c1d294fb46526ed67952d10289a
+EBUILD mod_jk-1.2.32.ebuild 1965 SHA256 d5323266433b10dd4031f50e63cbb1c2dd7c72bf90e775191a03a4eeb2149689 SHA512 7c26a47a1f3cdd66e8ed7c4bfba6b2c668727cf2589aff83c0e21225294513a328731bc733673b7223a86a1bd545aa07d54ca8175f681b04eab41a1169f05170 WHIRLPOOL 9b1f87dc5a28e426a5b18677e8df2dfc1786f8de5da7de0da0e39a5f9f2a8e2821b068f2ddaf7e452d6754b15cee7fc6d37a015abdb20af62bc86b5bb5b09895
+EBUILD mod_jk-1.2.37.ebuild 1965 SHA256 d91d58cffc1a71d6b5237c084f0fe3cc76e0b3dcdf818855fd66298b359a374b SHA512 e0c3ac005e7e2f2c696ad30e6a87a4b4bd573a7fcc9258a89e3e4bef551a6e5334a4ed98dbf213d6b5e15150608db82ae7d243b7b5045f0457f51bf91b782104 WHIRLPOOL 89bf9c5640fb4beb71051ed43162221d23229a986e09a1a95bfa3daa27578d714b1cf4a7d98dcdbbef4ba264ddd423ce4fb2c3aa912d4be9b779380e1f6ae7c4
+MISC ChangeLog 11492 SHA256 84b4025a85a51abfe24d20751990bde2ce13c0ffaee5535763b725f299e327cc SHA512 c4cd1480e0f17ab248f7c3e11d55c1fc1a42827a706bf2df6ffef1270c0a5a59ccb7f047bd4bc6df5789ea7a05ee14843710111768e518fb9e76abca8ce71ca0 WHIRLPOOL 506d0280d2996d6366187f9a64b9c00df261a7709c9357a6f5dbff9c4ca26d43e7b2e2023df38cdb9dea54c6fd3c78492720bed09f99908a6e18f242f90d547b
+MISC metadata.xml 526 SHA256 72b982a4c55bd7fd2a0646a1705cd578d2d6ed1506910bbafc413efdb6f45a2e SHA512 7e064aa64cea5059296e89297b29060e6603ead758c820f1790c3d0126d30c8f7715e677998c395bb952fec468a168df2f80766709c7d06192a59931a10bde29 WHIRLPOOL 43feb2e4f2b3cf1054049ba58bf819927968f7d3b697401b78f6f823bd48469a2ebdb7db498cd8716d6d3b083007d1da0e459dbdba142acc7f4d9278d6a3d971
diff --git a/www-apache/mod_jk/mod_jk-1.2.37.ebuild b/www-apache/mod_jk/mod_jk-1.2.37.ebuild
new file mode 100644
index 000000000000..a1d65def2e28
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.37.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2012 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.37.ebuild,v 1.1 2012/10/12 06:35:22 patrick 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/${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."
+}