Skip to content

Commit

Permalink
dev-java/openjdk: QA: fix dosym usage
Browse files Browse the repository at this point in the history
Package-Manager: Portage-2.3.86, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <[email protected]>
  • Loading branch information
gyakovlev committed Jan 28, 2020
1 parent 3e8fe4e commit b243425
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions dev-java/openjdk/openjdk-11.0.5_p10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die

dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts

# must be done before running itself
java-vm_set-pax-markings "${ddest}"
Expand All @@ -248,7 +248,7 @@ src_install() {
if use doc ; then
docinto html
dodoc -r "${S}"/build/*-release/images/docs/*
dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}

Expand Down
4 changes: 2 additions & 2 deletions dev-java/openjdk/openjdk-11.0.6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die

dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts
dosym ../../../../../etc/ssl/certs/java/cacerts "${dest}"/lib/security/cacerts

# must be done before running itself
java-vm_set-pax-markings "${ddest}"
Expand All @@ -248,7 +248,7 @@ src_install() {
if use doc ; then
docinto html
dodoc -r "${S}"/build/*-release/images/docs/*
dosym "${EPREFIX}"/usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
dosym ../../../usr/share/doc/"${PF}" /usr/share/doc/"${PN}-${SLOT}"
fi
}

Expand Down
2 changes: 1 addition & 1 deletion dev-java/openjdk/openjdk-8.222_p10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die

dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts

use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
java-vm_set-pax-markings "${ddest}"
Expand Down
2 changes: 1 addition & 1 deletion dev-java/openjdk/openjdk-8.232_p09.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die

dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts

use gentoo-vm && java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
java-vm_set-pax-markings "${ddest}"
Expand Down
2 changes: 1 addition & 1 deletion dev-java/openjdk/openjdk-8.242.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ src_install() {
dodir "${dest}"
cp -pPR * "${ddest}" || die

dosym "${EPREFIX}"/etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts
dosym ../../../../../../etc/ssl/certs/java/cacerts "${dest}"/jre/lib/security/cacerts

java-vm_install-env "${FILESDIR}"/${PN}-${SLOT}.env.sh
java-vm_set-pax-markings "${ddest}"
Expand Down

0 comments on commit b243425

Please sign in to comment.