commit: 3a35c06294a4576477c2cf8ac8147a00439aef84
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 18 17:10:01 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Tue Feb 18 17:40:10 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a35c062
app-doc/dita-ot-bin: update wrapper
Use gjl to get the jre instead of hardcoding in the patch.
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
.../{dita-ot-bin-4.3.ebuild => dita-ot-bin-4.3-r1.ebuild} | 11 ++++++++++-
.../dita-ot-bin/files/dita-ot-bin-4.3-set-java-home.patch | 15 +++++++++++++++
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/app-doc/dita-ot-bin/dita-ot-bin-4.3.ebuild
b/app-doc/dita-ot-bin/dita-ot-bin-4.3-r1.ebuild
similarity index 83%
rename from app-doc/dita-ot-bin/dita-ot-bin-4.3.ebuild
rename to app-doc/dita-ot-bin/dita-ot-bin-4.3-r1.ebuild
index 04bb5b9f1be4..e35eacfc6f0f 100644
--- a/app-doc/dita-ot-bin/dita-ot-bin-4.3.ebuild
+++ b/app-doc/dita-ot-bin/dita-ot-bin-4.3-r1.ebuild
@@ -3,6 +3,8 @@
EAPI=8
+inherit java-pkg-2
+
MY_PN=${PN%*-bin}
MY_P=${MY_PN}-${PV}
DESCRIPTION="Darwin Information Typing Architecture - Open Toolkit publishing
engine"
@@ -19,15 +21,22 @@ RDEPEND=">=virtual/jre-17:*"
BDEPEND="app-arch/unzip"
PATCHES=(
- "${FILESDIR}"/${PN}-4.2.3-set-java-home.patch
+ "${FILESDIR}"/${PN}-4.3-set-java-home.patch
)
+src_prepare() {
+ default
+ java-pkg-2_src_prepare
+}
+
src_install() {
local installpath=/opt/${MY_P}
local installbinpath="${installpath}"/bin
insinto "${installpath}"
doins -r config lib plugins resources
+ java-pkg_regjar "${installpath}"/lib/dost.jar
+
exeinto "${installbinpath}"
doexe bin/dita
dosym -r "${installbinpath}"/dita /usr/bin/dita
diff --git a/app-doc/dita-ot-bin/files/dita-ot-bin-4.3-set-java-home.patch
b/app-doc/dita-ot-bin/files/dita-ot-bin-4.3-set-java-home.patch
new file mode 100644
index 000000000000..4704b8a747e7
--- /dev/null
+++ b/app-doc/dita-ot-bin/files/dita-ot-bin-4.3-set-java-home.patch
@@ -0,0 +1,15 @@
+dita-ot requires java 17 or higher.
+Set JAVA_HOME accordingly.
+
+--- a/bin/dita
++++ b/bin/dita
+@@ -20,6 +20,9 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
++eval "$(gjl -v -p dita-ot-bin)"
++JAVA_HOME=$(java-config-2 --select-vm "${gjl_vm}" -g JAVA_HOME)
++
+ # Extract launch and ant arguments, (see details below).
+ ant_exec_args=
+ for arg in "$@" ; do
