gentoo resync : 12.01.2019

5 files changed, 3 insertions, 190 deletions

diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest
index 652543ec1bfb..f9985eea0093 100644
--- a/dev-java/tomcat-native/Manifest
+++ b/dev-java/tomcat-native/Manifest
@@ -1,9 +1,3 @@
-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
-DIST tomcat-native-1.2.18-src.tar.gz 411789 BLAKE2B 16f1ecff3abfa6bf1f88c44af4a6ba58addac69bec1c257325c429fe6eec6a522fd2ae7932d68afa9bb442b0cf248731ce3e1a9db2b383f502093bf0ea5bfd23 SHA512 66481c1f36dc7ea909bf8d55075a232bf6dea3300b56d36415b13da4aefbee16cb52456f3d44b4a2b09b43cd8c7df628145a0623b9cdfa322bc2432e6c44827f
 DIST tomcat-native-1.2.19-src.tar.gz 418183 BLAKE2B cab8621bca4dc41e87ebf6418337da8a86d56a0717aacd62c6e4fb2d039e413cb29e8f169abbd353719ce083d302613d3e0f64cd54f1bc8e57f26a523a828025 SHA512 7d69acd5dd684eee9a85c08357b7288a9f083c15a12a9524ba6344f1b9dcdc6ccc512a37b64b9f15b0e697609833e6c68591a60976dcfecce124ec29eb532dba
-EBUILD tomcat-native-1.2.16.ebuild 1238 BLAKE2B 2fea3080d1f68c5718caaf3e4a4780a66e511e3d2dc5b960adc86e788f1c6257dfd69dec607690d76178bb5fb4f2bb2723b2549c9b73b8dcb67a8fcb36a34887 SHA512 c86d56772be860e570f5ade50c5baa51c6267e689c767834aaed6965f9a483404d00b55558e10def1d8b0af9713cacd5e8018d41625403bc8cbc658c18db7727
-EBUILD tomcat-native-1.2.17.ebuild 1155 BLAKE2B 1a170dd795495595c0938b27017c5e017822f4ff515dc3ee60d645494c4999a378cc760ac0a49e0bc1b3e25183a0659b533f7158aae8d05e9eb1106b5e04a295 SHA512 2cce0be375c489a52c61fd629e6c2c499a27538df65f472e14fb4e6272aedd29fb6240831e3ad91990c41375b685d81255a61da350893e3ddd7c003e11f37358
-EBUILD tomcat-native-1.2.18.ebuild 1152 BLAKE2B 2732d749204372dfb2de8ccb517d7c12c433536cf9bafdac582a44eee2b4c599e1f40632df67fc7744414eff48b56a15dfdd2619094cb1a5115111a95e647b4e SHA512 cec8620ccbc912304ffce08fbd6d02b44546b0a2a65bd1685f42116520b31a93df96c0659026545d08f2b575eef5fc5548cabc10069e8e1528bd4b804b8cef07
-EBUILD tomcat-native-1.2.19.ebuild 1152 BLAKE2B 2732d749204372dfb2de8ccb517d7c12c433536cf9bafdac582a44eee2b4c599e1f40632df67fc7744414eff48b56a15dfdd2619094cb1a5115111a95e647b4e SHA512 cec8620ccbc912304ffce08fbd6d02b44546b0a2a65bd1685f42116520b31a93df96c0659026545d08f2b575eef5fc5548cabc10069e8e1528bd4b804b8cef07
+EBUILD tomcat-native-1.2.19.ebuild 1151 BLAKE2B 8420a566f91395dbcfb2eda52e1d2690d28d9eeb3da1591f331b479589b01a6303e5280f4ff5eee914c5207b3aa433be5779209b5550cb4b68401206a0d89a5c SHA512 384a632497f10dae1e481f0aeead04997f4742b32f00f53514d2851d0218e0b4cca519bb2340bc258935e5afb94f206bb5b790737f877f2708fc8b62e3e479b8
 MISC metadata.xml 806 BLAKE2B 7f193bb62b100b0c141677fcfe9671122b70bf5091663757fca98941ca2a7c195c0b7f4f1fd95c96706a8a8c8508a7a6b63858d2eb7a3afb75b4ec21f5eae021 SHA512 7bedd98efaa696458ae80b5bd844a569b2bda8903a7d4e7c9ee9ea197b80abacf7f257ff91aa14d4cf6df830425df58f08cac7c3e9ded79823424b352fd9e978
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
deleted file mode 100644
index bebd76103701..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.16.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2018 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="static-libs 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"
-
-	! use static-libs && prune_libtool_files --modules
-}
-
-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
deleted file mode 100644
index b9e42b33f4c0..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.17.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.18.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.18.ebuild
deleted file mode 100644
index bb3b879154d2..000000000000
--- a/dev-java/tomcat-native/tomcat-native-1.2.18.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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"
-}
diff --git a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
index bb3b879154d2..fb46a0bf4e2e 100644
--- a/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
+++ b/dev-java/tomcat-native/tomcat-native-1.2.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ DESCRIPTION="Allows Tomcat to use certain native resources for better performanc
 HOMEPAGE="https://tomcat.apache.org/"
 SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="static-libs test"