commit: 51315d8fbe66755a783e637bd604b9d6486498d9 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Thu Apr 14 19:36:04 2016 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Thu Apr 14 20:24:06 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51315d8f
dev-java/apple-jdk-bin: Remove obsolete JVM (bug #483018) This didn't actually install a JVM but merely symlinked to OS X's system copy. No doubt Apple stopped shipping Java 6 years ago. dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild | 50 ---------------------- dev-java/apple-jdk-bin/files/apple-jdk-bin-1.4.env | 17 -------- dev-java/apple-jdk-bin/files/apple-jdk-bin-1.5.env | 17 -------- dev-java/apple-jdk-bin/files/apple-jdk-bin-1.6.env | 17 -------- dev-java/apple-jdk-bin/metadata.xml | 8 ---- 5 files changed, 109 deletions(-) diff --git a/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild b/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild deleted file mode 100644 index 3c32c01..0000000 --- a/dev-java/apple-jdk-bin/apple-jdk-bin-1.6.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -JAVA_SUPPORTS_GENERATION_1="true" -inherit java-vm-2 eutils - -DESCRIPTION="Links to Apple's version of Sun's J2SE Development Kit" -HOMEPAGE="http://java.sun.com/j2se/1.6.0/"; -SLOT="1.6" -LICENSE="public-domain" -KEYWORDS="-* ~x64-macos ~x86-macos" -IUSE="" - -JAVA_PROVIDE="jdbc-stdext" - -APPLE_JAVA_DIR="/System/Library/Frameworks/JavaVM.framework/Versions/${PV}/Home" - -pkg_preinst() { - [[ ! -d ${APPLE_JAVA_DIR} ]] && die "Java 6 not installed!" -} - -src_install() { - local dirs="bin include lib man" - dodir /opt/${P} - - for d in ${dirs}; do - ln -s "${APPLE_JAVA_DIR}"/${d} "${ED}"/opt/${P}/${d} - done - # Apple just puts al JRE stuff in the Home dir next to the JDK stuff, - # "emulate" it to make the wrappers happy - ln -s "${APPLE_JAVA_DIR}" "${ED}"/opt/${P}/jre - - # create dir for system preferences - dodir /opt/${P}/.systemPrefs - # Create files used as storage for system preferences. - touch "${ED}/opt/${P}/.systemPrefs/.system.lock" - chmod 644 "${ED}/opt/${P}/.systemPrefs/.system.lock" - touch "${ED}/opt/${P}/.systemPrefs/.systemRootModFile" - chmod 644 "${ED}/opt/${P}/.systemPrefs/.systemRootModFile" - - set_java_env -} - -pkg_postinst() { - # Set as default VM if none exists - java-vm-2_pkg_postinst - - elog "Note: you're using your OSX (pre-)installed Java installation" -} diff --git a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.4.env b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.4.env deleted file mode 100644 index 2b67566..0000000 --- a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.4.env +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -VERSION="Apple's Sun JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin:${JAVA_HOME}/jre/javaws" -LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/classic/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" -MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.4" -BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.5.env b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.5.env deleted file mode 100644 index d7556e6..0000000 --- a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.5.env +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -VERSION="Apple's Sun JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" -MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.5" -BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.6.env b/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.6.env deleted file mode 100644 index bf6ed07..0000000 --- a/dev-java/apple-jdk-bin/files/apple-jdk-bin-1.6.env +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -VERSION="Apple's Sun JDK @PV@" -JAVA_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JDK_HOME="@GENTOO_PORTAGE_EPREFIX@/opt/@P@" -JAVAC=${JAVA_HOME}/bin/javac -PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin" -LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/" -MANPATH="@GENTOO_PORTAGE_EPREFIX@/opt/@P@/man" -PROVIDES_TYPE="JDK JRE" -PROVIDES_VERSION="1.6" -BOOTCLASSPATH="${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/i18n.jar:${JAVA_HOME}/jre/lib/sunrsasign.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar" -GENERATION="2" -ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH" diff --git a/dev-java/apple-jdk-bin/metadata.xml b/dev-java/apple-jdk-bin/metadata.xml deleted file mode 100644 index 0c982d8..0000000 --- a/dev-java/apple-jdk-bin/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="project"> - <email>pre...@gentoo.org</email> - <name>Gentoo Prefix</name> - </maintainer> -</pkgmetadata>
