From 6627c2253768aa40b6d3f6b4a80c219188db1557 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 30 Mar 2021 23:08:44 +0200
Subject: [PATCH] www-apache/mod_jk: 1.2.48 version bump, EAPI-7, drop
 IUSE=java

With the failure to call java-pkg-opt-2_pkg_setup the previous version
actually did nothing when java was enabled.

Add missing pkg_postinst().

Bug: https://bugs.gentoo.org/778758
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---
 www-apache/mod_jk/Manifest             |  1 +
 www-apache/mod_jk/mod_jk-1.2.48.ebuild | 58 ++++++++++++++++++++++++++
 2 files changed, 59 insertions(+)
 create mode 100644 www-apache/mod_jk/mod_jk-1.2.48.ebuild

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 14e280fda2d..a4a25989cf8 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -1 +1,2 @@
 DIST tomcat-connectors-1.2.42-src.tar.gz 3143693 BLAKE2B d1ea2a85ec80a5e207896f3225049c12e96c5cb6d1734306ec7a268d0963f1c368bcf963b529e17efdf448c0f8ad3257902340f969b5a0bc6ee9644af4bb3772 SHA512 9a796e2a7865a99c16595deaead94e843c291ed7229f48414edf0a260b2dda05fc94671e8b863a9ccef719bbe2ca7622c06e3dae6ccf68a41f7d96e847b68791
+DIST tomcat-connectors-1.2.48-src.tar.gz 3665280 BLAKE2B eca84f31235e441dea08fd7f0e44de4370799e9781384a0a4329ae48c9dab4b146733bf810669fdcf60ede9e67e139942ccfe12c74e15f4eda19d9107f9b6150 SHA512 955a830724a3902e29032a5d2e7603d3170334e8a383d314f6bf8539d53d9f7ee4cfa0b31cfc954acb0a13d9975ed2229de085d08de3885f8679b509924fde47
diff --git a/www-apache/mod_jk/mod_jk-1.2.48.ebuild b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
new file mode 100644
index 00000000000..5bf456887da
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.48.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="tomcat-connectors-${PV#-*}-src"
+inherit apache-module readme.gentoo-r1
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
+HOMEPAGE="https://tomcat.apache.org/connectors-doc/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/jk/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}/native"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+APACHE2_MOD_FILE="${S}/apache-2.0/${PN}.so"
+APACHE2_MOD_CONF="88_${PN}"
+APACHE2_MOD_DEFINE="JK"
+
+CONF_DIR="${WORKDIR}/${MY_P}/conf"
+
+need_apache2
+
+DOC_CONTENTS="
+	Advanced Directives and Options can be found at:
+	https://tomcat.apache.org/connectors-doc/reference/workers.html
+"
+
+src_configure() {
+	econf \
+		--with-apxs=${APXS}
+}
+
+src_compile() {
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent"
+}
+
+src_install() {
+	# otherwise installs to /mod_jk.so
+	APACHE_MODULESDIR="/usr/$(get_libdir)/apache2/modules"
+
+	# install the workers.properties file
+	insinto "${APACHE_CONFDIR}"
+	newins "${CONF_DIR}/workers.properties" \
+		jk-workers.properties
+	doins "${CONF_DIR}/uriworkermap.properties"
+
+	apache-module_src_install
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
-- 
2.31.1