[gentoo-commits] proj/java:master commit in: dev-java/cacao/

[Andrew John Hughes]

commit:     bce5025738d771b4931527f10d7932c7f5ab0f98
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Tue Nov  6 20:14:07 2018 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Thu Jan  3 05:03:34 2019 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=bce50257

dev-java/cacao: Use relative symlinks as suggested by repoman

Package-Manager: Portage-2.3.50, Repoman-2.3.10

Signed-off-by: Andrew John Hughes <gnu_andrew <AT> member.fsf.org>

 dev-java/cacao/ChangeLog             |  4 ++++
 dev-java/cacao/cacao-1.6.0-r4.ebuild | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index 0512ca95..0451cb93 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2018 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.22 2012/06/14 
21:25:44 radhermit Exp $
 
+  06 Nov 2018; Andrew John Hughes <gnu_and...@member.fsf.org>
+  cacao-1.6.0-r4.ebuild:
+  dev-java/cacao: Use relative symlinks as suggested by repoman
+
 *cacao-1.6.0-r4 (03 Nov 2018)
 
   03 Nov 2018; Andrew John Hughes <gnu_and...@member.fsf.org>

diff --git a/dev-java/cacao/cacao-1.6.0-r4.ebuild 
b/dev-java/cacao/cacao-1.6.0-r4.ebuild
index 1c56a1d1..8b57d2b5 100644
--- a/dev-java/cacao/cacao-1.6.0-r4.ebuild
+++ b/dev-java/cacao/cacao-1.6.0-r4.ebuild
@@ -61,16 +61,16 @@ src_install() {
 
        emake DESTDIR="${D}" install || die "make install failed"
        dodir /usr/bin
-       dosym /usr/libexec/${PN}/cacao /usr/bin/cacao || die
+       dosym ../libexec/${PN}/cacao /usr/bin/cacao || die
        dodoc AUTHORS ChangeLog* NEWS README || die "failed to install docs"
 
        dodir ${JDK_DIR}/bin
-       dosym /usr/libexec/${PN}/cacao ${JDK_DIR}/bin/java
+       dosym ../../../libexec/${PN}/cacao ${JDK_DIR}/bin/java
 
        dodir ${JDK_DIR}/jre/lib
-       dosym /usr/share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
+       dosym ../../../../share/classpath/glibj.zip ${JDK_DIR}/jre/lib/rt.jar
        dodir ${JDK_DIR}/lib
-       dosym /usr/share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
+       dosym ../../../share/classpath/tools.zip ${JDK_DIR}/lib/tools.jar
 
        exeinto ${JDK_DIR}/bin
        for files in ${CLASSPATH_DIR}/g*; do
@@ -97,15 +97,15 @@ src_install() {
        [ ${ARCH} == x86_64 ] && libarch="amd64"
        dodir ${JDK_DIR}/jre/lib/${libarch}/client
        dodir ${JDK_DIR}/jre/lib/${libarch}/server
-       dosym /usr/${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
-       dosym /usr/${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
-       dosym /usr/${libdir}/classpath/libjawt.so 
${JDK_DIR}/jre/lib/${libarch}/libjawt.so
+       dosym ../../../../../../${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
+       dosym ../../../../../../${libdir}/${PN}/libjvm.so 
${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
+       dosym ../../../../../${libdir}/classpath/libjawt.so 
${JDK_DIR}/jre/lib/${libarch}/libjawt.so
        set_java_env
 
        # Can't use java-vm_set-pax-markings as doesn't work with symbolic links
        # Ensure a PaX header is created.
        local pax_markings="C"
-       # Usally disabeling MPROTECT is sufficent.
+       # Usually dislabeling MPROTECT is sufficent.
        local pax_markings+="m"
        # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as 
well.
        use x86 && pax_markings+="sp"