From 284c3f40a024069a9ec537b8fa3f666d017b56e4 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@gmail.com>
Date: Fri, 4 Jul 2025 16:06:49 +0800
Subject: [PATCH 1/2] recaf-bin: cleanup

---
 dev-util/recaf-bin/recaf-bin-2.21.14.ebuild | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
index 90c9ea75e..553a16a68 100644
--- a/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
+++ b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
@@ -1,10 +1,11 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 MY_PN="recaf"
 JAVA_SLOT=21
+JFX_SLOT=11
 
 DESCRIPTION="A modern Java bytecode editor"
 HOMEPAGE="https://col-e.github.io/Recaf/"
@@ -16,7 +17,9 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE="system-openjfx"
 
-RDEPEND="system-openjfx? ( dev-java/openjfx-bin:${JAVA_SLOT} )
+RDEPEND="
+	system-openjfx? ( dev-java/openjfx:${JFX_SLOT} )
+	!system-openjfx? ( dev-java/openjfx-bin:${JAVA_SLOT} )
 	dev-java/openjdk-bin:${JAVA_SLOT}"
 DEPEND="${RDEPEND}"
 
@@ -29,10 +32,14 @@ src_install() {
 	insinto "/opt/${MY_PN}/"
 	doins "${MY_PN}.jar"
 
-#		FXLIB_PATH="/usr/lib64/openjfx-11/lib"
+	if ! use system-openjfx; then
+		FXLIB_PATH="/usr/lib64/openjfx-${JFX_SLOT}/lib"
+	else
+		FXLIB_PATH="/usr/share/openjfx-bin-${JAVA_SLOT}/lib"
+	fi
+
 	newbin - ${MY_PN} <<-EOF
 		#!/bin/sh
-		FXLIB_PATH="/usr/share/openjfx-bin-${JAVA_SLOT}/lib"
 
 		FXLIBS="\$FXLIB_PATH/javafx.base.jar:\$FXLIB_PATH/javafx.controls.jar:\
 \$FXLIB_PATH/javafx.graphics.jar:\

From c23132087da25e3994f6c410a59fe41c0b10c371 Mon Sep 17 00:00:00 2001
From: Anton Bolshakov <blshkv@gmail.com>
Date: Fri, 4 Jul 2025 21:49:44 +0800
Subject: [PATCH 2/2] recaf: fix class path

---
 dev-util/recaf-bin/recaf-bin-2.21.14.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
index 553a16a68..2a8ccdca5 100644
--- a/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
+++ b/dev-util/recaf-bin/recaf-bin-2.21.14.ebuild
@@ -32,7 +32,7 @@ src_install() {
 	insinto "/opt/${MY_PN}/"
 	doins "${MY_PN}.jar"
 
-	if ! use system-openjfx; then
+	if use system-openjfx; then
 		FXLIB_PATH="/usr/lib64/openjfx-${JFX_SLOT}/lib"
 	else
 		FXLIB_PATH="/usr/share/openjfx-bin-${JAVA_SLOT}/lib"
@@ -40,7 +40,7 @@ src_install() {
 
 	newbin - ${MY_PN} <<-EOF
 		#!/bin/sh
-
+		FXLIB_PATH=${FXLIB_PATH}
 		FXLIBS="\$FXLIB_PATH/javafx.base.jar:\$FXLIB_PATH/javafx.controls.jar:\
 \$FXLIB_PATH/javafx.graphics.jar:\
 /opt/${MY_PN}/recaf.jar"