gentoo resync : 14.07.2018

4 files changed, 72 insertions, 68 deletions

diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 2fd4790cf1ee..607cb5c53f7e 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,5 +1,5 @@
-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
-EBUILD tomcat-native-1.2.14.ebuild 1173 BLAKE2B 2ebf16043de5ea3f481f1ff6c8831197b8bfed9be0f26fac4fb4f5aa007d27fdf5e1d32ba23f6c991610e38f908918d801737a31ecad9e3d0c4e220ea46e4047 SHA512 0d289ef31795c99b933b2aaaca054533c0a53c285725c479d0a0b381dee0a2b7f75d237b38a430160f737a904fec872fee91d862ddced32eb1b5b7ffafd5a2e5
+DIST tomcat-native-1.2.17-src.tar.gz 408967 BLAKE2B 482b0416be01bcbe9ba55555715de37c6071502ed57f179115c3d351684621487b90e05dd488b1c2137e4813a785c1fe229241f191468bc88f7f0dd3a31562c0 SHA512 8fa946855fd14525ec0abe7b09975bbd34d6127352e90730a8afb77e16cd91715417e812a40017fee65939a9ce95faf39a9193222f441cda0ad2eb7f690e77b9
 EBUILD tomcat-native-1.2.16.ebuild 1238 BLAKE2B 2fea3080d1f68c5718caaf3e4a4780a66e511e3d2dc5b960adc86e788f1c6257dfd69dec607690d76178bb5fb4f2bb2723b2549c9b73b8dcb67a8fcb36a34887 SHA512 c86d56772be860e570f5ade50c5baa51c6267e689c767834aaed6965f9a483404d00b55558e10def1d8b0af9713cacd5e8018d41625403bc8cbc658c18db7727
-MISC metadata.xml 798 BLAKE2B 2c486251ad603082b61c08a26509895fda8c10ce59d66eafe550ff4854bc5049005de637c22cc77d4d5b7b0a804aacf4a6860a04134ce2dde0480e3275c1c82d SHA512 4074e9797b397fe24ee0ad0c56e7ba3504212a008a2d595a96cf4495dbaec38ebbb9ac4d48a55bbcf7b28d97951dde2a2ee2eeb135419114096aa4892ccb2269
+EBUILD tomcat-native-1.2.17.ebuild 1155 BLAKE2B 1a170dd795495595c0938b27017c5e017822f4ff515dc3ee60d645494c4999a378cc760ac0a49e0bc1b3e25183a0659b533f7158aae8d05e9eb1106b5e04a295 SHA512 2cce0be375c489a52c61fd629e6c2c499a27538df65f472e14fb4e6272aedd29fb6240831e3ad91990c41375b685d81255a61da350893e3ddd7c003e11f37358
+MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
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.14.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild
deleted file mode 100644
index de20842d0358..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.14.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Native APR library for Tomcat"
-
-SLOT="0"
-SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
-HOMEPAGE="https://tomcat.apache.org/"
-KEYWORDS="amd64 ~x86"
-LICENSE="Apache-2.0"
-IUSE="test"
-
-RDEPEND="dev-libs/apr:1
-	dev-libs/openssl:=
-	>=virtual/jre-1.7"
-
-DEPEND=">=virtual/jdk-1.7
-	test? ( dev-java/ant-junit:0 )"
-
-S=${WORKDIR}/${P}-src
-
-src_configure(){
-	cd native || die
-	econf --with-apr=/usr/bin/apr-1-config  \
-		--with-ssl=/usr || die "Could not configure native sources"
-}
-
-src_compile() {
-	eant jar -f build.xml
-
-	cd native || die
-	default
-}
-
-src_install() {
-	java-pkg_newjar "dist/${P}.jar" "${PN}.jar"
-
-	cd native
-	emake DESTDIR="${D}" install || die "Could not install libtcnative-1.so"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-pkg_postinst() {
-	elog
-	elog " APR should be available with Tomcat, for more information"
-	elog " please see https://tomcat.apache.org/tomcat-6.0-doc/apr.html"
-	elog
-	elog " Please report any bugs to https://bugs.gentoo.org/"
-	elog
-}
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"
+}