sparc64-multilib fixes.

diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog
index 012edb0cba877d28caff53ae15a98ec0415d4e69..bf7c033d153cb229aa9841f76861f015ea100f35 100644 (file)
--- a/dev-java/blackdown-jdk/ChangeLog
+++ b/dev-java/blackdown-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/blackdown-jdk
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.67 2004/12/23 12:44:26 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/ChangeLog,v 1.68 2005/01/01 04:19:38 eradicator Exp $
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  blackdown-jdk-1.4.1-r1.ebuild, blackdown-jdk-1.4.2.01-r1.ebuild,
+  blackdown-jdk-1.4.2.01.ebuild:
+  sparc64-multilib fixes.
 
 *blackdown-jdk-1.4.2.01-r1 (23 Dec 2004)
 

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild
index 9871df0d18ddf0e7986d3c8559fe29c44a782463..dfee447ab2c7a719336fde80cbbf17ddd9da899b 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.1 2004/11/25 13:27:22 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild,v 1.2 2005/01/01 04:19:38 eradicator Exp $
 
 
 inherit java
@@ -102,7 +102,7 @@ src_install() {
        set_java_env ${FILESDIR}/${VMHANDLE} || die
 
        # Fix for bug 26629
-       if [ "${PROFILE_ARCH}" = "sparc64" ]
+       if [ "${PROFILE_ARCH}" = "sparc64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ]
        then
                dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
        fi

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
index 134f7cf11f12951bc1bfa8cd1234a62a63d02823..9aeb834455bdd3c5af1bd1fb5b871b32db78485d 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild,v 1.2 2004/12/23 12:44:26 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild,v 1.3 2005/01/01 04:19:38 eradicator Exp $
 
 inherit java versionator
 
@@ -116,7 +116,7 @@ src_install() {
        set_java_env ${FILESDIR}/${VMHANDLE} || die
 
        # Fix for bug 26629
-       if [ "${PROFILE_ARCH}" = "sparc64" ]
+       if [ "${PROFILE_ARCH}" = "sparc64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ]
        then
                dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
        fi

diff --git a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
index b1c274a3c6250df5e1ee70b91f5024947d351982..4792d200849262835f0ef49fc9475a81f20eb12c 100644 (file)
--- a/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
+++ b/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild,v 1.2 2004/11/26 12:46:53 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild,v 1.3 2005/01/01 04:19:38 eradicator Exp $
 
 inherit java versionator
 
@@ -114,7 +114,7 @@ src_install() {
        set_java_env ${FILESDIR}/${VMHANDLE} || die
 
        # Fix for bug 26629
-       if [ "${PROFILE_ARCH}" = "sparc64" ]
+       if [ "${PROFILE_ARCH}" = "sparc64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ]
        then
                dosym /opt/${P}/jre/lib/sparc /opt/${P}/jre/lib/sparc64
        fi

diff --git a/dev-java/blackdown-jre/ChangeLog b/dev-java/blackdown-jre/ChangeLog
index 7373ab86e86b0083a8d98a99c693ee2c7d3419fe..fa6cc6debe3e1b112e494f33977d6c14f683ddfa 100644 (file)
--- a/dev-java/blackdown-jre/ChangeLog
+++ b/dev-java/blackdown-jre/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/blackdown-jre
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.52 2004/11/29 19:11:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/ChangeLog,v 1.53 2005/01/01 04:22:39 eradicator Exp $
+
+  31 Dec 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  blackdown-jre-1.4.1-r1.ebuild, blackdown-jre-1.4.2.01.ebuild:
+  sparc64-multilib fixes.
 
 *blackdown-jre-1.4.1-r1 (29 Nov 2004)
 

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild
index be384298f4f871dde0937704e3d3b1325dcb481c..d274462c7de2d88517be3aac0111d74290f77ac5 100644 (file)
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.1 2004/11/29 19:11:47 axxo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild,v 1.2 2005/01/01 04:22:39 eradicator Exp $
 
 inherit java gcc
 
@@ -85,7 +85,7 @@ src_install () {
        set_java_env ${FILESDIR}/${VMHANDLE}
 
        # Fix for bug #26629.
-       if [ "${PROFILE_ARCH}" = "sparc64" ]
+       if [ "${PROFILE_ARCH}" = "sparc64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ]
        then
                sed -i -e 's/\/\//\/sparc\//g' \
                        ${D}/etc/env.d/java/20blackdown-jre-1.4.1

diff --git a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild
index d9cd429fe379e91ed63b6830aab7312846d723a1..1bd785e107f524ad555c3623c969e885122b84cf 100644 (file)
--- a/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild
+++ b/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild,v 1.3 2004/12/14 21:13:00 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild,v 1.4 2005/01/01 04:22:39 eradicator Exp $
 
 inherit java versionator
 
@@ -113,7 +113,7 @@ src_install () {
        set_java_env ${FILESDIR}/${VMHANDLE} || die
 
        # Fix for bug 26629
-       if [ "${PROFILE_ARCH}" = "sparc64" ]
+       if [ "${PROFILE_ARCH}" = "sparc64" -o "${PROFILE_ARCH}" = "sparc64-multilib" ]
        then
                dosym /opt/${P}/lib/sparc /opt/${P}/lib/sparc64
        fi