summaryrefslogtreecommitdiff
path: root/dev-java
diff options
context:
space:
mode:
authorLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2022-05-13 09:39:33 +0000
committerLiguros - Gitlab CI/CD [develop] <gitlab@liguros.net>2022-05-13 09:39:33 +0000
commit27c4c392e99adae8a219bf11a8f257fa2d4786f5 (patch)
treecba783f580c7f4c0ba126c5c993eda9da9e8def4 /dev-java
parente8e1cef2dee055385d57e2fc11dcdfa98634d0ef (diff)
downloadbaldeagleos-repo-27c4c392e99adae8a219bf11a8f257fa2d4786f5.tar.gz
baldeagleos-repo-27c4c392e99adae8a219bf11a8f257fa2d4786f5.tar.xz
baldeagleos-repo-27c4c392e99adae8a219bf11a8f257fa2d4786f5.zip
Adding metadata
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/ant-core/ant-core-1.10.9-r3.ebuild1
-rw-r--r--dev-java/commons-cli/commons-cli-1.4.ebuild2
-rw-r--r--dev-java/mill-bin/Manifest2
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.2.ebuild2
-rw-r--r--dev-java/mill-bin/mill-bin-0.10.4.ebuild (renamed from dev-java/mill-bin/mill-bin-0.10.1.ebuild)0
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild2
-rw-r--r--dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild2
-rw-r--r--dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild3
-rw-r--r--dev-java/openjdk/openjdk-11.0.15_p10.ebuild3
-rw-r--r--dev-java/openjdk/openjdk-17.0.2_p8.ebuild14
-rw-r--r--dev-java/openjdk/openjdk-17.0.3_p7.ebuild14
-rw-r--r--dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild2
16 files changed, 29 insertions, 26 deletions
diff --git a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
index 6ceeeb9e569f..f7540588ca05 100644
--- a/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
+++ b/dev-java/ant-core/ant-core-1.10.9-r3.ebuild
@@ -9,6 +9,7 @@ JAVA_ANT_DISABLE_ANT_CORE_DEP="true"
# Rewriting build.xml files for the testcases has no use at the moment.
JAVA_PKG_BSFIX_ALL="no"
JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.ant:ant:1.10.9"
inherit java-pkg-2 java-ant-2 prefix
diff --git a/dev-java/commons-cli/commons-cli-1.4.ebuild b/dev-java/commons-cli/commons-cli-1.4.ebuild
index cfe05d27ae26..611027b4811d 100644
--- a/dev-java/commons-cli/commons-cli-1.4.ebuild
+++ b/dev-java/commons-cli/commons-cli-1.4.ebuild
@@ -9,7 +9,7 @@ MAVEN_ID="commons-cli:commons-cli:1.4"
inherit java-pkg-2 java-pkg-simple
DESCRIPTION="A Java library for working with the command line arguments and options"
-HOMEPAGE="http://commons.apache.org/cli/"
+HOMEPAGE="https://commons.apache.org/cli/"
SRC_URI="mirror://apache/commons/cli/source/${P}-src.tar.gz"
LICENSE="Apache-2.0"
SLOT="1"
diff --git a/dev-java/mill-bin/Manifest b/dev-java/mill-bin/Manifest
index fe99a5df2fba..b56fca0c8b03 100644
--- a/dev-java/mill-bin/Manifest
+++ b/dev-java/mill-bin/Manifest
@@ -1,4 +1,4 @@
DIST mill-bin-0.10.0 65538437 BLAKE2B 1c3583e34a0bea381b6368acf00936adaace5cf3a959e710cde3ab08509b7de237d46ee0fb9266a34e0f746d6c9c052337a6d8dddb4d3ba990710c131f0ea11d SHA512 fd8a8c79672275de9bc4ab74791484dd1c91b5382990d993794b1bde59b24a2e331422a1210010a9acb6c4a29bf168ba0564f7767413acb4d6867e9ea14d2c33
-DIST mill-bin-0.10.1 67217004 BLAKE2B 4df576762b86e909b2fdbab49e5f8025d73ea0f6b60e25c6d1ec0b55acd91af44c5fbeb5088ea7e0138c4e418e36e60eaf2248b6867a7936aa6612749101f46f SHA512 0fd727aa0bd2f67536ef7155a5f57166bcd13b2fccf0d9b03c3081b8ce9ab1e7290b5705b52aad7e993a4bc0421ea6d57f94d76c0f240ce41df9e05e61dce940
DIST mill-bin-0.10.2 67225385 BLAKE2B d3ec7f45344312fb3097142aebcbf7ccbafa1f2e2aeccd4b83c83b6dc4f90b5e7feeeb994dad930accee546106b2580bf37acc38dd83c9efb599e8b79b2ce8e3 SHA512 79b71bbbe4a05e314495cd97ae2fc926d35d5ba7134c8ff48c09a8fd0fe826b824dd8ccd7e27089acd84b0673acfcbebcf3ef77ac4d3b3d8a6b117244b1a80f5
DIST mill-bin-0.10.3 67435545 BLAKE2B 1a57f2eaa7af6dd66a2cf46bd653a678d1b81f7cf1c12a99ecbe35f3279241873ea200445cfcd95e43ae4c1d80cdfc202c7c03db562ddf48c39840c804a42877 SHA512 c758d06df4be61986d8bd24d9939eac09bf5080f50b9a2baeb34ff6ff37d699226ed7d65b8facb51edd6f4a8d246333a96a1181e1e641a1127f48ed3d88ff3c1
+DIST mill-bin-0.10.4 68195230 BLAKE2B 922604123641ea130da1fbc30e6fdbf768479cdee61f8ca9443f4a96f2d9a3608c2377741716c2f942c29cf40c10f23f3cd24255221d7095060c89c5cde7b8f3 SHA512 2141159fd88866ba3c3abf05af0d7b2bbd89b901a16a29e51b6baefbb94fe68afc4b5c83cf18d289279dbb142b47eadd5ec225a72059be9fa6fc0594b0c130af
diff --git a/dev-java/mill-bin/mill-bin-0.10.2.ebuild b/dev-java/mill-bin/mill-bin-0.10.2.ebuild
index e8485c57dfd6..4b4375e44bc5 100644
--- a/dev-java/mill-bin/mill-bin-0.10.2.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.2.ebuild
@@ -8,7 +8,7 @@ MY_PN=${PN%-bin}
DESCRIPTION="A Java/Scala build tool"
HOMEPAGE="https://com-lihaoyi.github.io/mill/"
SRC_URI="https://github.com/com-lihaoyi/${MY_PN}/releases/download/${PV}/${PV}-assembly -> ${P}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
LICENSE="MIT"
SLOT="0"
diff --git a/dev-java/mill-bin/mill-bin-0.10.1.ebuild b/dev-java/mill-bin/mill-bin-0.10.4.ebuild
index e8485c57dfd6..e8485c57dfd6 100644
--- a/dev-java/mill-bin/mill-bin-0.10.1.ebuild
+++ b/dev-java/mill-bin/mill-bin-0.10.4.ebuild
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
index 2a69b6b5e04c..1bb314be9d5d 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.14_p9-r1.ebuild
@@ -27,7 +27,7 @@ abi_uri() {
}
MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT=$(ver_cut 1)
SRC_URI="
$(abi_uri arm)
diff --git a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
index 81cd7dd0c1fe..27efa4384f29 100644
--- a/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-11.0.15_p10.ebuild
@@ -27,7 +27,7 @@ abi_uri() {
}
MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT=$(ver_cut 1)
SRC_URI="
$(abi_uri arm)
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
index 69156e432327..f5637ac0f050 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.2_p8.ebuild
@@ -27,7 +27,7 @@ abi_uri() {
}
MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT=$(ver_cut 1)
SRC_URI="
$(abi_uri aarch64 arm64)
diff --git a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
index ebe4afd00a4e..fba323d4c666 100644
--- a/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-17.0.3_p7.ebuild
@@ -27,7 +27,7 @@ abi_uri() {
}
MY_PV=${PV/_p/+}
-SLOT=${MY_PV%%[.+]*}
+SLOT=$(ver_cut 1)
SRC_URI="
$(abi_uri aarch64 arm64)
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
index 1c0861a84f55..aad1888ca56b 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.322_p06.ebuild
@@ -21,7 +21,7 @@ abi_uri() {
# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
+SLOT=$(ver_cut 1)
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net"
diff --git a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
index 03a1e6a2e354..7834a4a17075 100644
--- a/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
+++ b/dev-java/openjdk-bin/openjdk-bin-8.332_p09.ebuild
@@ -21,7 +21,7 @@ abi_uri() {
# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u282-b08/OpenJDK8U-jdk_aarch64_linux_hotspot_jdk8u282-b08.tar.gz
MY_PV=$(ver_rs 1 'u' 2 '-' ${PV//p/b})
-SLOT="$(ver_cut 1)"
+SLOT=$(ver_cut 1)
DESCRIPTION="Prebuilt Java JDK binaries provided by Eclipse Temurin"
HOMEPAGE="https://adoptium.net"
diff --git a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
index fa243d77955b..c9dc36e2d7bd 100644
--- a/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.14_p9-r1.ebuild
@@ -130,6 +130,8 @@ pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
JAVA_PKG_WANT_SOURCE="${SLOT}"
JAVA_PKG_WANT_TARGET="${SLOT}"
@@ -142,7 +144,6 @@ pkg_setup() {
fi
done
else
- [[ ${MERGE_TYPE} == "binary" ]] && return
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
fi
diff --git a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
index cb5035667c42..76cfa3954b7c 100644
--- a/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
+++ b/dev-java/openjdk/openjdk-11.0.15_p10.ebuild
@@ -130,6 +130,8 @@ pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
JAVA_PKG_WANT_SOURCE="${SLOT}"
JAVA_PKG_WANT_TARGET="${SLOT}"
@@ -142,7 +144,6 @@ pkg_setup() {
fi
done
else
- [[ ${MERGE_TYPE} == "binary" ]] && return
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
fi
diff --git a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
index 501c0e15b4d2..1a4d2981a7fe 100644
--- a/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.2_p8.ebuild
@@ -128,6 +128,8 @@ pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
JAVA_PKG_WANT_SOURCE="${SLOT}"
JAVA_PKG_WANT_TARGET="${SLOT}"
@@ -154,13 +156,11 @@ pkg_setup() {
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
else
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
- JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
- export JDK_HOME
- fi
+ JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+ JDK_HOME=${JDK_HOME#*/}
+ JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+ export JDK_HOME
fi
}
diff --git a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
index 5e8f8d958a2a..9868acbeda61 100644
--- a/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
+++ b/dev-java/openjdk/openjdk-17.0.3_p7.ebuild
@@ -128,6 +128,8 @@ pkg_setup() {
openjdk_check_requirements
java-vm-2_pkg_setup
+ [[ ${MERGE_TYPE} == "binary" ]] && return
+
JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT}"
JAVA_PKG_WANT_SOURCE="${SLOT}"
JAVA_PKG_WANT_TARGET="${SLOT}"
@@ -154,13 +156,11 @@ pkg_setup() {
local xpakvar="${ARCH^^}_XPAK"
export JDK_HOME="${WORKDIR}/openjdk-bootstrap-${!xpakvar}"
else
- if [[ ${MERGE_TYPE} != "binary" ]]; then
- JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
- [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
- JDK_HOME=${JDK_HOME#*/}
- JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
- export JDK_HOME
- fi
+ JDK_HOME=$(best_version dev-java/openjdk-bin:${SLOT})
+ [[ -n ${JDK_HOME} ]] || die "Build VM not found!"
+ JDK_HOME=${JDK_HOME#*/}
+ JDK_HOME=${EPREFIX}/opt/${JDK_HOME%-r*}
+ export JDK_HOME
fi
}
diff --git a/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild b/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
index 9e3c9d842122..7f8730949f16 100644
--- a/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
+++ b/dev-java/stax2-api/stax2-api-4.2.1-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/FasterXML/${PN}/archive/refs/tags/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
DEPEND=">=virtual/jdk-1.9:*"
RDEPEND=">=virtual/jre-1.8:*"