Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--dev-java/diablo-jdk/ChangeLog8
-rw-r--r--dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild131
-rw-r--r--dev-java/diablo-jdk/files/diablo-jdk-1.5.env17
-rw-r--r--dev-java/diablo-jre-bin/ChangeLog8
-rw-r--r--dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild109
-rw-r--r--dev-java/diablo-jre-bin/files/diablo-jre-bin-1.5.env16
6 files changed, 12 insertions, 277 deletions
diff --git a/dev-java/diablo-jdk/ChangeLog b/dev-java/diablo-jdk/ChangeLog
index 32c9fa22f057..cd5868b811a9 100644
--- a/dev-java/diablo-jdk/ChangeLog
+++ b/dev-java/diablo-jdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/diablo-jdk
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.9 2008/10/15 13:35:24 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.10 2010/03/11 10:42:38 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -diablo-jdk-1.5.0.07.01.ebuild, -files/diablo-jdk-1.5.env:
+ remove old
15 Oct 2008; Alexis Ballier <aballier@gentoo.org>
files/diablo-jdk-1.5.env:
diff --git a/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild b/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild
deleted file mode 100644
index 368902da7954..000000000000
--- a/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.5.0.07.01.ebuild,v 1.6 2007/07/22 09:45:06 graaff Exp $
-
-inherit java-vm-2 eutils versionator
-
-DESCRIPTION="Java Development Kit"
-HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
-MY_PV=$(replace_version_separator 3 '_')
-MY_PVL=$(get_version_component_range 1-3)
-
-javafile="diablo-caffe-freebsd6-i386-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"
-
-SRC_URI="$javafile"
-
-LICENSE="sun-bcla-java-vm"
-SLOT="1.5"
-KEYWORDS="-* ~x86-fbsd"
-RESTRICT="fetch"
-IUSE="X examples nsplugin jce"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/server/libjvm.so opt/${P}/jre/lib/i386/client/libjvm.so"
-
-DEPEND="jce? ( =dev-java/sun-jce-bin-1.5.0* )"
-RDEPEND="X? ( x11-libs/libICE
- x11-libs/libSM
- x11-libs/libX11
- x11-libs/libXau
- x11-libs/libXdmcp
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXp
- x11-libs/libXt
- x11-libs/libXtst
- )
- =sys-freebsd/freebsd-lib-6*
- =virtual/libstdc++-3.3*
- ${DEPEND}"
-
-JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
-S="${WORKDIR}/diablo-jdk$(get_version_component_range 1-4 ${MY_PV})"
-
-pkg_nofetch() {
- einfo "Please download ${javafile} from:"
- einfo "${HOMEPAGE}"
- einfo "and move it to ${DISTDIR}"
-}
-
-src_install() {
- cd "${S}"
- local dirs="bin include jre lib man"
-
- dodir /opt/${P}
-
- for i in $dirs ; do
- cp -pPR $i "${D}"/opt/${P}/ || die "failed to build"
- done
-
- dodoc COPYRIGHT README.html
- dohtml README.html
-
- dodir /opt/${P}/share/
-
- cp -pPR src.zip "${D}"/opt/${P}/share/
-
- if use examples; then
- cp -pPR demo "${D}"/opt/${P}/share/
- cp -pRR sample "${D}"/opt/${P}/share/
- fi
-
- if use jce ; then
- cd "${D}"/opt/${P}/jre/lib/security
- dodir /opt/${P}/jre/lib/security/strong-jce
- mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
- mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
- dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
- dosym /opt/sun-jce-bin-1.5.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
- fi
-
- if use nsplugin; then
- install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns7/libjavaplugin_oji.so
- fi
-
- # Change libz.so.3 to libz.so.1
- scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${P}/ | \
- while read i; do
- if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; then
- export SANITY_CHECK_LIBZ_FAILED=1
- break
- fi
- sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
- done
- [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-
- # create dir for system preferences
- dodir /opt/${P}/jre/.systemPrefs
- # Create files used as storage for system preferences.
- touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
- chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
- touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
- chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-
- # install control panel for Gnome/KDE
- sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
- -e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
- "${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
- ${T}/sun_java-${SLOT}.desktop
-
- domenu ${T}/sun_java-${SLOT}.desktop
-
- set_java_env
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if ! use X; then
- local xwarn="X11 libraries and/or"
- fi
-
- echo
- ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
- ewarn "Be careful which Java libraries you attempt to use."
-
- echo
- elog "Be careful: ${P}'s Java compiler uses"
- elog "'-source 1.5' as default. Some keywords such as 'enum'"
- elog "are not valid identifiers any more in that mode,"
- elog "which can cause incompatibility with certain sources."
-}
diff --git a/dev-java/diablo-jdk/files/diablo-jdk-1.5.env b/dev-java/diablo-jdk/files/diablo-jdk-1.5.env
deleted file mode 100644
index 5f711888c587..000000000000
--- a/dev-java/diablo-jdk/files/diablo-jdk-1.5.env
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/files/diablo-jdk-1.5.env,v 1.2 2008/10/15 13:35:24 aballier Exp $
-
-VERSION="Diablo JDK @PV@"
-JAVA_HOME=/opt/@P@
-JDK_HOME=/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="/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/diablo-jre-bin/ChangeLog b/dev-java/diablo-jre-bin/ChangeLog
index 48923657c5e1..81b361f81437 100644
--- a/dev-java/diablo-jre-bin/ChangeLog
+++ b/dev-java/diablo-jre-bin/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/diablo-jre-bin
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.6 2008/10/15 13:36:46 aballier Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/ChangeLog,v 1.7 2010/03/11 10:43:33 aballier Exp $
+
+ 11 Mar 2010; Alexis Ballier <aballier@gentoo.org>
+ -diablo-jre-bin-1.5.0.07.01.ebuild, -files/diablo-jre-bin-1.5.env:
+ remove old
15 Oct 2008; Alexis Ballier <aballier@gentoo.org>
files/diablo-jre-bin-1.5.env:
diff --git a/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild b/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild
deleted file mode 100644
index de28da7ddfb8..000000000000
--- a/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/diablo-jre-bin-1.5.0.07.01.ebuild,v 1.5 2007/07/23 17:13:45 mr_bones_ Exp $
-
-inherit java-vm-2 eutils versionator
-
-DESCRIPTION="Java Runtime Environment"
-HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
-MY_PV=$(replace_version_separator 3 '_')
-MY_PVA=$(replace_version_separator 4 '-b' ${MY_PV})
-
-SRC_URI="diablo-latte-freebsd6-i386-${MY_PVA}.tar.bz2"
-
-LICENSE="sun-bcla-java-vm"
-SLOT="1.5"
-KEYWORDS="-* ~x86-fbsd"
-RESTRICT="fetch"
-IUSE="X nsplugin"
-
-QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/motif21/libmawt.so opt/${P}/jre/lib/i386/server/libjvm.so opt/${P}/jre/lib/i386/client/libjvm.so"
-
-JAVA_VM_NO_GENERATION1=true
-
-DEPEND=""
-RDEPEND="X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXi
- x11-libs/libXp
- x11-libs/libXt
- x11-libs/libXtst
- )
- =sys-freebsd/freebsd-lib-6*
- =virtual/libstdc++-3.3*"
-
-S="${WORKDIR}/diablo-jre$(get_version_component_range 1-4 ${MY_PV})"
-
-pkg_nofetch() {
- einfo "Please download ${SRC_URI} from:"
- einfo "${HOMEPAGE}"
- einfo "and move it to ${DISTDIR}"
-}
-
-src_install() {
- cd "${S}"
- local dirs="bin lib man plugin javaws"
-
- dodir /opt/${P}
-
- for i in $dirs ; do
- cp -pPR $i ${D}/opt/${P}/ || die "failed to build"
- done
-
- dodoc COPYRIGHT README
- dohtml Welcome.html
-
- if use nsplugin; then
- install_mozilla_plugin /opt/${P}/plugin/i386/ns7/libjavaplugin_oji.so
- fi
-
- # Change libz.so.3 to libz.so.1
- scanelf -qR -N libz.so.3 -F "#N" "${D}"/opt/${P}/ | \
- while read i; do
- if [[ $(strings "$i" | fgrep -c libz.so.3) -ne 1 ]]; then
- export SANITY_CHECK_LIBZ_FAILED=1
- break
- fi
- sed -i -e 's/libz\.so\.3/libz.so.1/g' "$i"
- done
- [[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.3 to libz.so.1"
-
- # create dir for system preferences
- dodir /opt/${P}/.systemPrefs
-
- # install control panel for Gnome/KDE
- sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}/" \
- -e "s/\(Name=Java\)/\1 Control Panel/" \
- ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \
- ${T}/sun_java-jre.desktop
-
- domenu ${T}/sun_java-jre.desktop
-
- set_java_env
-}
-
-pkg_postinst() {
- # Create files used as storage for system preferences.
- PREFS_LOCATION=/opt/${P}/
- mkdir -p "${PREFS_LOCATION}"/.systemPrefs
- if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.system.lock ] ; then
- touch "${PREFS_LOCATION}"/.systemPrefs/.system.lock
- chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.system.lock
- fi
- if [ ! -f "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile ] ; then
- touch "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
- chmod 644 "${PREFS_LOCATION}"/.systemPrefs/.systemRootModFile
- fi
-
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if ! use X; then
- local xwarn="X11 libraries and/or"
- fi
-
- echo
- ewarn "Some parts of Sun's JRE require ${xwarn} virtual/lpr to be installed."
- ewarn "Be careful which Java libraries you attempt to use."
-}
diff --git a/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.5.env b/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.5.env
deleted file mode 100644
index 6cdf1957ea5f..000000000000
--- a/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.5.env
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jre-bin/files/diablo-jre-bin-1.5.env,v 1.2 2008/10/15 13:36:46 aballier Exp $
-
-VERSION="Diablo JRE @PV@"
-JAVA_HOME=/opt/@P@
-JRE_HOME=/opt/@P@
-PATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/javaws"
-LDPATH="${JAVA_HOME}/lib/@PLATFORM@/:${JAVA_HOME}/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/lib/@PLATFORM@/xawt/:${JAVA_HOME}/lib/@PLATFORM@/server/"
-MANPATH="/opt/@P@/man"
-PROVIDES_TYPE="JRE"
-PROVIDES_VERSION="1.5"
-BOOTCLASSPATH="${JAVA_HOME}/lib/rt.jar:${JAVA_HOME}/lib/i18n.jar:${JAVA_HOME}/lib/sunrsasign.jar:${JAVA_HOME}/lib/jsse.jar:${JAVA_HOME}/lib/jce.jar:${JAVA_HOME}/lib/charsets.jar"
-GENERATION="2"
-ENV_VARS="JAVA_HOME JRE_HOME PATH ROOTPATH LDPATH MANPATH"