From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A2C2D158083 for ; Sun, 15 Sep 2024 12:45:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A21CE29B7; Sun, 15 Sep 2024 12:45:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0AF06E29B7 for ; Sun, 15 Sep 2024 12:45:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 9F513341DD0 for ; Sun, 15 Sep 2024 12:45:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 369E327F2 for ; Sun, 15 Sep 2024 12:45:50 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1726404135.d67ad47c1d95a0d3df696a33cd66b6a78cedac83.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/mod_jk/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apache/mod_jk/Manifest www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild X-VCS-Directories: www-apache/mod_jk/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: d67ad47c1d95a0d3df696a33cd66b6a78cedac83 X-VCS-Branch: master Date: Sun, 15 Sep 2024 12:45:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c40ded57-f6c1-4ff3-aec1-5ee8dd586941 X-Archives-Hash: 3ab0c9e25e18b480a2d024a0e2fbda97 commit: d67ad47c1d95a0d3df696a33cd66b6a78cedac83 Author: Conrad Kostecki gentoo org> AuthorDate: Sun Sep 15 12:38:13 2024 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Sun Sep 15 12:42:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d67ad47c www-apache/mod_jk: drop 1.2.49-r1 Closes: https://bugs.gentoo.org/925253 Signed-off-by: Conrad Kostecki gentoo.org> www-apache/mod_jk/Manifest | 2 - www-apache/mod_jk/mod_jk-1.2.49-r1.ebuild | 82 ------------------------------- 2 files changed, 84 deletions(-) diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest index ad56adb2ba39..8034774162ab 100644 --- a/www-apache/mod_jk/Manifest +++ b/www-apache/mod_jk/Manifest @@ -1,4 +1,2 @@ -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 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 -}