Merge updates from master

dev-java/corretto-bin/corretto-bin-8.402.08.1-r1.ebuild

@@ -16,7 +16,7 @@ DESCRIPTION="Prebuilt Java JDK binaries provided by Amazon Web Services"
 HOMEPAGE="https://aws.amazon.com/corretto"
 LICENSE="GPL-2-with-classpath-exception"
 KEYWORDS="~amd64"
-IUSE="alsa cups headless-awt selinux source"
+IUSE="cups headless-awt selinux source"
 
 RDEPEND="
 	>=sys-apps/baselayout-java-0.1.0-r1
@@ -27,7 +27,6 @@ RDEPEND="
 		elibc_glibc? ( >=sys-libs/glibc-2.2.5:* )
 		elibc_musl? ( sys-libs/musl )
 		sys-libs/zlib
-		alsa? ( media-libs/alsa-lib )
 		cups? ( net-print/cups )
 		selinux? ( sec-policy/selinux-java )
 		!headless-awt? (
@@ -54,17 +53,8 @@ src_install() {
 	local dest="/opt/${P}"
 	local ddest="${ED}/${dest#/}"
 
-	# prefer system copy # https://bugs.gentoo.org/776676
-	rm -vf lib/libharfbuzz.so || die
-
-	# Oracle and IcedTea have libjsoundalsa.so depending on
-	# libasound.so.2 but AdoptOpenJDK only has libjsound.so. Weird.
-	if ! use alsa ; then
-		rm -v lib/libjsound.* || die
-	fi
-
 	if use headless-awt ; then
-		rm -v lib/lib*{[jx]awt,splashscreen}* || die
+		rm -v lib/amd64/libjawt.so || die
 	fi
 
 	if ! use source ; then

gui-libs/libdecor/libdecor-0.2.2.ebuild

@@ -1,4 +1,4 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,21 +7,27 @@ inherit meson
 
 DESCRIPTION="A client-side decorations library for Wayland clients"
 HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"
-SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"
+if [[ ${PV} == "9999" ]]; then
-
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+IUSE="+dbus +gtk examples"
-IUSE="+dbus examples"
 
 DEPEND="
 	>=dev-libs/wayland-1.18
 	>=dev-libs/wayland-protocols-1.15
 	x11-libs/pango
+	x11-libs/cairo
+	x11-libs/gtk+
 	dbus? ( sys-apps/dbus )
 	examples? (
 		virtual/opengl
-		media-libs/mesa[egl(+)]
+		media-libs/mesa[opengl(+)]
 		x11-libs/libxkbcommon
 	)
 "
@@ -31,7 +37,7 @@ src_configure() {
 	local emesonargs=(
 		# Avoid auto-magic, built-in feature of meson
 		-Dauto_features=disabled
-
+		$(meson_feature gtk)
 		$(meson_feature dbus)
 		$(meson_use examples demo)
 		-Dinstall_demo=true

gui-libs/libdecor/libdecor-9999.ebuild

@@ -1,26 +1,33 @@
-# Copyright 2023 Gentoo Authors
+# Copyright 2023-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit meson git-r3
+inherit meson
 
 DESCRIPTION="A client-side decorations library for Wayland clients"
 HOMEPAGE="https://gitlab.freedesktop.org/libdecor/libdecor"
-EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"
+if [[ ${PV} == "9999" ]]; then
-
+	EGIT_REPO_URI="https://gitlab.freedesktop.org/libdecor/libdecor.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitlab.freedesktop.org/libdecor/libdecor/-/archive/${PV}/${P}.tar.bz2"
+	KEYWORDS="~amd64"
+fi
 LICENSE="MIT"
 SLOT="0"
-IUSE="+dbus examples"
+IUSE="+dbus +gtk examples"
 
 DEPEND="
 	>=dev-libs/wayland-1.18
 	>=dev-libs/wayland-protocols-1.15
 	x11-libs/pango
+	x11-libs/cairo
+	x11-libs/gtk+
 	dbus? ( sys-apps/dbus )
 	examples? (
 		virtual/opengl
-		media-libs/mesa[egl(+)]
+		media-libs/mesa[opengl(+)]
 		x11-libs/libxkbcommon
 	)
 "
@@ -30,7 +37,7 @@ src_configure() {
 	local emesonargs=(
 		# Avoid auto-magic, built-in feature of meson
 		-Dauto_features=disabled
-
+		$(meson_feature gtk)
 		$(meson_feature dbus)
 		$(meson_use examples demo)
 		-Dinstall_demo=true

gui-libs/libdecor/metadata.xml

@@ -2,9 +2,18 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<use>
-		<flag name="dbus">Enable dbus to query current cursor theme </flag>
+    <flag name="dbus">Enable dbus to query current cursor theme </flag>
+		<flag name="gtk">Build GTK plugin</flag>
 		<flag name="examples">Build and install examples</flag>
 	</use>
+	<maintainer type="person">
+		<email>chewi@gentoo.org</email>
+		<name>James Le Cuirot</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Gentoo Proxy Maintainers</name>
+	</maintainer>
 	<maintainer type="person">
 		<email>gonegrier.duarte@gmail.com</email>
 		<name>Gonçalo Negrier Duarte</name>

media-fonts/nerdfonts/nerdfonts-3.1.1-r1.ebuild

@@ -14,6 +14,14 @@ intelonemono iosevka iosevkaterm iosevkatermslab jetbrainsmono lekton liberation
 martianmono meslo monaspace monofur monoid mononoki mplus nerdfontssymbolsonly noto opendyslexic
 overpass profont proggyclean robotomono sharetechmono sourcecodepro spacemono terminus tinos ubuntu
 ubuntumono victormono"
+REQUIRED_USE="|| ( 0xproto 3270 agave anonymouspro arimo aurulentsansmono bigblueterminal bitstreamverasansmono
+cascadiacode cascadiamono codenewroman comicshannsmono commitmono cousine d2coding daddytimemono
+dejavusansmono droidsansmono envycoder fantasquesansmono firacode firamono geistmono gomono gohu
+hack hasklig heavydata hermit iawriter ibmplexmono inconsolata inconsolatago inconsolatalgc
+intelonemono iosevka iosevkaterm iosevkatermslab jetbrainsmono lekton liberationmono lilex
+martianmono meslo monaspace monofur monoid mononoki mplus nerdfontssymbolsonly noto opendyslexic
+overpass profont proggyclean robotomono sharetechmono sourcecodepro spacemono terminus tinos ubuntu
+ubuntumono victormono )"
 HOMEPAGE="https://github.com/ryanoasis/nerd-fonts"
 SRC_URI="
 	0xproto? ( https://github.com/ryanoasis/nerd-fonts/releases/download/v${PV}/0xProto.tar.xz -> 0xProto-${PV}.tar.xz )
@@ -95,4 +103,50 @@ SLOT="0"
 KEYWORDS="~amd64"
 
 S="${WORKDIR}"
-FONT_SUFFIX="ttf"
+
+FONT_SUFFIX="ttf otf"
+
+
+# From font.eclass
+src_install() {
+	local dir suffix commondoc
+
+	if [[ -n ${FONT_OPENTYPE_COMPAT} ]] && in_iuse opentype-compat && use opentype-compat ; then
+		font_wrap_opentype_compat
+	fi
+
+	if [[ $(declare -p FONT_S 2>/dev/null) == "declare -a"* ]]; then
+		# recreate the directory structure if FONT_S is an array
+		for dir in "${FONT_S[@]}"; do
+			pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
+			insinto "${FONTDIR}/${dir#"${S}"}"
+			for suffix in ${FONT_SUFFIX}; do
+				if compgen -G "*.${suffix}" > /dev/null; then
+					doins *.${suffix}
+				fi
+			done
+			font_xfont_config "${dir}"
+			popd > /dev/null || die
+		done
+	else
+		pushd "${FONT_S:-${S}}" > /dev/null \
+			|| die "pushd ${FONT_S:-${S}} failed"
+		insinto "${FONTDIR}"
+		for suffix in ${FONT_SUFFIX}; do
+			if compgen -G "*.${suffix}" > /dev/null; then
+				doins *.${suffix}
+			fi
+		done
+		font_xfont_config
+		popd > /dev/null || die
+	fi
+
+	font_fontconfig
+
+	einstalldocs
+
+	# install common docs
+	for commondoc in COPYRIGHT FONTLOG.txt; do
+		[[ -s ${commondoc} ]] && dodoc ${commondoc}
+	done
+}

sys-boot/limine/Manifest

@@ -1,3 +1,4 @@
 DIST limine-7.0.0.tar.xz 1318064 BLAKE2B 7986d948fe84c80b338e5cc66edca5f511d277d2e854484c87183666bf1b075480b61213c177b6e39a1145502cc9e07b9e1442c3dcf3171339af5b55ac9c184f SHA512 40575711e0e51799cbca2b2de74eff813022ab760c32de7d485f0cb70aa6daa8c842d20ed3d740e8c59e4be63eab43969b0cf809f2e796107d7e9be221bd9bf6
 DIST limine-7.0.3.tar.xz 371416 BLAKE2B 7450784d53ef86993f53c84da4f51ee8a1beb826153da8fa2cef1a0669688de370a53ced321a92276e4b53fb7c9c1081f71b4a4c7adf432b271d395e96f00595 SHA512 d8d92f237f56249555fa54b5608ad2bdeff7c7b53e055f925acb3a7feeb783407c4c5d7ce092dba0b9a93441cfd1d0dcc4ec01a9e94c14e1742119a50f63aa06
 DIST limine-7.0.5.tar.xz 371612 BLAKE2B 029953e1a5adeac2b1cd92bfff3b3a893b8ad1f458f1560b194ad0607638a3cc77d4927f1f4376a958d7ae513400ec615ab092ef97cbb220e5866821e83f7fdc SHA512 149bc59785d06b293a9a9d18722afee66301e698fdd349bc5bd211720873213239617af0de665e22dc43299e7a580359d4d407c9eb6ffd6ac85c1de484124055
+DIST limine-7.3.0.tar.gz 523910 BLAKE2B aabe52c9013f17e61520aa8df0886339d6be16e3dea0b13b13160ed61b811355880e93b2928c0d73fdf8a7f80132569a7cd783dd720915235f5e78deecd4048d SHA512 fc25375f86c18ae991f6f6d11fa127b47d1fdfa81059ed663a82202f9de95b9774516e1bf5a648abaedde8e04fe004c296666b6ec3a1eeaf5cf3472aca87c0c5

sys-boot/limine/limine-7.3.0.ebuild

@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Limine is a modern, advanced, and portable BIOS/UEFI multiprotocol bootloader"
+HOMEPAGE="https://limine-bootloader.org/"
+SRC_URI="https://github.com/limine-bootloader/limine/releases/download/v${PV}/limine-${PV}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+bios +bios-pxe +bios-cd +cd-efi +uefi32 +uefi64 +uefiaa64 +uefirv64"
+
+MY_LLVM_TARGETS="AArch64 ARM X86 RISCV"
+MY_LLVM_FLAGS="llvm_targets_${MY_LLVM_TARGETS// /(-),llvm_targets_}(-)"
+
+BDEPEND="
+	app-alternatives/gzip
+	dev-lang/nasm
+	sys-apps/findutils
+	sys-devel/clang[${MY_LLVM_FLAGS}]
+	sys-devel/lld
+	sys-devel/llvm[${MY_LLVM_FLAGS}]
+
+	cd-efi? ( sys-fs/mtools )
+"
+
+src_configure() {
+	local myconf=(
+		"$(use_enable bios)"
+		"$(use_enable bios-cd)"
+		"$(use_enable bios-pxe)"
+
+		"$(use_enable uefi32 uefi-ia32)"
+		"$(use_enable uefi64 uefi-x86-64)"
+		"$(use_enable uefiaa64 uefi-aarch64)"
+		"$(use_enable uefirv64 uefi-riscv64)"
+		"$(use_enable cd-efi uefi-cd)"
+	)
+
+	TOOLCHAIN_FOR_TARGET=llvm \
+	econf "${myconf[@]}"
+}