11 files changed, 4 insertions, 390 deletions
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 2c2869b472db..77306438a386 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -6,36 +6,13 @@ 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.10-src.tar.gz 825352
-DIST jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067 RMD160 aa1bc48bb9443d7d4ba019d3aeab4a188a98bd48 SHA256 4547d2b2f220342a8e373e009a23326073ed0fcfcae7a54466b04d1bc8b9aee9
 DIST jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463 RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641
-DIST tomcat-connectors-1.2.18-src.tar.gz 929823 RMD160 3f9c60d6121271ade71dd0edd5dd88910e13e105 SHA256 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311
 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.10.ebuild 1623 RMD160 211eed7a717ba2b4b4f42e45e36312fe3d3f4753 SHA1 ce8cfe4232a724b37eb3c3f1e19fbe6a51f722a4 SHA256 054ee3e14468c6e543efed3f2ea0870fb52ece4641746a24299a8ddf61433603
-MD5 8e8673e565394d4acade788257281555 mod_jk-1.2.10.ebuild 1623
-RMD160 211eed7a717ba2b4b4f42e45e36312fe3d3f4753 mod_jk-1.2.10.ebuild 1623
-SHA256 054ee3e14468c6e543efed3f2ea0870fb52ece4641746a24299a8ddf61433603 mod_jk-1.2.10.ebuild 1623
-EBUILD mod_jk-1.2.13.ebuild 1624 RMD160 b180861ada2449d71512183726048616982deb0e SHA1 206f246e391b29a71afbc6b9dad87dd93d2d9edf SHA256 e845730af5f6631df995f98fabc2a716641e5f279fa918227850343b5079c9dd
-MD5 1c0b965430b130f56e26a1a59086cb3e mod_jk-1.2.13.ebuild 1624
-RMD160 b180861ada2449d71512183726048616982deb0e mod_jk-1.2.13.ebuild 1624
-SHA256 e845730af5f6631df995f98fabc2a716641e5f279fa918227850343b5079c9dd mod_jk-1.2.13.ebuild 1624
 EBUILD mod_jk-1.2.15-r1.ebuild 1866 RMD160 472dcfba8221c5041e478fd89692233c756de607 SHA1 8b70089f428a27a538004a301d08475637018604 SHA256 d030e2ab94142d7dff679edbdd6acf7f2b1d7b4bfa5d3de9710e25ca0f210405
 MD5 4c2e82faea7f16b09c9f69e4a6c73e8f mod_jk-1.2.15-r1.ebuild 1866
 RMD160 472dcfba8221c5041e478fd89692233c756de607 mod_jk-1.2.15-r1.ebuild 1866
 SHA256 d030e2ab94142d7dff679edbdd6acf7f2b1d7b4bfa5d3de9710e25ca0f210405 mod_jk-1.2.15-r1.ebuild 1866
-EBUILD mod_jk-1.2.15.ebuild 1746 RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 SHA1 12254394a4a3a307c8e3da90b00334303b9c07d1 SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c
-MD5 097f26a843471eaaf31f6bd28e32f81d mod_jk-1.2.15.ebuild 1746
-RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 mod_jk-1.2.15.ebuild 1746
-SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c mod_jk-1.2.15.ebuild 1746
-EBUILD mod_jk-1.2.18-r1.ebuild 1884 RMD160 755d76698c756ae62e0b9f092ae22a6f2e67b6f6 SHA1 4515db8f89e7d90c13e9dd007f913ac0a8a6d0a9 SHA256 de4076b2aecb039e07a2961be2ea82aa4bdb7d10d4504fdf3b6eab3e50e8dd2f
-MD5 44179f011e8110ac4a4358588866cffd mod_jk-1.2.18-r1.ebuild 1884
-RMD160 755d76698c756ae62e0b9f092ae22a6f2e67b6f6 mod_jk-1.2.18-r1.ebuild 1884
-SHA256 de4076b2aecb039e07a2961be2ea82aa4bdb7d10d4504fdf3b6eab3e50e8dd2f mod_jk-1.2.18-r1.ebuild 1884
-EBUILD mod_jk-1.2.18.ebuild 1796 RMD160 c41a3b484e9b6b739f55a07cbf694c8f77e12a15 SHA1 d2d1c6fb855ba570474e37f3f1f4931cff5489f6 SHA256 f93fe4c85aa9e47de466485e70009fb5f891e8f73ac6866108fbd47e647b128c
-MD5 958dbab934efa8bd13f3db394566d64f mod_jk-1.2.18.ebuild 1796
-RMD160 c41a3b484e9b6b739f55a07cbf694c8f77e12a15 mod_jk-1.2.18.ebuild 1796
-SHA256 f93fe4c85aa9e47de466485e70009fb5f891e8f73ac6866108fbd47e647b128c mod_jk-1.2.18.ebuild 1796
 EBUILD mod_jk-1.2.19.ebuild 1879 RMD160 936a76bfd0e06a214368c8e2c8ee5cdfb47eed5d SHA1 1d566c69efd4b0cf82ed480d6f4ed52b0ba6d1fd SHA256 16649626e2dc4a00dc30926dd1948cce3b7de833682db87277a963f1291becfc
 MD5 471721c224ea7c7b6b1d67350ef0f9ab mod_jk-1.2.19.ebuild 1879
 RMD160 936a76bfd0e06a214368c8e2c8ee5cdfb47eed5d mod_jk-1.2.19.ebuild 1879
@@ -44,32 +21,17 @@ EBUILD mod_jk-1.2.20.ebuild 1545 RMD160 b47e32cee8b734bcf28508ebaa1deac80a229729
 MD5 f0cb74159628aded34254403839ff8ee mod_jk-1.2.20.ebuild 1545
 RMD160 b47e32cee8b734bcf28508ebaa1deac80a229729 mod_jk-1.2.20.ebuild 1545
 SHA256 69869a2b963547a8dd91c2a8215fe35a529ae9019722ecfc39dbc3bbb9859667 mod_jk-1.2.20.ebuild 1545
-MISC ChangeLog 2540 RMD160 3f91d560312693e12e7bba5c66153eb838308791 SHA1 c2fe972ce48e81bfd134103ed66320f89610634c SHA256 5e0607a73d567452401d29e929158440577ba1abc15c8f2483cdf2b7692caca2
-MD5 c3078eb8c2d6bf9a57f5f3012e8cf4ca ChangeLog 2540
-RMD160 3f91d560312693e12e7bba5c66153eb838308791 ChangeLog 2540
-SHA256 5e0607a73d567452401d29e929158440577ba1abc15c8f2483cdf2b7692caca2 ChangeLog 2540
+MISC ChangeLog 2761 RMD160 9c7ccc0c1b3c601ba48bddd261eea41ff82143d9 SHA1 cbcaab65fb9b365275c7116ed76cef42decf45d2 SHA256 7d2d8fb6205697a3fb33fc0424787d2d86949b864ed7d7856e381547dea593a6
+MD5 b2ead03fd26a5ee79b6fa9e6e457ac5b ChangeLog 2761
+RMD160 9c7ccc0c1b3c601ba48bddd261eea41ff82143d9 ChangeLog 2761
+SHA256 7d2d8fb6205697a3fb33fc0424787d2d86949b864ed7d7856e381547dea593a6 ChangeLog 2761
 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 4816b7fbdd754d6ad17f967ec252ea39 files/digest-mod_jk-1.2.10 88
-RMD160 5301ce4cb4e361fd99287c826860d917258cf08b files/digest-mod_jk-1.2.10 88
-SHA256 4a5e0ad580f0cb449794bcd03b44e65f2de6654906fdf9a9f2ad8d232cb29951 files/digest-mod_jk-1.2.10 88
-MD5 38fc3dcf03f305ff7100787b1a4e10e9 files/digest-mod_jk-1.2.13 310
-RMD160 2f2ea640784d7faedc32140e8998e67b38c4b370 files/digest-mod_jk-1.2.13 310
-SHA256 44c52dd456b2c68fdef71fd5a9be938924160131c581420d439c5626cacd081f files/digest-mod_jk-1.2.13 310
-MD5 fa8b71d1318001ec36b73186933aa981 files/digest-mod_jk-1.2.15 310
-RMD160 712417003278d59d32ba493341b560731169342d files/digest-mod_jk-1.2.15 310
-SHA256 b55d2fe0be88cba01f44b72caa4e53bf33cd39269bda8cf885359f282e875718 files/digest-mod_jk-1.2.15 310
 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 2aa593598d06e901e2b389bef195e19e files/digest-mod_jk-1.2.18 286
-RMD160 54dc2c15e7e7d0c02f584c85f214563c6fc92e92 files/digest-mod_jk-1.2.18 286
-SHA256 4039bf46d18e2840dce0a0ccb2a5f40dc9f69e6f98928869b2db5db57778bf02 files/digest-mod_jk-1.2.18 286
-MD5 2aa593598d06e901e2b389bef195e19e files/digest-mod_jk-1.2.18-r1 286
-RMD160 54dc2c15e7e7d0c02f584c85f214563c6fc92e92 files/digest-mod_jk-1.2.18-r1 286
-SHA256 4039bf46d18e2840dce0a0ccb2a5f40dc9f69e6f98928869b2db5db57778bf02 files/digest-mod_jk-1.2.18-r1 286
 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.10 b/www-apache/mod_jk/files/digest-mod_jk-1.2.10
deleted file mode 100644
index 69b41e28a88e..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.10
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bdec6d9bc0a0f8e394d3bca9b0e390c6 jakarta-tomcat-connectors-1.2.10-src.tar.gz 825352
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.13 b/www-apache/mod_jk/files/digest-mod_jk-1.2.13
deleted file mode 100644
index 7971710939eb..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.13
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 028e39a84b81847b62d07ed9cd9427ae jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
-RMD160 aa1bc48bb9443d7d4ba019d3aeab4a188a98bd48 jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
-SHA256 4547d2b2f220342a8e373e009a23326073ed0fcfcae7a54466b04d1bc8b9aee9 jakarta-tomcat-connectors-1.2.13-src.tar.gz 724067
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.15 b/www-apache/mod_jk/files/digest-mod_jk-1.2.15
deleted file mode 100644
index 915a2d7dadc5..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.15
+++ /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/files/digest-mod_jk-1.2.18 b/www-apache/mod_jk/files/digest-mod_jk-1.2.18
deleted file mode 100644
index 77266e051213..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.18
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58e1b9406e0cfe11bd4bc297ba146b4f tomcat-connectors-1.2.18-src.tar.gz 929823
-RMD160 3f9c60d6121271ade71dd0edd5dd88910e13e105 tomcat-connectors-1.2.18-src.tar.gz 929823
-SHA256 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311 tomcat-connectors-1.2.18-src.tar.gz 929823
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.18-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.18-r1
deleted file mode 100644
index 77266e051213..000000000000
--- a/www-apache/mod_jk/files/digest-mod_jk-1.2.18-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 58e1b9406e0cfe11bd4bc297ba146b4f tomcat-connectors-1.2.18-src.tar.gz 929823
-RMD160 3f9c60d6121271ade71dd0edd5dd88910e13e105 tomcat-connectors-1.2.18-src.tar.gz 929823
-SHA256 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311 tomcat-connectors-1.2.18-src.tar.gz 929823
diff --git a/www-apache/mod_jk/mod_jk-1.2.10.ebuild b/www-apache/mod_jk/mod_jk-1.2.10.ebuild
deleted file mode 100644
index ed9ebeb7b6d2..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.10.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2005 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.10.ebuild,v 1.5 2005/10/17 18:15:11 betelgeuse Exp $
-
-inherit apache-module
-
-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 ~x86"
-IUSE="apache2"
-
-DEPEND=""
-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_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-
-	econf \
-		--with-apxs=${apxs} \
-		--with-apr-config=/usr/bin/apr-config \
-		|| die "econf failed"
-	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
-}
-
-src_install() {
-	# install the workers.properties file
-	local confdir=""
-	use apache2 && confdir="/etc/apache2"
-	use apache2 || confdir="/etc/apache"
-
-	dodir ${confdir}
-	insinto ${confdir}
-	doins ${FILESDIR}/jk-workers.properties
-
-	# call the nifty default src_install :-)
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
-	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
-	einfo "your own."
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.13.ebuild b/www-apache/mod_jk/mod_jk-1.2.13.ebuild
deleted file mode 100644
index 983831cd4ed3..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.13.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2006 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.13.ebuild,v 1.4 2006/05/26 09:51:21 nixnut Exp $
-
-inherit apache-module
-
-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=""
-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_compile() {
-	local apxs
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-
-	econf \
-		--with-apxs=${apxs} \
-		--with-apr-config=/usr/bin/apr-config \
-		|| die "econf failed"
-	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
-}
-
-src_install() {
-	# install the workers.properties file
-	local confdir=""
-	use apache2 && confdir="/etc/apache2"
-	use apache2 || confdir="/etc/apache"
-
-	dodir ${confdir}
-	insinto ${confdir}
-	doins ${FILESDIR}/jk-workers.properties
-
-	# call the nifty default src_install :-)
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
-	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
-	einfo "your own."
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.15.ebuild b/www-apache/mod_jk/mod_jk-1.2.15.ebuild
deleted file mode 100644
index 4e8021bfa884..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.15.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2006 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.ebuild,v 1.1 2006/07/23 09:31:44 nelchael Exp $
-
-inherit apache-module 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_compile() {
-	local apxs
-	local java_args
-	use apache2 && apxs="${APXS2}"
-	use apache2 || apxs="${APXS1}"
-	java_args="--with-java-home=${JAVA_HOME} --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
-	local confdir=""
-	use apache2 && confdir="/etc/apache2"
-	use apache2 || confdir="/etc/apache"
-
-	dodir ${confdir}
-	insinto ${confdir}
-	doins ${FILESDIR}/jk-workers.properties
-
-	# call the nifty default src_install :-)
-	apache-module_src_install
-}
-
-pkg_postinst() {
-	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
-	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
-	einfo "your own."
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild
deleted file mode 100644
index 8bec62701ab5..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2006 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.18-r1.ebuild,v 1.2 2006/09/22 17:45:26 wltjr Exp $
-
-inherit apache-module autotools java-pkg-opt-2
-
-MY_P="tomcat-connectors-${PV}-src"
-
-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"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 java"
-
-DEPEND="java? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )"
-S="${WORKDIR}/${MY_P}/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() {
-	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
-	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
-	einfo "your own."
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.18.ebuild b/www-apache/mod_jk/mod_jk-1.2.18.ebuild
deleted file mode 100644
index 088638869892..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.18.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2006 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.18.ebuild,v 1.2 2006/09/17 05:24:44 mr_bones_ Exp $
-
-inherit apache-module java-pkg-opt-2
-
-MY_P="tomcat-connectors-${PV}-src"
-
-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"
-KEYWORDS="~amd64 ~x86"
-IUSE="apache2 java"
-
-DEPEND="java? ( >=virtual/jdk-1.4 )"
-S="${WORKDIR}/${MY_P}/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_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() {
-	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
-	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
-	einfo "your own."
-}