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 7D6231581FB for ; Mon, 26 Aug 2024 08:30:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE077E2A7D; Mon, 26 Aug 2024 08:30:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 AFD0DE2A7D for ; Mon, 26 Aug 2024 08:30:51 +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 A617F33FE60 for ; Mon, 26 Aug 2024 08:30:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DA7D01889 for ; Mon, 26 Aug 2024 08:30:48 +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: <1724661030.ca810a65f875f024a7407cb304bfede80ba36c78.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.3.0.ebuild dev-java/tomcat-native/tomcat-native-2.0.7.ebuild X-VCS-Directories: dev-java/tomcat-native/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: ca810a65f875f024a7407cb304bfede80ba36c78 X-VCS-Branch: master Date: Mon, 26 Aug 2024 08:30:48 +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: d6334c8d-d5e0-4ae0-a4b0-4d211b5d913e X-Archives-Hash: 06e8cc45200859d34938e8b7c03ac962 commit: ca810a65f875f024a7407cb304bfede80ba36c78 Author: Volkmar W. Pogatzki pogatzki net> AuthorDate: Sun Aug 25 14:14:46 2024 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Mon Aug 26 08:30:30 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca810a65 dev-java/tomcat-native: drop 1.3.0, 2.0.7 Signed-off-by: Volkmar W. Pogatzki pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/38203/commits/e78086915c435a708676b16e43a817516927ab57 Signed-off-by: Miroslav Šulc gentoo.org> dev-java/tomcat-native/Manifest | 4 -- dev-java/tomcat-native/tomcat-native-1.3.0.ebuild | 86 ----------------------- dev-java/tomcat-native/tomcat-native-2.0.7.ebuild | 79 --------------------- 3 files changed, 169 deletions(-) diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 4b202bf1b541..b8af1b64ed64 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,8 +1,4 @@ -DIST tomcat-native-1.3.0-src.tar.gz 345276 BLAKE2B 73e8433e12bdd88036509f4ffbd2c0ed25b367567728829a56918d082627d43643865c492f4bc8eac4551e2ed82648ada71e6decfb45c173a856ab2fda6e01a5 SHA512 5a6c7337280774525c97e36e24d7d278ba15edd63c66cec1b3e5ecdc472f8d0535e31eac83cf0bdc68810eb779e2a118d6b4f6238b509f69a71d037c905fa433 -DIST tomcat-native-1.3.0-src.tar.gz.asc 833 BLAKE2B b7e05447643000ffda0d66143c199192b41843f10ae89874c353d613f612a6d481be3081aa971b640a3bedc6c903be7d052c418e2abc2d7d6db42924c7b3cf91 SHA512 9cfc137cd13086ccf421376a006164e6e6e14844636457db0cf7c0f699a1b1ceab28a52bd80da71dc9e190bdf84676abfdbe07a0cabecfc59b7845ac82a171e5 DIST tomcat-native-1.3.1-src.tar.gz 346588 BLAKE2B 3b979845dd10a0c74c7ed2e6404b217c7bdebf2d432ac904b50f8288cd3cf3b1489b4e5111ce02eca442c45deb805523062862225130386a6d47853cd972d788 SHA512 06951c67d2739ab9205a537d24345e13e4472f192602fc52015ea84612c6e2c9334404b30a82be7d1e7d4ce470ea9df8b1b8ca1a3b8674d82706ff432280724f DIST tomcat-native-1.3.1-src.tar.gz.asc 833 BLAKE2B d7483efea5dc4d9cc069a667896950526e22a6b4b0ee1fd6739754196d1b9e84a2b16f766f68419faf2c3fcc87d1fa83c9985de7149849d4f761d2c5b7e45af7 SHA512 3550e38556dab5594aea469cd8ae43505deceeab25bf60ecd61c26ed1106ce88e35634f936cb36e7fc766f30b5c5f0f19dd01a1513ed219ae7f68c8c10e960f1 -DIST tomcat-native-2.0.7-src.tar.gz 538131 BLAKE2B ef973c830e3e3e04f4bf7bd711915b1ac5f28e34832edd0750117a5d6b00f9a7fa9e390858d23bfaeeb08ad825d7dcc1e95967c00d4ada96cac83377fca7bea6 SHA512 625b334271494f7c86c06d6a8c6d13c06d9d6094f65cccbdc8d3df13ee2aae4cb42ad326e20bcbf8a8f141240111778991882f9bf87793b09a2920433d6c8c85 -DIST tomcat-native-2.0.7-src.tar.gz.asc 833 BLAKE2B 081f40de6fdc5ad819a167e0150a2e03ab8d4fd679be0dbabac9a9f2aabffd2fa36fd6a9c764deefd419576dcda07bc1b22ea2f14c04eddbfa7f94e4834bec7e SHA512 16a96a3c3b55d258ad0820c30392f37643f433c563b74a983109492569d06a399471acc42c7f07b87b50bff8711bc10ed278bfa183807bcdde1355e6b8058605 DIST tomcat-native-2.0.8-src.tar.gz 471386 BLAKE2B 7fb5e3c4671e4b56bfa5eb546ac1f87fdf1e33b350533ffcadb9005c1f3054013d61d15f4212923d9ec9370d15fd2717e2b446c80818c82d83cd9f1497e321c4 SHA512 fd45533b9c34b008717d18ed49334c7286b93c849c487c1c42746f2998cc4a6ff0362e536a8b5124c6539847a92a9f7631c7638a21cd5d22134fe1a9bb0f0702 DIST tomcat-native-2.0.8-src.tar.gz.asc 833 BLAKE2B b438034baf5191ce2af55087d1fcd55f196c3cfa75dc2c7fc9d1bfa8fa5b5289181dad6a02e55674e7d685482228df603478ba1f73a9b67169f50390cdd198a7 SHA512 64879cd6f02a6213a2b6cd102dc175d968a7c20bc821877e9f6f5bbaa11069e5cb672b584c47e3a7563a6c872d56646535a59e42331a2ad524c7f85e628085df diff --git a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild b/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild deleted file mode 100644 index d560c27c933d..000000000000 --- a/dev-java/tomcat-native/tomcat-native-1.3.0.ebuild +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright 1999-2024 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 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/${P}-src.tar.gz.asc - )" -S=${WORKDIR}/${P}-src/native - -KEYWORDS="amd64 ~x86" -LICENSE="Apache-2.0" -SLOT="0" -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="/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" - -DOCS=( ../{CHANGELOG.txt,NOTICE,README.txt} ) -PATCHES=( "${FILESDIR}/tomcat-native-1.2.39-slibtool.patch" ) - -src_prepare() { - default #780585 - 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 -} - -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() { - # Adjusting "String testFile =" path in TestFile.java:29 to match ${S} - sed \ - -e '/String testFile =/s&test/&../test/&' \ - -i ../test/org/apache/tomcat/jni/TestFile.java || die - - 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" -} diff --git a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild b/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild deleted file mode 100644 index 9507ee4750e0..000000000000 --- a/dev-java/tomcat-native/tomcat-native-2.0.7.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2024 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 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="/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" - -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 -} - -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" -}