Bumped to latest dev snapshot of upcoming release

Package-Manager: portage-2.1.2.2

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index 634756c6d21766ffe10cb0b542f6c26e03da12e3..7d346ba2e0be62c0f1cb8241eb5c143dc3caf7e6 100644 (file)
--- 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.27 2007/03/08 19:16:39 wltjr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.28 2007/04/02 15:22:39 wltjr Exp $
+
+*mod_jk-1.2.22_pre (02 Apr 2007)
+
+  02 Apr 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  +mod_jk-1.2.22_pre.ebuild:
+  Bumped to latest dev snapshot of upcoming release
 
   08 Mar 2007; William L. Thomson Jr. <wltjr@gentoo.org>
   mod_jk-1.2.21-r2.ebuild:

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index b4c7fb105a1e2badb93d2015392f39c017f27ec5..0b6e4f5845c051acaeba9331680116546c2cc299 100644 (file)
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -6,15 +6,20 @@ 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 tomcat-connectors-1.1.22-dev-524775-src.tar.gz 1347416 RMD160 0d296fc1a4e7496d9f42eacde6a14204cf943ec0 SHA1 c24189d56c62f958fab5c0e05790522497b756f1 SHA256 055cb877bef6ce75fb4e11e15e63f835f9005dabed96080fb7980bf081a9d01b
 DIST tomcat-connectors-1.2.21-src.tar.gz 1334563 RMD160 3fd67a6ef64ccb6aa5e0e82bb73bec423d94f84d SHA1 77b110d91ef0f3574bf74fa1dd37802def361ea6 SHA256 371908f280eeba38e64dce7bb25a398931c182b9b99976a7bb1196a8ba8b8faa
 EBUILD mod_jk-1.2.21-r2.ebuild 1727 RMD160 50f59ea84522c99055d908e0e37817530494d73f SHA1 feaaa9e8d043bdaf28db017bfc32214c98b0fde0 SHA256 14c99fbda4d5178dd5fadcb0a0921199832e00b667ae42e0acbbf2877617b1ee
 MD5 7bb814ee477be8b88d458152225b7e9d mod_jk-1.2.21-r2.ebuild 1727
 RMD160 50f59ea84522c99055d908e0e37817530494d73f mod_jk-1.2.21-r2.ebuild 1727
 SHA256 14c99fbda4d5178dd5fadcb0a0921199832e00b667ae42e0acbbf2877617b1ee mod_jk-1.2.21-r2.ebuild 1727
-MISC ChangeLog 5270 RMD160 19aff719893b965122488fcf26296792655c646d SHA1 86452afa33beb6f13c1e5aca93badbdf672f8551 SHA256 4fc9e8e03bcd4d6a0cdcfbb99c53f4baa896983e92f7db0727390c4ba46d335b
-MD5 fb3616e45f849670b619c95bc6cc3136 ChangeLog 5270
-RMD160 19aff719893b965122488fcf26296792655c646d ChangeLog 5270
-SHA256 4fc9e8e03bcd4d6a0cdcfbb99c53f4baa896983e92f7db0727390c4ba46d335b ChangeLog 5270
+EBUILD mod_jk-1.2.22_pre.ebuild 1827 RMD160 96a26d4e40fe1030002ff3b64d9c142484e62120 SHA1 7454a9fcad48c0fdb0b426c2a9620a1a950ea4ab SHA256 06668f2c9a08ce9f5a5c22cf5d8c2eb93d4662111c0dd659281a5eea45691e7c
+MD5 ad135d58442cc4590b2f43ba1f98c611 mod_jk-1.2.22_pre.ebuild 1827
+RMD160 96a26d4e40fe1030002ff3b64d9c142484e62120 mod_jk-1.2.22_pre.ebuild 1827
+SHA256 06668f2c9a08ce9f5a5c22cf5d8c2eb93d4662111c0dd659281a5eea45691e7c mod_jk-1.2.22_pre.ebuild 1827
+MISC ChangeLog 5443 RMD160 d0784fb77b5edc3449c7fc912d4dda6ddca994ae SHA1 39860e67b1026b0dd4f5c24baf526cf3d31d50bb SHA256 b00cb34eb378c4a61be77b13efcdf9498ee4680efb3040233a253465a0cc64e1
+MD5 39d6f6ddd2a1c76746fb719e577abb9c ChangeLog 5443
+RMD160 d0784fb77b5edc3449c7fc912d4dda6ddca994ae ChangeLog 5443
+SHA256 b00cb34eb378c4a61be77b13efcdf9498ee4680efb3040233a253465a0cc64e1 ChangeLog 5443
 MISC metadata.xml 490 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 SHA1 e2c0054761431097e455f551f0a16822c2315adf SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f
 MD5 0cb6c2d14d328234b97aab96f3a81981 metadata.xml 490
 RMD160 0007acb19f8fdc11a321cb730d9ca31477ddede2 metadata.xml 490
@@ -22,3 +27,6 @@ SHA256 31903cf82886a89fc00b56a3d1a54462b3e6a0853ccc55552c1c9814d9ff921f metadata
 MD5 bfb38ada368b556843143972158bd03f files/digest-mod_jk-1.2.21-r2 289
 RMD160 50d1681f5733e770bbfbdeaf86a0ba890a89bc26 files/digest-mod_jk-1.2.21-r2 289
 SHA256 51d6699d225cf9d6ca08e83085169e088bf9a48d1664efff0020454290409b1c files/digest-mod_jk-1.2.21-r2 289
+MD5 d1fe90d2c27dfffafc43b4e3d80da926 files/digest-mod_jk-1.2.22_pre 322
+RMD160 cf87ab2f3a316de9aa9817056e81e8235914ac04 files/digest-mod_jk-1.2.22_pre 322
+SHA256 db034c643ad53738f35a27b80488bc232782e0a49905d060647bc6787d51c651 files/digest-mod_jk-1.2.22_pre 322

diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.22_pre b/www-apache/mod_jk/files/digest-mod_jk-1.2.22_pre
new file mode 100644 (file)
index 0000000..f9d7769
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.22_pre
@@ -0,0 +1,3 @@
+MD5 61f2a1dbf062bcba4970e4f4f88f95c6 tomcat-connectors-1.1.22-dev-524775-src.tar.gz 1347416
+RMD160 0d296fc1a4e7496d9f42eacde6a14204cf943ec0 tomcat-connectors-1.1.22-dev-524775-src.tar.gz 1347416
+SHA256 055cb877bef6ce75fb4e11e15e63f835f9005dabed96080fb7980bf081a9d01b tomcat-connectors-1.1.22-dev-524775-src.tar.gz 1347416

diff --git a/www-apache/mod_jk/mod_jk-1.2.22_pre.ebuild b/www-apache/mod_jk/mod_jk-1.2.22_pre.ebuild
new file mode 100644 (file)
index 0000000..6593e59
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.22_pre.ebuild
@@ -0,0 +1,71 @@
+# 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.22_pre.ebuild,v 1.1 2007/04/02 15:22:39 wltjr Exp $
+
+inherit apache-module autotools
+
+MY_P="tomcat-connectors-${PV/2.22_pre/1.22-dev-524775}-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/~mturk/jk-1.2.22-dev/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE1_MOD_FILE="${S}/apache-1.3/${PN}.so"
+APACHE1_MOD_CONF="88_${PN}"
+APACHE1_MOD_DEFINE="JK"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.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 "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
+
+       if ! use apache2 ; then
+               sed -i -e 's:/apache2/:/apache/:' "${D}${APACHE_CONFDIR}/modules.d/88_${PN}.conf" \
+                       || die "Could not update jk-workers.properties for apache"
+       fi
+}
+
+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."
+}