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

Package-Manager: portage-2.2_rc28/cvs/Linux i686

3 files changed, 85 insertions, 6 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/Manifest b/www-apache/mod_jk/Manifest
index 473fa82de2fb..7f5af3250671 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -12,13 +12,15 @@ DIST tomcat-connectors-1.2.28-src.tar.gz 1541956 RMD160 4f8fc5a16614bb47c97ede8b
 EBUILD mod_jk-1.2.25.ebuild 1367 RMD160 bb30c1a008e5d88328a9281c7ef29c12eab031ff SHA1 0f0c95ca434cec8bffc7cab75f6a7a10426f3493 SHA256 91d505c8fdf6ae0d8face9a7bb680145c613dbe3d1baf63e533d4753e69a7002
 EBUILD mod_jk-1.2.26-r1.ebuild 1371 RMD160 749a487b3ea7bdf596e1d068b1a7fd1ba2a1bef2 SHA1 907f8101fe8467d45e997adedc09285e5b9279d4 SHA256 2d01fbea6a411c7e2b7412a21ffc9cc6e33d10c817de54bb15ffa1e5fd1e3def
 EBUILD mod_jk-1.2.27.ebuild 1539 RMD160 ff876e9bf701bfaef758ad6b0119eebedaa11fc3 SHA1 d12b14bcff868cd42b9ee23c5162cb6c591b4de6 SHA256 c668b24d03c03e8cd14e0c3100909ba33f3c90bb4f419915767fffdb7f2dec3b
+EBUILD mod_jk-1.2.28-r1.ebuild 1947 RMD160 8cb42bd9c733907e34e6321e2f35d1df26d5ea24 SHA1 8a5b574a7dcd8656ff4ed9096a051cfcebbc472e SHA256 4bf1703dcbe65e556f8dcca991643d9ab22bd1caff7cd72ff2d7d6bbe1970e5c
 EBUILD mod_jk-1.2.28.ebuild 1813 RMD160 1eacdc754639e218998d2e7517a08cc9f20efdba SHA1 5a03ef14c2e423c5f409cbc917de1f4a4b5bd7df SHA256 ab6bd6491b1c4a6ae0a26395cbe825f373bdfb52ed709a99a52c12465c44592b
-MISC ChangeLog 9478 RMD160 16606437ad29e45c58dcf13a80fbec604be7bfd0 SHA1 56b534aa5a627a3a038181ced955e75f04e25517 SHA256 8e9e7a1603e74e0a22672ded22622f0878ecdd9f76cac489fb0bd5d4327232dd
+MISC ChangeLog 9692 RMD160 2d316a0fa3fcee6793b4268b81f37a6b16eeafee SHA1 624bda2828e87223ffadebe0d5e767819834a612 SHA256 9fda13b93195d389ac532fc1303da4987a61abde6c91fb2d5483b35ab024b84d
 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.10 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAknpwD8ACgkQkKaRLQcq0GLtMQCgq8Qh1a6LdoZMbIBKkX/qGLmJ
-Ku0AoKaK5lyFQgczO+559G/ynJhkEvxS
-=YMT0
+iEYEARECAAYFAkoAEcgACgkQcxLzpIGCsLTUmgCfYj4PFdflxJQ0JiXxs17mTzVc
+VsIAoJYMrvLKQVF/5rcfdCKq+rAt7TeC
+=bYhY
 -----END PGP SIGNATURE-----
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."
+}