From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23C3815800A for ; Wed, 12 Jul 2023 07:23:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58CC3E0784; Wed, 12 Jul 2023 07:23:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 230B9E0784 for ; Wed, 12 Jul 2023 07:23:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 45EE8340BBE for ; Wed, 12 Jul 2023 07:23:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A725ACB for ; Wed, 12 Jul 2023 07:23:00 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1689146569.664ad8505c4176bd4327fdd73ce8e02ab204bfd8.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/tomcat-native/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/tomcat-native/Manifest dev-java/tomcat-native/tomcat-native-1.2.36.ebuild dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild X-VCS-Directories: dev-java/tomcat-native/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 664ad8505c4176bd4327fdd73ce8e02ab204bfd8 X-VCS-Branch: master Date: Wed, 12 Jul 2023 07:23:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9303c974-b94e-435d-aad7-80707e43f928 X-Archives-Hash: 64bba2236c740767740f7bda98978958 commit: 664ad8505c4176bd4327fdd73ce8e02ab204bfd8 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Jul 12 07:22:49 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Wed Jul 12 07:22:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=664ad850 dev-java/tomcat-native: dropped obsolete 1.2.36 & 2.0.3-r1 Bug: https://bugs.gentoo.org/909526 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-native/Manifest | 3 - dev-java/tomcat-native/tomcat-native-1.2.36.ebuild | 62 --------------- .../tomcat-native/tomcat-native-2.0.3-r1.ebuild | 88 ---------------------- 3 files changed, 153 deletions(-) diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 0267c1a62bb7..f93fdb6f8ac4 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,6 +1,3 @@ -DIST tomcat-native-1.2.36-src.tar.gz 437622 BLAKE2B c553fee65bc9ff9eec099afde7516b3108ed4175915e853a720d188f684f39b9a8a040b9b9c28e64deecd0c1b0c61cd24e03a552f465c7646b0b6e47d9f12372 SHA512 ae89a872b8331035e01387665539a0c08096ae1abdb5dc7a25a197650a641ba3637f01437f1bee27b442c1c59c4d2fe2e5679d1595e8c5d121b9b219da2fb094 DIST tomcat-native-1.2.37-src.tar.gz 438373 BLAKE2B 89ec571fea09b5ee0cf5f5ffec8f5547b08da301e713361687d7aad96f70b3b789a5f26061e2277b90b845f9df1c7c140fdee4c83f1ba05d168bcabf2cf1f549 SHA512 e845239f1b6a1dab22885d39f4fd131e464c38b0d52faca0d960f99fe3e8b7d732c0112f25e5eb81ff8dc71a5e3c6799bfdf867e617d8f934068ed107036fd0b -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 DIST tomcat-native-2.0.4-src.tar.gz 318845 BLAKE2B 44cd99ff52d5b402c2d8caa6819e2e420c84399f7f3cc0be38cd2a40985ddaaf89093005454527976ad2cf083c90d39c9c4d600671a8e5c7c07d0834b23d93e0 SHA512 276133e44ae9f9d3e853b66120937865c675eed6dd6b5b7d8a94ef741f037c0b3d99a6c065a1303c0ca42b65c109aef35b6bd370a2af0b7b2752eadf85b1d880 DIST tomcat-native-2.0.4-src.tar.gz.asc 873 BLAKE2B 509c63dce69c767d3dd694d7994c8b2cbb4f84d40095ff89373a165d592449fc028402b17bf0e25c9ffe40d5ca8383cda50703054fcdfb2fd4cb36bdcecdff0c SHA512 80768307fd1d46ca822151977b3d9fecdb3121929e97338a78c39bc439f914694dedbfff087cd512f986532567734f04422b4764ea215ad5dbb0319380fa05d2 diff --git a/dev-java/tomcat-native/tomcat-native-1.2.36.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.36.ebuild deleted file mode 100644 index e2093e095560..000000000000 --- a/dev-java/tomcat-native/tomcat-native-1.2.36.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit java-pkg-2 java-ant-2 - -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" - -KEYWORDS="amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="0" -IUSE="static-libs test" -RESTRICT="!test? ( 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-2.0.3-r1.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild deleted file mode 100644 index e5d555c68e08..000000000000 --- a/dev-java/tomcat-native/tomcat-native-2.0.3-r1.ebuild +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -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/native - -KEYWORDS="~amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="2" -IUSE="static-libs" - -DEPEND=" - >=virtual/jdk-1.8:* -" -RDEPEND=" - dev-libs/apr:1= - dev-libs/openssl:0/3 - >=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_RESOURCE_DIRS="../resources" -JAVA_SRC_DIR="../java" -JAVA_TEST_GENTOO_CLASSPATH="junit-4" -JAVA_TEST_SRC_DIR="../test" - -PATCHES=( - "${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 - sed -i 's/configure.in/configure.ac/' configure.in || die - eautoreconf -} - -src_configure() { - local myeconfargs=( - --with-apr="${EPREFIX}"/usr/bin/apr-1-config - --with-ssl="${EPREFIX}"/usr - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - java-pkg-simple_src_compile - default -} - -src_test() { - JAVA_TEST_EXTRA_ARGS=( -Djava.library.path=".libs" ) - java-pkg-simple_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() { - elog "For more information, please visit" - elog "https://tomcat.apache.org/tomcat-9.0-doc/apr.html" -}