diff --git a/dev-java/jetty-http/Manifest b/dev-java/jetty-http/Manifest index f629a841f..55547efe1 100644 --- a/dev-java/jetty-http/Manifest +++ b/dev-java/jetty-http/Manifest @@ -1 +1 @@ -DIST jetty-http-11.0.2-sources.jar 128150 BLAKE2B f01079ce92bd8cdddf08621d1a559b9ed5919968d85a188868f3aec5fad9cef134285bce2d352d57154647cd7e3cab0b6ab0b040d8c496fcde3a4adc9ee5c571 SHA512 c1fedbf0358a52c20b18030134ef9c995ad55a1068b312027b7340b424bee0972d025f5e49e8191cc17a0d57995080d6397d854ea49e6de70b0025abf073a620 +DIST jetty-http-11.0.8-sources.jar 133640 BLAKE2B 0c1ee1529ef333785015f2a83f1c5ce64408296f8c5b98fe18741b24f3faa893be30acfb93c9f7cc8fba2b1b0fb6aaadb9ebf93dd53031f6fae8f1629fc7dbc7 SHA512 3c903f88fd94a1765f756fa3d30265a9116cf1a3c10075fae3fb83cb187360c736878f5915729ce76ea6fced307f77dd164011d8ae77806d0116353ca85c4268 diff --git a/dev-java/jetty-http/jetty-http-11.0.2.ebuild b/dev-java/jetty-http/jetty-http-11.0.8.ebuild similarity index 60% rename from dev-java/jetty-http/jetty-http-11.0.2.ebuild rename to dev-java/jetty-http/jetty-http-11.0.8.ebuild index 30def4166..5a406a28e 100644 --- a/dev-java/jetty-http/jetty-http-11.0.2.ebuild +++ b/dev-java/jetty-http/jetty-http-11.0.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" @@ -14,16 +14,16 @@ LICENSE="EPL-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=">=virtual/jre-11" +CDEPEND="dev-java/slf4j-api:0 + dev-java/jetty-util:0 + dev-java/jetty-io:0 +" +RDEPEND=">=virtual/jre-11:* + ${CDEPEND}" +DEPEND=">=virtual/jdk-11:* + ${CDEPEND}" -DEPEND=">=virtual/jdk-11 - dev-java/slf4j-api - dev-java/slf4j-log4j12 - dev-java/jetty-util - dev-java/jetty-io - " - -JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,jetty-util,jetty-io" +JAVA_GENTOO_CLASSPATH="slf4j-api,jetty-util,jetty-io" src_prepare(){ rm module-info.java diff --git a/dev-java/jetty-io/Manifest b/dev-java/jetty-io/Manifest index 6f675eb71..16278845c 100644 --- a/dev-java/jetty-io/Manifest +++ b/dev-java/jetty-io/Manifest @@ -1 +1 @@ -DIST jetty-io-11.0.2-sources.jar 95999 BLAKE2B 983a58477a777d413c52ef6f37466eb6127c32eaa8be0bc230e9842e416f85efecd0dd13c6d96a79489b38d3f928bbac4a989a11cbcec1ff7b505bdb95c92d29 SHA512 1d9e4f386adc89a72fdaa83c54856d81fe868eb894505b3f0aab54f2ad4fd2c5cf5ed1239c5235628fec6df69e641789570099cd8f0d0d272e2ee2ca97e239cc +DIST jetty-io-11.0.8-sources.jar 115543 BLAKE2B 98bbc9543e6f69823e4843401e778f41df2a965ac6aa8b14b051408c2dd7384799dabcccabd80b974e25dc2d6eb4aefa8f7119b670b6d3744f6b596139e8e26d SHA512 ea66ef81596ef691dcf4bb2c33a5b854748a5af5cb7061d38246b645c7841e486258d8250fa0f7300851d938800b759dc0ee68fd2ef9193e91b01c34e0c1358d diff --git a/dev-java/jetty-io/jetty-io-11.0.2.ebuild b/dev-java/jetty-io/jetty-io-11.0.2.ebuild deleted file mode 100644 index f870210aa..000000000 --- a/dev-java/jetty-io/jetty-io-11.0.2.ebuild +++ /dev/null @@ -1,30 +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" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION=" IO Utility" -HOMEPAGE="http://www.eclipse.org/jetty/" -SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" -LICENSE="EPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=">=virtual/jre-11" - -DEPEND=">=virtual/jdk-11 - dev-java/slf4j-api - dev-java/slf4j-log4j12 - dev-java/jetty-util - " - -JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,jetty-util" - -src_prepare(){ - rm module-info.java - eapply_user -} diff --git a/dev-java/jetty-io/jetty-io-11.0.8.ebuild b/dev-java/jetty-io/jetty-io-11.0.8.ebuild new file mode 100644 index 000000000..01b533206 --- /dev/null +++ b/dev-java/jetty-io/jetty-io-11.0.8.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="IO Utility" +HOMEPAGE="http://www.eclipse.org/jetty/" +SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" +LICENSE="EPL-2.0" +SLOT="0" +KEYWORDS="amd64 ~x86" + +CDEPEND="dev-java/slf4j-api:0 + dev-java/jetty-util:0 + dev-java/jetty-jmx:0 +" +RDEPEND=">=virtual/jre-11:* + ${CDEPEND}" +DEPEND=">=virtual/jdk-11:* + ${CDEPEND}" + +JAVA_GENTOO_CLASSPATH="slf4j-api,jetty-util,jetty-jmx" + +#src_prepare(){ +# rm module-info.java +# eapply_user +#} diff --git a/dev-java/jetty-jmx/Manifest b/dev-java/jetty-jmx/Manifest index e204de7eb..e317a2a31 100644 --- a/dev-java/jetty-jmx/Manifest +++ b/dev-java/jetty-jmx/Manifest @@ -1 +1 @@ -DIST jetty-jmx-11.0.2-sources.jar 26320 BLAKE2B 29f4a77888312f817d985c0d18abb1dadf964aed241de848da6fbf7a2e19fba811d8205e365b77954f0488b391412243885f315ab14983b3c56c93c33d1decc5 SHA512 acbdbf499a03bc95cf64e88254c85a0fdb06bd569e39a2f0199a6679d22a12343bdd4bbfe6a2f10ea34e38ca685aa3f7c403249bd802e2712b322323ec7c7785 +DIST jetty-jmx-11.0.8-sources.jar 26302 BLAKE2B 761fce6661f089c868f0dd3214f835fefb6ce63418571b0c0e1f1971e1bccf217194ddde5b575e587412f8bb69d84430d74a91b5438aec6ef3f8f5a60e1b0643 SHA512 6bbd6da09f7cdac42ee201271fcb7794ff41b768d423e8484f683f096b03d15a851b00c1e6169bf53f3fa42fadba4f54dd974ef85b40c79aaa926424bf9b74ac diff --git a/dev-java/jetty-jmx/jetty-jmx-11.0.2.ebuild b/dev-java/jetty-jmx/jetty-jmx-11.0.8.ebuild similarity index 64% rename from dev-java/jetty-jmx/jetty-jmx-11.0.2.ebuild rename to dev-java/jetty-jmx/jetty-jmx-11.0.8.ebuild index c28346ad5..339900864 100644 --- a/dev-java/jetty-jmx/jetty-jmx-11.0.2.ebuild +++ b/dev-java/jetty-jmx/jetty-jmx-11.0.8.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 JAVA_PKG_IUSE="doc source" @@ -14,14 +14,16 @@ LICENSE="EPL-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=">=virtual/jre-11" +CDEPEND="dev-java/jetty-util:0" -DEPEND=">=virtual/jdk-11 - dev-java/jetty-util" +RDEPEND=">=virtual/jre-11:* + ${CDEPEND}" +DEPEND=">=virtual/jdk-11:* + ${CDEPEND}" JAVA_GENTOO_CLASSPATH="jetty-util" -src_prepare(){ - rm module-info.java - eapply_user -} +#src_prepare(){ +# rm module-info.java +# eapply_user +#} diff --git a/dev-java/jetty-server/Manifest b/dev-java/jetty-server/Manifest index 6bfab77e3..5a4881029 100644 --- a/dev-java/jetty-server/Manifest +++ b/dev-java/jetty-server/Manifest @@ -1 +1 @@ -DIST jetty-server-11.0.2-sources.jar 428289 BLAKE2B 7093d10523440224e09f4af4ce339f8a7223d9aab7553a1532379138489acb96e791c64ae37445696b38c739324320d2c30a332c1915eaf039fd005e991baea0 SHA512 236d9702ff2bfe6de5445b52e2b067c472beb9f0979eb8815b811a25fd61ae587802a053eb3b4f866588c6f2b2ab128b1f797ebd79b076d1219544c1296217a2 +DIST jetty-server-11.0.8-sources.jar 441364 BLAKE2B c3f3dda648a38031d1333cc69fe1c3be5bf309d6ead051ca98900ab61be71df62be94cc0d789648031d96ebff98fa7874303cfee495b01ea8be043e68f81de9e SHA512 e5d71eae61603cbe5dc7cf7b7cc27031cde8da47b584167265d6284071867cda5627384580d8189aa01e18be7d9f6238287a6fcccb5d3f81f229a10b9bbe7c5a diff --git a/dev-java/jetty-server/jetty-server-11.0.2.ebuild b/dev-java/jetty-server/jetty-server-11.0.8.ebuild similarity index 92% rename from dev-java/jetty-server/jetty-server-11.0.2.ebuild rename to dev-java/jetty-server/jetty-server-11.0.8.ebuild index 1d4450647..0ff209832 100644 --- a/dev-java/jetty-server/jetty-server-11.0.2.ebuild +++ b/dev-java/jetty-server/jetty-server-11.0.8.ebuild @@ -14,9 +14,9 @@ LICENSE="EPL-2.0" SLOT="0" KEYWORDS="~amd64 ~x86" -RDEPEND=">=virtual/jre-11" +RDEPEND=">=virtual/jre-11:0" -DEPEND=">=virtual/jdk-11 +DEPEND=">=virtual/jdk-11:0 app-arch/unzip dev-java/jetty-io dev-java/jetty-util diff --git a/dev-java/jetty-util/Manifest b/dev-java/jetty-util/Manifest index b07b683b5..2bd4a6baf 100644 --- a/dev-java/jetty-util/Manifest +++ b/dev-java/jetty-util/Manifest @@ -1 +1 @@ -DIST jetty-util-11.0.2-sources.jar 338999 BLAKE2B c663576abd259d19d1f32e9975a6dbcdcca0ab0075455cab45e18966932d925ae612a50481c6e0b260f079db2c8b26c80a36c4635f53dcba908a057a8279654e SHA512 ac5139d113a0486b65ba5bf77f0b89fb2b93e96a4ab7a4d32114a348541900fbf9c53204af92ba645d18686b206075bb0f86b18d4acb1ee9f6231895457f42d0 +DIST jetty-util-11.0.8-sources.jar 347914 BLAKE2B b8348d8866a2af97b44a1cd8e814d62cd67a1c6cd7682ef5bff683d466e496bef880daef579c97126b1154606bf2b5bbf7bfb7257fc7871199d046290cabecef SHA512 5bb8591108dbecb42eb5301dfe939370723bfc8880b32f39fcb22838bb86d91f3034a3bf9422ae39cb33fc0692befa3e5bee0f425834f89acafe0941a9b7e28a diff --git a/dev-java/jetty-util/jetty-util-11.0.2.ebuild b/dev-java/jetty-util/jetty-util-11.0.8.ebuild similarity index 55% rename from dev-java/jetty-util/jetty-util-11.0.2.ebuild rename to dev-java/jetty-util/jetty-util-11.0.8.ebuild index 5d9c5e2ac..562c16536 100644 --- a/dev-java/jetty-util/jetty-util-11.0.2.ebuild +++ b/dev-java/jetty-util/jetty-util-11.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -12,18 +12,17 @@ HOMEPAGE="http://www.eclipse.org/jetty/" SRC_URI="https://repo1.maven.org/maven2/org/eclipse/jetty/${PN}/${PV}/${P}-sources.jar" LICENSE="EPL-2.0" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" -RDEPEND=">=virtual/jre-11" +CDEPEND="dev-java/slf4j-api:0" +RDEPEND=">=virtual/jre-11:* + ${CDEPEND}" +DEPEND=">=virtual/jdk-11:* + ${CDEPEND}" -DEPEND=">=virtual/jdk-11 - dev-java/slf4j-api - dev-java/slf4j-log4j12 - " +JAVA_GENTOO_CLASSPATH="slf4j-api" -JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12" - -src_prepare(){ - rm module-info.java - eapply_user -} +#src_prepare(){ +# rm module-info.java +# eapply_user +#} diff --git a/dev-java/logback/Manifest b/dev-java/logback/Manifest index 81224fd46..c14dcd16e 100644 --- a/dev-java/logback/Manifest +++ b/dev-java/logback/Manifest @@ -1 +1 @@ -DIST logback-1.2.3.tar.gz 4159589 BLAKE2B 32f091a460dea754181f8757afd45cc9e9888ead5bc5e2851b194371e8757d2e795b89f187039f9b17a6120b51c9c837d5a8f222276b8814a60052e549b57513 SHA512 f6c359d1d2033c15e61e441efd6a09df991164972e3b77a181f0105a2d536c4f9d4d6589131fc9b81fa86c714693b68a8ee9226257f0fa4f3748083df93862ba +DIST logback-1.2.10.tar.gz 4130738 BLAKE2B 8141cf88fd0d68094bf3a24ffba6afcbb3d2856f2edb3bf253c4a584094b47ce3c954fc86514ffd60c7c09ad9eb9b3e276b8301a5d0fe94c5f264e7833672d88 SHA512 ee16e4ef44ab5cfe3b548676daea37da0caa141c2dce8462f05a058f5a1cf34edc87dbbfae3de9bfb958e1168bb87d082e0c42b7e554b55aa9cca7a09ca026da diff --git a/dev-java/logback/logback-1.2.3.ebuild b/dev-java/logback/logback-1.2.10.ebuild similarity index 75% rename from dev-java/logback/logback-1.2.3.ebuild rename to dev-java/logback/logback-1.2.10.ebuild index ee7b16c23..eace15dbf 100644 --- a/dev-java/logback/logback-1.2.3.ebuild +++ b/dev-java/logback/logback-1.2.10.ebuild @@ -18,12 +18,11 @@ IUSE="" RDEPEND="virtual/jre:11" DEPEND="${RDEPEND} dev-java/slf4j-api - dev-java/slf4j-log4j12 + dev-java/assertj-core dev-java/junit:4 dev-java/osgi-core-api virtual/jdk:11 dev-java/mockito - dev-java/janino dev-java/joda-time java-virtuals/servlet-api:3.1 dev-java/jansi @@ -31,11 +30,11 @@ DEPEND="${RDEPEND} dev-java/jetty-server " -JAVA_GENTOO_CLASSPATH="slf4j-api,slf4j-log4j12,junit-4,osgi-core-api,joda-time,mockito,jansi-native,janino,servlet-api-3.1,oracle-javamail,jetty-server" +JAVA_GENTOO_CLASSPATH="slf4j-api,junit-4,osgi-core-api,joda-time,mockito,jansi-native,janino,servlet-api-3.1,oracle-javamail,jetty-server" src_prepare(){ - rm -r ./logback-v_1.2.3/logback-classic - rm -r ./logback-v_1.2.3/logback-access/src/test/ + rm -r ./logback-v_${PV}/logback-classic + rm -r ./logback-v_${PV}/logback-access/src/test/ eapply_user } diff --git a/dev-util/jd-cli/jd-cli-1.2.0.ebuild b/dev-util/jd-cli/jd-cli-1.2.0.ebuild index d46b278f9..bd907f453 100644 --- a/dev-util/jd-cli/jd-cli-1.2.0.ebuild +++ b/dev-util/jd-cli/jd-cli-1.2.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/kwart/jd-cli/archive/refs/tags/jd-cli-${PV}.tar.gz - LICENSE="GPL-3" SLOT="0" #logback fails to build -KEYWORDS="amd64 ~x86" +#KEYWORDS="amd64 ~x86" IUSE="" RDEPEND="virtual/jre:11" diff --git a/profiles/pentoo/base/package.accept_keywords/dev-java b/profiles/pentoo/base/package.accept_keywords/dev-java index 520151c56..52e40c589 100644 --- a/profiles/pentoo/base/package.accept_keywords/dev-java +++ b/profiles/pentoo/base/package.accept_keywords/dev-java @@ -9,7 +9,6 @@ dev-java/swt:4.10 ~amd64 #jetty -dev-java/jetty-util dev-java/jetty-io dev-java/jakarta-servlet-api dev-java/jetty-http