commit: 3c2fde907ae8fd05c550dbcd623fe059298092eb
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 14 19:27:56 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 14 20:24:04 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c2fde90
dev-java/soylatte-jdk-bin: Remove old and vulnerable JVM (bug #483018)
Java 6 is being removed entirely. The Java 7 version is dead. IcedTea
might work as a maintained alternative for OS X but this is untested.
dev-java/soylatte-jdk-bin/Manifest | 3 -
.../files/soylatte-jdk-bin-1.6.env | 17 ----
.../files/soylatte-jdk-bin-1.7.env | 17 ----
dev-java/soylatte-jdk-bin/metadata.xml | 9 --
.../soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild | 105 ---------------------
.../soylatte-jdk-bin/soylatte-jdk-bin-7.ebuild | 87 -----------------
6 files changed, 238 deletions(-)
diff --git a/dev-java/soylatte-jdk-bin/Manifest
b/dev-java/soylatte-jdk-bin/Manifest
deleted file mode 100644
index 702e151..0000000
--- a/dev-java/soylatte-jdk-bin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST openjdk7-macppc-2009-12-16-b4.tar.bz2 52825661 SHA256
a31b444214de2f9ff7959a8d9fa626f7be446fa612e78af5ac8087ad30de8a42 SHA512
ac856d91d2d80fcbde99e85a2f603746dd05fa40d113770354d1871ee87a8821a83e41332b56b99a24e832d1c3e7ceeca76ec94cccb010a4e086ebb362b2ee28
WHIRLPOOL
24b41b33ed489b4426545567977377186892a10cb3adec159eba6429d124a55da63d5ef4b09ba658872e1fc3a7031846483d51549f6087ec9058e6b069181304
-DIST soylatte16-amd64-1.0.3.tar.bz2 53888225 SHA256
749762d742450a8711acd7ba981969c0056e9373b453d3e97c58af07f5f92c60 SHA512
51e3499eb56c3177c3cef9416e265769757fc8e5b8075a5eb1cbde74fd7b64edb0ab64ba2c2e9751fc21f5fae035e6224a60ffff2ab8808e7f9a4d106ac1d071
WHIRLPOOL
ec3e01cab1c1ddcb126e34b31a1552b65fbc96282e505f672e1e175e14aa22be348f4d3077b93ae711352eee3cbd37271950c4ab246dad58e775210e79f42f90
-DIST soylatte16-i386-1.0.3.tar.bz2 55567606 SHA256
8f389eb9c19336ce18d864ad600edd692c6994259889646d68c2e66494d67ffc SHA512
e19f9755ffea0de8d397c537264334d473ae5678034bed0a04254dc82d9322ab8ae6ddc158d85713fe19c4e51542c46a06cfc7fe86ce17d278673dbd47be3abc
WHIRLPOOL
d8b9ae1ca8674135f6dd10aa511ee9606f255fdfa8d72b75e50d30daec39b4645137a6d02b5142020029a6a0ac0f5a766673d7833acb41e59ed29339e55f13aa
diff --git a/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.6.env
b/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.6.env
deleted file mode 100644
index b34bd73..0000000
--- a/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.6.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="Landon Fuller's @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/soylatte-jdk-bin/files/soylatte-jdk-bin-1.7.env
b/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.7.env
deleted file mode 100644
index 7945935..0000000
--- a/dev-java/soylatte-jdk-bin/files/soylatte-jdk-bin-1.7.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-VERSION="Landon Fuller's OpenJDK @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.7"
-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/soylatte-jdk-bin/metadata.xml
b/dev-java/soylatte-jdk-bin/metadata.xml
deleted file mode 100644
index 41a5dee..0000000
--- a/dev-java/soylatte-jdk-bin/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-<maintainer type="project">
- <email>[email protected]</email>
- <name>Gentoo Prefix</name>
-</maintainer>
-<longdescription>SoyLatte: Java 6 Port for Mac OS X 10.4 and 10.5
(Intel)</longdescription>
-</pkgmetadata>
diff --git a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
deleted file mode 100644
index f69bd3d..0000000
--- a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 multilib
-
-DESCRIPTION="Landon Fuller's Java 6 for Mac OS X 10.4 and 10.5"
-HOMEPAGE="http://landonf.bikemonkey.org/static/soylatte/";
-DLURL="http://landonf.bikemonkey.org/static/soylatte/bsd-dist/javasrc_1_6_jrl_darwin";
-SRC_URI="
- x86-macos? ( ${DLURL}/soylatte16-i386-${PV}.tar.bz2 )
- x64-macos? ( ${DLURL}/soylatte16-amd64-${PV}.tar.bz2 )
-"
-SLOT="1.6"
-LICENSE="sun-jrl"
-KEYWORDS="~x86-macos ~x64-macos"
-IUSE="examples"
-
-RDEPEND="dev-db/unixODBC"
-
-JAVA_PROVIDE="jdbc-stdext"
-
-chdir_s() {
- local MY_P=soylatte16-i386-${PV}
- use x64-macos && MY_P=soylatte16-amd64-${PV}
-
- cd "${WORKDIR}"/${MY_P}
-}
-
-src_prepare() {
- chdir_s
-
- # fix install_names
- local arch=i586
- use x64-macos && arch=amd64
- local
original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-${arch}
- local original_demo=${original_root}/demo
- local original_lib=${original_root}/lib
- for dir in demo jre ; do
- for dynamic_lib in $(find ${dir} -name '*.dylib'); do
- install_name_tool \
- -id "${EPREFIX}"/opt/${P}/${dynamic_lib} \
- ${dynamic_lib}
- for linked_against in $(scanmacho -BF'%n#f'
${dynamic_lib} | tr ',' ' '); do
- case ${linked_against} in
- ${original_lib}/*)
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/opt/${P}/jre${linked_against#${original_root}} \
- ${dynamic_lib}
- ;;
- ${original_demo}/*)
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/opt/${P}${linked_against#${original_root}} \
- ${dynamic_lib}
- ;;
- libjvm.dylib)
- # 64-bits binary has no client,
so default to server JVM
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386/client || echo
amd64/server)/libjvm.dylib \
- ${dynamic_lib}
- ;;
- */libodbc*.dylib)
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/usr/$(get_libdir)/${linked_against##*/} \
- ${dynamic_lib}
- ;;
- esac
- done
- done
- done
-}
-
-src_install() {
- chdir_s
-
- local dirs="bin include jre lib man"
- dodir /opt/${P}
-
- cp -pPR $dirs "${ED}/opt/${P}/" || die "failed to copy"
- dodoc COPYRIGHT || die
- dohtml README.html || die
-
- cp -pP src.zip "${ED}/opt/${P}/" || die
-
- if use examples; then
- cp -pPR demo sample "${ED}/opt/${P}/" || die
- fi
-
- # create dir for system preferences
- dodir /opt/${P}/jre/.systemPrefs
- # Create files used as storage for system preferences.
- touch "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
- chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
- touch "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
- chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
- set_java_env
-}
diff --git a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-7.ebuild
b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-7.ebuild
deleted file mode 100644
index b242918..0000000
--- a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-7.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="3"
-
-JAVA_SUPPORTS_GENERATION_1="true"
-inherit java-vm-2 multilib
-
-DESCRIPTION="Landon Fuller's OpenJDK 7 for Mac OS X 10.5/PPC"
-HOMEPAGE="http://landonf.bikemonkey.org/static/soylatte/";
-SRC_URI="http://landonf.bikemonkey.org/static/soylatte/bsd-dist/openjdk7_darwin/openjdk7-macppc-2009-12-16-b4.tar.bz2";
-SLOT="1.7"
-LICENSE="GPL-2-with-exceptions"
-KEYWORDS="~ppc-macos"
-IUSE="examples"
-
-RDEPEND="dev-db/unixODBC"
-
-JAVA_PROVIDE="jdbc-stdext"
-
-S=${WORKDIR}/openjdk7-macppc-2009-12-16-b4
-
-src_prepare() {
- # fix install_names
- local
original_root=/Users/landonf/Desktop/openjdk-ppc/bsd-port/build/bsd-ppc
- local original_demo=${original_root}/demo
- local original_lib=${original_root}/lib
- for dir in demo jre ; do
- for dynamic_lib in $(find ${dir} -name '*.dylib'); do
- install_name_tool \
- -id "${EPREFIX}"/opt/${P}/${dynamic_lib} \
- ${dynamic_lib}
- for linked_against in $(scanmacho -BF'%n#f'
${dynamic_lib} | tr ',' ' '); do
- case ${linked_against} in
- ${original_lib}/*)
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/opt/${P}/jre${linked_against#${original_root}} \
- ${dynamic_lib}
- ;;
- ${original_demo}/*)
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/opt/${P}${linked_against#${original_root}} \
- ${dynamic_lib}
- ;;
- libjvm.dylib)
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/opt/${P}/jre/lib/ppc/server/libjvm.dylib \
- ${dynamic_lib}
- ;;
- */libodbc*.dylib)
- install_name_tool -change \
- ${linked_against} \
-
"${EPREFIX}"/usr/$(get_libdir)/${linked_against##*/} \
- ${dynamic_lib}
- ;;
- esac
- done
- done
- done
-}
-
-src_install() {
- local dirs="bin include jre lib man"
- dodir /opt/${P}
-
- cp -pPR $dirs "${ED}/opt/${P}/" || die "failed to copy"
-
- cp -pP src.zip "${ED}/opt/${P}/" || die
-
- if use examples; then
- cp -pPR demo sample "${ED}/opt/${P}/" || die
- fi
-
- # create dir for system preferences
- dodir /opt/${P}/jre/.systemPrefs
- # Create files used as storage for system preferences.
- touch "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
- chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
- touch "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
- chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
- set_java_env
-}
