From: William Thomson Date: Thu, 21 Dec 2006 02:12:10 +0000 (+0000) Subject: Bumping package to lastest stable version. Dropped java USE flag, should have been... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=aae281af59c3dd583b062f41eb534bf68054fff1;p=gentoo.git Bumping package to lastest stable version. Dropped java USE flag, should have been jni, but upstream will be dropping the jni stuff or has. Package-Manager: portage-2.1.2_rc3-r6 --- diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog index e42ee7f8fe98..d25adf0213f3 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-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.12 2006/11/05 23:34:06 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.13 2006/12/21 02:12:10 wltjr Exp $ + +*mod_jk-1.2.20 (21 Dec 2006) + + 21 Dec 2006; William L. Thomson Jr. + +mod_jk-1.2.20.ebuild: + Bumping package to lastest stable version. Dropped java USE flag, should + have been jni, but upstream will be dropping the jni stuff or has. 05 Nov 2006; Christian Faulhammer mod_jk-1.2.19.ebuild: stable x86, bug #151748 diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index fcd2bb29e2e6..2c2869b472db 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 88_mod_jk.conf 5391 RMD160 840beec20a576b630c571d26fbf3e61722991810 SHA1 dbbf75f2d9427441496786c6767b62231deb12db SHA256 1f78a0766aac425e994da81aa26632aa359db92ced09dc443dc207049d9d38cf MD5 eecf40590474fbcdb54010d1f8525e49 files/88_mod_jk.conf 5391 RMD160 840beec20a576b630c571d26fbf3e61722991810 files/88_mod_jk.conf 5391 @@ -10,10 +7,11 @@ 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 SHA1 2b2e1a612b133824548dad7858c10fd986da3722 SHA256 4547d2b2f220342a8e373e009a23326073ed0fcfcae7a54466b04d1bc8b9aee9 -DIST jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463 RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 SHA1 c9a67de4e03d6d7780cf0b14284f62d30bb78156 SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641 -DIST tomcat-connectors-1.2.18-src.tar.gz 929823 RMD160 3f9c60d6121271ade71dd0edd5dd88910e13e105 SHA1 cb7286f3f773d9ed2111cdcc7760445899f7bcd5 SHA256 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311 +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 @@ -42,10 +40,14 @@ EBUILD mod_jk-1.2.19.ebuild 1879 RMD160 936a76bfd0e06a214368c8e2c8ee5cdfb47eed5d MD5 471721c224ea7c7b6b1d67350ef0f9ab mod_jk-1.2.19.ebuild 1879 RMD160 936a76bfd0e06a214368c8e2c8ee5cdfb47eed5d mod_jk-1.2.19.ebuild 1879 SHA256 16649626e2dc4a00dc30926dd1948cce3b7de833682db87277a963f1291becfc mod_jk-1.2.19.ebuild 1879 -MISC ChangeLog 2283 RMD160 f0b617a7a9ed919d196d21293fa5ddfc1169b75e SHA1 e1dc50102e04b78dd7f64cf058321ac939bfa20f SHA256 68de34355288ebf9e96e7e7b3977f7194d7e4ce4299b15aa8026910d989ee657 -MD5 20f0cf9364dfbd4ca11b3bc6bb5818b1 ChangeLog 2283 -RMD160 f0b617a7a9ed919d196d21293fa5ddfc1169b75e ChangeLog 2283 -SHA256 68de34355288ebf9e96e7e7b3977f7194d7e4ce4299b15aa8026910d989ee657 ChangeLog 2283 +EBUILD mod_jk-1.2.20.ebuild 1545 RMD160 b47e32cee8b734bcf28508ebaa1deac80a229729 SHA1 68c8b27d12af3a47d343b8876a669d73b85f6a67 SHA256 69869a2b963547a8dd91c2a8215fe35a529ae9019722ecfc39dbc3bbb9859667 +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 metadata.xml 473 RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 SHA1 719bc65c876fdef4ef13af0f4e4a27259e342815 SHA256 d77999e17d2604645bdc7a6a79580941ac02a9beefde026e72e2045556e9d101 MD5 49773dac392214840f81ce9ed35bedf2 metadata.xml 473 RMD160 c73e6b427fac7f036d19e47af05d0b72b4386bd0 metadata.xml 473 @@ -71,10 +73,6 @@ SHA256 4039bf46d18e2840dce0a0ccb2a5f40dc9f69e6f98928869b2db5db57778bf02 files/di 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 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFFTnT2NQqtfCuFneMRAiHaAKCOXxU+8bFZaRtp6UGtHjJ1XwXTaACfeb+v -4lDIMTFuLzH85nK+hTZbous= -=glVc ------END PGP SIGNATURE----- +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 diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.20 b/www-apache/mod_jk/files/digest-mod_jk-1.2.20 new file mode 100644 index 000000000000..fbc0dafee4d2 --- /dev/null +++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.20 @@ -0,0 +1,3 @@ +MD5 f10709339009b3be9398d3a838d9cabd tomcat-connectors-1.2.20-src.tar.gz 1316612 +RMD160 380e6ce7d45a2c522fbb067963b7e9850ff670fc tomcat-connectors-1.2.20-src.tar.gz 1316612 +SHA256 5a606c4438952e858f8ad91e98519bf723833dc61223439a8f57e4567a506610 tomcat-connectors-1.2.20-src.tar.gz 1316612 diff --git a/www-apache/mod_jk/mod_jk-1.2.20.ebuild b/www-apache/mod_jk/mod_jk-1.2.20.ebuild new file mode 100644 index 000000000000..01d7e84a53b8 --- /dev/null +++ b/www-apache/mod_jk/mod_jk-1.2.20.ebuild @@ -0,0 +1,64 @@ +# 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.20.ebuild,v 1.1 2006/12/21 02:12:10 wltjr Exp $ + +inherit apache-module autotools + +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" + +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 + 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 + insinto ${APACHE_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." +}