Version bump, bug 355151

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

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 8e75fb9ee207c684af403720c1bb44bda89fe1fa..0be678343d8ced9316a4129560fda76f1f3d251c 100644 (file)
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-apache/mod_jk
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.68 2010/10/24 14:43:15 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.69 2011/10/14 16:58:23 beandog Exp $
+
+*mod_jk-1.2.32 (14 Oct 2011)
+
+  14 Oct 2011; Steve Dibb <beandog@gentoo.org> +mod_jk-1.2.32.ebuild:
+  Version bump, bug 355151
 
   24 Oct 2010; Brent Baude <ranger@gentoo.org> mod_jk-1.2.30.ebuild:
   Marking mod_jk-1.2.30 ppc for bug 315561

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index e17f02e22061018f70e7c95729324f246fcf0daa..e84f56bb5490798490d56fb4f4fb2af044033d72 100644 (file)
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -2,7 +2,9 @@ AUX 88_mod_jk.conf 5443 RMD160 71170b45e6a3bab604ac4911d0c6675416302471 SHA1 276
 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
-MISC ChangeLog 10925 RMD160 1e2dc38c073a93458e8b7376c6f530cd810a20c7 SHA1 ef06d241c8471f69eaa5508073f185990021d4de SHA256 26c938f963eb14b7c4b68c47e72e50e8c8796253a8d7a9b3f7fdaf91ac78e4df
+EBUILD mod_jk-1.2.32.ebuild 1965 RMD160 4b0888007b051352b8f3285c747f2c0a4d729a39 SHA1 0720d6b6a4589a244ccec8e6a76cec4e78bd3950 SHA256 c51d165df3ee2f5e7e40e3ef6c4da8dceef87b17b6c290854b09c782e5b4776e
+MISC ChangeLog 11054 RMD160 7cf35ac9fc8098adbb46cb5cf34e8ca014ccb755 SHA1 8f0b24f4492bb9ae5d29ed736dc46e0f6326958e SHA256 8749725d081f81e4f6f7387453728d50b930fdac2c8cc58bf2f4b3ec75165c01
 MISC metadata.xml 526 RMD160 7ad086f1c883e675de1916e7cff2a8a2e5e90d4d SHA1 032c8da47cbe3a7332eb0a4b1dfe9c650f0c3dfb SHA256 72b982a4c55bd7fd2a0646a1705cd578d2d6ed1506910bbafc413efdb6f45a2e

diff --git a/www-apache/mod_jk/mod_jk-1.2.32.ebuild b/www-apache/mod_jk/mod_jk-1.2.32.ebuild
new file mode 100644 (file)
index 0000000..7bbf08b
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.32.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2011 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.32.ebuild,v 1.1 2011/10/14 16:58:23 beandog 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."
+}