Version bump (#505934 by Guido Jäkel), drop old

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

diff --git a/www-apache/mod_jk/ChangeLog b/www-apache/mod_jk/ChangeLog
index c1a697d8e2f435963b6d9906ec2b75a5f82dec85..c9dbcc6ed1714f5bd97c9dcac755ccddc139297f 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-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.79 2014/08/10 20:16:02 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_jk/ChangeLog,v 1.80 2015/05/08 19:25:49 pacho Exp $
+
+*mod_jk-1.2.40 (08 May 2015)
+
+  08 May 2015; Pacho Ramos <pacho@gentoo.org> +mod_jk-1.2.40.ebuild,
+  -mod_jk-1.2.28-r1.ebuild, -mod_jk-1.2.30.ebuild, -mod_jk-1.2.32.ebuild:
+  Version bump (#505934 by Guido Jäkel), drop old
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> mod_jk-1.2.28-r1.ebuild,
   mod_jk-1.2.30.ebuild, mod_jk-1.2.32.ebuild, mod_jk-1.2.37.ebuild:

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index be123d5693a20885fd012de7a87f902f7dab06f8..09e3c3c75445708209922d642ecdbcbbad4253a2 100644 (file)
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -3,20 +3,16 @@ Hash: SHA256
 
 AUX 88_mod_jk.conf 5443 SHA256 07cc24b0bd11cc4b7dfeee01eae191710086711827a527952c6fc2bad99c6a53 SHA512 3fa5a4b596a7a968275eedcdc4d480efe6d9ac850bbc90f5cd4fcd1ca691fd1165ff34174de9397deb110906a51f62890590a1df83f941e4aaf4572a245f3cba WHIRLPOOL f2a2cde91c50467d78905fec3bf3e008ea05e7ebc2dc731123277e95b18708a5c3c0374540c107376c7f89820a22ca2da303113bb0e59ee6001d7b3d0f75ffa3
 AUX jk-workers.properties 1034 SHA256 a1ef6f9fe43e9a1dfabc754a6b7258da7966822c5c4d21fabca030347d31486d SHA512 0c2603f9b689c1a395c7ff3973921424a3310b0b1a7c2c79f6053ad438412cabd71f1d125981a320f29de607ea0a67b229a629916ccca7ad78cd833027a80268 WHIRLPOOL 24f62190e9c90da629aee21bbaa9a683035b86f81b0743b13d5744585821eec41cfce4eca44c2783d6f2335840defce511bfa85247c5b223eb8560934a152750
-DIST tomcat-connectors-1.2.28-src.tar.gz 1541956 SHA256 898fddced320754121b53b3292d1d20a31bebc6733d5aeb92367143f8941fe6f
-DIST tomcat-connectors-1.2.30-src.tar.gz 1566749 SHA256 7c7b39f045168e4a220e05f4e962edf48aaa235c13ed4c51bcc6dfba2c270aea
-DIST tomcat-connectors-1.2.32-src.tar.gz 1545588 SHA256 512a5d4ae06fd6d6aa7ba6f177b7c9ba1c8297c676b3c33686c1ffacb83035b6
 DIST tomcat-connectors-1.2.37-src.tar.gz 1528647 SHA256 38a92623ddd28b85bbf54cf77f4c867ccbebafb71233131471623691e4e751f9 SHA512 96d0d3baba661a14a2235424ad7bdd78b8b44db168cabd015cba328a200f3df00aa922fd6afb4cd3cff896591e7aeb65cdde16c641ccff5bdcb84518d8d0862f WHIRLPOOL 4d6b7b24610309f0fa44951dca81e0638aa92646e171df95fa225d1f813841592c687d6204dd0be4fb03303ad84ccee3f2adf54b542ee365877e74caaa5581d4
-EBUILD mod_jk-1.2.28-r1.ebuild 1979 SHA256 50b513c0a7848570385fc2d442fe5b43b9085824c2998305634a2f60e587f4f1 SHA512 e48fce18bc9b65fc352cdd0b728934280863435c12f2296ba9c73331d2191c131101d6a984d67b1e495b231c7d4b78cca435972c95749115c346d6797c406df1 WHIRLPOOL 4248480ec6237700dab1718e1a6c3cb7b0921f890747cdc1c8a584a8ec5e10566f573adc486e57f3fdf91bc4199d022d54f841753c4d5e245d5147a1798e00ad
-EBUILD mod_jk-1.2.30.ebuild 1976 SHA256 9b1192676896bee4070b81c340f188e9876196fd778464b9f446fed13913d2eb SHA512 07af266f78c8d65fa6e72b36489af9e62d35988b5f8306362aaec08e2ac5529c2be69acfbc29d351507e2c67362284667f072ec76b1a68dff122d2774b9ea55b WHIRLPOOL 96c1a80ad08b09d9425f2c0478a2afd7f1379ce2a3cc92dac41a8c54ddd7cf0d18140569b997c554d44440bfcee0df2f756cbc77b62419d8006a966c50fcbaf2
-EBUILD mod_jk-1.2.32.ebuild 1960 SHA256 eef22dbd148b70fd9c65e70af337de5ae4d91d9a0bdc12e8034581f4afa4ec3f SHA512 0b16fca921de5bf6af6fd23667d7d305a37b7c00b2373c9bc3c75c2a1e3ca38d0126270e02b178d46f5cec463e2ef73041a134b959019354b8a9a50c5b3cc55f WHIRLPOOL e3c6fd9ca5a63553b47fb7146ba631d0cb5dec61833dc1949d9f1f4b516b736cf6d5a6053b5fef81ecf731e2b3ea642f4f1f87eaec1fb3274d6b60fc0ee9d46b
+DIST tomcat-connectors-1.2.40-src.tar.gz 1526449 SHA256 895e347c4dff74049a848603fb29958e6cf429ea0fc708d514b3a8958236705d SHA512 502424add813e85d725dfd0658809db113510a9ed755d24257fa4ee50224971f9cd679fad4f6b4ecbcca0a6ecd1414c86b0d08023ce123374dc28538f1e53c1c WHIRLPOOL 7a5810727987b4aa76134fd813c611ea813bbd99b68bb283fdebc77ee0e67f00676a410de01984f880611e8033e80fadbb8bc6b480df5d3c5ea4c456cb11fa4b
 EBUILD mod_jk-1.2.37.ebuild 1960 SHA256 20681626dcaea7dc2fc0c38fe2a0236f74fcbeeba0918bdee35dca7009b14d68 SHA512 00d75720b56e141373f7a5b7245ebba790dcb783c40af97299bd723515c0b6569f659028b33df57412e3fd7b23a74d0d67a1a990d2ac9308b7a33a161d512617 WHIRLPOOL f7203d50ccfa3d0649483c04c5e680a847ad727eebca315f248df707dce6af2556478c97d2449c448a1c742c5e08fffacea83552e7fd33b5576057ca93961bb5
-MISC ChangeLog 12263 SHA256 e68da618898300088372594d0786c4afa2a7baf4476eeae8f86cf4ee19720b41 SHA512 a48de29e9485b1bb80da444859a967567aa74d9019797922d8f684fb86d3f5ec41fee505ca5260bfac014eafc613f31eb3855e2dd25b317693d65d8be4670443 WHIRLPOOL 81a82bc06a68d022419f4a3b922ab3c625d92a0028879bd4f380a61b5be1f4ddbcebfb650639330a1d04b21540f9d272b3e0f56308e70ed1a19d0667f13b5f66
+EBUILD mod_jk-1.2.40.ebuild 1554 SHA256 57fd69164a808a0207e1855fc96ad332b954f21a5ad351a3bdb23e5e090004be SHA512 4e43acf0c8fb1e64ebacfd5f36280bacebb76dce54d058307b4ba23058967252186c0bf3d453782889e92bc9e1d4d880b099b5dab07cd0f31eece34403d8d28e WHIRLPOOL d35617970dd7f7d07df263df7590b2e1f4918ec89c5ad89e9b63c47bf75557f85a4f3e96c960df7ab111df21c88d465f97e67231d92fbc9596cd5fd3ffa505b1
+MISC ChangeLog 12487 SHA256 07432b1695faa8f24e26a616ed608a4a852c321c4218fb0de4dce45241e47cf8 SHA512 7449cf1301e9da200e02cf7a8c762224c5d04161752825eed6c4f2f45f275a9f15c5e7a5bf88f2c598a14e7351cb7c92cd1d5c4fd567c608a2c4d5f2eeed9a1d WHIRLPOOL 9afe481f56067ff62ad21bf53ed439bfe32a96f49bb29d98dbfd504a48c927aa40c67a134e5052930b461581071616eae84544fd494f5992b39f0abca01e5153
 MISC metadata.xml 537 SHA256 e9b32d29318375fb886754e508784d0181a182bca500e1b79bf372878466ac46 SHA512 e96f3d7263bad99b2fb1932245c85758b2b8e4cef92ccf63074e1390b6d06c6f331ee468740d0c013d089c3e5bcd9d3c4ff391bdc12edf9534959161845aa32d WHIRLPOOL c42a22868376e59c7bac4501ded715d7e7a251efa25e8fb61f479da67d043613e64e72b50d9acca93cb26022eee727738e9fbe3bcf9de1f8396f2d0c7b75ad10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0wIACgkQcaHudmEf86oQdwCeJoWLkPGvFfcPdWOJQHkxviAK
-ClAAnjW8Y56J0FsPCl+N94M2/a1YX7DQ
-=JA4c
+iEYEAREIAAYFAlVNDb4ACgkQCaWpQKGI+9QBjACffYFMv9+AZezCpVjfrXQbODhb
+EPoAn0OuoElHIBGe+kSGpsfme/3BB6I2
+=QSlp
 -----END PGP SIGNATURE-----

diff --git a/www-apache/mod_jk/mod_jk-1.2.28-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.28-r1.ebuild
deleted file mode 100644 (file)
index 848882b..0000000
--- a/www-apache/mod_jk/mod_jk-1.2.28-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 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.28-r1.ebuild,v 1.6 2014/08/10 20:16:02 slyfox Exp $
-
-EAPI="2"
-
-inherit apache-module java-pkg-2
-
-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"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES"
-CONF_DIR="${WORKDIR}/${MY_P}/conf"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=""
-
-need_apache
-
-pkg_setup() {
-       java-pkg-2_pkg_setup
-}
-
-src_configure() {
-       econf \
-               --with-apxs=${APXS} \
-               --with-apr-config=/usr/bin/apr-config \
-               || die "econf failed"
-}
-
-src_compile() {
-       emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
-}
-
-src_install() {
-       # install the workers.properties file
-       insinto "${APACHE_CONFDIR}"
-       newins "${CONF_DIR}/workers.properties.minimal" \
-               jk-workers-minimal.properties || die
-       newins "${CONF_DIR}/workers.properties" \
-               jk-workers.properties || die
-       doins "${CONF_DIR}/uriworkermap.properties" || die
-
-       # 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."
-
-       elog "Advanced Directives and Options can be found at: "
-       elog "http://tomcat.apache.org/connectors-doc/reference/workers.html"
-
-       elog ""
-       elog "JNI Worker Deprecation:"
-       elog "Workers of type jni are broken since a long time."
-       elog "Since there is no more use for them, they have been deprecated now,"
-       elog "and will be removed in a future release."
-}

diff --git a/www-apache/mod_jk/mod_jk-1.2.30.ebuild b/www-apache/mod_jk/mod_jk-1.2.30.ebuild
deleted file mode 100644 (file)
index 07cf279..0000000
--- a/www-apache/mod_jk/mod_jk-1.2.30.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 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.30.ebuild,v 1.5 2014/08/10 20:16:02 slyfox Exp $
-
-EAPI="2"
-
-inherit apache-module java-pkg-2
-
-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"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES"
-CONF_DIR="${WORKDIR}/${MY_P}/conf"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=""
-
-need_apache
-
-pkg_setup() {
-       java-pkg-2_pkg_setup
-}
-
-src_configure() {
-       econf \
-               --with-apxs=${APXS} \
-               --with-apr-config=/usr/bin/apr-config \
-               || die "econf failed"
-}
-
-src_compile() {
-       emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
-}
-
-src_install() {
-       # install the workers.properties file
-       insinto "${APACHE_CONFDIR}"
-       newins "${CONF_DIR}/workers.properties.minimal" \
-               jk-workers-minimal.properties || die
-       newins "${CONF_DIR}/workers.properties" \
-               jk-workers.properties || die
-       doins "${CONF_DIR}/uriworkermap.properties" || die
-
-       # 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."
-
-       elog "Advanced Directives and Options can be found at: "
-       elog "http://tomcat.apache.org/connectors-doc/reference/workers.html"
-
-       elog ""
-       elog "JNI Worker Deprecation:"
-       elog "Workers of type jni are broken since a long time."
-       elog "Since there is no more use for them, they have been deprecated now,"
-       elog "and will be removed in a future release."
-}

diff --git a/www-apache/mod_jk/mod_jk-1.2.32.ebuild b/www-apache/mod_jk/mod_jk-1.2.32.ebuild
deleted file mode 100644 (file)
index d941dc0..0000000
--- a/www-apache/mod_jk/mod_jk-1.2.32.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2014 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.32.ebuild,v 1.5 2014/08/10 20:16:02 slyfox Exp $
-
-EAPI="2"
-
-inherit apache-module java-pkg-2
-
-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/${MY_P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}/native"
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_CONF="88_${PN}"
-APACHE2_MOD_DEFINE="JK"
-
-DOCFILES="CHANGES"
-CONF_DIR="${WORKDIR}/${MY_P}/conf"
-
-DEPEND=">=virtual/jdk-1.4"
-RDEPEND=""
-
-need_apache
-
-pkg_setup() {
-       java-pkg-2_pkg_setup
-}
-
-src_configure() {
-       econf \
-               --with-apxs=${APXS} \
-               --with-apr-config=/usr/bin/apr-config \
-               || die "econf failed"
-}
-
-src_compile() {
-       emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "emake failed"
-}
-
-src_install() {
-       # install the workers.properties file
-       insinto "${APACHE_CONFDIR}"
-       newins "${CONF_DIR}/workers.properties.minimal" \
-               jk-workers-minimal.properties || die
-       newins "${CONF_DIR}/workers.properties" \
-               jk-workers.properties || die
-       doins "${CONF_DIR}/uriworkermap.properties" || die
-
-       # 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."
-
-       elog "Advanced Directives and Options can be found at: "
-       elog "http://tomcat.apache.org/connectors-doc/reference/workers.html"
-
-       elog ""
-       elog "JNI Worker Deprecation:"
-       elog "Workers of type jni are broken since a long time."
-       elog "Since there is no more use for them, they have been deprecated now,"
-       elog "and will be removed in a future release."
-}

diff --git a/www-apache/mod_jk/mod_jk-1.2.40.ebuild b/www-apache/mod_jk/mod_jk-1.2.40.ebuild
new file mode 100644 (file)
index 0000000..5379073
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.40.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 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.40.ebuild,v 1.1 2015/05/08 19:25:49 pacho Exp $
+
+EAPI="5"
+inherit apache-module java-pkg-opt-2 readme.gentoo
+
+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/${MY_P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="java"
+
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+CONF_DIR="${WORKDIR}/${MY_P}/conf"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+RDEPEND=""
+
+need_apache
+
+DOC_CONTENTS="
+       Advanced Directives and Options can be found at:
+       http://tomcat.apache.org/connectors-doc/reference/workers.html
+"
+
+pkg_setup() {
+       if use java ; then
+               java-pkg-2_pkg_setup
+       fi
+}
+
+src_configure() {
+       econf \
+               --with-apxs=${APXS} \
+               --with-apr-config=/usr/bin/apr-config
+}
+
+src_compile() {
+       emake LIBTOOL="/bin/sh $(pwd)/libtool --silent"
+}
+
+src_install() {
+       # install the workers.properties file
+       insinto "${APACHE_CONFDIR}"
+       newins "${CONF_DIR}/workers.properties.minimal" \
+               jk-workers-minimal.properties
+       newins "${CONF_DIR}/workers.properties" \
+               jk-workers.properties
+       doins "${CONF_DIR}/uriworkermap.properties"
+
+       # call the nifty default src_install
+       apache-module_src_install
+
+       readme.gentoo_create_doc
+}