summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
authorJan Meier2010-12-28 17:22:29 +0000
committerQuentin Glidic2013-01-28 17:36:11 +0100
commit5d39261591bcd9218442970a299f66f7d7702d7d (patch)
treea90e4615d24048ba2cdb8767cecb7e75af685037 /packages
parent0e6dc348219b50588f6ae527ddd180109b8ed92d (diff)
downloadsardemff7-pending-5d39261591bcd9218442970a299f66f7d7702d7d.tar.xz
Remove sun-jdk-bin-1.5.0-r1
Diffstat (limited to 'packages')
-rw-r--r--packages/dev-lang/sun-jdk-bin/sun-jdk-bin-1.5.0.22-r1.exheres-010
-rw-r--r--packages/dev-lang/sun-jdk-bin/sun-jdk-bin.exlib15
2 files changed, 2 insertions, 23 deletions
diff --git a/packages/dev-lang/sun-jdk-bin/sun-jdk-bin-1.5.0.22-r1.exheres-0 b/packages/dev-lang/sun-jdk-bin/sun-jdk-bin-1.5.0.22-r1.exheres-0
deleted file mode 100644
index b5b3f34..0000000
--- a/packages/dev-lang/sun-jdk-bin/sun-jdk-bin-1.5.0.22-r1.exheres-0
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2009 Sterling X. Winter <replica@exherbo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-SLOT="$(ever range 1-2)"
-require sun-jdk-bin
-
-PLATFORMS="~amd64"
-
-UPSTREAM_DOCUMENTATION="http://java.sun.com/j2se/1.5.0/docs/api/ [[ lang = en ]]"
-
diff --git a/packages/dev-lang/sun-jdk-bin/sun-jdk-bin.exlib b/packages/dev-lang/sun-jdk-bin/sun-jdk-bin.exlib
index 8a157b2..6797611 100644
--- a/packages/dev-lang/sun-jdk-bin/sun-jdk-bin.exlib
+++ b/packages/dev-lang/sun-jdk-bin/sun-jdk-bin.exlib
@@ -1,15 +1,9 @@
# Copyright 2009 Sterling X. Winter <replica@exherbo.org>
# Distributed under the terms of the GNU General Public License v2
-# This currently doesn't handle :1.4, it's only for :1.5 and :1.6.
-
require java [ virtual_jdk_and_jre_deps=false ] java-jdk [ use_versioned_java_home=${SLOT} ] multilib
-if [[ ${SLOT} == 1.5 ]] ; then
- MY_PV="5.0u$(ever range 4)"
-else
- MY_PV="$(ever range 2)u$(ever range 4)"
-fi
+MY_PV="$(ever range 2)u$(ever range 4)"
MY_PN_AMD64="jdk-${MY_PV}-dlj-linux-amd64"
MY_PN_X86="jdk-${MY_PV}-dlj-linux-i586"
@@ -73,7 +67,7 @@ DEPENDENCIES="
RESTRICT="strip"
-BUGS_TO="replica@exherbo.org"
+BUGS_TO="jan@codejunky.org"
WORK="${WORKBASE}"/jdk$(ever replace 3 _)
@@ -86,11 +80,6 @@ src_compile() {
# JDK bundles, so do it manually. CDS isn't supported at all for 64-bit.
# http://java.sun.com/javase/6/docs/technotes/guides/vm/class-data-sharing.html
if option platform:x86 ; then
- if ever at_least 1.5 ${SLOT} ; then
- einfo "Generating Class Data Sharing archive for the client VM"
- edo nonfatal "${WORK}"/bin/java -client -Xshare:dump ||
- ewarn "Unable to create CDS archive for client VM on this platform"
- fi
if ever at_least 1.6 ${SLOT} ; then
einfo "Generating Class Data Sharing archive for the server VM"
edo nonfatal "${WORK}"/bin/java -server -Xshare:dump ||