From eb72a69c0109ff53b8c18b2f6c3b160489376e2e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 11 Jan 2024 13:07:07 +0000 Subject: gentoo auto-resync : 11:01:2024 - 13:07:07 --- dev-java/Manifest.gz | Bin 60158 -> 60149 bytes dev-java/jsch-agent-proxy/Manifest | 2 +- .../jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild | 24 +++---- dev-java/json/Manifest | 2 - dev-java/json/json-20220320.ebuild | 57 --------------- dev-java/scala-cli-bin/Manifest | 6 +- dev-java/scala-cli-bin/metadata.xml | 1 + dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild | 78 +++++++++++++++++++++ 8 files changed, 97 insertions(+), 73 deletions(-) delete mode 100644 dev-java/json/json-20220320.ebuild create mode 100644 dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild (limited to 'dev-java') diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz index 25f2a2c1a862..a0b8b8eba0c8 100644 Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ diff --git a/dev-java/jsch-agent-proxy/Manifest b/dev-java/jsch-agent-proxy/Manifest index f7aef5974cba..9dbee5c90656 100644 --- a/dev-java/jsch-agent-proxy/Manifest +++ b/dev-java/jsch-agent-proxy/Manifest @@ -1,3 +1,3 @@ DIST jsch-agent-proxy-0.0.9.tar.gz 19040 BLAKE2B d20989663ed4544d60e890d48c8b3262184bbdf5bc6b8a42d8a008a0ad94831b283ec76382616a3df2f9ad677e59608920bcbc973f6da79d8e373dc21758ece8 SHA512 a80bb2cda8f0a96f4d069c64bc60633292fac46fcca94402f2c2762d3def94e3b9fef886b56e8f2b834141643173cea29ca678a61963fefa33fbb3cd56c1af88 -EBUILD jsch-agent-proxy-0.0.9.ebuild 3303 BLAKE2B 3f614c60ef70129b73bf4b8d7eb42d51b47201485430db494ee7da11331592a986d11ec453c3e00b825b10ad2d4d7041ab908acde75d08ce31f06717003ab3e7 SHA512 bc165fea36981991b53c52f73f9b2667879b9ac6f99b14bb14e948896a77491c2aba3cf559964c7adcd6f265b4bb3e20c3c456bc1e0d0843b156f831e5c447e7 +EBUILD jsch-agent-proxy-0.0.9.ebuild 3301 BLAKE2B b1fb22f24cecb470ca27e82ed457e5b44de6d26386b81e7f405ed37638f8ac7b14cada14672c6923845e2cbac51f143ea862e4b86d8dcd722d8bbcbe8103b523 SHA512 e61e1d9140f05991cdf6424b6987dca7b062634593d22b2d302b480f5a62f819ce9604179821bdd23c3b95763c7e1a6765b0ee4d0b0d430713d88d5ec05f83fc MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6 diff --git a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild index eea65095cac2..0a12a3826469 100644 --- a/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild +++ b/dev-java/jsch-agent-proxy/jsch-agent-proxy-0.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Skeleton command: @@ -40,6 +40,16 @@ S="${WORKDIR}/jsch-agent-proxy-${MY_COMMIT}" JAVA_GENTOO_CLASSPATH="jna-4,jsch" JAVA_GENTOO_CLASSPATH_EXTRA="jsch-agentproxy-core.jar:jsch-agentproxy-pageant.jar:jsch-agentproxy-sshagent.jar:jsch-agentproxy-usocket-jna.jar:jsch-agentproxy-usocket-nc.jar" +JAVADOC_CLASSPATH="${JAVA_GENTOO_CLASSPATH}" +JAVADOC_SRC_DIRS=( + "${PN}-core" + "${PN}-jsch" + "${PN}-pageant" + "${PN}-sshagent" + "${PN}-usocket-jna" + "${PN}-usocket-nc" + "${PN}-connector-factory" +) src_compile() { JAVA_SRC_DIR="${PN}-core" @@ -77,17 +87,7 @@ src_compile() { java-pkg-simple_src_compile rm -fr target || die - JAVA_SRC_DIR=( - "${PN}-core" - "${PN}-jsch" - "${PN}-pageant" - "${PN}-sshagent" - "${PN}-usocket-jna" - "${PN}-usocket-nc" - "${PN}-connector-factory" - ) - JAVA_JAR_FILENAME="ignoreme.jar" - java-pkg-simple_src_compile + use doc && ejavadoc } src_install() { diff --git a/dev-java/json/Manifest b/dev-java/json/Manifest index 3c065150926c..94179313056d 100644 --- a/dev-java/json/Manifest +++ b/dev-java/json/Manifest @@ -1,6 +1,4 @@ -DIST json-20220320.tar.gz 229462 BLAKE2B 9d549e4e905e2a63985b0b2d9a6cfbf7483776799d6b907455356940b48242fda9344874f1625da06215991eae1cfa1e87f3f8f0a204807795ed50f3f9afdbc2 SHA512 1bcd99c69201ea6609a41ec1679467504cd129a8c5a9caede0829cd8eb70b0e59e504a4bc409f57e6b27091e11acbf6108830c6f1fe16919d0cb1daff643bdf0 DIST json-20231013.tar.gz 240211 BLAKE2B c0594f89c2b02273c736c0fc362f1e3d519d3d88b7e708e64bbd5ca202f539368e9856e311dd9ad42a24c317cfd727feed5af215fbc5e9bbcb18e797323684c8 SHA512 4c5eb3e9ef77825c9e7b874c9084b5bb75b39c527c3cb419fc45171e0d11b24796931a2d16255500ed86610da3ac7805b302ec0b1051f97c97795580dca7c183 DIST json-path-2.1.0.jar 189658 BLAKE2B 2813abfc3b6c758f600bb5e8f8b73eac8dc2a642d461bc26c569a650378ea65cebf691afe975fa2dca406eb324863c36c4623b21c1df2cb83c92e6859b5a9d85 SHA512 c16fc68a04945ad49eb96c38f68a8b4ff351ab1bbc51685f42d22723b2dee4b827ba45cb6b8167199e3f4d22e668ef58665558beec8e11399ac547e9fcebd9f6 -EBUILD json-20220320.ebuild 1482 BLAKE2B 36157695be78f2cce807513e2525c1446f32618596d6a181c83cd8d9c4ebc139eacb2c314325352e49dfb9ec36d1a508c8fd5664522b956172de289706f2ef55 SHA512 aa15265508c64bc0486b911766cf988b2a6d38a50ef4519c7a60690278d533e9bcc4fb9f04084999da2022882f90220bceabd400408c3253bba4fdcb5bca2076 EBUILD json-20231013-r1.ebuild 1494 BLAKE2B 3d43885a8994103e747a25ceb1506b443069e88ebd1bcc14f62d9f67bb6905a09e98c7cea205294f89755f50c292ab558e1dbf4ebb4d01d04a4783a53b5c5901 SHA512 8e790530ae9d77b53b45ee67c68bec7c1f57c448683203d48a91ff688addf7b059e6c69a19d481b1384c4ee92388dac6e4520d5f35b4180c50f79feb67c1fb13 MISC metadata.xml 1083 BLAKE2B 9dfa3392b02d2bb6ae3198a884c154a52926de81aead27309fd0bbe25011a1b0ea89c0c7fa3694c56fee4cb339c2fd161384c9d7c780369cc3da4464d3abd40a SHA512 3d0f231f0e67e178f838474e6aa07e88dffc26e26261a49515124c3e68120d323cc1a790be017b082af8f27dd051121750c1e1829e7a2fc2714821caf9a8802b diff --git a/dev-java/json/json-20220320.ebuild b/dev-java/json/json-20220320.ebuild deleted file mode 100644 index 86e62eab5ee3..000000000000 --- a/dev-java/json/json-20220320.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2022 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://codeload.github.com/stleary/JSON-java/tar.gz/20220320 --slot 0 --keywords "~amd64 ~x86" --ebuild json-20220320.ebuild - -EAPI=8 - -JAVA_PKG_IUSE="doc source" -MAVEN_ID="org.json:json:20220320" -# We don't have com.jayway.jsonpath:json-path -# JAVA_TESTING_FRAMEWORKS="junit-4" - -inherit java-pkg-2 java-pkg-simple - -DESCRIPTION="A reference implementation of a JSON package in Java" -HOMEPAGE="https://github.com/stleary/JSON-java" -SRC_URI="https://codeload.github.com/stleary/JSON-java/tar.gz/${PV} -> ${P}.tar.gz" - -LICENSE="JSON" -SLOT="0" -KEYWORDS="amd64 x86" - -# Compile dependencies -# POM: pom.xml -# test? com.jayway.jsonpath:json-path:2.1.0 -> !!!groupId-not-found!!! -# test? junit:junit:4.13.1 -> >=dev-java/junit-4.13.2:4 -# test? org.mockito:mockito-core:1.9.5 -> >=dev-java/mockito-1.9.5:0 - -DEPEND=" - >=virtual/jdk-1.8:*" -# test? ( -# !!!groupId-not-found!!! -# >=dev-java/mockito-1.9.5:0 -# ) -#" - -RDEPEND=" - >=virtual/jre-1.8:* -" - -DOCS=( {README,SECURITY}.md ) - -S="${WORKDIR}/JSON-java-${PV}" - -JAVA_SRC_DIR="src/main/java" - -# JAVA_TEST_GENTOO_CLASSPATH="!!!groupId-not-found!!!,junit-4,mockito" -# JAVA_TEST_SRC_DIR="src/test/java" -# JAVA_TEST_RESOURCE_DIRS=( -# "src/test/resources" -# ) - -src_install() { - default # https://bugs.gentoo.org/789582 - java-pkg-simple_src_install -} diff --git a/dev-java/scala-cli-bin/Manifest b/dev-java/scala-cli-bin/Manifest index 8ba2f0611617..4d80f1334e62 100644 --- a/dev-java/scala-cli-bin/Manifest +++ b/dev-java/scala-cli-bin/Manifest @@ -1,9 +1,13 @@ DIST scala-cli-amd64-1.0.4.gz 33291617 BLAKE2B bd97626e7e95fb6b2a82fd424673078b89f5f4270087c667193e4de1ceff614076e73b728ba1f0334d5f9d7aa6f52c660487d52bf8fb49a786f7fe4ce18a0428 SHA512 447acafd47041cd173a06b5d113cd30adee76a2c161b2efc98b8ece60082d5b98189fd9b3da1f048061d306343cacb9b67566daa78ce8fe54dc82dd90a1e34bc DIST scala-cli-amd64-1.1.0.gz 33673708 BLAKE2B 332f5a974949af49914de8fdb3129b0937fbce842616d6fefe16f7aff89baf6be1ba536d0ee6ff9bc1dd2b5ebfa51943bd0c6279ef83b95bd25a337530fa1295 SHA512 ba7ebb321a27e95f786027257c3f50dac1d12e0cc33abde24dc7c5dffb2f57a11c3ea67d92ed487968c49ff9ec3eaf5d1d62065beda5b6fa373d09b9126f4529 +DIST scala-cli-amd64-1.1.1.gz 33754319 BLAKE2B 91fb5e9b828a2c6c6dd984b421bb101ea1ae03c85d94eda14ba79433d29a88cb2850cb376c212f677c1b8167a0a21b320aeb0e4e63a29e6c8502d76babc1543d SHA512 1e0cd5eee280e208090961e4b6d216d472fef360f13e0f4e28412b9a52883d65c97e3fe70c8ce5cf96e6cd866f14b175454175be9df3bdc5c229fb2f121c925a DIST scala-cli-arm64-1.0.4.gz 33185346 BLAKE2B 2b0131a56ed3f67fb5d5f25db6c511dc7d9e9128089e6826fa7d859b1457f03a99e290cc63f185820ea849a857f40d667d5db7a378dabcf545cdcdefded6a577 SHA512 3ff1c025a1035aa6a8550de17e85bc5c483007d5f07f03e0d792d6dc9ed1b18eb26909b3c7195fde12056a3b84ffa69dc53c01ec21b34187c1d7188a0a023aaa DIST scala-cli-arm64-1.1.0.gz 33575885 BLAKE2B ebccbe86044b4708a356060a16f06bb94df01d261ab7dabe8eba8e644c121864cdee99debf95468d936cbff670413ec47e1ef903a9071b267a61c5fe46738c1a SHA512 6a85529be06a8d43d729c5a795bb0dcdb2680bd7ef3de471fee908e91249401262e8322019c640d4eb45d0a15ed0073ff51b24d61846228f46c36bfb48731408 +DIST scala-cli-arm64-1.1.1.gz 33656505 BLAKE2B b943f370c9375fec5cec3c63628ecd9e416b569ec2d692422f217b2506c104a1c3bb415569581d68c9476bf892b4a087e7b95b2310955dd0f9af52edc90af2e9 SHA512 79836261613bafe4710c1d904ec39e88c1862b3021f7b37ac5004c6079c762e68550522fbb7240e48e7408f844f648ab92c12cb568ebc63bb3e01f1992a7eaf3 DIST scala-cli-non-native-1.0.4 7553232 BLAKE2B 9299b20dddec80d12e738af4b283e816de5bae23262510146cd33a9b175f2a343f52932fbd3254974bd4219d2903f32772409f234423d3a027b6b0f02268e584 SHA512 4e5281ef7f8a886ad79746477d852f485ccad317568a64ee513e691dcd9a9121c2aed51f6170b959f0226fb81efe9aa1f8ecf1d94a84a0b387c349adfb756762 DIST scala-cli-non-native-1.1.0 7728727 BLAKE2B 05deb93b91029721a21bac729aa9b370e05909e67bbade921e00d09c3a37e851e519188bff73dc614c3f5768834ae56f94623347735e756a6bcb0c4c81c8713c SHA512 13e426915794df757b6eb029d2545316bd9f4b9ba6f58cf59a546227d6997741cf681ce0c5e721e8e95cb9e420702f2d28f004df1780637dc9b39fd3bc4c884a +DIST scala-cli-non-native-1.1.1 7779964 BLAKE2B 08849ce4a6fbf1e6eb2e4fafd2e29522e535c0795d6f1acbcd25ec4523d14dcae4a746f3729786db8f62a3770e6fdbd78a76477b182b32945454ac19a2f8217c SHA512 61c2a1a325f83e19102cd2f5d6b89d37b9914d64f86da6218258f064a6a8e5ab927d28b278363316446611e2cbdc8e4687616ea2b001da00ecbafb4207eabeb2 EBUILD scala-cli-bin-1.0.4.ebuild 1818 BLAKE2B b6f64c1a87aaeb118f5cea239ec569a77d8593a0963745c9977cc28e60b6538218eca4f8f7dd79205fc97ef6dc5fee1142b93da5f37a4b62a733b292327a06f8 SHA512 304c303924f7485630911d125f92fbdb05d25dc76581ec3a6737808a96e16780bcb33600cedb0078a0ba66c9828316a54e0f67f0e5ecb33445085b8becca4243 EBUILD scala-cli-bin-1.1.0.ebuild 1818 BLAKE2B 5b07a1917af542f3141556d5de5932ce036254087765630bd3e498088193b8c0cf2862dc9c2abf3e125f3d28ea78f3b5f8333680bd9db3376858f8671b6c1b86 SHA512 3caa40269b85c7bb04517902637fc4eac76801f931fa24163cf4fa86bad9cee2944e89b20d75bb0b6b16a1ada1586240b150a4f56d86a8ecf81a2748052e29c7 -MISC metadata.xml 398 BLAKE2B b9b93abb74284cfbf4adfdf5d78a62dc6d21fa9e33c36d65842aa225b499f2220fed94648e4422eed5ae9f3c93123aeb68965783f3980a6c046168b3cde3657c SHA512 94e42c3c3b2b4d0b0092dce77a564f5e96617ab74aff3fa1ec89344c4d787f06ea8ff3ab6245440c228aa9c7018c96e2e740417dafc1699124f72b0235aed11c +EBUILD scala-cli-bin-1.1.1.ebuild 1819 BLAKE2B 5048953ca83fb189a59272673d715cd98be632b9ee60b6087a82ec38da56e43c9a23073a467a85918d1cba72232a50b1c7230dc11a6d027f8a79a209870f7a9f SHA512 cebdb118fa90c5444d2bbf9ca1052bf11d739e9992c1fa1add031506016412b6a0e5b94d4aa5e9e89bc32656dd34ee6a6ea81f5ddd67b496d38f813fa4a7ef70 +MISC metadata.xml 471 BLAKE2B 651dc485aacabfc581d9f5d5ab1cf524601b38fd2024113fbd8986090131e6c458db3c2d9649e9876df74f0e7471cdc66c8f1307ed71baa18508754143c10411 SHA512 6906a09bc65b6d1887a9a17d9be2e7afc990ea017439cad751fcfee806df0c456006473141b69f52b5373227cfd6e2f66e7750903d4bd9736f40d6c93cbede4e diff --git a/dev-java/scala-cli-bin/metadata.xml b/dev-java/scala-cli-bin/metadata.xml index c4efbfd85748..27dc5e6617c8 100644 --- a/dev-java/scala-cli-bin/metadata.xml +++ b/dev-java/scala-cli-bin/metadata.xml @@ -6,6 +6,7 @@ Florian Schmaus + https://github.com/VirtusLab/scala-cli/releases VirtusLab/scala-cli https://github.com/VirtusLab/scala-cli/issues diff --git a/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild new file mode 100644 index 000000000000..dc0659cfd5ec --- /dev/null +++ b/dev-java/scala-cli-bin/scala-cli-bin-1.1.1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit bash-completion-r1 + +UPSTREAM_PV=${PV/_/-} +UPSTREAM_PV=${UPSTREAM_PV/rc/RC} + +DESCRIPTION="CLI to interact with Scala and Java" +HOMEPAGE="https://scala-cli.virtuslab.org/" +SRC_URI=" + !amd64? ( !arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli + -> scala-cli-non-native-${UPSTREAM_PV} + ) ) + amd64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-x86_64-pc-linux.gz + -> scala-cli-amd64-${UPSTREAM_PV}.gz + ) + arm64? ( + https://github.com/VirtusLab/scala-cli/releases/download/v${UPSTREAM_PV}/scala-cli-aarch64-pc-linux.gz + -> scala-cli-arm64-${UPSTREAM_PV}.gz + ) +" + +KEYWORDS="~amd64 ~arm64" +LICENSE="Apache-2.0" +SLOT="0" + +S="${WORKDIR}" + +# A JRE is not strictly required if native images of scala-cli are used +# (amd64, arm64). However we may want a system JRE anyway, and having JRE +# in RDEPEND reduces the chances that scala-cli needs to install one +# for the user. +RDEPEND=" + >=virtual/jre-11 + sys-libs/zlib +" +BDEPEND="!amd64? ( !arm64? ( >=virtual/jre-11 ) )" + +QA_TEXTRELS="*" +QA_FLAGS_IGNORED="/usr/bin/scala-cli" + +src_prepare() { + default + + if use amd64; then + mv scala-cli-amd64-${UPSTREAM_PV} scala-cli || die + elif use arm64; then + mv scala-cli-arm64-${UPSTREAM_PV} scala-cli || die + else + mv scala-cli-non-native-${UPSTREAM_PV} scala-cli || die + fi + + chmod +x scala-cli || die +} + +src_compile() { + for shell in bash zsh; do + ./scala-cli install-completions \ + --shell ${shell} \ + --env \ + --output "${S}" \ + > ${shell}-completion || die + done +} + +src_install() { + dobin scala-cli + + newbashcomp bash-completion scala-cli + + insinto /usr/share/zsh/site-functions + doins zsh/_scala-cli +} -- cgit v1.2.3