Bumped to latest release

Package-Manager: portage-2.1.2-r11

5 files changed, 23 insertions, 21 deletions

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index d7e26be0a0b6..f73e3f21458c 100644
--- a/www-apache/mod_jk/ChangeLog
+++ b/www-apache/mod_jk/ChangeLog
@@ -1,6 +1,10 @@
 # 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.21 2007/02/26 22:38:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.22 2007/03/02 17:43:30 wltjr Exp $
+
+  02 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  -mod_jk-1.2.21_pre.ebuild, +mod_jk-1.2.21.ebuild:
+  Bumped to latest release
 
 *mod_jk-1.2.21_pre (26 Feb 2007)
 
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 7394d2411e19..0f1b9a3b141d 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -8,7 +8,7 @@ RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f files/jk-workers.properties 1034
 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk-workers.properties 1034
 DIST tomcat-connectors-1.2.19-src.tar.gz 1246419 RMD160 f48895b847b84a77f95ec87faa47115b023f686f SHA1 7e49c98000455ea226b16c45cf63fd565c2221eb SHA256 7d75e357c6ff083f5b383d53475a3f14d1f6a45294bf0f2de0a8c552a04746c0
 DIST tomcat-connectors-1.2.20-src.tar.gz 1316612 RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc SHA1 716b61ffa137067c1df9fb1b0a5d81f6969a181a SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610
-DIST tomcat-connectors-1.2.21-dev-511994-src.tar.gz 1333746 RMD160 ee5786e247d41fa52512468581acb7d96665a8bf SHA1 f56ef635e02d034d5fc4c45b6ed321aa6fb4b618 SHA256 5c017ab47b38c0e763c9be3e9ab58a0e4b29dab58f6b2528a4039f231d2fc890
+DIST tomcat-connectors-1.2.21-src.tar.gz 1334563 RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d SHA1 77b110d91ef0f3574bf74fa1dd37802def361ea6 SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa
 EBUILD mod_jk-1.2.19.ebuild 1908 RMD160 1e66f293151db950c3bf91fe8a7788ef62199887 SHA1 123831e02113608eaa0bb417528d63c44dffb4f5 SHA256 76b1294ddfc6760ca565e720ab0c95f573f427016453b8ea2a49a468602574e5
 MD5 981a100c54f2ae482a3db8c2c8d80e9b mod_jk-1.2.19.ebuild 1908
 RMD160 1e66f293151db950c3bf91fe8a7788ef62199887 mod_jk-1.2.19.ebuild 1908
@@ -17,14 +17,14 @@ EBUILD mod_jk-1.2.20.ebuild 1548 RMD160 ee8fe4ba7fa46a9d050d5e69b6fc817ac7c0b781
 MD5 1b77cd525adae70ca02bdb7e92bee2e8 mod_jk-1.2.20.ebuild 1548
 RMD160 ee8fe4ba7fa46a9d050d5e69b6fc817ac7c0b781 mod_jk-1.2.20.ebuild 1548
 SHA256 4001a45e87e9013bd25dc470715b44b2fb92e0292be16c8b04d393e0e81ac004 mod_jk-1.2.20.ebuild 1548
-EBUILD mod_jk-1.2.21_pre.ebuild 1852 RMD160 d8c42530189c8631461d1cd0979e04bfda578339 SHA1 bde026dc3122f61197338a35d3e589ee99edece4 SHA256 ef9f41656b237d89f183807c10d7972f6576fa41bc0f0ae867a788b7489b85d3
-MD5 ddb704c4982d68652cdd7d2bb0671794 mod_jk-1.2.21_pre.ebuild 1852
-RMD160 d8c42530189c8631461d1cd0979e04bfda578339 mod_jk-1.2.21_pre.ebuild 1852
-SHA256 ef9f41656b237d89f183807c10d7972f6576fa41bc0f0ae867a788b7489b85d3 mod_jk-1.2.21_pre.ebuild 1852
-MISC ChangeLog 3992 RMD160 46f537493d0fec964a49cd9129c3fc8c4a48b60a SHA1 220643e0d9486dbf646dd2f9f9fcdf251c6adef2 SHA256 f5d5a7f3d1cad88380be491587087da9b14aba0fcbb9d0f9d332947f7cf9ab29
-MD5 0608391c615b27e70363ef24d997438c ChangeLog 3992
-RMD160 46f537493d0fec964a49cd9129c3fc8c4a48b60a ChangeLog 3992
-SHA256 f5d5a7f3d1cad88380be491587087da9b14aba0fcbb9d0f9d332947f7cf9ab29 ChangeLog 3992
+EBUILD mod_jk-1.2.21.ebuild 1732 RMD160 5901e1cd783fa1a1f39a59f1edb48e8aa35349c9 SHA1 5feeb1b64b472b2dc802cd488440b248f0db0a02 SHA256 5cd5eb10bfbde20ffdbb02c1ea45bfbcaad4ab144518818f7784bf03fcfd8b12
+MD5 f322a763140b3ced3eec35c825767de2 mod_jk-1.2.21.ebuild 1732
+RMD160 5901e1cd783fa1a1f39a59f1edb48e8aa35349c9 mod_jk-1.2.21.ebuild 1732
+SHA256 5cd5eb10bfbde20ffdbb02c1ea45bfbcaad4ab144518818f7784bf03fcfd8b12 mod_jk-1.2.21.ebuild 1732
+MISC ChangeLog 4129 RMD160 90a95753478760d9cccbe2cf3bd8fe9e269573c4 SHA1 f9ea13d5e6cd4036b9f39f783e0874d3d107d35c SHA256 499571cf293d4885222166fa10751c21b032d5e66800974b13e65ff9cb70a2a0
+MD5 ea355d7d73b3768bcbeaa01a12a1438c ChangeLog 4129
+RMD160 90a95753478760d9cccbe2cf3bd8fe9e269573c4 ChangeLog 4129
+SHA256 499571cf293d4885222166fa10751c21b032d5e66800974b13e65ff9cb70a2a0 ChangeLog 4129
 MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f
 MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490
 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490
@@ -35,6 +35,6 @@ SHA256 82a579b49926d41fc56a3e3866a8b00c430e49b455a50d31a3133a87ae07a221 files/di
 MD5 351803f1828843b33d077f268ce7697c files/digest-mod_jk-1.2.20 289
 RMD160 300a2ff8289cd5721e1dd04b0b8bb6fc08b7fe2d files/digest-mod_jk-1.2.20 289
 SHA256 e02255ee932a8ec7fe4d9bd14d03d4ed317bd86ae39bcf5da3cc18c467756a8a files/digest-mod_jk-1.2.20 289
-MD5 4ff4328b30a756338400a2dbbdb536ef files/digest-mod_jk-1.2.21_pre 322
-RMD160 105e0f86e0da94ced160c6c609e8e58df201cd0f files/digest-mod_jk-1.2.21_pre 322
-SHA256 58025cb983d3f8ef74f609b00d6a1066c8f11abc230cba4e2ccea8fd79605d1a files/digest-mod_jk-1.2.21_pre 322
+MD5 bfb38ada368b556843143972158bd03f files/digest-mod_jk-1.2.21 289
+RMD160 50d1681f5733e770bbfbdeaf86a0ba890a89bc26 files/digest-mod_jk-1.2.21 289
+SHA256 51d6699d225cf9d6ca08e83085169e088bf9a48d1664efff0020454290409b1c files/digest-mod_jk-1.2.21 289
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.21 b/www-apache/mod_jk/files/digest-mod_jk-1.2.21
new file mode 100644
index 000000000000..4ee079f49367
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.21
@@ -0,0 +1,3 @@
+MD5 ed65157ecbea7d3569de08611aa160eb tomcat-connectors-1.2.21-src.tar.gz 1334563
+RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d tomcat-connectors-1.2.21-src.tar.gz 1334563
+SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa tomcat-connectors-1.2.21-src.tar.gz 1334563
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.21_pre b/www-apache/mod_jk/files/digest-mod_jk-1.2.21_pre
deleted file mode 100644
index b1583200d988..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.21_pre
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cbfcefd469caadaf5594feeeea2fa128 tomcat-connectors-1.2.21-dev-511994-src.tar.gz 1333746
-RMD160 ee5786e247d41fa52512468581acb7d96665a8bf tomcat-connectors-1.2.21-dev-511994-src.tar.gz 1333746
-SHA256 5c017ab47b38c0e763c9be3e9ab58a0e4b29dab58f6b2528a4039f231d2fc890 tomcat-connectors-1.2.21-dev-511994-src.tar.gz 1333746
diff --git a/www-apache/mod_jk/mod_jk-1.2.21_pre.ebuild b/www-apache/mod_jk/mod_jk-1.2.21.ebuild
index 09385c28a7e7..8aa9e55e4e3e 100644
--- a/www-apache/mod_jk/mod_jk-1.2.21_pre.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.21.ebuild
@@ -1,18 +1,16 @@
 # 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.21_pre.ebuild,v 1.1 2007/02/26 22:38:17 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/mod_jk-1.2.21.ebuild,v 1.3 2007/03/02 17:43:30 wltjr Exp $
 
 inherit apache-module autotools
 
-#MY_P="tomcat-connectors-${PV}-src"
-MY_P="tomcat-connectors-${PV/_pre/}-dev-511994-src"
+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"
-SRC_URI="http://people.apache.org/~rjung/mod_jk-dev/${MY_P}.tar.gz"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""