commit: a448699a4605f407d218418365f5b6bd7a7765fc Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Sat Feb 18 10:36:49 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Sun Feb 19 07:55:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a448699a
dev-java/tomcat-native: add 2.0.3, drop 2.0.2 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/29619 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/tomcat-native/Manifest | 4 +- ...ol.patch => tomcat-native-2.0.3-slibtool.patch} | 4 +- dev-java/tomcat-native/metadata.xml | 2 +- ...ive-2.0.2.ebuild => tomcat-native-2.0.3.ebuild} | 67 +++++++++++++--------- 4 files changed, 44 insertions(+), 33 deletions(-) diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 2c0a81584235..fcad976ae8cc 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,4 +1,4 @@ DIST tomcat-native-1.2.35-src.tar.gz 436593 BLAKE2B 808ed0396e421609092f9e59676a55501e67fef7b0ca466ad15e4fe11cc88abb8b07043364c63a53760052a6258585aa13a53378c3fb8823bc8349371ad12245 SHA512 a290eb0cd940e1f8de0caba72517d9999d4e9c96f1a19e0ef7ccdabf039ba86b48d1c6f554f59decd87e2ef03ec3e3bfcce694a92e1db130966987c1e37b5c8d DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094 -DIST tomcat-native-2.0.2-src.tar.gz 315063 BLAKE2B c044a0b6ef226a038728d5c009a7415bc95cd4317bf8fcbcc0a0a9a9ee930c0c2e74cd6c028a92cc9e96c218f38d580c7af6599c3df35e9c677d1a382727582f SHA512 a0badfaa537dd8dc24901bbf2a11dbaab7cabe5c033eb9162daa5c748269c3dace08f99c0a477c0d0e051b7d226e2e2c6c3031ab7c45d007333cb53d72738c21 -DIST tomcat-native-2.0.2-src.tar.gz.asc 833 BLAKE2B 8368c96d6bff84c1281ab08699401286ce89adcf21ffda5d896e19d05f8279746070256612038c8b670b13e0cef4d43e678dfa785175b54b15aa68e33268bb29 SHA512 9d2e2c64cde1c1812192ad451610e32480ad005832e2b781f0eb5f5559a23730715ccf7bfd04937091bb6635b098badc61f73a926fcfa5ea09175d7a9fe0e002 +DIST tomcat-native-2.0.3-src.tar.gz 318403 BLAKE2B a9936ad951bd521c77b8a3fe3306cb1a7a78bdbb229f84fdf53e5bd71caa55bfcee049de406df0047341c6896e05e7da4e0e2a8524fdda91a24f007176f26503 SHA512 d80e6b76295bb253eaf6eab4d722f3ba2f683f33a96310838b4c44b99f0b47a49ed9c09bb53ed23698db057ce765e3fcbfcd4ac4b75d2bdbe691f916be3be339 +DIST tomcat-native-2.0.3-src.tar.gz.asc 873 BLAKE2B f9998b9b7c410ac7fe2c72207cec64dcd003142ede4f37abd4ebb04ee930a5d536169c84e24bc7fb328cead15da19c13a991f30bdcce80ffd5380114884ec5f6 SHA512 bc513239ccd2a4b4eb60d30513328bb008b926e702ece8ddb4a9a084d64fc7db02b894f741d7073e5f869e7df948b4539d849e8c602549bab91f7055e3c23222 diff --git a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch similarity index 95% rename from dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch rename to dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch index e0378669aad5..cd090afb9854 100644 --- a/dev-java/tomcat-native/files/tomcat-native-2.0.2-slibtool.patch +++ b/dev-java/tomcat-native/files/tomcat-native-2.0.3-slibtool.patch @@ -18,8 +18,8 @@ Gentoo bug: https://bugs.gentoo.org/778914 diff --git a/native/configure.in b/native/configure.in index 567894b10..e082ae6d2 100644 ---- a/native/configure.in -+++ b/native/configure.in +--- a/configure.in ++++ b/configure.in @@ -50,6 +50,9 @@ AC_SUBST(TCN_CONFIG_LOCATION) AC_CANONICAL_TARGET AC_PROG_INSTALL diff --git a/dev-java/tomcat-native/metadata.xml b/dev-java/tomcat-native/metadata.xml index e07558c04674..1989b45b9137 100644 --- a/dev-java/tomcat-native/metadata.xml +++ b/dev-java/tomcat-native/metadata.xml @@ -16,9 +16,9 @@ memory, NT pipes and Unix sockets). </longdescription> <upstream> - <remote-id type="github">apache/tomcat-native</remote-id> <bugs-to>https://tomcat.apache.org/bugreport.html</bugs-to> <doc>https://tomcat.apache.org/native-doc/</doc> <changelog>https://tomcat.apache.org/native-doc/miscellaneous/changelog.html</changelog> + <remote-id type="github">apache/tomcat-native</remote-id> </upstream> </pkgmetadata> diff --git a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.3.ebuild similarity index 51% rename from dev-java/tomcat-native/tomcat-native-2.0.2.ebuild rename to dev-java/tomcat-native/tomcat-native-2.0.3.ebuild index 5874a906ef17..c9cfba053ed8 100644 --- a/dev-java/tomcat-native/tomcat-native-2.0.2.ebuild +++ b/dev-java/tomcat-native/tomcat-native-2.0.3.ebuild @@ -3,41 +3,57 @@ EAPI=8 -inherit autotools java-pkg-2 java-ant-2 verify-sig +JAVA_PKG_IUSE="doc source test" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit autotools java-pkg-2 java-pkg-simple verify-sig DESCRIPTION="Allows Tomcat to use certain native resources for better performance" HOMEPAGE="https://tomcat.apache.org/native-doc/"; SRC_URI="mirror://apache/tomcat/tomcat-connectors/native/${PV}/source/${P}-src.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc )" -S=${WORKDIR}/${P}-src + verify-sig? ( + https://downloads.apache.org/tomcat/tomcat-connectors/native/${PV}/source/tomcat-native-${PV}-src.tar.gz.asc + )" +S=${WORKDIR}/${P}-src/native KEYWORDS="~amd64 ~x86" LICENSE="Apache-2.0" SLOT="2" -IUSE="static-libs test" -RESTRICT="!test? ( test )" +IUSE="static-libs" -RDEPEND="dev-libs/apr:1= +DEPEND=" + >=virtual/jdk-1.8:* +" +RDEPEND=" + dev-libs/apr:1= dev-libs/openssl:0/3 - >=virtual/jre-1.8:*" - -DEPEND=">=virtual/jdk-1.8:* - test? ( dev-java/ant-junit:0 )" - + >=virtual/jre-1.8:* +" BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-tomcat-connectors )" VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-connectors.apache.org.asc" -JAVA_ANT_REWRITE_CLASSPATH="yes" +JAVA_RESOURCE_DIRS="../resources" +JAVA_SRC_DIR="../java" +JAVA_TEST_GENTOO_CLASSPATH="junit-4" +JAVA_TEST_RESOURCE_DIRS=".libs" +JAVA_TEST_SRC_DIR="../test" PATCHES=( - "${FILESDIR}"/${P}-slibtool.patch #778914 + "${FILESDIR}"/tomcat-native-2.0.3-slibtool.patch #778914 ) +DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) + src_prepare() { + java-pkg-2_src_prepare + mkdir -p "${JAVA_RESOURCE_DIRS}/META-INF" || die + sed -ne '/attribute name/s:^.*name="\(.*\)" value="\(.*\)".*$:\1\: \2:p' \ + ../build.xml \ + | sed "s:\${version}:${PV}:" \ + > "${JAVA_RESOURCE_DIRS}/META-INF/MANIFEST.MF" || die default # Needed for the slibtool patch - cd native || die sed -i 's/configure.in/configure.ac/' configure.in || die eautoreconf } @@ -47,29 +63,24 @@ src_configure() { --with-apr="${EPREFIX}"/usr/bin/apr-1-config --with-ssl="${EPREFIX}"/usr ) - - cd native || die econf "${myeconfargs[@]}" } src_compile() { - eant jar - - cd native || die + java-pkg-simple_src_compile 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_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" ) + java-pkg-simple_src_test } -src_test() { - java-pkg-2_src_test +src_install() { + java-pkg-simple_src_install + java-pkg_doso .libs/*.so + dodoc -r ../docs + ! use static-libs && find "${D}" -name '*.la' -delete || die } pkg_postinst() {
