gentoo auto-resync : 21:12:2024 - 06:30:51

3 files changed, 6 insertions, 19 deletions

diff --git a/dev-java/openjdk/Manifest b/dev-java/openjdk/Manifest
index 792fdfe1fd88..481780529761 100644
--- a/dev-java/openjdk/Manifest
+++ b/dev-java/openjdk/Manifest
@@ -1,4 +1,3 @@
-AUX openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch 608 BLAKE2B ae49ac440d0f3c73f9afb31f4b80ba18fb739ee914841d31919827ecfcb7962ed2a7388897091b443ff57b241abd2faa0e8138fb37288f6f43a1e9befe0f5335 SHA512 1e4bb26489f72a1c40d1032ce76ecce3f30b22e33cb0e05bba8abbd4accddf951423fc16a0e747af03bdb9f3d036868b87e8d09c1a969b27d223653e4dcd926f
 AUX openjdk-8-insantiate-arrayallocator.patch 647 BLAKE2B b2403d842ace7198520a25bf7c2027e6d74b5d418b52321722b21cac866df883d47e53e4f5e040aed55a9cc4bf03b5a62d008a0877add6c649a41f6230d78a38 SHA512 4bf002ec25844f4e55b588d0516e658c548700d3bcae79be74bf75d9cf30cf9cd448767db36935924dd3b07f34d0cf087321cb35abb4943690353d11485ab0de
 AUX openjdk-8.402_p06-0001-Fix-Wint-conversion.patch 1457 BLAKE2B bf40827358b66f4f74ed506daec28f90c2c36609e28bbdd1a1df289a7a7b6b837c58f4978fffd18e580e0d49a6caaba31e54c3fcfbc66a218203cc2e05ec595d SHA512 4c2c9a6b99f833318fdd955ad015813326f8f9a5ad7e5327b74ccd2b638f1c7f8935223c3a1af26946f470b5d7c19ac130c72291b3a5ce0ec4a729df3a3915b9
 AUX openjdk-8.402_p06-0002-Fix-Wincompatible-pointer-types.patch 2254 BLAKE2B 6e8e008b6735262d9447605e60fbf0a5937068d5efbac014dad86910d55320cba048b88dd2a4436bcac407d1660137f94eab037b8b99453c9a5cf6721e22f4bc SHA512 8f6659dcbc63c0fa637a636b0e09141a09eecb31e2296f863f3446ce1c820922d2be12063822f6b12ce4702e920fcd5a6573494e4b88224cd3505be46574e8ba
@@ -10,7 +9,7 @@ DIST openjdk-11.0.18-riscv.patch.xz 272672 BLAKE2B b079612032a5bf135b05bdd1da16f
 DIST openjdk-11.0.25_p9.tar.gz 116541441 BLAKE2B 5be0d6e1996860f0d8f36732758207044668fdbd6e9c9b21b96c897d526f2d86a931f2b8d732ebe4b668679c0e48cb49a472baf29d4ea5785dc4edb0d8a5de2f SHA512 25971b26d04dd111a21c112f694968c8d56c3692a62eb1366a1f49617a308a3a0cb37ab92ff02cff727041d6e32cbbc345f313db46df58f9e933a801a1588e8b
 DIST openjdk-17.0.13_p11.tar.gz 107315661 BLAKE2B e403a8f33d4e79dd5c77a5dbfc991b443e15bddefe7cfde6cbd6f8df29f1cf499d0bd467d23f0c1b89b92b1dca16ebfb398a5c64b8787f787465a8a5f50bdfce SHA512 6f2220b3b0b9ab4441968d487858449f0e58400bfbbf8cc322b6c9393ab44869ea27285bed1022ac531f0a9eec5b7d6a07db4f7e78b094bb5ca8cedd5f40711a
 DIST openjdk-21.0.5_p11.tar.gz 112679148 BLAKE2B 6cfb2ab73e1bcc5d74c28f56e163778ca42fa1b9eda5367f2198827eae04d5a269926c97b326d1e71b2a57f2780588f538db8d3a81f367903fd967534747d3af SHA512 2fdfdb7e21fcaf97590fa54317f87169d5fdabf38027f4f6570942b2af637fc9ace3d35c3bbb0df29720e7a0f6d6a4087253a713389743ed7947e433d7b8103b
-DIST openjdk-23.0.1_p11.tar.gz 116677478 BLAKE2B ad5e8ea1f4c55627941909473401ce54a690c36d3162b108bafceb3a8a15982711876864067c960322092fa1855f4b0e199a870f1ce74e360456dccc569010a7 SHA512 9c60352aa792c2802adc14426aaeb81ea97d2462fba3e7d5692912447e64fc22c6058bf24c41ac18c72eac6759cb627e6ce174b9b407f370dd28d22838142510
+DIST openjdk-24.0.1_p0.tar.gz 122453193 BLAKE2B 660539336f68d7ad850e8d9f2e8ad68fe4ef4a8c936c5c2f255b6651d9cd8464cc0c2abebfbdb933d934c44906b3d9bbf3e0321ae1a224ab8a00eea95a827b10 SHA512 db75846a92bb3c8edfcfcc3b35cefd3d80c03c9fd05bf994983174b0696a14e75130283407371eb765d16f5820d5ca4744c94332c8ed5a33560b343effedb37d
 DIST openjdk-8.432_p06.tar.gz 92765730 BLAKE2B 9c3823ed0394730cdbf306a92062656a793dd7b57a333319282a6aa01a8150927227d3e91ee2ee975108b8c3aa2b0b87669af2971dfc27a6400fb7c4ef22d246 SHA512 263642d56915e0533c154ab51148b0f6a9860b243dddf5bbb70f49174d07dd505393fa6e257bfa34eca6e95ecd4f271737fa48fee8db93e624e8336fe488eb83
 DIST openjdk-bootstrap-11.0.13_p8-ppc64.tar.xz 108215404 BLAKE2B 5e6c0b905b34b437137922b73a9724da96b8832186fea945f8c73d941db822ca1cc5718f3ecb4607ed98d1f8241c9f365b54caaf978863e8b84680a94f067b5d SHA512 732e2220219d42be10589fcaf2420da87ebc8564b4afc6bd02f61f31cdca9c31b339366e34d374fb814499b92f8aa796435a18f28e10c8cb00d9a0f5953bb60e
 DIST openjdk-bootstrap-11.0.13_p8-x86.tar.xz 105420236 BLAKE2B d3137ad497937a9a04dedf38776f3ac45bf3b115d275991fd8582b72ade48390b6aa8ad89e0b4d34fa6a787a3c413dab20b32ef347dc8733544e810150c55d29 SHA512 f71a7ef8fbf19b0595dd7d4ebe52bbe1c95b8c17f34d092472c5f5ce8caf52a053f22db8587f1649f9a96ad01c0c632be343342812f5a8cc4ff843b33b8d9b0f
@@ -26,6 +25,6 @@ DIST openjdk-bootstrap-8.402_p06-x86.tar.xz 37076244 BLAKE2B bd50f84e8ac2ee9850c
 EBUILD openjdk-11.0.25_p9.ebuild 9003 BLAKE2B e8b0c87b9fb1322893cb137cf7eb94c29e0b4d33720d40d464c5d4c171297642eedcbcb66f637c963c07d83db84d551f7d536e5ba6c8510f6140f6051fa15134 SHA512 3ed25ec77e46faf8843085a3eceabf801a242ed0471eed32d344c871cb1e006477009d9a19db748ff1fd083ac0b7874f364d48360ee258bb57e3bdfcdd79227b
 EBUILD openjdk-17.0.13_p11.ebuild 9423 BLAKE2B 269c2108f9807cac55c140e93901566537d99c865238da907be7e2542664eebde575e02fa425414e786cde43ec804937819e4311036ac9b74c4c81cce964b0fc SHA512 d1c49ce3d13496a945a362fe52b1b6cebe43280b82e41a32180c077e0c9c0e60ef5f4c752a3288331ac33e659e92bdb98f7e54c64d31414cdb600161766c68df
 EBUILD openjdk-21.0.5_p11.ebuild 9534 BLAKE2B 16ec3a58ac789c46f3527b72da86a282916e9dc9774f8fbddea40a66763f35eebbb545493682f869ecf03bb3d2d86829bb3d0c7e2c61ec879d9c722eb6a9806d SHA512 3ed2814c35176848b3ec882f2c679c62be126091945008a12945041d24bc6e2941bcd6c975661c9dde6bfbd596a702123c017a7f74d9b79deadf9aa87ce37b4a
-EBUILD openjdk-23.0.1_p11.ebuild 9584 BLAKE2B e114f8858f737e48fab5c1295a0fcc8af495d4ac1d2102a6aab51a02282380bd84081a7d98771873d5020ab7d5b7e7f1e83859633ab7a154ea40ef16b0b72d9f SHA512 78c6b34b4c95de3362a48a1192cf53f51564c11f6ca1032429edba9543ee73c0ccc684e3df4a7d1d0e753610f839f5a57a59b3cdea0a85ec189d251f6014340d
+EBUILD openjdk-24.0.1_p0.ebuild 9560 BLAKE2B f3596b4640597df3091f18be3a9f246e185c7f3081fa58249fd557715e16d7c84934a7a724af806ec6c1ab0dd938cbf11deaddd7953bf49785ce7247244e7f2a SHA512 6ee4ede48e208897bcae247f8b0c2c0bf2242d27e412642b729bbd6de3edda4c0d64775338542f3037f38ae6629c98a2b6548c493e3f7fa0d3d9c34c5c8acb48
 EBUILD openjdk-8.432_p06.ebuild 7819 BLAKE2B 46ee633ad8c8751885c948f3648e76f973266336fe15fa0016368302719770d9435c5e0db4cb59481e782e2b89adabe8b8cd0b4624749051c066de120509f8b7 SHA512 250754810305bf30ac7ce4dbc15dd1a321f4dc47cf5e49154f26b80b704218b21b6ab2f428a9857096936793460f2471df2fcd921c7fdc40838f11a2d0cce377
 MISC metadata.xml 1549 BLAKE2B 6c922cbe1dd4261036670a176be092d495024dd25e2ffb83cc1af1e3ad0dda3491e8973cdd7f8688f1c0854acf55cdc11e9d80ac5b9a16b544455d2cd1bdcbfe SHA512 57cd1a08f0479e8b11d37665c1d905255685ed2d8d27f469a9689ffe070c7ee6cd5944a1baf87cb19722b31af56b1a4692f7967e817d1e4ffbf7c4d97881d838
diff --git a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch b/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
deleted file mode 100644
index bc4d96dfc141..000000000000
--- a/dev-java/openjdk/files/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-src/java.desktop/share/native/libfontmanager/HBShaper_Panama.c:27:10: fatal error: hb.h: No such file or directory
-
---- jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk~	2024-08-20 17:57:04.000000000 +0200
-+++ jdk23u-jdk-23-ga/make/modules/java.desktop/lib/ClientLibraries.gmk	2024-09-20 10:00:52.460817053 +0200
-@@ -279,6 +279,7 @@ endif
- ################################################################################
-
- ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
-+   LIBFONTMANAGER_CFLAGS += $(HARFBUZZ_CFLAGS)
-    LIBFONTMANAGER_EXTRA_SRC =
-    LIBFONTMANAGER_LIBS += $(HARFBUZZ_LIBS)
- else
diff --git a/dev-java/openjdk/openjdk-23.0.1_p11.ebuild b/dev-java/openjdk/openjdk-24.0.1_p0.ebuild
index c88d48ceb72d..24341f94692b 100644
--- a/dev-java/openjdk/openjdk-23.0.1_p11.ebuild
+++ b/dev-java/openjdk/openjdk-24.0.1_p0.ebuild
@@ -30,12 +30,14 @@ bootstrap_uri() {
 # you will see, for example, jdk-17.0.4.1-ga and jdk-17.0.4.1+1, both point
 # to exact same commit sha. we should always use the full version.
 # -ga tag is just for humans to easily identify General Availability release tag.
-MY_PV="${PV%_p*}-ga"
+#	MY_PV="${PV%_p*}-ga" # '-ga' isn't available
+MY_PV="${PV/_p/+}"
 
 DESCRIPTION="Open source implementation of the Java programming language"
 HOMEPAGE="https://openjdk.org"
 SRC_URI="
-	https://github.com/${PN}/jdk23u/archive/jdk-${MY_PV}.tar.gz
+	https://github.com/${PN}/jdk24u/archive/jdk-${MY_PV}.tar.gz
+
 		-> ${P}.tar.gz
 	!system-bootstrap? (
 		$(bootstrap_uri ppc64 ${PPC64_XPAK} big-endian)
@@ -109,8 +111,6 @@ DEPEND="
 	)
 "
 
-PATCHES=( "${FILESDIR}/openjdk-23_p37-LIBFONTMANAGER_CFLAGS.patch" )
-
 # The space required to build varies wildly depending on USE flags,
 # ranging from 2GB to 16GB. This function is certainly not exact but
 # should be close enough to be useful.