From 448a40b73978a977e83307947814d639e4178b81 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Sat, 1 Jan 2005 04:22:39 +0000 Subject: [PATCH] sparc64-multilib fixes. --- dev-java/blackdown-jdk/ChangeLog | 7 ++++++- dev-java/blackdown-jdk/blackdown-jdk-1.4.1-r1.ebuild | 4 ++-- dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01-r1.ebuild | 4 ++-- dev-java/blackdown-jdk/blackdown-jdk-1.4.2.01.ebuild | 4 ++-- dev-java/blackdown-jre/ChangeLog | 6 +++++- dev-java/blackdown-jre/blackdown-jre-1.4.1-r1.ebuild | 4 ++-- dev-java/blackdown-jre/blackdown-jre-1.4.2.01.ebuild | 4 ++-- 7 files changed, 21 insertions(+), 12 deletions(-) diff --git a/dev-java/blackdown-jdk/ChangeLog b/dev-java/blackdown-jdk/ChangeLog index 012edb0cba87..bf7c033d153c 100644 --- 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 + 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 9871df0d18dd..dfee447ab2c7 100644 --- 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 134f7cf11f12..9aeb834455bd 100644 --- 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 b1c274a3c625..4792d2008492 100644 --- 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 7373ab86e86b..fa6cc6debe3e 100644 --- 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 + 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 be384298f4f8..d274462c7de2 100644 --- 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 d9cd429fe379..1bd785e107f5 100644 --- 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 -- 2.26.2