gentoo auto-resync : 16:09:2024 - 12:11:35

4 files changed, 2 insertions, 87 deletions

diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index cd4fd421f8ef..41e324bc50d3 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 35ffc4699921..fbd5a5ed27b2 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1,9 +1,6 @@
 AUX mod_jk-1.2.49-export-symbols-regex.patch 1352 BLAKE2B dd9c7325be14083b3ba81235c7c195ec450052089061efb5cee58c6bfa7df5bf4ffe63a9eb3a7821863e3131ed4faa8786b5b85e9593ea7054b5fcf38b14d3fe SHA512 cdd7eecc9bc3fe5af9d7c85b18800b4ae1e859c667d5db5262df40da1009e4e944fe73b2c88027f570b6082ea47edf05eff24a99025df7cef3cf20913a77fb9c
 AUX mod_jk-1.2.49-musl.patch 985 BLAKE2B e7cc5412d74f2df9c28ebe7eddf7594214931eecf5ec20c1c6486ea48e1aa79e86f95931568425af73535a3df37a44e8e2620e502b03d85338db2b15219b2ceb SHA512 77635b10c5e14466c57512a3423673aa2b488b73abb2727522b321f71db3d7aed39ab0b6f7e783cc246742c973d5f7dd5d8b9039a6cc6274656f1761b174ca07
-DIST tomcat-connectors-1.2.49-src.tar.gz 1702479 BLAKE2B 5994bbff6b8c11770cfe8287590d3af793d8720b8a54ecb066abe481e158517c25757a575c9db197e39b1ffc957f27237e92818a9da557db78e5d286b58b1d13 SHA512 936eb017ff9d9011996933838d5c306ede9ae1886405f4daed60719ee522cca6075dedb3b647863ef12155cca93f6db8e58209a5d3bbd2da157ffc536a6809f2
-DIST tomcat-connectors-1.2.49-src.tar.gz.asc 873 BLAKE2B 52cd9b6f051a6a76b1823773c4af2742dfdd686afa951975623d2d2a42730cbd40882e0f6f13600a6e473d265418b662ae1a576889e25685d74d8e692ae1a42e SHA512 41edf25b31bbf280814451dcb9fdc28497394213dfd968c37b2c15670aee34e028a7fc1145a374f128d7ab969c43ca9ae6fd296fee6bf5fae4785ea35908b144
 DIST tomcat-connectors-1.2.50-src.tar.gz 1738508 BLAKE2B ffa76cde244010169753d903735157fadcc93e91f32cb604247a8db801d6c05cf67817f457f11ba1aaa3b9d5ae480fad4bde2e50f3114e4e64a70117062419b4 SHA512 9b5a1eb1c0fd38627c574102b3551cdc96fc438b00be5d65770c55b43234af445e642fe8bcbdfe47686b0f3aadab3679340fa76b54b693f57f2273e83ac114ab
 DIST tomcat-connectors-1.2.50-src.tar.gz.asc 833 BLAKE2B e27ef4f7a194623f6561b30f9a97ba0dd1391404d44577e8bfe8663513bf12801753d859fbd75c63d1ceafa59493d338f5b0a1db2eb3678caf807293dc2acd7e SHA512 359721d9bbf121415b655082db5dc9ca7e98aa952038e89c49a69da0c77a4cd183a3e4c40107aa4803885332439868abfe9473b296e99480d01dd2ccc4c9b98b
-EBUILD mod_jk-1.2.49-r1.ebuild 2035 BLAKE2B 762764a3a1c47233b40494264b8b65aac5b682bbd8832403a449a20765aa218ae318bb34d60257e9219763b322dd8d62cddbe4b9e2f98a26e1b8fc919ff181d2 SHA512 a6ee14da81da6637dd27c038a54f662bfe5147e35d52d2fb6ded13e16643d4882d31aef297a69b60a213b788e4d04901218bcf189e4ff299b6d04e2ddd4b36b2
-EBUILD mod_jk-1.2.50.ebuild 1922 BLAKE2B ab036027cab3bde53023b5e9c4de7683d1795174fe744459dde4571033938c0fb07d7ce608554af84d443706ba593882d9abdda35a91b75b4dc59eaa1553d72c SHA512 8b4c5821ca8ddc484e47ae10610728fecc1569270570506b09806416aed1d8d029897b20b6f5d42df3912609b9ecbce80949f92cfe5d0aaca5fc38bb252c1c6f
+EBUILD mod_jk-1.2.50.ebuild 1920 BLAKE2B 46554274869ef2270dcb2d5ec0b7219f3b25688aab6f2aceb77f95ddd32e88c47e5e0414ccdd8c7102c61078dc32ad04b4a73fe55a8c89a984f0a8ae94be5294 SHA512 4bc5b2b4e56d9a10c0f06616be06a0e90bb3c8212462155847b6cd739969724ca505b5c1a485f300287d10c9531228d61571b6afc1af17c10f77a99a9998952f
 MISC metadata.xml 617 BLAKE2B 2fe52915ee2fdf01518b2631479934838c85820e4803792e6c4c69e7ee490cd08aea7f4a269eb456a258d6433fd5f323866439ca61c40f86a256ee941b4457e2 SHA512 0df6992cc0912e1a93b5ca9e5d3c5470e9a91b065714bd77391a8efbf8118bcede4aecb2263a3cd0e4c0a3ad1bfe006db7ee524fe4148e04a69dcbad0dbd18b7
diff --git a/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild
deleted file mode 100644
index 535ec64ea05c..000000000000
--- a/www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="tomcat-connectors-${PV#-*}-src"
-
-inherit apache-module autotools verify-sig
-
-DESCRIPTION="Provides an AJP Apache2-JK-connector for the Tomcat servlet engine"
-HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz
-	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/jk/tomcat-connectors-${PV}-src.tar.gz.asc  )"
-S="${WORKDIR}/${MY_P}/native"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
-
-DEPEND="dev-libs/apr:1="
-RDEPEND="${DEPEND}"
-BDEPEND="
-	dev-lang/perl
-	verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.2.49-export-symbols-regex.patch" #914237
-	"${FILESDIR}/${PN}-1.2.49-musl.patch"
-)
-
-APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
-APACHE2_MOD_DEFINE="JK"
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc"
-
-need_apache2
-
-pkg_setup() {
-	# Calling depend.apache_pkg_setup fails because we do not have
-	# "apache2" in IUSE but the function expects this in order to call
-	# _init_apache2_late which sets the APACHE_MODULESDIR variable.
-	_init_apache2
-	_init_apache2_late
-}
-
-src_prepare() {
-	default
-
-	# Don't add '-Wl,' as prefix for CFLAGS, as linker will fail
-	sed -e '/JK_PREFIX_IF_MISSING/d' -i configure.ac || die
-	eautoreconf
-
-	# Adjust confpath and logpath for Gentoo
-	local logs_path="/var/log/apache2"
-	sed -e "s|conf|${APACHE_CONFDIR}|g" -e "s|logs|${logs_path}|g" -i ../conf/httpd-jk.conf || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		--with-apxs="${APXS}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	LIBTOOL="/bin/sh $(pwd)/libtool --silent"
-	default
-}
-
-src_install() {
-	apache-module_src_install
-
-	insinto "${APACHE_CONFDIR}"
-	doins "${S}"/../conf/*.properties
-
-	insinto "${APACHE_MODULES_CONFDIR}"
-	newins ../conf/httpd-jk.conf 88_mod_jk.conf
-
-	einstalldocs
-}
diff --git a/www-apache/mod_jk/mod_jk-1.2.50.ebuild b/www-apache/mod_jk/mod_jk-1.2.50.ebuild
index f2d4d9bc0b19..9f3276c04839 100644
--- a/www-apache/mod_jk/mod_jk-1.2.50.ebuild
+++ b/www-apache/mod_jk/mod_jk-1.2.50.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/${MY_P}/native"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86"
 
 DEPEND="dev-libs/apr:1="
 RDEPEND="${DEPEND}"