From b7a7c39c4e9ca7a64f2bf3176a7a83c6759b1fae Mon Sep 17 00:00:00 2001
From: Conrad Kostecki <conrad@kostecki.com>
Date: Sat, 7 Jul 2018 00:07:53 +0200
Subject: dev-java/tomcat-native: bump to version 1.2.17

Closes: https://bugs.gentoo.org/660562
Package-Manager: Portage-2.3.41, Repoman-2.3.9
Closes: https://github.com/gentoo/gentoo/pull/9073
---
 dev-java/tomcat-native/Manifest                    |  1 +
 dev-java/tomcat-native/metadata.xml                | 16 +++---
 dev-java/tomcat-native/tomcat-native-1.2.17.ebuild | 61 ++++++++++++++++++++++
 3 files changed, 70 insertions(+), 8 deletions(-)
 create mode 100644 dev-java/tomcat-native/tomcat-native-1.2.17.ebuild

diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 37b075aec476..126cd424c16a 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,2 +1,3 @@
 DIST tomcat-native-1.2.14-src.tar.gz 404159 BLAKE2B c0137527edc647e6d3cfb7c115ca9dd7d20b0aa8edaf3f7b0ac554007010da37d0a825c07bfdd747fa429d1e89e673a5a19245dc2fa41f69f1e2cbc4697d5e1b SHA512 ddfc44f07dc4200f8ef20b5425355d2737a7510e41660002553c04e7451c48e4f54f4cfb462ed6bea1fad1ea60525a7ce3787af74e6a4b795f9dd1862b75c633
 DIST tomcat-native-1.2.16-src.tar.gz 405109 BLAKE2B e153caeb82c4ac4d2a8c7c24373204edf6e691068e70c858618caf72faaee1f4d10c4529ba758e24422e8580e8b3e95d28cc942998568106ec60b8de7c196c51 SHA512 0345f85fbab406f25c25c8fc06bf55f3d166fa14bfcf542bddb5dc5db4c8c7bd0c5b71603d85261d71152ead3023b112144f2ffa5ede14ae8595013f79c802aa
+DIST tomcat-native-1.2.17-src.tar.gz 408967 BLAKE2B 482b0416be01bcbe9ba55555715de37c6071502ed57f179115c3d351684621487b90e05dd488b1c2137e4813a785c1fe229241f191468bc88f7f0dd3a31562c0 SHA512 8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9
diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml
index ac45019bb279..2228187b5ce8 100644
--- a/dev-java/tomcat-native/metadata.xml
+++ b/dev-java/tomcat-native/metadata.xml
@@ -6,13 +6,13 @@
 		<name>Java</name>
 	</maintainer>
 	<longdescription>
-	Native library for Tomcat to use the Apache Portable Runtime to
-	provide superior scalability, performance, and better integration with
-	native server technologies. The Apache Portable Runtime is a highly
-	portable library that is at the heart of Apache HTTP Server 2.x. APR
-	has many uses, including access to advanced IO functionality (such as
-	sendfile, epoll and OpenSSL), OS level functionality (random number
-	generation, system status, etc), and native process handling (shared
-	memory, NT pipes and Unix sockets).
+		Native library for Tomcat to use the Apache Portable Runtime to
+		provide superior scalability, performance, and better integration with
+		native server technologies. The Apache Portable Runtime is a highly
+		portable library that is at the heart of Apache HTTP Server 2.x. APR
+		has many uses, including access to advanced IO functionality (such as
+		sendfile, epoll and OpenSSL), OS level functionality (random number
+		generation, system status, etc), and native process handling (shared
+		memory, NT pipes and Unix sockets).
 	</longdescription>
 </pkgmetadata>
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild
new file mode 100644
index 000000000000..b9e42b33f4c0
--- /dev/null
+++ b/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="Allows Tomcat to use certain native resources for better performance"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="static-libs test"
+
+RDEPEND="dev-libs/apr:1=
+	dev-libs/openssl:0=
+	>=virtual/jre-1.8"
+
+DEPEND=">=virtual/jdk-1.8
+	test? ( dev-java/ant-junit:0 )"
+
+S=${WORKDIR}/${P}-src
+
+JAVA_ANT_REWRITE_CLASSPATH="yes"
+
+src_configure() {
+	local myeconfargs=(
+		--with-apr="${EPREFIX}"/usr/bin/apr-1-config
+		--with-ssl="${EPREFIX}"/usr
+	)
+
+	cd native || die
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	eant jar
+
+	cd native || die
+	default
+}
+
+src_install() {
+	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
+
+	cd native || die
+	default
+
+	! use static-libs && find "${D}" -name '*.la' -delete || die
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+pkg_postinst() {
+	elog "For more information, please visit"
+	elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html"
+}
-- 
cgit v1.2.3-18-g5258