From 1bb8e47b133f245ec9a1ef658ac3dfb54eef84eb Mon Sep 17 00:00:00 2001 From: Joshua Nichols Date: Wed, 16 Aug 2006 08:10:11 +0000 Subject: Version bump, bug #143970 (Portage version: 2.1.1_pre4-r4) --- dev-java/sun-jdk/ChangeLog | 9 +- dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.08 | 6 + dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild | 5 +- dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild | 5 +- dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild | 5 +- dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild | 5 +- dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild | 181 +++++++++++++++++++++++++ 7 files changed, 207 insertions(+), 9 deletions(-) create mode 100644 dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.08 create mode 100644 dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild (limited to 'dev-java/sun-jdk') diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog index 7fb62de8a92c..56e94d2ea0c3 100644 --- a/dev-java/sun-jdk/ChangeLog +++ b/dev-java/sun-jdk/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/sun-jdk # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.154 2006/07/29 19:24:05 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.155 2006/08/16 08:10:11 nichoj Exp $ + +*sun-jdk-1.5.0.08 (16 Aug 2006) + + 16 Aug 2006; Joshua Nichols sun-jdk-1.5.0.07.ebuild, + sun-jdk-1.5.0.07-r1.ebuild, sun-jdk-1.5.0.07-r2.ebuild, + sun-jdk-1.5.0.07-r3.ebuild, +sun-jdk-1.5.0.08.ebuild: + Version bump, bug #143970 *sun-jdk-1.5.0.07-r3 (29 Jul 2006) *sun-jdk-1.4.2.12-r1 (29 Jul 2006) diff --git a/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.08 b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.08 new file mode 100644 index 000000000000..89b29a996b47 --- /dev/null +++ b/dev-java/sun-jdk/files/digest-sun-jdk-1.5.0.08 @@ -0,0 +1,6 @@ +MD5 e6388e30448ffd7ccaaca3cfc0708e44 jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 +RMD160 c6669cba980b9097c6921041ee3af8753587ea37 jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 +SHA256 a4a4baa5488c7be8b109ed6c1f460a8b30861ae546c050c319de41e987bc857f jdk-1_5_0_08-dlj-linux-amd64.bin 43854617 +MD5 3e2935cca24ceb54dd2181892a3d5456 jdk-1_5_0_08-dlj-linux-i586.bin 49498712 +RMD160 11c01f6391cec0476a3d96306a7bee7ec82d8425 jdk-1_5_0_08-dlj-linux-i586.bin 49498712 +SHA256 e96ebeefb5116182c01f6e3fb306d24f1b81ba6849b76b0d4705051b01647ce8 jdk-1_5_0_08-dlj-linux-i586.bin 49498712 diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild index 7d6c8da97bac..2023ae617f23 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild,v 1.1 2006/07/23 16:40:48 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07-r1.ebuild,v 1.2 2006/08/16 08:10:11 nichoj Exp $ inherit java-vm-2 eutils @@ -20,7 +20,8 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/jdk-${MY_PVA}-distro-linux SLOT="1.5" LICENSE="dlj-1.1" KEYWORDS="~x86 ~amd64 -*" -RESTRICT="nostrip" +# Restrict stricter because of textrels +RESTRICT="nostrip stricter" IUSE="X alsa doc examples nsplugin" JAVA_VM_NO_GENERATION1=true diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild index d9021261e310..73d140bd6f0a 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild,v 1.2 2006/07/29 19:24:05 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07-r2.ebuild,v 1.3 2006/08/16 08:10:11 nichoj Exp $ inherit java-vm-2 eutils @@ -20,7 +20,8 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/jdk-${MY_PVA}-distro-linux SLOT="1.5" LICENSE="dlj-1.1" KEYWORDS="~x86 ~amd64 -*" -RESTRICT="nostrip" +# Restrict stricter because of textrels +RESTRICT="nostrip stricter" IUSE="X alsa doc examples jce nsplugin" JAVA_VM_NO_GENERATION1=true diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild index 2c2078b7bd7f..b22bb8864d67 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild,v 1.1 2006/07/29 19:24:05 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07-r3.ebuild,v 1.2 2006/08/16 08:10:11 nichoj Exp $ inherit java-vm-2 eutils @@ -20,7 +20,8 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/jdk-${MY_PVA}-distro-linux SLOT="1.5" LICENSE="dlj-1.1" KEYWORDS="~x86 ~amd64 -*" -RESTRICT="nostrip" +# Restrict stricter because of textrels +RESTRICT="nostrip stricter" IUSE="X alsa doc examples jce nsplugin" JAVA_VM_NO_GENERATION1=true diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild index 7af6daaa1e55..53157560fafa 100644 --- a/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild,v 1.3 2006/07/06 10:46:51 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.07.ebuild,v 1.4 2006/08/16 08:10:11 nichoj Exp $ inherit java-vm-2 eutils @@ -26,7 +26,8 @@ SRC_URI="x86? ( $x86file ) amd64? ( $amd64file ) SLOT="1.5" LICENSE="sun-bcla-java-vm" KEYWORDS="~x86 ~amd64 -*" -RESTRICT="fetch nostrip " +# Restrict stricter because of textrels +RESTRICT="fetch nostrip stricter" IUSE="X alsa doc examples nsplugin jce" JAVA_VM_NO_GENERATION1=true diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild new file mode 100644 index 000000000000..9cdc7c3c44bf --- /dev/null +++ b/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild @@ -0,0 +1,181 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.08.ebuild,v 1.1 2006/08/16 08:10:11 nichoj Exp $ + +inherit java-vm-2 eutils + +MY_PVL=${PV%.*}_${PV##*.} +MY_PVA=${PV//./_} +S="${WORKDIR}/jdk${MY_PVL}" + +X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" +AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" +if use x86; then + At=${X86_AT} +elif use amd64; then + At=${AMD64_AT} +fi +DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" +HOMEPAGE="http://java.sun.com/j2se/1.5.0/" +SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) + amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" +SLOT="1.5" +LICENSE="dlj-1.1" +KEYWORDS="~x86 ~amd64 -*" +# Restrict stricter because of textrels +RESTRICT="nostrip stricter" +IUSE="X alsa doc examples jce nsplugin" + +JAVA_VM_NO_GENERATION1=true + +# +DEPEND=">=dev-java/java-config-1.2 + sys-apps/sed + doc? ( =dev-java/java-sdk-docs-1.5.0* ) + jce? ( =dev-java/sun-jce-bin-1.5.0* )" + +RDEPEND="alsa? ( media-libs/alsa-lib ) + doc? ( =dev-java/java-sdk-docs-1.5.0* ) + 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 + ) + virtual/x11 + ) + )" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +PACKED_JARS="lib/tools.jar jre/lib/rt.jar jre/lib/jsse.jar jre/lib/charsets.jar jre/lib/ext/localedata.jar jre/lib/plugin.jar jre/lib/javaws.jar jre/lib/deploy.jar" + +# this is needed for proper operating under a PaX kernel without activated grsecurity acl +CHPAX_CONSERVATIVE_FLAGS="pemsv" + +#FETCH_SDK="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jdk-${MY_PVL}-oth-JPR&SiteId=JSC&TransactionId=noreg" +#FETCH_JCE="http://javashoplm.sun.com/ECom/docs/Welcome.jsp?StoreId=22&PartDetailId=jce_policy-${PV%.*}-oth-JPR&SiteId=JSC&TransactionId=noreg" + + +src_unpack() { + if [ ! -r ${DISTDIR}/${At} ]; then + die "cannot read ${At}. Please check the permission and try again." + fi +# if use jce; then +# if [ ! -r ${DISTDIR}/${jcefile} ]; then +# die "cannot read ${jcefile}. Please check the permission and try again." +# fi +# fi + + sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack" + + ${S}/bin/java -client -Xshare:dump +} + +src_install() { + local dirs="bin include jre lib man" + dodir /opt/${P} + + for i in $dirs ; do + cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" + 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/ + if ( use x86 || use amd64 ); then + cp -pPR sample ${D}/opt/${P}/share/ + fi + 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 + local plugin_dir="ns7-gcc29" + if has_version '>=sys-devel/gcc-3' ; then + plugin_dir="ns7" + fi + + if use x86 ; then + install_mozilla_plugin /opt/${P}/jre/plugin/i386/$plugin_dir/libjavaplugin_oji.so + else + eerror "No plugin available for amd64 arch" + fi + fi + + # 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 chpax is on the target system, set the appropriate PaX flags + # this will not hurt the binary, it modifies only unused ELF bits + # but may confuse things like AV scanners and automatic tripwire + if has_version sys-apps/chpax + then + echo + einfo "setting up conservative PaX flags for jar, javac and java" + + for paxkills in "jar" "javac" "java" "javah" "javadoc" + do + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/bin/$paxkills + done + + # /opt/$VM/jre/bin/java_vm + chpax -${CHPAX_CONSERVATIVE_FLAGS} /opt/${P}/jre/bin/java_vm + + einfo "you should have seen lots of chpax output above now" + ewarn "make sure the grsec ACL contains those entries also" + ewarn "because enabling it will override the chpax setting" + ewarn "on the physical files - help for PaX and grsecurity" + ewarn "can be given by #gentoo-hardened + hardened@gentoo.org" + fi + + if ! use X; then + local xwarn="virtual/x11 and/or" + fi + + echo + ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." + ewarn "Be careful which Java libraries you attempt to use." + + echo + einfo " Be careful: ${P}'s Java compiler uses" + einfo " '-source 1.5' as default. Some keywords such as 'enum'" + einfo " are not valid identifiers any more in that mode," + einfo " which can cause incompatibility with certain sources." +} -- cgit v1.2.3-65-gdbad