From c719fdcee603a5a706a45d10cb598762d56a727d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Sep 2021 20:21:45 +0100 Subject: gentoo resync : 25.09.2021 --- dev-java/Manifest.gz | Bin 75997 -> 76009 bytes dev-java/asm-analysis/Manifest | 2 - dev-java/asm-analysis/asm-analysis-9.1.ebuild | 28 ------ dev-java/asm-commons/Manifest | 2 - dev-java/asm-commons/asm-commons-9.1.ebuild | 28 ------ dev-java/asm-tree/Manifest | 2 - dev-java/asm-tree/asm-tree-9.1.ebuild | 28 ------ dev-java/asm-util/Manifest | 2 - dev-java/asm-util/asm-util-9.1.ebuild | 28 ------ dev-java/asm/Manifest | 2 - dev-java/asm/asm-9.1.ebuild | 23 ----- dev-java/commons-csv/Manifest | 2 + dev-java/commons-csv/commons-csv-1.9.0.ebuild | 55 ++++++++++++ dev-java/commons-io/Manifest | 2 + dev-java/commons-io/commons-io-2.11.0.ebuild | 55 ++++++++++++ dev-java/maven-bin/Manifest | 4 +- dev-java/maven-bin/maven-bin-3.8.1.ebuild | 67 -------------- dev-java/maven-bin/maven-bin-3.8.2.ebuild | 2 +- dev-java/tomcat-native/Manifest | 2 + dev-java/tomcat-native/tomcat-native-1.2.31.ebuild | 62 +++++++++++++ dev-java/tomcat-servlet-api/Manifest | 12 ++- .../tomcat-servlet-api-10.0.10.ebuild | 2 +- .../tomcat-servlet-api-10.0.11.ebuild | 98 ++++++++++++++++++++ .../tomcat-servlet-api-8.5.70.ebuild | 2 +- .../tomcat-servlet-api-8.5.71.ebuild | 99 +++++++++++++++++++++ .../tomcat-servlet-api-9.0.52.ebuild | 2 +- .../tomcat-servlet-api-9.0.53.ebuild | 99 +++++++++++++++++++++ 27 files changed, 488 insertions(+), 222 deletions(-) delete mode 100644 dev-java/asm-analysis/asm-analysis-9.1.ebuild delete mode 100644 dev-java/asm-commons/asm-commons-9.1.ebuild delete mode 100644 dev-java/asm-tree/asm-tree-9.1.ebuild delete mode 100644 dev-java/asm-util/asm-util-9.1.ebuild delete mode 100644 dev-java/asm/asm-9.1.ebuild create mode 100644 dev-java/commons-csv/commons-csv-1.9.0.ebuild create mode 100644 dev-java/commons-io/commons-io-2.11.0.ebuild delete mode 100644 dev-java/maven-bin/maven-bin-3.8.1.ebuild create mode 100644 dev-java/tomcat-native/tomcat-native-1.2.31.ebuild create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.11.ebuild create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild create mode 100644 dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.53.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 1fd0f7099fcb..d962ac5bc87a 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/asm-analysis/Manifest b/dev-java/asm-analysis/Manifest index d5008ce27727..d7e94c78e60a 100644 --- a/dev-java/asm-analysis/Manifest +++ b/dev-java/asm-analysis/Manifest @@ -1,5 +1,3 @@ -DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd -EBUILD asm-analysis-9.1.ebuild 740 BLAKE2B 7572ed77471724a907ddd36d146ab5e911f743ea2837cda38a4ba93852d21e408108791aeb6c76d19b38a351dcde62e7ebbd9c75a9f33bde94f4621dddeaf1fd SHA512 f741334e33572f21bcbf46cc7573ebf80504e4d13c385dcac203a38427bce384782b6bdc2a205d459bd8bf9d3073fb53e41db7e3c47176102a884f50cee7b088 EBUILD asm-analysis-9.2.ebuild 740 BLAKE2B fb8b01b8621c37cdc4209bcddcf41d6285094d4ef522b615b3af58d4f4517eae21432636598c72cfd3b019c37ece381feed4cfa98463c77320850aba93754154 SHA512 488d6a32b6246de57a209f72d7b2a987275f23739b3deddbd578fb4ce69e1ef1422125f745ba02ca1630b8d6fc56eff0ddcada6e9343325325f6eec0a4a5ab03 MISC metadata.xml 1096 BLAKE2B ea769c32d2fd2fbf33153b44888e443d40e199df3f3f6dd2d2635b2a74bf5626570d43ae7ae17e4bb8e729fcd937993eb37e05604388ad17f39d9e13b2bacec6 SHA512 b8a710522edc585a03ec50483c9c645e64caf997e5334ae1e8fc2f7017c4609f63b25a9d8ed39dd58e2c2be71553468a44ad2e215defc8c1ea2c2312cfe3b3a6 diff --git a/dev-java/asm-analysis/asm-analysis-9.1.ebuild b/dev-java/asm-analysis/asm-analysis-9.1.ebuild deleted file mode 100644 index 4fbdb6554d9e..000000000000 --- a/dev-java/asm-analysis/asm-analysis-9.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.ow2.asm:asm-analysis:9.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bytecode manipulation framework for Java (Static code analysis API)" -HOMEPAGE="http://asm.ow2.org" -MY_P="ASM_${PV//./_}" -SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" -LICENSE="BSD" -SLOT=`ver_cut 1` -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" -RESTRICT="test" - -CDEPEND="dev-java/asm-tree:${SLOT}" -DEPEND=">=virtual/jdk-1.8 -${CDEPEND} -" -RDEPEND=">=virtual/jre-1.8 -${CDEPEND} -" - -JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT}" -JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java" diff --git a/dev-java/asm-commons/Manifest b/dev-java/asm-commons/Manifest index 334c602fb402..8ab2e8b1aad9 100644 --- a/dev-java/asm-commons/Manifest +++ b/dev-java/asm-commons/Manifest @@ -1,5 +1,3 @@ -DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd -EBUILD asm-commons-9.1.ebuild 808 BLAKE2B 35ccd30ac59d1a044520502bd206608c67e55b0fc6cb9d8add8377f6c60137c23f30d0bd3f9764bd5388daff9122fca67fd4743eecd7f9c3f75e5dc0ffc8d612 SHA512 f5b82ce78db28ae2dcceee8e07cb2fa816a9a24878ff58d1de7c6232bf19a86f5ccd0b1fb837b59bfa0494fd4efba87176d54bc8a3b79e4435b8cddefbae906e EBUILD asm-commons-9.2.ebuild 808 BLAKE2B de21c6759706a70e80b3aaa86b5a5ccc8231e4b3bb0b0b56ca8e2f06027476c7796069d784042c1b5bb5c80b6e4e487010b90aeef020e1157b3644b9977d3f7f SHA512 1585c4237cb1f0644fcb702deb8bf10cecc3845d62ccd4941252100f6b60c1d877125e10f4d72f6ce37abf6962bbb606db6d3d405e5ab909de45b8ab29eecd2a MISC metadata.xml 1096 BLAKE2B ea769c32d2fd2fbf33153b44888e443d40e199df3f3f6dd2d2635b2a74bf5626570d43ae7ae17e4bb8e729fcd937993eb37e05604388ad17f39d9e13b2bacec6 SHA512 b8a710522edc585a03ec50483c9c645e64caf997e5334ae1e8fc2f7017c4609f63b25a9d8ed39dd58e2c2be71553468a44ad2e215defc8c1ea2c2312cfe3b3a6 diff --git a/dev-java/asm-commons/asm-commons-9.1.ebuild b/dev-java/asm-commons/asm-commons-9.1.ebuild deleted file mode 100644 index 66b8a6ec335e..000000000000 --- a/dev-java/asm-commons/asm-commons-9.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.ow2.asm:asm-commons:9.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bytecode manipulation framework for Java (Common class adaptors)" -HOMEPAGE="http://asm.ow2.org" -MY_P="ASM_${PV//./_}" -SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" -LICENSE="BSD" -SLOT=`ver_cut 1` -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" -RESTRICT="test" - -CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}" -DEPEND=">=virtual/jdk-1.8 -${CDEPEND} -" -RDEPEND=">=virtual/jre-1.8 -${CDEPEND} -" - -JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}" -JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java" diff --git a/dev-java/asm-tree/Manifest b/dev-java/asm-tree/Manifest index 04fe4e538f81..0dcf59b248f0 100644 --- a/dev-java/asm-tree/Manifest +++ b/dev-java/asm-tree/Manifest @@ -1,5 +1,3 @@ -DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd -EBUILD asm-tree-9.1.ebuild 698 BLAKE2B fbf8fcd6062226e8081c205c4180199bd3ed7bba439dfe9c6d38ee38c91858d34858b075416d257c50ea57f5d0641179ecbfc6f2b5551a1a1e0acd8335d14c2d SHA512 300f307d92b369bb9306e251e2e09edb8dd660726b78cb398f50620701c5fd726a20ccccbc329760949a3b2ac4ebe0797d36f9eb8aac1f3e4fde30b9fc3d0513 EBUILD asm-tree-9.2.ebuild 698 BLAKE2B ba92688359cef09110ed19f11776c44cb2ef1304467cbd00de6eea50697cfb2c202565eb8e52f6218f3f88f186cec8ac79b79aa4546b0beee8151e68ff037bac SHA512 2bb46957cad24d8f64bda1eda728dba2a1293160efc8d8607aca46356ab273f8369c13f9a9429b4150c9c04bdcd1a66d013837267c343aa542f236e082625a43 MISC metadata.xml 1096 BLAKE2B ea769c32d2fd2fbf33153b44888e443d40e199df3f3f6dd2d2635b2a74bf5626570d43ae7ae17e4bb8e729fcd937993eb37e05604388ad17f39d9e13b2bacec6 SHA512 b8a710522edc585a03ec50483c9c645e64caf997e5334ae1e8fc2f7017c4609f63b25a9d8ed39dd58e2c2be71553468a44ad2e215defc8c1ea2c2312cfe3b3a6 diff --git a/dev-java/asm-tree/asm-tree-9.1.ebuild b/dev-java/asm-tree/asm-tree-9.1.ebuild deleted file mode 100644 index 01e3400a43ae..000000000000 --- a/dev-java/asm-tree/asm-tree-9.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.ow2.asm:asm-tree:9.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bytecode manipulation framework for Java (Tree API)" -HOMEPAGE="http://asm.ow2.org" -MY_P="ASM_${PV//./_}" -SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" -LICENSE="BSD" -SLOT=`ver_cut 1` -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" -RESTRICT="test" - -CDEPEND="dev-java/asm:${SLOT}" -DEPEND=">=virtual/jdk-1.8 -${CDEPEND} -" -RDEPEND=">=virtual/jre-1.8 -${CDEPEND} -" - -JAVA_GENTOO_CLASSPATH="asm-${SLOT}" -JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java" diff --git a/dev-java/asm-util/Manifest b/dev-java/asm-util/Manifest index c0a0fd0413c0..4f8e6ec03396 100644 --- a/dev-java/asm-util/Manifest +++ b/dev-java/asm-util/Manifest @@ -1,5 +1,3 @@ -DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd -EBUILD asm-util-9.1.ebuild 793 BLAKE2B 95991d7c4a603bb8831bcc798625ca86a39ec7ba7c431b79795069016498201a11e72ea386ef5ec19ba229bfe965f43192a70aa93ba7fc60807ba632148a50cd SHA512 b1eed72c60ce1f075f83745b0903b41b1041924eea78a626f9f956534fea87c14110d6a894141a1fe629267801b4534fdd86c8718d1475e48a82462c96aac329 EBUILD asm-util-9.2.ebuild 793 BLAKE2B 374aa04c32c36e0daada627b85d1ddbedc07912434aff3c167d5e8ad4d056e449cf89064745d8f39e2523fb5b1c8ba87e64289045b8e8d63cc576acb10d1c9e8 SHA512 21a720d27c91c8c2e49c7a6d7318b41ab6a92d5192933e01df1f497b508964597bbbf5db59fa8e36084648eb55620faed1a06aae88d33924805c237477f08ba4 MISC metadata.xml 1096 BLAKE2B ea769c32d2fd2fbf33153b44888e443d40e199df3f3f6dd2d2635b2a74bf5626570d43ae7ae17e4bb8e729fcd937993eb37e05604388ad17f39d9e13b2bacec6 SHA512 b8a710522edc585a03ec50483c9c645e64caf997e5334ae1e8fc2f7017c4609f63b25a9d8ed39dd58e2c2be71553468a44ad2e215defc8c1ea2c2312cfe3b3a6 diff --git a/dev-java/asm-util/asm-util-9.1.ebuild b/dev-java/asm-util/asm-util-9.1.ebuild deleted file mode 100644 index 8986257ddeec..000000000000 --- a/dev-java/asm-util/asm-util-9.1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.ow2.asm:asm-util:9.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bytecode manipulation framework for Java (Utilities)" -HOMEPAGE="http://asm.ow2.org" -MY_P="ASM_${PV//./_}" -SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" -LICENSE="BSD" -SLOT=`ver_cut 1` -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" -RESTRICT="test" - -CDEPEND="dev-java/asm-analysis:${SLOT} dev-java/asm-tree:${SLOT} dev-java/asm:${SLOT}" -DEPEND=">=virtual/jdk-1.8 -${CDEPEND} -" -RDEPEND=">=virtual/jre-1.8 -${CDEPEND} -" - -JAVA_GENTOO_CLASSPATH="asm-${SLOT} asm-tree-${SLOT} asm-analysis-${SLOT}" -JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java" diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest index edac89916a9d..4cc07deceb40 100644 --- a/dev-java/asm/Manifest +++ b/dev-java/asm/Manifest @@ -1,8 +1,6 @@ DIST asm-ASM_4_0.tar.gz 14789505 BLAKE2B 62b49d904f1ef2d32379f4f5d644cdc274b30f292ee4f64ad02be7d2226a90965f7b12421700e79dcd1e67a46e6a8543d5e353486a1577313616688ddc57f3b3 SHA512 e654623a882d9fe414e71861183f64840f7b6629231864872497d4bf9274e8ac05e05496593fa54a90d8c6a2e6d701b9a6f3876df611637f7d2079c5519def1e DIST asm-ASM_5_1.tar.gz 16258842 BLAKE2B bd7d717cdfa6ff652c96b88d7b7d33fae614acba390c256ea72ecfbb3edc48382621a076dedf9b8728fdb1d0961cda943f165f99de840824b766c9af45a49339 SHA512 4bb32ce6eba267928261238f8f13cd2365ab374780039ad1df31698cd791645a370aca58c44270ec05f8377d6aa0a0d00f9f3890961cbd32a10cbd2e79e2d518 -DIST asm-ASM_9_1.tar.gz 1614561 BLAKE2B f19efad14a7bce5dd7311682a2e6c8625816d1b97ed390652681f14d6d341f559fee152b70474566752a80ff2fcc7cb83fea91f7382f898a0725beba5c9c6ada SHA512 84eb7bc0c7119d3ab0ddd9f3bad640662d96235d365da5bd85031abbdfed371c9742a01817ddd022fd4fb447441f423e4f5126d12dcadf12fa9669cd86b34f18 DIST asm-ASM_9_2.tar.gz 1614845 BLAKE2B 3fc0fb45d0583b06371452d2df166ce53f81a114a386eda96fe3b0c748beffdd42791d59ddfb4c9ad368f73728f3382855a7336324b013e937c20a4f31cea44b SHA512 a0077e3c1ebbd8a841d3556be4363383951244ba87670af45a8565e14ad3ac94ab89a23b934b3609190e1b16dd9663798c01d1c859eddb2e825c41908c2e2afd EBUILD asm-5.1-r1.ebuild 1281 BLAKE2B 4b96ddb02de5c1fddf23646db0133774464554bf2957161e1d83c3bab9c3c9bc8fdbeeec67c04b2e2d83438fee807f44d8fb535baf750e6e4e413410a5045582 SHA512 fccc9bd86fe9e41469e2002c2c5ff9cb3bd53b6ba3d935195d92bb8ab771091290b3db0bfa3ce5a685480511a364d3c17a0f74ee08f6be16a1779b6e25f081df -EBUILD asm-9.1.ebuild 595 BLAKE2B 784a00c90d2ac3acb2fdd667bcf9f1f4979e25dc98966d63b7330211ed8aa9b3a1ad018654163cdf6ba96617198987b663f34b122346145b5e91eca117a09189 SHA512 562c2c83bc2604c2f064256aa5fbb25c6a86a4db784cc32a1582d2bdce01271fecff910eaadf70c21a212d5ce6bbf4b4b214eb36b8d05d2587a856a9a5a7bee3 EBUILD asm-9.2.ebuild 599 BLAKE2B cdcaf6910008f7b48257e11cfe495261a5b72650829c55c6944cb71e202128678c393fda65deb2c553c5ea2f012de7d0e94264d733ddae33555b11bda9baa05e SHA512 34811b7acbdf352e8e2776bca3524a9b97bddcb496bd9502bfbe073cc85b1c306599c209f92121e8fd63971fc35bf25873af2d5166f3a43fa440178e0f27610e MISC metadata.xml 1231 BLAKE2B c61d8566d1a337e99616013267474cf4fc92afdfed38f1c2183d41980528fd1b8994bd6ce5a06b4fa85f54819d560379bb1b505c62f26f7421bd1965cbcf7244 SHA512 c0b4d632146cab80755c18a6e15e9e9673c7adc60addac523bbf98e8fb0f771b526fbaa65906914984d27658a7ee390e90d164e855f5bc5601bfef7b89d902a2 diff --git a/dev-java/asm/asm-9.1.ebuild b/dev-java/asm/asm-9.1.ebuild deleted file mode 100644 index f4ae85d5b7d8..000000000000 --- a/dev-java/asm/asm-9.1.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.ow2.asm:asm:9.1" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="Bytecode manipulation framework for Java" -HOMEPAGE="https://asm.ow2.io" -MY_P="ASM_${PV//./_}" -SRC_URI="https://gitlab.ow2.org/asm/asm/-/archive/${MY_P}/asm-${MY_P}.tar.gz" -LICENSE="BSD" -SLOT="9" -KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos" -RESTRICT="test" - -CDEPEND="" -DEPEND=">=virtual/jdk-1.8" -RDEPEND=">=virtual/jre-1.8" - -JAVA_SRC_DIR="asm-${MY_P}/${PN}/src/main/java" diff --git a/dev-java/commons-csv/Manifest b/dev-java/commons-csv/Manifest index 10c8d7fc7659..45e8678465db 100644 --- a/dev-java/commons-csv/Manifest +++ b/dev-java/commons-csv/Manifest @@ -1,3 +1,5 @@ DIST commons-csv-1.8-sources.tar.gz 36962976 BLAKE2B 6b3ee00a9e6185b30aa5dd4cb8be684740ce9e61c38a5e3596b0e96da9674b05494b6996a4d39b88412f0cd333ec3d6c5b2c0e10171a5e9d3b6e8925107aa3e9 SHA512 e0a7f7dbb0bf381f0f8f703e0ccb689f96c0a610b7afbd771cfeecab7042416f6dddc15c0a6e9a23f157da87c2bf3f16efb2e2aeb135ef1ac8c7306659936443 +DIST commons-csv-1.9.0-sources.tar.gz 36975991 BLAKE2B b2e2091556f3766968dbe660e4059f491eedc458d3c15c0372770d144737ab3ddcc78ff36f674759bde8aa9690e4bbe14866f8546e1de3b67498736678650697 SHA512 4610197fbbf1b3fb3ff19ff8f5ee0ffe945c34c05e3db71b89156bf17aa7f6b2816ddace85457fec82cb22337f777e08eac5984d7299e702b537f0d242d368d8 EBUILD commons-csv-1.8.ebuild 1708 BLAKE2B 6f19376dfe068931da7e8e4bc8eae0c0ee41027e8a68b1be717c021dfda126e5522ca4ea523af83e68272992ef69b86458e5f779e13506c4fcf1f32abb5f5e4e SHA512 baf9e2a304b60f6d625586e320394126bdda69ef9468d7713eeb8308f2fb59121ada4b302cc4832f7125ddc0f521a3dcba9282a7e9d3e63a32ca222aae22afd8 +EBUILD commons-csv-1.9.0.ebuild 1664 BLAKE2B ffdb6806d079715a3f5de3b663b4bb69a17a6127084336705afe5fa0e3261f7b29213e8a372de34c7db6129670637256e13cd748255639e72cb8259346b4f478 SHA512 7e81f9241f272625bb34d1ba5dae272197e904f95ad77eba04ca0f3021cb1fa785f9b90827c2da64043b2a8b64e509ef3a5554d0ecb831b77a187057ee53cb00 MISC metadata.xml 416 BLAKE2B 193c84e7cdd7d31c475be29d0f00c44f86dba7226d4c9d3de052b9ecc8e2dae8fe9b402cdd797b04d714253591b39b3f858be13caf0584b1e67f6756cbae7bce SHA512 9c3695f3b80d8efb699cf1f1b8801aa173480a71604abdcc8cf3d093f9631fbf0ef2c6cfbf22ae106831b0b58747219184966904b9c3622c1ce424d4325e18b6 diff --git a/dev-java/commons-csv/commons-csv-1.9.0.ebuild b/dev-java/commons-csv/commons-csv-1.9.0.ebuild new file mode 100644 index 000000000000..7ba31d2d1582 --- /dev/null +++ b/dev-java/commons-csv/commons-csv-1.9.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri mirror://apache/commons/csv/source/commons-csv-1.9.0-src.tar.gz --slot 0 --keywords "~amd64 ~ppc64 ~x86" --ebuild commons-csv-1.9.0.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="org.apache.commons:commons-csv:1.9.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Simple interface for reading and writing CSV files of various types." +HOMEPAGE="https://commons.apache.org/proper/commons-csv/" +SRC_URI="mirror://apache/commons/csv/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +# missing test deps +RESTRICT="test" + +# Compile dependencies +# POM: pom.xml +# test? com.h2database:h2:1.4.200 -> !!!groupId-not-found!!! +# test? commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1 +# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 +# test? org.hamcrest:hamcrest:2.2 -> !!!artifactId-not-found!!! +# test? org.junit.jupiter:junit-jupiter:5.8.0-M1 -> !!!groupId-not-found!!! +# test? org.mockito:mockito-core:3.11.2 -> !!!suitable-mavenVersion-not-found!!! + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + >=dev-java/commons-io-2.11.0:1 + >=dev-java/commons-lang-3.12.0:3.6 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +S="${WORKDIR}/${P}-src" + +DOCS=( LICENSE.txt NOTICE.txt RELEASE-NOTES.txt ) + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="commons-io-1,commons-lang-3.6" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS=( + "src/test/resources" +) diff --git a/dev-java/commons-io/Manifest b/dev-java/commons-io/Manifest index d5d84a19e665..1d8f17a28a68 100644 --- a/dev-java/commons-io/Manifest +++ b/dev-java/commons-io/Manifest @@ -1,3 +1,5 @@ +DIST commons-io-2.11.0-sources.tar.gz 498841 BLAKE2B e45ae4400246d7469e8628f08d2f647ea670b994360c1150fe1f414beee5177e7af7c94589a5c81ce6996f2fb755441f29080ca9b69b98cb5ae1ad897f8f00b5 SHA512 e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3 DIST commons-io-2.8.0-sources.tar.gz 445833 BLAKE2B 4fc6f9b66fa88adfc110742bd3eab55cbe165552f71d665f70fd54d4b0b79c4e76b45fccdb78c6ef64e476f54efc8b51adc9b2d7e880c71dbdb6bc5883d2fe55 SHA512 6189c72eff8661bfb8cfed95dd7ee32578b24b50f6586d4628a4dbfd3618853a72eb73da311729e55742ace47b2d38d3ce130ab87b684494d8ce33d1ccf14a2d +EBUILD commons-io-2.11.0.ebuild 1829 BLAKE2B b884ba97cc1b9f8a79a27138539ffd5ee139b8e4b1e940baf441265817cdc99abd5a17068794805e6142aeb2c2352ac4a52429988a91f94f44f6fef81da97c21 SHA512 961aa16513b7dd03db6b4082bdcff5ffbad7a4df5290f0796acb43e53ee81fe5c2df13f91942be8be6963c08a4f38237d256d9f9a0663a1d85982c5c4b8a7ebf EBUILD commons-io-2.8.0.ebuild 1031 BLAKE2B eed3f1516b0a4b9382ee69b133363be093018abf28ef84c056f725e904ca78eeac9902aa51210e0ca8ed46dbd11cbe0638d2ef8c6be80dacc938eb4e2f5a8f21 SHA512 7dbaecd92f51898e047efe48fd47c013d6a96ace64f5921307eb0caaff1182c719c5f268a77da1bb09769535e0fbd03ec098bf10900fce1929893f5e46e82a01 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f diff --git a/dev-java/commons-io/commons-io-2.11.0.ebuild b/dev-java/commons-io/commons-io-2.11.0.ebuild new file mode 100644 index 000000000000..ef103119de08 --- /dev/null +++ b/dev-java/commons-io/commons-io-2.11.0.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +# Skeleton command: +# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://mirror.dkm.cz/apache//commons/io/source/commons-io-2.11.0-src.tar.gz --slot 0 --keywords "~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" --ebuild commons-io-2.11.0.ebuild + +EAPI=7 + +JAVA_PKG_IUSE="doc source test" +MAVEN_ID="commons-io:commons-io:2.11.0" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="Utility classes, stream implementations, file filters, and much more." +HOMEPAGE="https://commons.apache.org/proper/commons-io/" +SRC_URI="mirror://apache/commons/io/source/${P}-src.tar.gz -> ${P}-sources.tar.gz" +LICENSE="Apache-2.0" +SLOT="1" +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" + +# Compile dependencies +# POM: pom.xml +# test? com.google.jimfs:jimfs:1.2 -> !!!groupId-not-found!!! +# test? org.apache.commons:commons-lang3:3.12.0 -> >=dev-java/commons-lang-3.12.0:3.6 +# test? org.junit-pioneer:junit-pioneer:1.4.2 -> !!!groupId-not-found!!! +# test? org.junit.jupiter:junit-jupiter:5.7.2 -> !!!groupId-not-found!!! +# test? org.mockito:mockito-inline:3.11.2 -> !!!artifactId-not-found!!! +# test? org.openjdk.jmh:jmh-core:1.32 -> !!!groupId-not-found!!! +# test? org.openjdk.jmh:jmh-generator-annprocess:1.32 -> !!!groupId-not-found!!! + +DEPEND=" + >=virtual/jdk-1.8:* + test? ( + >=dev-java/commons-lang-3.12.0:3.6 + ) +" + +RDEPEND=" + >=virtual/jre-1.8:* +" + +# some test dependencies are missing +RESTRICT="test" + +S="${WORKDIR}/${P}-src" + +JAVA_ENCODING="iso-8859-1" + +JAVA_SRC_DIR="src/main/java" + +JAVA_TEST_GENTOO_CLASSPATH="commons-lang-3.6" +JAVA_TEST_SRC_DIR="src/test/java" +JAVA_TEST_RESOURCE_DIRS=( + "src/test/resources" +) diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest index 2004ad57253f..0403c3d1a9d1 100644 --- a/dev-java/maven-bin/Manifest +++ b/dev-java/maven-bin/Manifest @@ -1,5 +1,3 @@ -DIST apache-maven-3.8.1-bin.tar.gz 9536838 BLAKE2B a6b464d44d577e126ea042ea37aa07a6ea18c56252627b3a266c6c25cc3520421c01d372930948bd2d784ace330f888fb6a8a5a1012946015c8d16d465bb5953 SHA512 0ec48eb515d93f8515d4abe465570dfded6fa13a3ceb9aab8031428442d9912ec20f066b2afbf56964ffe1ceb56f80321b50db73cf77a0e2445ad0211fb8e38d DIST apache-maven-3.8.2-bin.tar.gz 9338426 BLAKE2B b39c9c87b6d05d633172152598496b6cb9b82c64c0572426c6a612ecfcc6d087085d58fdcaef0b61f5554c2b58e90b47bb0e6844dacc88c95bfb72ffc618e355 SHA512 b0bf39460348b2d8eae1c861ced6c3e8a077b6e761fb3d4669be5de09490521a74db294cf031b0775b2dfcd57bd82246e42ce10904063ef8e3806222e686f222 -EBUILD maven-bin-3.8.1.ebuild 1526 BLAKE2B 6d256f07b449def93a2769a2f8856e17e14aeab6ff47a60fc221ef54e5842f54030fc4aae7d90bd03f993b33a5a776703c6d6c41f13181c4ee19526e5128707b SHA512 f42b3ee7d7b1c89b6080bb2f9c9f54e78d674fb53ab518fec5b53c1f438259c8e9a996fcdb78ca4245c922bee04888f8488f7640c5ff085687a9c518575af7ef -EBUILD maven-bin-3.8.2.ebuild 1374 BLAKE2B a6f0026867f2142587b626b74bde23dd7b3d8079538b48644452ba633d26fc6e925d7fb5d9be4608728250619d6865125580236877dcd4ea2bef4d4175061dcc SHA512 160579460a6c14784bab62d786b45c55998ef836a8172c0366f95d25548fbe918563082483a5cd383d165aa7a189765378060ed2bc6a385969fd05ae140c1239 +EBUILD maven-bin-3.8.2.ebuild 1372 BLAKE2B e31f57f1f30b411ae889b6b210cb0689c2b800e99f97de192648e828d78700201391269f4c9ac62c276699e1fe987a5e0421ff694aaed9299e65656d1e7ac704 SHA512 f742703fc9096acbd3f7edafa2040cafe74d2a6c4f0de7cbdafc1f07d4a57a60657f6a293e8523fb6678be9bc61e306d398b33e91f7af74319bc0da5a4455a30 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff diff --git a/dev-java/maven-bin/maven-bin-3.8.1.ebuild b/dev-java/maven-bin/maven-bin-3.8.1.ebuild deleted file mode 100644 index e06ebe56a590..000000000000 --- a/dev-java/maven-bin/maven-bin-3.8.1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit java-pkg-2 - -MY_PN=apache-${PN%%-bin} -MY_PV=${PV/_alpha/-alpha-} -MY_P="${MY_PN}-${MY_PV}" -MY_MV="${PV%%.*}" - -DESCRIPTION="Project Management and Comprehension Tool for Java" -SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz" -HOMEPAGE="https://maven.apache.org/" - -LICENSE="Apache-2.0" -SLOT="3.8" -KEYWORDS="amd64 x86" - -DEPEND=" - >=virtual/jdk-1.8:* - app-eselect/eselect-java" - -RDEPEND=" - >=virtual/jre-1.8:*" - -S="${WORKDIR}/${MY_P}" - -MAVEN="${PN}-${SLOT}" -MAVEN_SHARE="/usr/share/${MAVEN}" - -QA_FLAGS_IGNORED=( - "${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so" - "${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so" -) - -# TODO: -# We should use jars from packages, instead of what is bundled. -src_install() { - dodir "${MAVEN_SHARE}" - - cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy" - - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar - java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar - - dodoc NOTICE README.txt - - dodir /usr/bin - dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT} - - # See bug #342901. - echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die - doenvd "${T}/25${MAVEN}" - - # remove broken useless files (bug #734906 and #704618) - rm -r "${ED}"/${MAVEN_SHARE}/lib/jansi-native/freebsd* || die "Failed to remove FreeBSD files" -} - -pkg_postinst() { - eselect maven update mvn-${SLOT} -} - -pkg_postrm() { - eselect maven update -} diff --git a/dev-java/maven-bin/maven-bin-3.8.2.ebuild b/dev-java/maven-bin/maven-bin-3.8.2.ebuild index 3d422db02a49..15cbb360e0de 100644 --- a/dev-java/maven-bin/maven-bin-3.8.2.ebuild +++ b/dev-java/maven-bin/maven-bin-3.8.2.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/" LICENSE="Apache-2.0" SLOT="3.8" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DEPEND=" >=virtual/jdk-1.8:* diff --git a/dev-java/tomcat-native/Manifest b/dev-java/tomcat-native/Manifest index 711d1aed120b..b21f61bbe9ad 100644 --- a/dev-java/tomcat-native/Manifest +++ b/dev-java/tomcat-native/Manifest @@ -1,3 +1,5 @@ DIST tomcat-native-1.2.30-src.tar.gz 425741 BLAKE2B d39c7762db0f8c6b3422d1a4811d65793e2315e0d34fae8a37f250ff41a2c11a0c89ccaf8a361cda7cb16434dcd9678289ecec60cc5322a5fae2d6963c76f36c SHA512 51a8c55214de166cace193c3330abe77cabea56c2d05efc8c3408bc06369c328899376c94c572725ebe2887f2faf99fea05d1819fa84c712d57fd309d0476953 +DIST tomcat-native-1.2.31-src.tar.gz 428057 BLAKE2B 9e76c2c4c6e3721c36331f21026c00dda40e811ed34b6deb024f3511159c96ec624131aa3d9e0cc26fb97286bd9f0133d03d742fa5616d05ed18ecacb05d3d51 SHA512 2aaa93f0acf3eb780d39faeda3ece3cf053d3b6e2918462f7183070e8ab32232e035e9062f7c07ceb621006d727d3596d9b4b948f4432b4f625327b72fdb0e49 EBUILD tomcat-native-1.2.30.ebuild 1182 BLAKE2B 9a7261837690e5b5a1bc07019bcf27f1c34e9c08740ede80ce86e844132736515c4ce9f18e940509f67f8f85616b376806180901da445a57f1026ceb1c085a02 SHA512 75b69feb9bd93291cd8d834394c8344fd792205d28ab6e381f07f0139b241a27c32befd5f63b3db40fac5365d22f79024ee08e6b9b38d38d4702cbab5b1f064b +EBUILD tomcat-native-1.2.31.ebuild 1183 BLAKE2B 3fe9fa721ae862875f026e4a0c47e2b04cea7a0f4e3cea4dea9a253b5142e34a6676209ef3d1557ef397a186897b1f6c992464e70962b01b4364d6760553b1cd SHA512 486bffb651f11774551d532b008f343411f812d692b3301e3f474e60a5a2678b26ca1869ccc42317201cd48cdf5d3db345fda5f79609d9dff9b182cc71a90ce9 MISC metadata.xml 807 BLAKE2B 38715d09df2df7390b4f1bb3179d2d5cb65874f438ea434cc30e52aa8068ae9d9fb60f147f69cda6300cef97aeaa8eb950c55027f5cc3ca67f9afdaf0457b21a SHA512 fc6ae086e1855089491a9ba0b1abb007005a15eb85b5b213d8d36451ff10968dbd810f229795dc384e0e48ab1b9dabffacac333397c4b526c5490de5f99d7d5d diff --git a/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild b/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild new file mode 100644 index 000000000000..76a4520b2d1f --- /dev/null +++ b/dev-java/tomcat-native/tomcat-native-1.2.31.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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" +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-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest index 9d538999f189..aa790920bdb8 100644 --- a/dev-java/tomcat-servlet-api/Manifest +++ b/dev-java/tomcat-servlet-api/Manifest @@ -2,6 +2,7 @@ AUX 2.5-build-r1.xml 3084 BLAKE2B 6eb6025444ad6b2af035217bc7c1410a1238e25eaafdfd 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.0.10-src.tar.gz 6032784 BLAKE2B f73d2b0d549d773a13a8adcc76a87713f0f146d80bca2d2ba633ce3145d69505fb7172eac0f04bb6d10fd9f9abb0cbbca7fb6d5b4608e2f6f07df88e5e661d70 SHA512 6241a62d01dcbf37e4745803c77dfbc4307d43c884e8e4c78c33b10d45a9b42e0103ef94acaff19790fa4876bdb369e9aca4974a4dae2622cedfa56b3fbe0658 +DIST apache-tomcat-10.0.11-src.tar.gz 6065513 BLAKE2B e734a3f5086d94dd49886a1fc7e1fddc1b500240837ccba945dc0d10ad5aaaf580d1b9e2c78aca8af474c4312d723bc4095ec8e90a14f0bd7f292b9333bc554f SHA512 c06f4069c1664483f176231dd9fe132c89e7c66f845d82b41d6c962ea2d2ba2d3c6004b6a875388925ba295761f533ced416fc91261ecb97d11219a87940db2b DIST apache-tomcat-10.0.8-src.tar.gz 6010420 BLAKE2B 86390f04147d3082fbc9f15704121cbd6aa8ba756b4bc03e64a49aae3dca96c6b503949da0096f8ddf143bdeb1320b7601008683ce94bdad9ef235e1f73ad948 SHA512 c264be4cb29d87c95918d2723ab20bc7e2cb5149cb366cca348c6cd311b0f38ac500ed6b4756b20245a446ead50e7208f77093d6081563ed76d6691abfcbe14c DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7 @@ -9,16 +10,21 @@ DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce DIST apache-tomcat-8.5.69-src.tar.gz 5916996 BLAKE2B 4a3ef958b6bb0089149877c25baaa2c1a0bcee473c0942b419c5c1d7071dcae4f8a6e6f1805efdee1201042feedc64e213fffbcdb35cf2b7f9a67217b8dcad48 SHA512 467dd38bd77d8b5ac6fa2acf9f6ee71d04467a3182647757fa47f5d1d9576c96e5061db61ba08b04318f1db9ee4f2bcac7b45f1f9f4f81cd1807a57483dd7bbb DIST apache-tomcat-8.5.70-src.tar.gz 5939095 BLAKE2B 9a2bf14c9b9f551af15ebf2b95ffede140b3accdb9fc1b9836c980169b597e8c796d5aa59df28cd42ccff67dbda83c7b7ced8b0ac2954a40214a0767ad8b90ce SHA512 fe752c4196d12496a3dcb4e6b59df30da10cd52b8642f9273de7158dcf6dd16d2443675744db0033e6dc5c1cf0aeaf0125c9921e1e36ceb8dea9ba58328a4133 +DIST apache-tomcat-8.5.71-src.tar.gz 5945776 BLAKE2B b7a5b344dbe09ef88ee046dcce701ea65d8587f1d8c2f980c67fff5466979d15dea019a9abae6d48a45797a989ebddb4dbdbc5196c8740cde9ebc45041b857ef SHA512 df99749d7ef387e29c1d2976c584dc219fc8764f618a004a646564315ab3f00a71ca94408d1fbaff20c3bab3911c82af4f7cf2ec02f0408d9e829c27f8aabdba DIST apache-tomcat-9.0.50-src.tar.gz 6086608 BLAKE2B 59b5eb1616d377193f330fd8c5abb6e98926ab0a2f75b1ea14251d249837aad733f55a0b79f2a67de57f612dd1afdeae53836be97e81701d8dc27ecb0a381d4a SHA512 1032d2d5c342fb495b76426fdc301e0e5546815e709e604061d7aa2cdab19bcd376adc957fd25dee1d574306186eafd2e9d24140dd5e725b130128592cac47a2 DIST apache-tomcat-9.0.52-src.tar.gz 6110883 BLAKE2B 8d2d4e3640fdc43a3b20d9722a73a8756de7ad71b2f05e8b2090bc712811cfcf6f8e79eeded039291b9306d1c49aec46fe8c7e347aab10384ca293894984ab27 SHA512 8b1817c171fa49e5568fb24a72b6b7533c5eb3ddd6d232b78e67186574f70bb311bbef9a58af047caa14bdae57c27c6a3df721c4583072740fec0a3863bb068d -EBUILD tomcat-servlet-api-10.0.10.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803 +DIST apache-tomcat-9.0.53-src.tar.gz 6142608 BLAKE2B 71f45e04ac01221cbfc6e730066e1aa7f5d65d31a497a775a3147180591f23799f0b47db3a1dd4a86936c40f624795cf4fd1d3dd44d4d39633aeb0733f4f9f26 SHA512 f72b9abff6af24d486a1e3dd3cd8b6cb44feab811efb74a3469502676e661bdb4cfed0fe44f38b7f5a6f74a6776ae1c0c732504d26609b88280e0b0da6710b27 +EBUILD tomcat-servlet-api-10.0.10.ebuild 3016 BLAKE2B b563cd01c61d47c69bcd01167d6c03fd08c06d57440cab0c4217e43c2238a3c710adfe0ee1af3c0587bb2dd3838f6922b797a33989936849cd49e294c7bda1a5 SHA512 2acb50d16f6527dd1ff4db00191d07128cd8ff37ce2bb701e34978fee9c3d549a7fc663178b203d33b1f6d5c416525b3b41cb2e68c74dce60acab930f381e07c +EBUILD tomcat-servlet-api-10.0.11.ebuild 3018 BLAKE2B 1b0a0ae5ade523a746c6f9d62a805ef1332a5d021fbb3f2b3893ce7c5204afa140da818010676bbd0751f64a56b135557f6f4af509b826bda21aa0eb4d4f172c SHA512 fdee126c42bde90a7265f3ea7d742a58552c6a578724157e35e76233a9b0299e522778659e8d9a0468a15eac762c0acebb2564eec08697d49bdfa542debdc803 EBUILD tomcat-servlet-api-10.0.8.ebuild 3015 BLAKE2B d00f9dd42643a5ac88e522cc7c8b6dae88a11b59189d5424d248859d2223432af20ad966f9173a7419cee39eeb7b4bb04dbef9b261eacfe3e1f3fbeda6500820 SHA512 479cad183a31ab15d32d24d125aa00e472d8264656ba6013f383fcc6163ffdc79307bd10ed991620b1e4c60e102337d4cbb6dd3111e2e9761c6fa02df3b2bd43 EBUILD tomcat-servlet-api-4.1.40.ebuild 1001 BLAKE2B c3a337a341d14d193e0b409e2ae751ad7e2f4d7dcff941e28c4eb7ef4d614ae5f626235bf7cfdeb56eaf3bba608913bf12bde46b2a9e576c7cf1d886c275336a SHA512 b36e97e60cb546ef2a980d1b9787dda5b21e5c788555d9a696ca166632315a870477fb8c52fa24c1698dcf43bb096201b6d4835113ec87192287eff9f5664e3b EBUILD tomcat-servlet-api-5.5.36.ebuild 1419 BLAKE2B e512a93e76e7e675606f112baad26f0c5013654293bf0a95085d255911c444b8ede5f0c283237810e025a9877dd41ae7285c57e0ce781ab434f29a98d3f58122 SHA512 d64b2289bdd50b8e320bc2927580080e70b532c25ffd4743342401527c4e90b7db2b6ffec35598d4e6e9e426880f7b0e10ccffc711ae05c06043586f06972ee2 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 955 BLAKE2B e7046e9afdfc33a906b44bcc98d092f75d3c6cae4ca7263b5e0605318aa19257edeaf83c2ea7a3639852c0ff140b6b65d16dc04433d94bbccce9db12ad82a9c6 SHA512 3a3d5450df02d079c04406cb3a4b63e986ce4f2d591ab12ee8918d4fecc6337634cf5627539bd277d9fda07ed4b6398c70dd87c322ae598649b61a8fd7cab58a EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263 EBUILD tomcat-servlet-api-8.5.69.ebuild 3002 BLAKE2B 18e52e0a01dac33784343e0204513cd694e227ae12666f8158106c053956723168d5ea0ce526bd46ec9983ad49b0b6a9ad21b4da2fe38ed5b71f9167ea510517 SHA512 b878c7a52254babccc96fc3e144bbf08a5fe42d04de614a0a2122bfc8459be7fe7c2816d517ee43da131fc542c795d348e420e10aa507cac6fff9b67a788ac6c -EBUILD tomcat-servlet-api-8.5.70.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac +EBUILD tomcat-servlet-api-8.5.70.ebuild 3003 BLAKE2B b8bbaaed51e3d2d25497f6a5f4ba493cd249edef833ac72171d5f8e19c83c11ce00928ceff8ff1348842ea85c3196791103608fc3b7ceca184519a6eaa2e8364 SHA512 68ae1a904dc5c9cf2824db5fe7ef4ce1a07b41becbb69ea14f3717cc02b0f8d5ced6c860bac740c78a4ee80c5862811465850772d741841e4b4dd9d91e55edb5 +EBUILD tomcat-servlet-api-8.5.71.ebuild 3006 BLAKE2B 039405bb1fd288272473d64eb9e4aa44e5b7c2dbd54b25e1fde030f4f511a43127f2d88e45b549084afc3b1dd4024d09360601305e021e7d2fd01b8a49598e5e SHA512 4dde713a2e6484a959abf8c924ab5c48509c53e9f0b7491fe67b8717790f1231e8e4fc7d367cd77297700538abe4b00661509c55454841704dc7ef943a9cb5ac EBUILD tomcat-servlet-api-9.0.50.ebuild 3009 BLAKE2B 6a687dee6eeb283532ccffe1e29c248755c2aa639d7a716b21b6097a99c2bdca62fc6b1acf017cff5de27d2a7e91037f2b1212d6bbb5699b3ba9f1b04f9d909e SHA512 e330e8959e3d3d2d7f3639160065e35963515df5bb886672c4359c26562fc2fab9d77ff40c8fb23e6ecdf9a67adcf1ee77f69da8fed681b7b2e0acc67d02b945 -EBUILD tomcat-servlet-api-9.0.52.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d +EBUILD tomcat-servlet-api-9.0.52.ebuild 3010 BLAKE2B f9496cb27b626b16eff3d2e3c0358dce807ae34089cd205ccabe66172632b9555145a4109daa4f1ea9d3b3d951afb3234c534ee0a0f526d25c151e04c86f584b SHA512 739edfe11422094aeea69f57e0c22ac31d05ab1b996d237956a9596d7e4c36db91e1ae8cb558ea0e28f325e9e00fbc0704d57dc8f185d55c0dae525740632386 +EBUILD tomcat-servlet-api-9.0.53.ebuild 3013 BLAKE2B de9767718af5e643a912a112bde60431cf461d02bdcc157834a3806299f3ebebf8df8b467278727c1eb5ef588874c70f3637f8ce2f1fe4e0b5cb169aa3954683 SHA512 7d5febfe5fd7d4760e03449dfc177f1c0aa21d9752f49429ca2ecfc3f9b8bef45381cc83f6bbd1a132b0d9366d65fb45c32ff4e3b1d87f922bb6b71fed7f3a3d MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559 diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild index fb739b89bf7a..c5339740e594 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.10.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="5.0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="amd64 ~arm ~arm64 x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.11.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.11.ebuild new file mode 100644 index 000000000000..fb739b89bf7a --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.0.11.ebuild @@ -0,0 +1,98 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-pkg-simple + +MY_A="apache-${PN}-${PV}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 5.0/JSP API 3.0/EL API 4.0 implementation" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-10/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="5.0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/${MY_P}/" + +JAVA_TEST_SRC_DIR="src/test" + +SERVLET_API_JAR="servlet-api.jar" +SERVLET_API_SRC="src/main/servlet-api" +SERVLET_API_RESOURCES="src/resources/servlet-api" +EL_API_JAR="el-api.jar" +EL_API_SRC="src/main/el-api" +EL_API_RESOURCES="src/resources/el-api" +JSP_API_JAR="jsp-api.jar" +JSP_API_SRC="src/main/jsp-api" +JSP_API_RESOURCES="src/resources/jsp-api" + +src_prepare() { + default + + # The sources and also resources are mixed together so we first give it a structure to make it easier to compile and package + mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ + ${EL_API_SRC} ${EL_API_RESOURCES} \ + ${JSP_API_SRC}/jakarta/servlet ${JSP_API_RESOURCES} \ + ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" + + pushd java || die "Failed to cd to java dir" + + cp --parents -R jakarta/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" + mv "${S}/${SERVLET_API_SRC}/jakarta/servlet/jsp" "${S}/${JSP_API_SRC}/jakarta/servlet" || die "Failed to copy jsp-api sources" + cp --parents -R jakarta/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" + + popd + + for file in $(find src -type f | grep -vE "\.java$"); do + target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") + mkdir -p ${target_dir} || die "Failed to create resource directory" + mv $file ${target_dir} || die "Failed to move resource file" + done + + mv test/jakarta ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" + + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" + java-pkg-simple_src_compile +} + +src_install() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + java-pkg-simple_src_install +} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild index eaffc40f4037..d5d3aa1096eb 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.70.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" 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" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild new file mode 100644 index 000000000000..eaffc40f4037 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-8.5.71.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-pkg-simple + +MY_A="apache-${P}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="3.1" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/${MY_P}/" + +JAVA_TEST_SRC_DIR="src/test" + +SERVLET_API_JAR="servlet-api.jar" +SERVLET_API_SRC="src/main/servlet-api" +SERVLET_API_RESOURCES="src/resources/servlet-api" +EL_API_JAR="el-api.jar" +EL_API_SRC="src/main/el-api" +EL_API_RESOURCES="src/resources/el-api" +JSP_API_JAR="jsp-api.jar" +JSP_API_SRC="src/main/jsp-api" +JSP_API_RESOURCES="src/resources/jsp-api" + +src_prepare() { + default + + # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package + + mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ + ${EL_API_SRC} ${EL_API_RESOURCES} \ + ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ + ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" + + pushd java || die "Failed to cd to java dir" + + cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" + mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" + cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" + + popd + + for file in $(find src -type f | grep -vE "\.java$"); do + target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") + mkdir -p ${target_dir} || die "Failed to create resource directory" + mv $file ${target_dir} || die "Failed to move resource file" + done + + mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" + + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" + java-pkg-simple_src_compile +} + +src_install() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + java-pkg-simple_src_install +} diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild index 4a8d22d12869..b008bbac0cd2 100644 --- a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.52.ebuild @@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="4.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" IUSE="" DEPEND=">=virtual/jdk-1.8:*" diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.53.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.53.ebuild new file mode 100644 index 000000000000..4a8d22d12869 --- /dev/null +++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.53.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="source" + +inherit java-pkg-2 java-pkg-simple + +MY_A="apache-${PN}-${PV}-src" +MY_P="${MY_A/-servlet-api/}" +DESCRIPTION="Tomcat's Servlet API 4.0/JSP API 2.3/EL API 3.0 implementation" +HOMEPAGE="https://tomcat.apache.org/" +SRC_URI="mirror://apache/tomcat/tomcat-9/v${PV}/src/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="4.0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +IUSE="" + +DEPEND=">=virtual/jdk-1.8:*" +RDEPEND=">=virtual/jre-1.8:*" + +S="${WORKDIR}/${MY_P}/" + +JAVA_TEST_SRC_DIR="src/test" + +SERVLET_API_JAR="servlet-api.jar" +SERVLET_API_SRC="src/main/servlet-api" +SERVLET_API_RESOURCES="src/resources/servlet-api" +EL_API_JAR="el-api.jar" +EL_API_SRC="src/main/el-api" +EL_API_RESOURCES="src/resources/el-api" +JSP_API_JAR="jsp-api.jar" +JSP_API_SRC="src/main/jsp-api" +JSP_API_RESOURCES="src/resources/jsp-api" + +src_prepare() { + default + + # The sources and also resources are mixed together so we first give it a structure to make it easier to compila and package + + mkdir -p ${SERVLET_API_SRC} ${SERVLET_API_RESOURCES} \ + ${EL_API_SRC} ${EL_API_RESOURCES} \ + ${JSP_API_SRC}/javax/servlet ${JSP_API_RESOURCES} \ + ${JAVA_TEST_SRC_DIR} || die "Failed to create source directory" + + pushd java || die "Failed to cd to java dir" + + cp --parents -R javax/servlet "${S}/${SERVLET_API_SRC}/" || die "Failed to copy servlet-api sources" + mv "${S}/${SERVLET_API_SRC}/javax/servlet/jsp" "${S}/${JSP_API_SRC}/javax/servlet" || die "Failed to copy jsp-api sources" + cp --parents -R javax/el "${S}/${EL_API_SRC}/" || die "Failed to copy el-api sources" + + popd + + for file in $(find src -type f | grep -vE "\.java$"); do + target_dir=$(dirname $file | sed "s%src/main/%src/resources/%g") + mkdir -p ${target_dir} || die "Failed to create resource directory" + mv $file ${target_dir} || die "Failed to move resource file" + done + + mv test/javax ${JAVA_TEST_SRC_DIR} || die "Failed to copy test sources" + + java-pkg-2_src_prepare +} + +src_compile() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_RESOURCE_DIRS="${SERVLET_API_RESOURCES}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_RESOURCE_DIRS="${EL_API_RESOURCES}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_compile + rm -fr target || die "Failed to remove compiled files" + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_RESOURCE_DIRS="${JSP_API_RESOURCES}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + JAVA_GENTOO_CLASSPATH_EXTRA="servlet-api.jar:el-api.jar" + java-pkg-simple_src_compile +} + +src_install() { + JAVA_SRC_DIR="${SERVLET_API_SRC}" + JAVA_JAR_FILENAME="${SERVLET_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${EL_API_SRC}" + JAVA_JAR_FILENAME="${EL_API_JAR}" + java-pkg-simple_src_install + + JAVA_SRC_DIR="${JSP_API_SRC}" + JAVA_JAR_FILENAME="${JSP_API_JAR}" + java-pkg-simple_src_install +} -- cgit v1.2.3