Proxy commit for weisso. Fixes jk-workers.properties installation reported in bug #267069.

(Portage version: 2.2_rc28/cvs/Linux i686)

2 files changed, 78 insertions, 1 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 342c32415efe..ad194fd71cad 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-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.58 2009/04/18 11:57:23 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.59 2009/05/05 10:15:16 betelgeuse Exp $
+
+*mod_jk-1.2.28-r1 (05 May 2009)
+
+  05 May 2009; Petteri Räty <betelgeuse@gentoo.org>
+  +mod_jk-1.2.28-r1.ebuild:
+  Proxy commit for weisso. Fixes jk-workers.properties installation reported
+  in bug #267069.
 
   18 Apr 2009; Markus Meier <maekke@gentoo.org> mod_jk-1.2.27.ebuild:
   amd64/x86 stable, bug #265455
diff --git a/www-apache/mod_jk/mod_jk-1.2.28-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.28-r1.ebuild
new file mode 100644
index 000000000000..c0157874002b
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.28-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 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.28-r1.ebuild,v 1.1 2009/05/05 10:15:16 betelgeuse 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"
+need_apache
+
+DEPEND=">=virtual/jdk-1.4"
+RDEPEND=""
+
+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."
+}