summaryrefslogtreecommitdiff
path: root/app-doc
diff options
context:
space:
mode:
Diffstat (limited to 'app-doc')
-rw-r--r--app-doc/Manifest.gzbin7646 -> 7644 bytes
-rw-r--r--app-doc/dita-ot-bin/Manifest3
-rw-r--r--app-doc/dita-ot-bin/dita-ot-bin-4.3-r1.ebuild (renamed from app-doc/dita-ot-bin/dita-ot-bin-4.3.ebuild)11
-rw-r--r--app-doc/dita-ot-bin/files/dita-ot-bin-4.3-set-java-home.patch15
4 files changed, 27 insertions, 2 deletions
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 56e7b2b7a4f7..0d4769a1e90d 100644
--- a/app-doc/Manifest.gz
+++ b/app-doc/Manifest.gz
Binary files differ
diff --git a/app-doc/dita-ot-bin/Manifest b/app-doc/dita-ot-bin/Manifest
index 9ea6704ebee1..7f2497d9d69d 100644
--- a/app-doc/dita-ot-bin/Manifest
+++ b/app-doc/dita-ot-bin/Manifest
@@ -1,8 +1,9 @@
AUX dita-ot-bin-4.2.3-set-java-home.patch 419 BLAKE2B 6f5a43c431504f1f4067be247e6e2771539ab5bd9ce5da88a4a8c591c67b2a4174270fa29fcfa96049bb7b9e5086d5659a8d8a732091a267f60ceddf5b06b577 SHA512 23c6beeba9a4f10bdbda2eedfaa8e32d6f441237db5f168ce655b5f4727537ee2d618577e1f25700b4ddc1e9ee383337a0595d71bbf3ee9b991cfd7f8153143d
+AUX dita-ot-bin-4.3-set-java-home.patch 415 BLAKE2B 2cd766dbe812df50353979b9f9e4917658fe0046f259b6473a2adccdb3a2e12dee21915b31d04578ba8639e1f6eeff48bd87ebb9c80b633d0ae6276530fdea08 SHA512 eed6452e10079577991b7ef48b710eb3f722ae0209fbf868a3191edcbd03e83b899a10ef2800f962c49d605e0efa9c3e5b5075536efd84f1313c469dd0d09c20
DIST dita-ot-4.2.3.zip 55110433 BLAKE2B 53c4e2e7896c1b496f95b4d5dafc059c63b7b73fb63c7faefabc87500aab862c80707bc64effa52c447bbdb73e007aadbacec7ada98dade9af0e0c0300b75ba7 SHA512 a1e2684444f04d14991d39cfea6b86f49a4ae2802d5b9ffa600c2b18c6ac4efddfb68db8484d6edda5812301f281828b5d22ef3057aa343cd1ffd6d3beeaf48b
DIST dita-ot-4.2.4.zip 55306735 BLAKE2B 8467e358873300c9c6fa24cd99cbf2481137aad02e3878820947a55c13c52ee933271e676f111d04951fc7b9cc7fbd16d7d41edb0d8b52a07eb58d75ffdde300 SHA512 81ee8963d33f92d3fa95ec458c306ff65fd646a494fb681da254106be1085daf24edaa4b0425d530c62c5e3bc41e63dd5786ed452bef79ef6fc14ace89a80ef3
DIST dita-ot-4.3.zip 55846129 BLAKE2B b931478256e826eb651068bebaf3159e6961aaab86402f21ced8f84d69ccbc15ae528c794c3004e324601ae52a3c2e9b6bf4d6da6d47d0f927a05875f80e3dc2 SHA512 222e0b0369ba466b7e591b238679ae7e54e4207eb0dc3e40aeebeaaf291448ef55b08e303e5df3996eb4bd717e489e165f6e0b525205ec4c382c24e6fd4ad7b4
EBUILD dita-ot-bin-4.2.3.ebuild 872 BLAKE2B a7c56ff7a3d43315004e76138ce0744b268592e8ee0d10e2a0188133b1d5cab64c5c980240c33ecd89fc39ffec57652733e5d4b6bb37a20db53abdbd7c540b58 SHA512 b85dc2da1832754f886c68bbfbb888379aa77db121f877e947f12a60212e0396d133a69cedd8a08be8cb18a6e20b0710b1213b4a754e9620a5ec7ea78217e0c1
EBUILD dita-ot-bin-4.2.4.ebuild 868 BLAKE2B a8719330f7a8eb5fd8dec9a621711122a98a94b0db8045ce28e5c7f2433c351883c9303918ffdd5accf01f013c4c69b0cce63e91c0f660ed0398a682c6f3fe4d SHA512 591c6b181e3d19ebc6c0dc7e58799f7ec69bbb28e4374d2c48289650d6c0103fbd72e94eecaab349730875fa43154231dc70b484dac2f0d1879a89ad578c1e62
-EBUILD dita-ot-bin-4.3.ebuild 873 BLAKE2B 04fe5114b3ae4bd9bad68565d5fd2db7342952a2aa44ade1c2635b0adc6a2ed584c41a5a3905a62c3809f406a0ca703a620815b89856ff3371006ae177a64408 SHA512 019bfae1a788236a9549a9b4804de5c4212dc17835e03539ad69babccacf3d29d84366bff97feedd6f34576d67d74fbc7c04a48becad3c9d7933f5651786c90f
+EBUILD dita-ot-bin-4.3-r1.ebuild 991 BLAKE2B 23fe5b270e0770a68b99399d3de9d6b7af0b8705cf86d6c6a635d1ddb0c107233919e0e378b19afbf9ef6143f8d2aa9d5b801aed402bade4b394996a7ebdfd94 SHA512 96c2052eee6a0cb4b7e166861cd2b5579b657d0816bcc3ff97c7dc900d45a8d72f0266566402ebfeeaa1fca6fd0568088b22d88671705ee3731153cef3364733
MISC metadata.xml 329 BLAKE2B 713308403908ea1b884e57947d7bac6ea492d6fe91f17025d76cead1f3b5649cc1ba4b3a96abbbd7b0c0cbfbaa6d91c0387c70d3b71efef7b3082d42331bf0ca SHA512 7c4c9ab356cf0c5d12fcd32416c6a8a4c1d742040a553447e76326aab8d276b566355159474c0ed3de3877ed056e5ef108069c69d80a56d9ad39399cdde69fa9
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
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