Introduce use of aut otools eclass and eautoreconf in src_unpack to address issues in bug 92565

Package-Manager: portage-2.1.2_pre1

5 files changed, 169 insertions, 0 deletions

diff --git a/www-apache/mod_jk/Manifest b/www-apache/mod_jk/Manifest
index 5cf91327d57d..19ad9e24b1e6 100644
--- a/www-apache/mod_jk/Manifest
+++ b/www-apache/mod_jk/Manifest
@@ -18,10 +18,18 @@ EBUILD mod_jk-1.2.13.ebuild 1624 RMD160 b180861ada2449d71512183726048616982deb0e
 MD5 1c0b965430b130f56e26a1a59086cb3e mod_jk-1.2.13.ebuild 1624
 RMD160 b180861ada2449d71512183726048616982deb0e mod_jk-1.2.13.ebuild 1624
 SHA256 e845730af5f6631df995f98fabc2a716641e5f279fa918227850343b5079c9dd mod_jk-1.2.13.ebuild 1624
+EBUILD mod_jk-1.2.15-r1.ebuild 1866 RMD160 472dcfba8221c5041e478fd89692233c756de607 SHA1 8b70089f428a27a538004a301d08475637018604 SHA256 d030e2ab94142d7dff679edbdd6acf7f2b1d7b4bfa5d3de9710e25ca0f210405
+MD5 4c2e82faea7f16b09c9f69e4a6c73e8f mod_jk-1.2.15-r1.ebuild 1866
+RMD160 472dcfba8221c5041e478fd89692233c756de607 mod_jk-1.2.15-r1.ebuild 1866
+SHA256 d030e2ab94142d7dff679edbdd6acf7f2b1d7b4bfa5d3de9710e25ca0f210405 mod_jk-1.2.15-r1.ebuild 1866
 EBUILD mod_jk-1.2.15.ebuild 1746 RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 SHA1 12254394a4a3a307c8e3da90b00334303b9c07d1 SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c
 MD5 097f26a843471eaaf31f6bd28e32f81d mod_jk-1.2.15.ebuild 1746
 RMD160 241d0406d88a3392aeac55e29602c2781d1e0278 mod_jk-1.2.15.ebuild 1746
 SHA256 a0479b941feaf8b6efeb6f6867c439f1daacdc923fcd258a0ac9006036bab04c mod_jk-1.2.15.ebuild 1746
+EBUILD mod_jk-1.2.18-r1.ebuild 1859 RMD160 27a1247ff63ef6958d5fcb46157e51d16355417a SHA1 38d258ed569b3b703799aa1f434a4b575bf68579 SHA256 4a02a33a30080f6f5c889c99d008e3ad48336e3ca2904a1603ac7b57b5388d53
+MD5 81800b8d8877ec088f42e1b7b6400883 mod_jk-1.2.18-r1.ebuild 1859
+RMD160 27a1247ff63ef6958d5fcb46157e51d16355417a mod_jk-1.2.18-r1.ebuild 1859
+SHA256 4a02a33a30080f6f5c889c99d008e3ad48336e3ca2904a1603ac7b57b5388d53 mod_jk-1.2.18-r1.ebuild 1859
 EBUILD mod_jk-1.2.18.ebuild 1796 RMD160 c41a3b484e9b6b739f55a07cbf694c8f77e12a15 SHA1 d2d1c6fb855ba570474e37f3f1f4931cff5489f6 SHA256 f93fe4c85aa9e47de466485e70009fb5f891e8f73ac6866108fbd47e647b128c
 MD5 958dbab934efa8bd13f3db394566d64f mod_jk-1.2.18.ebuild 1796
 RMD160 c41a3b484e9b6b739f55a07cbf694c8f77e12a15 mod_jk-1.2.18.ebuild 1796
@@ -43,6 +51,12 @@ SHA256 44c52dd456b2c68fdef71fd5a9be938924160131c581420d439c5626cacd081f files/di
 MD5 fa8b71d1318001ec36b73186933aa981 files/digest-mod_jk-1.2.15 310
 RMD160 712417003278d59d32ba493341b560731169342d files/digest-mod_jk-1.2.15 310
 SHA256 b55d2fe0be88cba01f44b72caa4e53bf33cd39269bda8cf885359f282e875718 files/digest-mod_jk-1.2.15 310
+MD5 fa8b71d1318001ec36b73186933aa981 files/digest-mod_jk-1.2.15-r1 310
+RMD160 712417003278d59d32ba493341b560731169342d files/digest-mod_jk-1.2.15-r1 310
+SHA256 b55d2fe0be88cba01f44b72caa4e53bf33cd39269bda8cf885359f282e875718 files/digest-mod_jk-1.2.15-r1 310
 MD5 2aa593598d06e901e2b389bef195e19e files/digest-mod_jk-1.2.18 286
 RMD160 54dc2c15e7e7d0c02f584c85f214563c6fc92e92 files/digest-mod_jk-1.2.18 286
 SHA256 4039bf46d18e2840dce0a0ccb2a5f40dc9f69e6f98928869b2db5db57778bf02 files/digest-mod_jk-1.2.18 286
+MD5 2aa593598d06e901e2b389bef195e19e files/digest-mod_jk-1.2.18-r1 286
+RMD160 54dc2c15e7e7d0c02f584c85f214563c6fc92e92 files/digest-mod_jk-1.2.18-r1 286
+SHA256 4039bf46d18e2840dce0a0ccb2a5f40dc9f69e6f98928869b2db5db57778bf02 files/digest-mod_jk-1.2.18-r1 286
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.15-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.15-r1
new file mode 100644
index 000000000000..915a2d7dadc5
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.15-r1
@@ -0,0 +1,3 @@
+MD5 b815a666329f7de097775113547539e0 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
+RMD160 e5bce1ad604e9461ca4684a2c7ffffe1f2a7b667 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
+SHA256 9e8d1c0f7e0750dc646e1497a13888748eaf7b53d478dc2007bab814188f7641 jakarta-tomcat-connectors-1.2.15-src.tar.gz 722463
diff --git a/www-apache/mod_jk/files/digest-mod_jk-1.2.18-r1 b/www-apache/mod_jk/files/digest-mod_jk-1.2.18-r1
new file mode 100644
index 000000000000..77266e051213
--- /dev/null
+++ b/www-apache/mod_jk/files/digest-mod_jk-1.2.18-r1
@@ -0,0 +1,3 @@
+MD5 58e1b9406e0cfe11bd4bc297ba146b4f tomcat-connectors-1.2.18-src.tar.gz 929823
+RMD160 3f9c60d6121271ade71dd0edd5dd88910e13e105 tomcat-connectors-1.2.18-src.tar.gz 929823
+SHA256 149de5bf40d4f7d29efaf3e61d401a74db93c1cf27e0053dd29a316db98ad311 tomcat-connectors-1.2.18-src.tar.gz 929823
diff --git a/www-apache/mod_jk/mod_jk-1.2.15-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.15-r1.ebuild
new file mode 100644
index 000000000000..2054eab3379c
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.15-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2006 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.15-r1.ebuild,v 1.1 2006/09/21 16:08:17 wltjr Exp $
+
+inherit apache-module autotools java-utils-2
+
+MY_P="jakarta-tomcat-connectors-${PV}-src"
+
+DESCRIPTION="JK module for connecting Tomcat and Apache using the ajp13 protocol"
+HOMEPAGE="http://jakarta.apache.org/tomcat/connectors-doc"
+SRC_URI="mirror://apache/jakarta/tomcat-connectors/jk/source/jk-${PV}/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="apache2"
+
+DEPEND=">=virtual/jdk-1.4"
+S="${WORKDIR}/${MY_P}/jk/native"
+
+APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so"
+APACHE1_MOD_CONF="88_${PN}"
+APACHE1_MOD_DEFINE="JK"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.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
+	local java_args
+	use apache2 && apxs="${APXS2}"
+	use apache2 || apxs="${APXS1}"
+	use java && java_args="--with-java-home=${JAVA_HOME} \
+				--with-java-platform=2 --enable-jni"
+	econf \
+		--with-apxs=${apxs} \
+		--with-apr-config=/usr/bin/apr-config \
+		${java_args} \
+		|| die "econf failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto ${APACHE_CONFDIR}
+	doins ${FILESDIR}/jk-workers.properties
+
+	# if using java install the jni stuff
+	if use java; then
+		insinto ${APACHE_MODULESDIR}
+		doins ${S}/jni/jk_jnicb.so
+	fi
+
+	# call the nifty default src_install :-)
+	apache-module_src_install
+}
+
+pkg_postinst() {
+	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
+	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
+	einfo "your own."
+}
diff --git a/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild b/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild
new file mode 100644
index 000000000000..e6a7187b2462
--- /dev/null
+++ b/www-apache/mod_jk/mod_jk-1.2.18-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2006 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.18-r1.ebuild,v 1.1 2006/09/21 16:08:17 wltjr Exp $
+
+inherit apache-module autotools java-pkg-opt-2
+
+MY_P="tomcat-connectors-${PV}-src"
+
+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"
+KEYWORDS="~amd64 ~x86"
+IUSE="apache2 java"
+
+DEPEND="java? ( >=virtual/jdk-1.4 )"
+S="${WORKDIR}/${MY_P}/native"
+
+APACHE1_MOD_FILE="${S}/apache-1.3/mod_jk.so"
+APACHE1_MOD_CONF="88_${PN}"
+APACHE1_MOD_DEFINE="JK"
+
+APACHE2_MOD_FILE="${S}/apache-2.0/mod_jk.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
+	local java_args
+	use apache2 && apxs="${APXS2}"
+	use apache2 || apxs="${APXS1}"
+	use java && java_args="--with-java-home=${JAVA_HOME} \
+				--with-java-platform=2 --enable-jni"
+
+	econf \
+		--with-apxs=${apxs} \
+		--with-apr-config=/usr/bin/apr-config \
+		${java_args} \
+		|| die "econf failed"
+	emake LIBTOOL="/bin/sh $(pwd)/libtool --silent" || die "make failed"
+}
+
+src_install() {
+	# install the workers.properties file
+	insinto ${APACHE_CONFDIR}
+	doins ${FILESDIR}/jk-workers.properties
+
+	# if using java install the jni stuff
+	if use java; then
+		insinto ${APACHE_MODULESDIR}
+		doins ${S}/jni/jk_jnicb.so
+	fi
+
+	# call the nifty default src_install :-)
+	apache-module_src_install
+}
+
+pkg_postinst() {
+	einfo "Tomcat is not a dependency of mod_jk any longer, if you intend"
+	einfo "to use it with Tomcat, you have to merge www-servers/tomcat on"
+	einfo "your own."
+}