diff options
-rw-r--r-- | dev-java/openjdk/Manifest | 2 | ||||
-rw-r--r-- | dev-java/openjdk/openjdk-17.0.0_p35.ebuild (renamed from dev-java/openjdk/openjdk-16.0.2_p7.ebuild) | 10 |
2 files changed, 4 insertions, 8 deletions
diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest index 587f7c5..d28c01e 100644 --- a/dev-java/openjdk/Manifest +++ b/dev-java/openjdk/Manifest @@ -1 +1 @@ -DIST openjdk-16.0.2_p7.tar.gz 104404052 BLAKE2B c2eb0dabc8cb172ce60da01d89f629bf5c4668d9aa9f2c6816c57a5064d2547f92c0a5bef7ee91e2dc9d1cf8f71c4a8c54e188661ca785120db06e160e00a8b0 SHA512 dbcc24fa3f596b54a362935487046a910a9d4bc0ab1e158cb4149f9672dec7f27e187f267d431a2cdc1d40f550282f6e4565852771f2dee6dbe3610894800b50 +DIST openjdk-17.0.0_p35.tar.gz 104576069 BLAKE2B 079865c8c679836b7edf04e2341b60713bbd7dbc43a608a23c03359e2a636d9dd972d2c79ec3c45bcd3ad7ea54dd15ef697480efb86ee5ad0022fd360818696d SHA512 6f263bc78f00f42612c42282fb40370315e7c93454d69ad12ad98463a3397f6eeda21e661a42749c9807d84f672ed90bfce59c889a407f3cf60744e205233fff diff --git a/dev-java/openjdk/openjdk-16.0.2_p7.ebuild b/dev-java/openjdk/openjdk-17.0.0_p35.ebuild index d0ffd35..d1b1e48 100644 --- a/dev-java/openjdk/openjdk-16.0.2_p7.ebuild +++ b/dev-java/openjdk/openjdk-17.0.0_p35.ebuild @@ -7,8 +7,9 @@ inherit autotools check-reqs flag-o-matic java-pkg-2 java-vm-2 multiprocessing p # we need -ga tag to fetch tarball and unpack it, but exact number everywhere else to # set build version properly -MY_PV="${PV%_p*}-ga" -SLOT="${MY_PV%%[.+]*}" +MY_PV="${PV%_p*}" +MY_PV="${MY_PV%.0.0}-ga" +SLOT="${PV%%[.+]*}" DESCRIPTION="Open source implementation of the Java programming language" HOMEPAGE="https://openjdk.java.net" @@ -95,11 +96,6 @@ pkg_pretend() { pkg_setup() { openjdk_check_requirements - - JAVA_PKG_WANT_BUILD_VM="openjdk-${SLOT} openjdk-bin-${SLOT} openj9-openjdk-${SLOT} openj9-openjdk-bin-${SLOT}" - JAVA_PKG_WANT_SOURCE="${SLOT}" - JAVA_PKG_WANT_TARGET="${SLOT}" - java-vm-2_pkg_setup java-pkg-2_pkg_setup } |