From df26c7469c1f2af2e643d43e2e32a6c9142e4885 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 11 Jan 2023 11:44:03 +0000 Subject: gentoo auto-resync : 11:01:2023 - 11:44:03 --- dev-java/Manifest.gz | Bin 56635 -> 56634 bytes dev-java/protobuf-java/Manifest | 4 + .../protobuf-java/protobuf-java-3.21.12.ebuild | 122 +++++++++++++++++++++ .../protobuf-java/protobuf-java-3.21.9-r2.ebuild | 119 ++++++++++++++++++++ dev-java/tomcat-el-api/Manifest | 5 +- dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild | 40 ------- dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild | 2 +- dev-java/tomcat-jsp-api/Manifest | 5 +- .../tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild | 47 -------- .../tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild | 2 +- dev-java/tomcat-servlet-api/Manifest | 5 +- .../tomcat-servlet-api-10.1.2.ebuild | 47 -------- .../tomcat-servlet-api-10.1.4.ebuild | 2 +- 13 files changed, 251 insertions(+), 149 deletions(-) create mode 100644 dev-java/protobuf-java/protobuf-java-3.21.12.ebuild create mode 100644 dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild delete mode 100644 dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild delete mode 100644 dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild delete mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 8c96786aebc1..4f6ebf1b42c3 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/protobuf-java/Manifest b/dev-java/protobuf-java/Manifest index 2d0655df6891..6fb91ba738fa 100644 --- a/dev-java/protobuf-java/Manifest +++ b/dev-java/protobuf-java/Manifest @@ -1,4 +1,8 @@ +DIST protobuf-21.12.tar.gz 5141166 BLAKE2B 33500612d103afb817062486a741e8e5503f82c42c70054d47d1899e6bb79f3fdde2666cad5b8eff6e1bc539c3b0cdf9f2b125ce7e5d3a459a69e84d67ab535e SHA512 2dc8f552388438268d8b9f7a9e84c6abf1736be3d5031438c789c317410c9f4b5cedd25bf7da6d67b3ba32ca890869f9ddaab2284d6ac0e734a5b135ffbb1346 DIST protobuf-21.9.tar.gz 5110670 BLAKE2B a4f5b7f58e1c5904ca990b100a72992f6f56177b28773f8de8c99e4158391d33cfb8aa8575915887fc9ae4294faf81d4ff6b470bc07b394bfd5885a09ba0fafe SHA512 6954b42d21921e630173b7848c056ab95635627d8eddec960f3db2ddda13eedde00520a9b350722e76e2998649eb8ebe10758e1db938b6a91e38ff3295b1b7c1 +DIST truth-1.1.3.jar 243021 BLAKE2B a59149038c62ef5dd352b13d4b393e1b7715fbafe5ed86ec2d16d722c738a31dcdca10132fc73b17b367ac4309e5407ba2e489f8d4c8fbca60ce5f35ae75d1e3 SHA512 f29a9fb070aff8a32358a7b6c8998c0095de5d8d68afa7f7bac759c7050309deff929e767657ecbbefd96163460f10255ca01bc567ab30df4834b9d916a4fae8 +EBUILD protobuf-java-3.21.12.ebuild 4454 BLAKE2B ce6a686a8b61122bab004aa3b5fd989413e3300ee84b6e3926fe470c1b8b070ce043c59ba20c40dd66c9a81d07a112ada611e175b69e8a8a6c7b136223f19add SHA512 d3868a7a52d86919898dac49209a643de204cabb36f7dee55634f62fc18e57aafd223bfef967b7d57c6cfa8bd177c09cc1a8c549785ef98c7842b8ae990ded98 EBUILD protobuf-java-3.21.9-r1.ebuild 2998 BLAKE2B ccc295705b54c9d132c5d67a5a949fa3cbc9d0ee330540d9824c5e36dc738e70080fdb66a941f225748df62af934b30c2745f01b06436eb6c3e921c04e6c1dcb SHA512 7d11c96dfa448ae46ebab6ddcc0dc622cd8bbc04090354148eaf2d89f6f9d3f31b7b49eae7506e70dc0f78bde3bf4ddf74cdba214a663d47cdaa1466168b0e72 +EBUILD protobuf-java-3.21.9-r2.ebuild 4309 BLAKE2B 0d836a8bd93a282e57702ae646eff00983d3f1e037a9bd9267e0a3167c632bf254b83339379b77746d5c11564d8db9827a810623df57aa2a893e8c5e1c25c203 SHA512 73b895c8e096ae863dfc56c948649701721690fa13ba51d15cdfc31a14f4034a82653069caa1d77749f1da4e6e637ac6306bd7157c128bb608cded3dbdf8a448 EBUILD protobuf-java-9999.ebuild 3078 BLAKE2B 837383cde2c29c4605564b30a071eeb8240c9a447a03cae8c63526d0c0011146faf0a914fe13c0cfe6952f49fef01c08e928fb7568a1f7930393ae851a87f484 SHA512 4be8eef3afd89a5e0248d4181d0ae7e1fdde18adfa9e7e3e9aa869e174adff77ce066ae346393d201ba585c7dd686b7ee0826ba9f76729f11569717b5655441c MISC metadata.xml 625 BLAKE2B 13394b9a2148b9117ce719954591e79088f845ac1ceb667bbdd2645b989daadcfea09525f9dde68c405e3f1cce5cc1af32de9fb4dff629e4745e13fa92727dd7 SHA512 47f693db57dbde04f419ed65494d81b0a800c9ac49d790c9b794baef34fb1f876da29c5a0662c45aa3c01cecd34af648e196fb76110fcc0066198c59543049b3 diff --git a/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild new file mode 100644 index 000000000000..7885a6ab21ee --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.21.12.ebuild @@ -0,0 +1,122 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:3.21.12" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Google's Protocol Buffers - Java bindings" +HOMEPAGE="https://developers.google.com/protocol-buffers/" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.21.11 from the 21.11 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" + +# Once =protobuf-${PV#3.} hits the tree use it +# BDEPEND="~dev-libs/protobuf-${PV#3.}:0" +BDEPEND="dev-libs/protobuf:0" + +S="${WORKDIR}/protobuf-${PV#3.}/java" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="core/src/main/resources" +JAVA_SRC_DIR="core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_RESOURCE_DIRS="core/src/test/proto" +JAVA_TEST_SRC_DIR="core/src/test/java" + +src_prepare() { + default + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/pom.xml#L43-L62 + echo $(sed \ + -n '/google\/protobuf.*\.proto/s:.*\(.*\):-C ../../../../../src \1:p' \ + "${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed" + # Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS + pushd "${JAVA_RESOURCE_DIRS}" || die + jar cv "@${T}/core_proto" | jar xv + assert"Copying protos failed" + popd || die + + # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-sources-build.xml + einfo "Replace variables in generate-sources-build.xml" + sed \ + -e 's:${generated.sources.dir}:core/src/main/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i core/generate-sources-build.xml || die "sed to sources failed" + + einfo "Run protoc to generate sources" + protoc @core/generate-sources-build.xml || die "protoc sources failed" +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar" + + # https://github.com/protocolbuffers/protobuf/blob/v21.12/java/core/generate-test-sources-build.xml + einfo "Replace variables in generate-test-sources-build.xml" + sed \ + -e 's:${generated.testsources.dir}:core/src/test/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:${test.proto.dir}:core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Remove second exec from the file. Makes trouble here. We run it separately. + sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines" + + einfo "Running protoc to generate test-sources" + protoc @core/generate-test-sources-build.xml || die "protoc I failed" + + einfo "Running protoc on previously removed test-sources" + protoc --java_out=lite:core/src/test/java \ + --proto_path=../src \ + --proto_path=core/src/test/proto \ + core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \ + core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \ + || die "protoc II failed" + + # Ignore two failing test cases from CodedOutputStreamTest.java + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/testWriteWholeMessage/i @Ignore' \ + -e '/testWriteWholePackedFieldsMessage/i @Ignore' \ + -i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die + + einfo "Running tests" + # Exclude MapInitializationOrderTest and CachedFieldSizeTest + pushd core/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -wholename "**/*Test.java" \ + ! -wholename "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -name "CachedFieldSizeTest.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} diff --git a/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild new file mode 100644 index 000000000000..ef157767a703 --- /dev/null +++ b/dev-java/protobuf-java/protobuf-java-3.21.9-r2.ebuild @@ -0,0 +1,119 @@ +# Copyright 2008-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="com.google.protobuf:protobuf-java:3.21.9" +JAVA_TESTING_FRAMEWORKS="junit-4" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Google's Protocol Buffers - Java bindings" +HOMEPAGE="https://developers.google.com/protocol-buffers/" +# Currently we bundle the binary version of truth.jar used only for tests, we don't install it. +# And we build artifact 3.21.9 from the 21.9 tarball in order to allow sharing the tarball with +# dev-libs/protobuf. +SRC_URI="https://github.com/protocolbuffers/protobuf/archive/v${PV#3.}.tar.gz -> protobuf-${PV#3.}.tar.gz + test? ( https://repo1.maven.org/maven2/com/google/truth/truth/1.1.3/truth-1.1.3.jar )" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos" + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + dev-java/guava:0 + dev-java/mockito:4 + ) +" +RDEPEND=">=virtual/jre-1.8:*" +BDEPEND="~dev-libs/protobuf-${PV#3.}:0" + +S="${WORKDIR}/protobuf-${PV#3.}/java" + +JAVA_AUTOMATIC_MODULE_NAME="com.google.protobuf" +JAVA_JAR_FILENAME="protobuf.jar" +JAVA_RESOURCE_DIRS="core/src/main/resources" +JAVA_SRC_DIR="core/src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="guava,junit-4,mockito-4" +JAVA_TEST_RESOURCE_DIRS="core/src/test/proto" +JAVA_TEST_SRC_DIR="core/src/test/java" + +src_prepare() { + default + + mkdir "${JAVA_RESOURCE_DIRS}" || die + # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/pom.xml#L43-L62 + echo $(sed \ + -n '/google\/protobuf.*\.proto/s:.*\(.*\):-C ../../../../../src \1:p' \ + "${S}/core/pom.xml") > "${T}/core_proto" || die "echo to core_proto failed" + # Copy them from ../src/google/protobuf to JAVA_RESOURCE_DIRS + pushd "${JAVA_RESOURCE_DIRS}" || die + jar cv "@${T}/core_proto" | jar xv + assert "Copying protos failed" + popd || die + + # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-sources-build.xml + einfo "Replace variables for code generation " + sed \ + -e 's:${generated.sources.dir}:core/src/main/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|echo\|mkdir\|exec/d' \ + -i core/generate-sources-build.xml || die "sed to sources failed" + + einfo "Run protoc to generate sources" + protoc @core/generate-sources-build.xml || die "protoc sources failed" +} + +src_test() { + JAVA_GENTOO_CLASSPATH_EXTRA="${DISTDIR}/truth-1.1.3.jar" + + # https://github.com/protocolbuffers/protobuf/blob/v21.9/java/core/generate-test-sources-build.xml + einfo "Replace variables for code generation " + sed \ + -e 's:${generated.testsources.dir}:core/src/test/java:' \ + -e 's:${protobuf.source.dir}:../src:' \ + -e 's:${test.proto.dir}:core/src/test/proto:' \ + -e 's:^.*value="::' -e 's:\"/>::' \ + -e '/project\|mkdir\|exec\|Also generate/d' \ + -i core/generate-test-sources-build.xml || die "sed to test sources failed" + + # Remove second exec from the file. Makes trouble here. We run it separately. + sed '50,54d' -i core/generate-test-sources-build.xml || die "cannot remove lines" + + einfo "Running protoc first exec" + protoc @core/generate-test-sources-build.xml || die "protoc I failed" + + einfo "Running protoc second exec" + protoc --java_out=lite:core/src/test/java \ + --proto_path=../src \ + --proto_path=core/src/test/proto \ + core/src/test/proto/com/google/protobuf/nested_extension_lite.proto \ + core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto \ + || die "protoc II failed" + + # Ignore two failing test cases from CodedOutputStreamTest.java + sed \ + -e '/import org.junit.Test/a import org.junit.Ignore;' \ + -e '/testWriteWholeMessage/i @Ignore' \ + -e '/testWriteWholePackedFieldsMessage/i @Ignore' \ + -i core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java || die + + einfo "Running tests" + # Exclude MapInitializationOrderTest and CachedFieldSizeTest + pushd core/src/test/java || die + local JAVA_TEST_RUN_ONLY=$(find * \ + -wholename "**/*Test.java" \ + ! -wholename "**/Abstract*Test.java" \ + ! -name "MapInitializationOrderTest.java" \ + ! -name "CachedFieldSizeTest.java" \ + ) + popd + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//.java}" + JAVA_TEST_RUN_ONLY="${JAVA_TEST_RUN_ONLY//\//.}" + java-pkg-simple_src_test +} diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest index b36a536f600b..dbcc94153e14 100644 --- a/dev-java/tomcat-el-api/Manifest +++ b/dev-java/tomcat-el-api/Manifest @@ -1,13 +1,10 @@ -DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655 -DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07 -EBUILD tomcat-el-api-10.1.2.ebuild 1374 BLAKE2B 17b60391fd43e9a788a846b6ab803edc4df33073dd2f5a9c317409b71f1e3ec97a7f80285f533889484c03dbd4c783b093547f49c91d4c01fd7c1a7260176a7c SHA512 c128cd5d425aaba434bb46cb7aa4514751de7a2e59f8c40652cdd124f545c564efefff3ca71c8bba309f60bc525bec50d7a47f101c20d5cc85fe82f912786482 -EBUILD tomcat-el-api-10.1.4.ebuild 1377 BLAKE2B aab780db18214e1dc1bbd754e9d0143d4cca83f6cace121ab9f19ac91c609807b84af2fe48db30cedadf894a1d3600ff57d8e81cd0cae31e82d26a8cd0f8264f SHA512 120e0412caf396f00b2205074dc462031d40aea8b5aba08f764fbd1b78b3d224526ca907e8577a69db17282c00cdc7c155802d855d72b27e618d9136717339c8 +EBUILD tomcat-el-api-10.1.4.ebuild 1374 BLAKE2B 4296a5b0314ecb8bf78fcba7c536a182e1abf4a52a89d18532b6a8083552926cb94f301bec141c85008d49f5aa12277c2b0807867fa882115f349bf3b11b7c9b SHA512 b1812d67e3405123bb2ad21469268df419141f75f1a9bb23da6ace7bea9a9f740c08301b0dc06c54525359c7dc3ef8767bf58f1c4dba923207285c1d6f50d367 EBUILD tomcat-el-api-8.5.84.ebuild 1370 BLAKE2B 34bacef959f8b2ffeae59deeac238c6ea7c13c587e29ce1ca648fabd5eaf331903c2056390feda0f603c2652414b12955af2727efb01184cd8c81365f26269f9 SHA512 cfbfbd055abd5a30836268389bb16aac872fef7c3a9f9fe249c08c994681f075e4bcc49f6e09d89eb67e7492c22098b9e9c19d1e7f026619f13e5284891b3ec7 EBUILD tomcat-el-api-9.0.70.ebuild 1370 BLAKE2B f218b5ce0baf1563b88edff9a1720353367ecfe16907a880dabd9be2e88ede18eacd6fed334982a1f9c2902e0db5068eb75a6ac28059c59b4843d4fb102a8988 SHA512 7742cb95728b30becf186873b61a362cea048b9504a9ff993a1bf838afdaac7d7df85097639118d9bb61cd817f7c84701061fd6922a5225f0533f904345662c7 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild deleted file mode 100644 index 5bf204df801f..000000000000 --- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.2" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Tomcat's EL API 5.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="5.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -DEPEND=">=virtual/jdk-11:*" -RDEPEND=">=virtual/jre-11:*" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S="${WORKDIR}/apache-tomcat-${PV}-src" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="java/jakarta/el" - -src_prepare() { - default - # remove anything related to "el" or "jsp" - find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \ - -exec rm -rf {} + || die "removing jsp failed" - - mkdir resources || "creating \"resources\" failed" - cp -r java/jakarta resources || "cannot copy to \"resources\" dir" - find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed" -} diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild index 2989889d5cdf..56e06f95d3d0 100644 --- a/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild +++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P LICENSE="Apache-2.0" SLOT="5.0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-11:*" diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest index b5db30552c60..6eebf68559c0 100644 --- a/dev-java/tomcat-jsp-api/Manifest +++ b/dev-java/tomcat-jsp-api/Manifest @@ -1,13 +1,10 @@ -DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655 -DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07 -EBUILD tomcat-jsp-api-10.1.2.ebuild 1417 BLAKE2B ba8f0659b764d412c055e82c10974db38c93d7d33e85aeaaa4886b8b54738ff2ee6e6ec452f42fb3ff61b6cf8ec011f5fedadd3567f67ca536b75170a49e5e2b SHA512 a06ca64936cf9246c23d0c5d3e16eaee14446f739cbaaeeecee9691d155b45dd9d056ed12e4174d0b8c6f199c989d6ef1e94c7e0e47f2b51df0d624b76457a82 -EBUILD tomcat-jsp-api-10.1.4.ebuild 1420 BLAKE2B fe29b7326c10c1277d9bf20c2e593a1dea9386fb8e2c7bb90e531515bf1629489c870c6b45ee7429d583dca892e1d727b8274cba5a917ee38f9d737bc7a7d99e SHA512 547e3c1d50585843b933e2038354c56d0828bc16e7cb127a6c9e5957e5e481984b015c6d9145890cf3048520d632ceb51e874257f3e0cf3c63e7b45c6e814a43 +EBUILD tomcat-jsp-api-10.1.4.ebuild 1417 BLAKE2B 03236d9990abcf733d8eb1cdd16deac9d38fbed148aef64ffde58c9f3564bf272fa0228a5ed11f3eb4c9a9e60b7250af0bf68deb608c9dba4f93fcd9a5eff078 SHA512 f10d63de0ea589d81d08c6c5cdd0961539096f4e5b1d946b49367f70cc304f2005630bceb8a08022cb9b80aa3110a90895f7e5dc6a1df1b68989f87197042725 EBUILD tomcat-jsp-api-8.5.84.ebuild 1413 BLAKE2B b8bbb03d477442ddbd45f7b234bcc985b1b1f37d4ad07caf66a25d8db7b48dca1e3a1c21198a445730c82aec7a37baebab6eafeedaa7997d416166cf2b3032c3 SHA512 4dd898389dded9ddf958a931d4843d22806eee262c78128d3ce5ed961ff6c8f2be36bd256cc03ee57066ba729e3ef920ff31fd8a651b5c3a67a05386b0579359 EBUILD tomcat-jsp-api-9.0.70.ebuild 1413 BLAKE2B 3695a4ee4b5365c8716e6cf465556e29920893f8361d2b015a091ee8984d7d38483dc44a4b55ea9d77ea9f561d4dfee2cd159a2d4ac4a5926b4a2e86fd21797f SHA512 153f9e1adea22e21250077e471c1d2d524659da13055a6be5f2f507a928773a933171e66384a8b3591336eb2c2b83cc30f6bbaede56b97099f15f2aeb18376bc MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild deleted file mode 100644 index 30e80c0e6e49..000000000000 --- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.2" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Tomcat's JSP API 3.1 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="3.1" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -CP_DEPEND=" - ~dev-java/tomcat-el-api-${PV}:5.0 - ~dev-java/tomcat-servlet-api-${PV}:6.0 -" - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND}" - -RDEPEND=" - >=virtual/jre-11:* - ${CP_DEPEND}" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S="${WORKDIR}/apache-tomcat-${PV}-src" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="java/jakarta/servlet/jsp" - -src_prepare() { - default - mkdir -p resources/jakarta/servlet || "creating \"resources\" failed" - cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir" - find resources \( -name '*.java' -o -name 'tagext' \) \ - -exec rm -rf {} + || die "removing *.java files failed" -} diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild index ff82b2a9c671..e43c05b27418 100644 --- a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild +++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P LICENSE="Apache-2.0" SLOT="3.1" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" CP_DEPEND=" ~dev-java/tomcat-el-api-${PV}:5.0 diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index bf6d5596da9d..a6f7b8c1b599 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -1,8 +1,6 @@ AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfdfe4ac706137791b329b05a28f56f77c57fa8de30b77d457e912208068b97bf6b8fbee7d7af168d07a5 SHA512 1bf5789c683896ffde160f96dc6fcb2ef58dd645a208b3d8e08863fd176337ae81e4d29535bb18df909cfe233576f25d93c35ad1072fca3a79b19e784638f5fb AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1e0b8193fa80d70a776c0cf24b2eee585cf77292bc2112b60075414a4d05ebe16dc26eb3c2976a44420774 SHA512 f2e21cee74fd1c3f1403eb3e26c1c7a59be420bc25da842af0cfae851fcf4bb22575b147feb2ffd3a52410e0e552bafb4414b9f8ef5f9a0f4df1d061f2c6be41 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca -DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655 -DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e @@ -13,8 +11,7 @@ DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a968 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07 -EBUILD tomcat-servlet-api-10.1.2.ebuild 1464 BLAKE2B f15c08f22b4a8f0317b5487cab9f2d4624fe575730cc648f12cd448681e700559ed4075fdf291be40db6510ad72092758b5c36a9eb8e9522996b04e84b87e2cb SHA512 46bd926b649995861f42196aeec6b44c3e4e80c75417a3b0977630c04bec5145e8134ae5118cc18c44f0640c79c2c7a0d9e01282426417c13da87c227fbc182e -EBUILD tomcat-servlet-api-10.1.4.ebuild 1467 BLAKE2B 14912880bb6fddf23424867cb050cbffb7cc1f788ab1863a17b88b92ac2020e603ce5d1f03dfd72f6cc324c4758e718336188f784470b240d2ced95bb4eaf61e SHA512 a7dd569d0eb37b9fe4cf899058e9644350e6171d907f9450b675b7320f97bd2439bb0836f00c1456ef0a9edf737515238cf8719c5397f93669223943dfe29726 +EBUILD tomcat-servlet-api-10.1.4.ebuild 1464 BLAKE2B 8bf04e73c0e534bdff1d35f25d171b716a6416c179230b4e99f2731de3ac0336e3203e81bbea7b8dcdece2e79983126833a2836252b320edf931e5978d6220f6 SHA512 c88981bb5e3b7ccc2e97874a1703b3a40bcd7879653358c749680abdb6896be621ee0fd6fb9c6ca6d59fbce08aa5d5d9b6462167e5d0920227e3be28397f6d30 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild deleted file mode 100644 index 38370ea2c1d9..000000000000 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:10.1.2" - -inherit java-pkg-2 java-pkg-simple verify-sig - -DESCRIPTION="Tomcat's Servlet API 6.0 implementation" -HOMEPAGE="https://tomcat.apache.org/" -SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz - verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )" - -LICENSE="Apache-2.0" -SLOT="6.0" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" - -CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0" - -DEPEND=" - >=virtual/jdk-11:* - ${CP_DEPEND}" - -RDEPEND=" - >=virtual/jre-11:* - ${CP_DEPEND}" - -BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )" -VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc" - -S="${WORKDIR}/apache-tomcat-${PV}-src" - -JAVA_RESOURCE_DIRS="resources" -JAVA_SRC_DIR="java/jakarta/servlet" - -src_prepare() { - default - # remove anything related to "el" or "jsp" - find java/jakarta \( -name 'el' -o -name 'jsp' \) \ - -exec rm -rf {} + || die "removing jsp failed" - - mkdir resources || "creating \"resources\" failed" - cp -r java/jakarta resources || "cannot copy to \"resources\" dir" - find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed" -} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild index 3ee904435f6f..3a19ce54b1b8 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.4.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${P LICENSE="Apache-2.0" SLOT="6.0" -KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0" -- cgit v1.2.3