Bumped to latest release

Package-Manager: portage-2.1.3.3

4 files changed, 78 insertions, 5 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 53552c558560..d65cafd210c0 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-apache/mod_jk
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.39 2007/08/02 14:38:40 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.40 2007/08/10 21:40:36 wltjr Exp $
+
+*mod_jk-1.2.25 (10 Aug 2007)
+
+  10 Aug 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +mod_jk-1.2.25.ebuild:
+  Bumped to latest release
 
   02 Aug 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   -mod_jk-1.2.24.ebuild:
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 2394b33836ad..a1cdb7f8a71e 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -9,6 +9,7 @@ SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk
 DIST tomcat-connectors-1.2.21-src.tar.gz 1334563 RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d SHA1 77b110d91ef0f3574bf74fa1dd37802def361ea6 SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa
 DIST tomcat-connectors-1.2.22-src.tar.gz 1346940 RMD160 a378022f3b817216f71c7236d87479265d4fb6f1 SHA1 9c6ca8df4e54ce4654c0ccd61bdd6bab5982b0da SHA256 024bbc5c9593fc67b6a6e3f318ad6b8b8ceae9d08fc19a1d94dbfefed581d398
 DIST tomcat-connectors-1.2.23-src.tar.gz 1368060 RMD160 d7892ff73f22e83feb49b4746d769f518e3f4c6a SHA1 9ab3c108a9e6b20dc7dd172917f8941eee0ec32c SHA256 90df61bfc88a54f11aa39a0ba4acc5d7ae52c559f51da810ada0d678e19e3c5a
+DIST tomcat-connectors-1.2.25-src.tar.gz 1426003 RMD160 abe57e277046de2fcf49304fc4e07816571c4780 SHA1 f268cd7e83b7fa8f823cbcc8d0e6d30526eedbeb SHA256 c985db915c250b6c96e5a1d42ef3b7e8f7034ddc2ca2361e856f398824c957d8
 EBUILD mod_jk-1.2.21-r2.ebuild 1379 RMD160 3f947e89ba1065308bd3ffaa8c90751437b2b436 SHA1 70a8b3e96b4b47fc3ba1dc28a2e5b28ce85d24a3 SHA256 38fcd58e99d36c2577011585b8912213366abc6bcccc5a74a15e50b5e43dc362
 MD5 22a60077409f211ff41dbaf8866ca8c6 mod_jk-1.2.21-r2.ebuild 1379
 RMD160 3f947e89ba1065308bd3ffaa8c90751437b2b436 mod_jk-1.2.21-r2.ebuild 1379
@@ -21,10 +22,14 @@ EBUILD mod_jk-1.2.23.ebuild 1372 RMD160 316475a9a248cbd31b58fc8f5de75d1eeb1f2449
 MD5 90a99537592cb2147bedc43b7e852f88 mod_jk-1.2.23.ebuild 1372
 RMD160 316475a9a248cbd31b58fc8f5de75d1eeb1f2449 mod_jk-1.2.23.ebuild 1372
 SHA256 f1cff13972803e42dfcb421dc1c6da2082cf4a0ba1f979814333fc66fde78e40 mod_jk-1.2.23.ebuild 1372
-MISC ChangeLog 6867 RMD160 7b01f679fc22f680a826b8890ce5b6783ac7cd78 SHA1 7bed7e3b3afd9948b459ddf2762963b3307c341d SHA256 9dff5e16f6b58c211845dadac923f430f5321c6a89549f637ea1d8b3057dd37e
-MD5 484eb53fd6fde91ee8ad80f6e1f50a17 ChangeLog 6867
-RMD160 7b01f679fc22f680a826b8890ce5b6783ac7cd78 ChangeLog 6867
-SHA256 9dff5e16f6b58c211845dadac923f430f5321c6a89549f637ea1d8b3057dd37e ChangeLog 6867
+EBUILD mod_jk-1.2.25.ebuild 1367 RMD160 92545beebf48cab0604c4ceab6462f50f65ae7cd SHA1 0f588a95bcbc5ce6aabe48350351e95aa25f1a18 SHA256 f97525d5ca819eabcb58b2d2771900bdae8348ac0c88f0a31b534bf83815a093
+MD5 52a291d799c61f572d9b6574b680c4f1 mod_jk-1.2.25.ebuild 1367
+RMD160 92545beebf48cab0604c4ceab6462f50f65ae7cd mod_jk-1.2.25.ebuild 1367
+SHA256 f97525d5ca819eabcb58b2d2771900bdae8348ac0c88f0a31b534bf83815a093 mod_jk-1.2.25.ebuild 1367
+MISC ChangeLog 7007 RMD160 98cbeead4060e678b780d44f93072c46cb2dff1d SHA1 9a31c2170dc3e0229c0379fceddd0fb043210571 SHA256 a371b36bdb17c779a8271c38907d529608b30164cc906c8c555877553ecefd43
+MD5 01db366c8b7cff67e4c17edfc3f0e909 ChangeLog 7007
+RMD160 98cbeead4060e678b780d44f93072c46cb2dff1d ChangeLog 7007
+SHA256 a371b36bdb17c779a8271c38907d529608b30164cc906c8c555877553ecefd43 ChangeLog 7007
 MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f
 MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490
 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490
@@ -38,3 +43,6 @@ SHA256 8e2ee225375bb047bae285ec20b4ced7daaaf0d71aa11a1bbe6261482dc5b063 files/di
 MD5 6e0c5430fcc2bd223abccad8cd353f32 files/digest-mod_jk-1.2.23 289
 RMD160 e2f0943bf9f4ef1f6fb0051312dcecf2762ae6ca files/digest-mod_jk-1.2.23 289
 SHA256 2f8ebf4a2a2e62415fec10a01b6f2fcd306767f29724f604f148f32ef57f77c2 files/digest-mod_jk-1.2.23 289
+MD5 cb41c9d41fc35575267d61578081a8de files/digest-mod_jk-1.2.25 289
+RMD160 b0776679cab7cd4218c585daf0ee022eeba76946 files/digest-mod_jk-1.2.25 289
+SHA256 b3ba7cb21b6ca729faf65ece2d2ae1852aae8e560e7ef5a4ffd496f0b0c8b3d1 files/digest-mod_jk-1.2.25 289
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.25 b/www-apache/mod_jk/files/digest-mod_jk-1.2.25
new file mode 100644
index 000000000000..a4a25e323986
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.25
@@ -0,0 +1,3 @@
+MD5 4f614130c85f86d8d3359a03230db8a3 tomcat-connectors-1.2.25-src.tar.gz 1426003
+RMD160 abe57e277046de2fcf49304fc4e07816571c4780 tomcat-connectors-1.2.25-src.tar.gz 1426003
+SHA256 c985db915c250b6c96e5a1d42ef3b7e8f7034ddc2ca2361e856f398824c957d8 tomcat-connectors-1.2.25-src.tar.gz 1426003
diff --git a/www-apache/mod_jk/mod_jk-1.2.25.ebuild b/www-apache/mod_jk/mod_jk-1.2.25.ebuild
new file mode 100644
index 000000000000..48a1bcfa6192
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.25.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2007 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.25.ebuild,v 1.1 2007/08/10 21:40:36 wltjr Exp $
+
+inherit apache-module autotools
+
+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 README"
+
+need_apache
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	eautoreconf
+}
+
+src_compile() {
+	econf \
+		--with-apxs=${APXS2} \
+		--with-apr-config=/usr/bin/apr-config \
+		|| die "econf failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto "${APACHE_CONFDIR}"
+	doins "${FILESDIR}/jk-workers.properties"
+
+	# 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."
+}