Moved forward ~ppc keyword, removed older version.

Package-Manager: portage-2.1.2_rc4-r6

3 files changed, 12 insertions, 97 deletions

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index a9bc0d4a9ec4..0a9c2bccdae0 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -6,32 +6,24 @@ AUX jk-workers.properties 1034 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f S
 MD5 83e37c0f3e893815403a6f9e4efde4f1 files/jk-workers.properties 1034
 RMD160 2770b4ca80925dfd50664c02c706315d83a84b2f files/jk-workers.properties 1034
 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d files/jk-workers.properties 1034
-DIST jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463 RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 SHA1 c9a67de4e03d6d7780cf0b14284f62d30bb78156 SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641
 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
-EBUILD mod_jk-1.2.15-r1.ebuild 1864 RMD160 debf6249849631a0d3d204cf23bd3f98970b8a04 SHA1 0ef8feeea0c444ae2e360fcdc364bbfdb9efd692 SHA256 1f01004e6267f648a9dfd55602f5b0a41fd31879be270be3bf342cb4db9a4a79
-MD5 4e266c9e3a2885213605904492638cbf mod_jk-1.2.15-r1.ebuild 1864
-RMD160 debf6249849631a0d3d204cf23bd3f98970b8a04 mod_jk-1.2.15-r1.ebuild 1864
-SHA256 1f01004e6267f648a9dfd55602f5b0a41fd31879be270be3bf342cb4db9a4a79 mod_jk-1.2.15-r1.ebuild 1864
-EBUILD mod_jk-1.2.19.ebuild 1877 RMD160 0527f9b512d881c9d854f3a472683f0f57a8c629 SHA1 7dc8041951ed73894eaaa9f92b1f7d568f143c35 SHA256 0016a7fcf33da5d2078a7eec0279320951814afdf3022106f31dd1152957a857
-MD5 1c1c6ddc72d6e26cf06c7065b40b1bb6 mod_jk-1.2.19.ebuild 1877
-RMD160 0527f9b512d881c9d854f3a472683f0f57a8c629 mod_jk-1.2.19.ebuild 1877
-SHA256 0016a7fcf33da5d2078a7eec0279320951814afdf3022106f31dd1152957a857 mod_jk-1.2.19.ebuild 1877
-EBUILD mod_jk-1.2.20.ebuild 1543 RMD160 e0ee9b88d11a4d4ac18143fbb9b0cc7cf2ded38d SHA1 df7168546a53d971c33dee1f9e72eec11279657b SHA256 6463ae3b3f090ee18b89eaa5c72c91b0c7c61bf7cbc6205d95179998f52fa35c
-MD5 cd814dbba0cd04d6a0ad4818130a695f mod_jk-1.2.20.ebuild 1543
-RMD160 e0ee9b88d11a4d4ac18143fbb9b0cc7cf2ded38d mod_jk-1.2.20.ebuild 1543
-SHA256 6463ae3b3f090ee18b89eaa5c72c91b0c7c61bf7cbc6205d95179998f52fa35c mod_jk-1.2.20.ebuild 1543
-MISC ChangeLog 2910 RMD160 f42abf16e457721f63bd01e7c8e025b88d612eeb SHA1 fe215f8aee11c120100526bb4566dae1ca56e3a9 SHA256 1f50e4827ba575fdeb554b56fceb4ca32d84487dbf83041897dc4f6a9475e819
-MD5 b23e210fd1f3a04d9ad65244119b29ca ChangeLog 2910
-RMD160 f42abf16e457721f63bd01e7c8e025b88d612eeb ChangeLog 2910
-SHA256 1f50e4827ba575fdeb554b56fceb4ca32d84487dbf83041897dc4f6a9475e819 ChangeLog 2910
+EBUILD mod_jk-1.2.19.ebuild 1881 RMD160 7ddafe100aff230d72368ef50a66438c2296a60b SHA1 7e0e49cceae649d173d89543e66c55be20ec667e SHA256 530848adf586eb270775f0bd9f8ef08bf1319da95b485e979102c14a548e6737
+MD5 150a31afdee16968181dc20563026d0a mod_jk-1.2.19.ebuild 1881
+RMD160 7ddafe100aff230d72368ef50a66438c2296a60b mod_jk-1.2.19.ebuild 1881
+SHA256 530848adf586eb270775f0bd9f8ef08bf1319da95b485e979102c14a548e6737 mod_jk-1.2.19.ebuild 1881
+EBUILD mod_jk-1.2.20.ebuild 1547 RMD160 a0a21b40b75c672a86e52e33108e5da43407d5f0 SHA1 b871d03c3cf6d9f924c41ae62103a80f3f8b87e7 SHA256 8c0ce344f4a373565b7e41792568af3eaf2e6b6db8700c26ccadcb4835ec4356
+MD5 904a7951aa4d3f6c944383aafd92f117 mod_jk-1.2.20.ebuild 1547
+RMD160 a0a21b40b75c672a86e52e33108e5da43407d5f0 mod_jk-1.2.20.ebuild 1547
+SHA256 8c0ce344f4a373565b7e41792568af3eaf2e6b6db8700c26ccadcb4835ec4356 mod_jk-1.2.20.ebuild 1547
+MISC ChangeLog 3092 RMD160 903d70287415c6812695bf02c67ba0860d5cf110 SHA1 7768d069167aec86ad01e42fab7dd19bab966ada SHA256 6ee4b53e5d436229f51fa6a34b2870ee2cfbfc585457e261565dd29ba3b01524
+MD5 12eba1a57b8882964a9f3ff5fbf78711 ChangeLog 3092
+RMD160 903d70287415c6812695bf02c67ba0860d5cf110 ChangeLog 3092
+SHA256 6ee4b53e5d436229f51fa6a34b2870ee2cfbfc585457e261565dd29ba3b01524 ChangeLog 3092
 MISC metadata.xml 473 RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 SHA1 719bc65c876fdef4ef13af0f4e4a27259e342815 SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101
 MD5 49773dac392214840f81ce9ed35bedf2 metadata.xml 473
 RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 metadata.xml 473
 SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101 metadata.xml 473
-MD5 fa8b71d1318001ec36b73186933aa981 files/digest-mod_jk-1.2.15-r1 310
-RMD160 712417003278d59d32ba493341b560731169342d files/digest-mod_jk-1.2.15-r1 310
-SHA256 b55d2fe0be88cba01f44b72caa4e53bf33cd39269bda8cf885359f282e875718 files/digest-mod_jk-1.2.15-r1 310
 MD5 6a1a77b35ef40de8cea74b541da1086b files/digest-mod_jk-1.2.19 289
 RMD160 697b2e65cc081d5e40685b670d61f0992d46a628 files/digest-mod_jk-1.2.19 289
 SHA256 82a579b49926d41fc56a3e3866a8b00c430e49b455a50d31a3133a87ae07a221 files/digest-mod_jk-1.2.19 289
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.15-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.15-r1
deleted file mode 100644
index 915a2d7dadc5..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.15-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b815a666329f7de097775113547539e0 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
-RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
-SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
diff --git a/www-apache/mod_jk/mod_jk-1.2.15-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.15-r1.ebuild
deleted file mode 100644
index bd0508d3bc8f..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.15-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# 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.15-r1.ebuild,v 1.2 2007/01/09 15:43:50 caster Exp $
-
-inherit apache-module autotools java-utils-2
-
-MY_P="jakarta-tomcat-connectors-${PV}-src"
-
-DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
-HOMEPAGE="http://jakarta.apache.org/tomcat/connectors-doc"
-SRC_URI="mirror://apache/jakarta/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="apache2"
-
-DEPEND=">=virtual/jdk-1.4"
-S="${WORKDIR}/${MY_P}/jk/native"
-
-APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so"
-APACHE1_MOD_CONF="88_${PN}"
-APACHE1_MOD_DEFINE="JK"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES.txt README"
-
-need_apache
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	eautoreconf
-}
-
-src_compile() {
-	local apxs
-	local java_args
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-	use java && java_args="--with-java-home=${JAVA_HOME} \
-				--with-java-platform=2 --enable-jni"
-	econf \
-		--with-apxs=${apxs} \
-		--with-apr-config=/usr/bin/apr-config \
-		${java_args} \
-		|| die "econf failed"
-	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
-}
-
-src_install() {
-	# install the workers.properties file
-	insinto ${APACHE_CONFDIR}
-	doins ${FILESDIR}/jk-workers.properties
-
-	# if using java install the jni stuff
-	if use java; then
-		insinto ${APACHE_MODULESDIR}
-		doins ${S}/jni/jk_jnicb.so
-	fi
-
-	# 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."
-}