From b0a03af076eb81493a2c1bd9e197e45ee2f75df6 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Sun, 29 Mar 2009 23:05:43 +0000 Subject: Version bump, security bug #252416. (Portage version: 2.2_rc28/cvs/Linux x86_64) --- dev-java/ibm-jdk-bin/ChangeLog | 9 +- dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.8a.ebuild | 253 -------------------- dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild | 244 -------------------- dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild | 256 +++++++++++++++++++++ 4 files changed, 264 insertions(+), 498 deletions(-) delete mode 100644 dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.8a.ebuild delete mode 100644 dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild create mode 100644 dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild (limited to 'dev-java') diff --git a/dev-java/ibm-jdk-bin/ChangeLog b/dev-java/ibm-jdk-bin/ChangeLog index 38291b8c7393..dfc3150161ad 100644 --- a/dev-java/ibm-jdk-bin/ChangeLog +++ b/dev-java/ibm-jdk-bin/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-java/ibm-jdk-bin # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.190 2009/01/26 16:47:55 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.191 2009/03/29 23:05:43 caster Exp $ + +*ibm-jdk-bin-1.6.0.4 (29 Mar 2009) + + 29 Mar 2009; Vlastimil Babka + -ibm-jdk-bin-1.5.0.8a.ebuild, -ibm-jdk-bin-1.6.0.2-r1.ebuild, + +ibm-jdk-bin-1.6.0.4.ebuild: + Version bump, security bug #252416. 26 Jan 2009; Brent Baude ibm-jdk-bin-1.6.0.3.ebuild: Marking ibm-jdk-bin-1.6.0.3 ppc64 for bug 252357 diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.8a.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.8a.ebuild deleted file mode 100644 index 1c042d6c5acd..000000000000 --- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.8a.ebuild +++ /dev/null @@ -1,253 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.8a.ebuild,v 1.4 2008/09/12 22:11:20 maekke Exp $ - -inherit java-vm-2 versionator eutils - -JDK_RELEASE=$(get_version_component_range 2-3) -SERVICE_RELEASE=$(get_version_component_range 4) -SERVICE_RELEASE_LINK="${SERVICE_RELEASE}a" -TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}a.0" - -JDK_DIST_PREFIX="ibm-java2-sdk-${TGZ_PV}-linux" -JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${TGZ_PV}-linux" - -X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz" -X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz" - -AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz" -AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz" - -PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz" -PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz" - -PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz" -PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz" - -if use x86; then - JDK_DIST=${X86_JDK_DIST} - JAVACOMM_DIST=${X86_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java2-i386-50" - LINK_ARCH="intel" -elif use amd64; then - JDK_DIST=${AMD64_JDK_DIST} - JAVACOMM_DIST=${AMD64_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java2-x86_64-50" - LINK_ARCH="amd64" -elif use ppc; then - JDK_DIST=${PPC_JDK_DIST} - JAVACOMM_DIST=${PPC_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java2-ppc-50" - LINK_ARCH="ipseries32" -elif use ppc64; then - JDK_DIST=${PPC64_JDK_DIST} - JAVACOMM_DIST=${PPC64_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java2-ppc64-50" - LINK_ARCH="ipseries64" -fi - -DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=sdk5&S_PKG=${LINK_ARCH}5sr${SERVICE_RELEASE_LINK}&S_TACT=105AGX05&S_CMP=JDK" - -SLOT="1.5" -DESCRIPTION="IBM Java Development Kit ${SLOT}" -HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" -DOWNLOADPAGE="${HOMEPAGE}linux/download.html" -# bug #125178 -ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" - -SRC_URI="x86? ( ${X86_JDK_DIST} ) - amd64? ( ${AMD64_JDK_DIST} ) - ppc? ( ${PPC_JDK_DIST} ) - ppc64? ( ${PPC64_JDK_DIST} ) - javacomm? ( - x86? ( ${X86_JAVACOMM_DIST} ) - amd64? ( ${AMD64_JAVACOMM_DIST} ) - ppc? ( ${PPC_JAVACOMM_DIST} ) - ppc64? ( ${PPC64_JAVACOMM_DIST} ) - )" -LICENSE="IBM-J1.5" -KEYWORDS="-* amd64 ppc ppc64 x86" -RESTRICT="fetch" -IUSE="X alsa doc examples javacomm nsplugin odbc" - -RDEPEND="=virtual/libstdc++-3.3 - X? ( - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXp - x11-libs/libXtst - x11-libs/libXt - x11-libs/libX11 - ) - alsa? ( media-libs/alsa-lib ) - doc? ( =dev-java/java-sdk-docs-1.5.0* ) - nsplugin? ( - x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* ) - ppc? ( =x11-libs/gtk+-1* ) - ) - odbc? ( dev-db/unixODBC )" - -DEPEND="" - -QA_EXECSTACK_amd64="opt/${P}/jre/bin/libjclscar_23.so - opt/${P}/jre/bin/libj9vrb23.so - opt/${P}/jre/bin/libj9vm23.so - opt/${P}/jre/bin/libj9trc23.so - opt/${P}/jre/bin/libj9thr23.so - opt/${P}/jre/bin/libj9shr23.so - opt/${P}/jre/bin/libj9prt23.so - opt/${P}/jre/bin/libj9jvmti23.so - opt/${P}/jre/bin/libj9jpi23.so - opt/${P}/jre/bin/libj9jit23.so - opt/${P}/jre/bin/libj9jextract.so - opt/${P}/jre/bin/libj9hookable23.so - opt/${P}/jre/bin/libj9gc23.so - opt/${P}/jre/bin/libj9dyn23.so - opt/${P}/jre/bin/libj9dmp23.so - opt/${P}/jre/bin/libj9dbg23.so - opt/${P}/jre/bin/libj9bcv23.so - opt/${P}/jre/bin/libiverel23.so - opt/${P}/jre/bin/classic/libjvm.so - opt/${P}/jre/bin/j9vm/libjvm.so" - -QA_TEXTRELS_amd64="opt/${P}/jre/bin/libjclscar_23.so - opt/${P}/jre/bin/libj9jit23.so" - -QA_EXECSTACK_x86="opt/${P}/jre/bin/j9vm/libjvm.so - opt/${P}/jre/bin/libj9jvmti23.so - opt/${P}/jre/bin/libj9hookable23.so - opt/${P}/jre/bin/libj9vm23.so - opt/${P}/jre/bin/libj9dyn23.so - opt/${P}/jre/bin/libjclscar_23.so - opt/${P}/jre/bin/libj9jpi23.so - opt/${P}/jre/bin/libj9thr23.so - opt/${P}/jre/bin/libj9dmp23.so - opt/${P}/jre/bin/libj9prt23.so - opt/${P}/jre/bin/libj9jit23.so - opt/${P}/jre/bin/libiverel23.so - opt/${P}/jre/bin/libj9trc23.so - opt/${P}/jre/bin/libj9dbg23.so - opt/${P}/jre/bin/libj9jextract.so - opt/${P}/jre/bin/libj9shr23.so - opt/${P}/jre/bin/libj9gc23.so - opt/${P}/jre/bin/libj9vrb23.so - opt/${P}/jre/bin/libj9bcv23.so - opt/${P}/jre/bin/libj9aotrt23.so - opt/${P}/jre/bin/classic/libjvm.so" - -QA_TEXTRELS_ppc="opt/${P}/jre/bin/classic/libjvm.so - opt/${P}/jre/bin/j9vm/libjvm.so - opt/${P}/jre/bin/libj9aotrt23.so - opt/${P}/jre/bin/libj9dbg23.so - opt/${P}/jre/bin/libj9gc23.so - opt/${P}/jre/bin/libj9gcchk23.so - opt/${P}/jre/bin/libj9jextract.so - opt/${P}/jre/bin/libj9jit23.so - opt/${P}/jre/bin/libj9jitd23.so - opt/${P}/jre/bin/libj9jpi23.so - opt/${P}/jre/bin/libj9jvmti23.so - opt/${P}/jre/bin/libj9prt23.so - opt/${P}/jre/bin/libj9thr23.so - opt/${P}/jre/bin/libj9thr23.so - opt/${P}/jre/bin/libj9ute23.so - opt/${P}/jre/bin/libj9vm23.so - opt/${P}/jre/bin/libj9vm23.so - opt/${P}/jre/bin/libjaas.so - opt/${P}/jre/bin/libjclscar_23.so - opt/${P}/jre/bin/libjsig.so -" - -QA_TEXTRELS_ppc64="opt/${P}/jre/bin/libj9jextract.so - opt/${P}/jre/bin/libjsig.so - opt/${P}/jre/bin/libj9jitd23.so - opt/${P}/jre/bin/libj9ute23.so - opt/${P}/jre/bin/classic/libjvm.so - opt/${P}/jre/bin/libj9prt23.so - opt/${P}/jre/bin/libjclscar_23.so - opt/${P}/jre/bin/j9vm/libjvm.so - opt/${P}/jre/bin/libj9gc23.so - opt/${P}/jre/bin/libj9dbg23.so - opt/${P}/jre/bin/libj9thr23.so - opt/${P}/jre/bin/libj9jpi23.so - opt/${P}/jre/bin/libj9gcchk23.so - opt/${P}/jre/bin/libj9vm23.so - opt/${P}/jre/bin/libj9jit23.so" - -QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so - opt/${P}/jre/bin/j9vm/libjvm.so - opt/${P}/jre/bin/xawt/libmawt.so - opt/${P}/jre/bin/javaplugin.so - opt/${P}/jre/bin/motif21/libmawt.so - opt/${P}/jre/bin/headless/libmawt.so - opt/${P}/jre/bin/classic/libjvm.so - opt/${P}/jre/lib/i386/libdeploy.so" - -pkg_nofetch() { - einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles" - einfo "Please visit: ${DOWNLOADPAGE}" - - einfo "Under J2SE 5.0, download SR${SERVICE_RELEASE} for your arch:" - einfo "(note that we switched to tgz format because it's now versioned)" - einfo "${JDK_DIST}" - if use javacomm ; then - einfo "${JAVACOMM_DIST}" - fi - - einfo "You can use direct link to your arch download page:" - einfo "${DIRECT_DOWNLOAD}" - einfo "Place the file(s) in: ${DISTDIR}" - einfo "Then restart emerge: 'emerge --resume'" - - einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}" - einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" - einfo "isn't updated, but the files should still available through the" - einfo "direct link to arch download page. If it doesn't work, file a bug." -} - -src_unpack() { - unpack ${A} - cd "${S}" - - # bug #126105 - epatch "${FILESDIR}/${PN}-jawt.h.patch" -} - -src_compile() { :; } - -src_install() { - # Copy all the files to the designated directory - dodir /opt/${P} - cp -pR "${S}"/{bin,jre,lib,include,src.jar} "${D}/opt/${P}/" - - dodir /opt/${P}/share - if use examples; then - cp -pPR "${S}/demo" "${D}/opt/${P}/share/" - fi - - local x86plugin=libjavaplugin_ojigtk2.so - local ppcplugin=libjavaplugin_oji.so - local jrebindest="${D}/opt/${P}/jre/bin/" - - local plugin - if use x86; then - plugin=${x86plugin} - elif use ppc; then - plugin=${ppcplugin} - fi - - plugin=/opt/${P}/jre/bin/${plugin} - - if use x86 || use ppc; then - if use nsplugin; then - install_mozilla_plugin ${plugin} - fi - fi - - dohtml -a html,htm,HTML -r docs - dodoc "${S}/COPYRIGHT" - - set_java_env - java-vm_revdep-mask -} diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild deleted file mode 100644 index 14bf63b61c4d..000000000000 --- a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild +++ /dev/null @@ -1,244 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.2-r1.ebuild,v 1.2 2008/10/14 08:16:55 corsair Exp $ - -inherit java-vm-2 versionator eutils - -JDK_RELEASE=$(get_version_component_range 2-3) -JAVACOMM_RELEASE=$(get_version_component_range 3) -SERVICE_RELEASE=$(get_version_component_range 4) -SERVICE_RELEASE_LINK="${SERVICE_RELEASE}" -TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" -#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0" -# looks like they didn't bump javacomm -JAVACOMM_PV="3.${JAVACOMM_RELEASE}-0.0" - -JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux" -JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux" - -X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz" -X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz" - -AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz" -AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz" - -PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz" -PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz" - -PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz" -PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz" - -if use x86; then - JDK_DIST=${X86_JDK_DIST} - JAVACOMM_DIST=${X86_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java-i386-60" - LINK_ARCH="intel" -elif use amd64; then - JDK_DIST=${AMD64_JDK_DIST} - JAVACOMM_DIST=${AMD64_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java-x86_64-60" - LINK_ARCH="amd64" -elif use ppc; then - JDK_DIST=${PPC_JDK_DIST} - JAVACOMM_DIST=${PPC_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java-ppc-60" - LINK_ARCH="ipseries32" -elif use ppc64; then - JDK_DIST=${PPC64_JDK_DIST} - JAVACOMM_DIST=${PPC64_JAVACOMM_DIST} - S="${WORKDIR}/ibm-java-ppc64-60" - LINK_ARCH="ipseries64" -fi - -DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK" - -SLOT="1.6" -DESCRIPTION="IBM Java Development Kit ${SLOT}" -HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" -DOWNLOADPAGE="${HOMEPAGE}linux/download.html" -# bug #125178 -ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" - -SRC_URI=" - x86? ( ${X86_JDK_DIST} ) - amd64? ( ${AMD64_JDK_DIST} ) - ppc? ( ${PPC_JDK_DIST} ) - ppc64? ( ${PPC64_JDK_DIST} ) - javacomm? ( - x86? ( ${X86_JAVACOMM_DIST} ) - amd64? ( ${AMD64_JAVACOMM_DIST} ) - ppc? ( ${PPC_JAVACOMM_DIST} ) - ppc64? ( ${PPC64_JAVACOMM_DIST} ) - )" -LICENSE="IBM-J1.6" -KEYWORDS="-* ~amd64 ppc ppc64 ~x86" -RESTRICT="fetch" -IUSE="X alsa doc examples javacomm nsplugin odbc" - -RDEPEND=" - ppc? ( =virtual/libstdc++-3.3 ) - ppc64? ( =virtual/libstdc++-3.3 ) - X? ( - x11-libs/libXext - x11-libs/libXft - x11-libs/libXi - x11-libs/libXp - x11-libs/libXtst - x11-libs/libX11 - amd64? ( x11-libs/libXt ) - ) - alsa? ( media-libs/alsa-lib ) - doc? ( =dev-java/java-sdk-docs-1.6.0* ) - odbc? ( dev-db/unixODBC )" - -DEPEND="" - -QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so -opt/${P}/jre/lib/i386/libj9vm24.so -opt/${P}/jre/lib/i386/libjclscar_24.so -opt/${P}/jre/lib/i386/motif21/libmawt.so -opt/${P}/jre/lib/i386/libj9thr24.so -opt/${P}/jre/lib/i386/libj9jit24.so -opt/${P}/jre/lib/i386/libj9dbg24.so -opt/${P}/jre/lib/i386/libj9gc24.so" - -QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so -opt/${P}/jre/lib/i386/j9vm/libjvm.so -opt/${P}/jre/lib/i386/libj9jvmti24.so -opt/${P}/jre/lib/i386/libj9hookable24.so -opt/${P}/jre/lib/i386/libj9vm24.so -opt/${P}/jre/lib/i386/libjclscar_24.so -opt/${P}/jre/lib/i386/libj9thr24.so -opt/${P}/jre/lib/i386/libj9dmp24.so -opt/${P}/jre/lib/i386/libj9prt24.so -opt/${P}/jre/lib/i386/libj9jit24.so -opt/${P}/jre/lib/i386/libiverel24.so -opt/${P}/jre/lib/i386/libj9trc24.so -opt/${P}/jre/lib/i386/libj9dbg24.so -opt/${P}/jre/lib/i386/libj9shr24.so -opt/${P}/jre/lib/i386/libj9gc24.so -opt/${P}/jre/lib/i386/libj9bcv24.so -opt/${P}/jre/lib/i386/classic/libjvm.so" - -QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so -opt/${P}/jre/lib/amd64/default/libj9jvmti24.so -opt/${P}/jre/lib/amd64/default/libj9hookable24.so -opt/${P}/jre/lib/amd64/default/libj9vm24.so -opt/${P}/jre/lib/amd64/default/libjclscar_24.so -opt/${P}/jre/lib/amd64/default/libj9jpi24.so -opt/${P}/jre/lib/amd64/default/libj9thr24.so -opt/${P}/jre/lib/amd64/default/libj9dmp24.so -opt/${P}/jre/lib/amd64/default/libj9prt24.so -opt/${P}/jre/lib/amd64/default/libj9jit24.so -opt/${P}/jre/lib/amd64/default/libiverel24.so -opt/${P}/jre/lib/amd64/default/libj9trc24.so -opt/${P}/jre/lib/amd64/default/libj9dbg24.so -opt/${P}/jre/lib/amd64/default/libj9shr24.so -opt/${P}/jre/lib/amd64/default/libj9gc24.so -opt/${P}/jre/lib/amd64/default/libj9bcv24.so -opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so -opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so -opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so -opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so" - -pkg_nofetch() { - einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles" - einfo "Please visit: ${DOWNLOADPAGE}" - - einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:" - einfo "${JDK_DIST}" - if use javacomm ; then - einfo "${JAVACOMM_DIST}" - fi - - einfo "You can also use a direct link to your arch download page:" - einfo "${DIRECT_DOWNLOAD}" - einfo "Place the file(s) in: ${DISTDIR}" - einfo "Then restart emerge: 'emerge --resume'" - - einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}" - einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" - einfo "isn't updated, but the files should still available through the" - einfo "direct link to arch download page. If it doesn't work, file a bug." -} - -src_unpack() { - unpack ${JDK_DIST} - if use javacomm; then - mkdir "${WORKDIR}/javacomm/" || die - cd "${WORKDIR}/javacomm/" - unpack ${JAVACOMM_DIST} - fi - cd "${S}" - - # bug #126105 - epatch "${FILESDIR}/${PN}-jawt.h.patch" -} - -src_compile() { :; } - -src_install() { - # Copy all the files to the designated directory - dodir /opt/${P} - cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die - - if use examples; then - cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die - fi - if use javacomm; then - chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die - cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die - cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die - cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die - if use examples; then - cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die - fi - fi - - if use x86 || use ppc; then - if use nsplugin; then - local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so" - install_mozilla_plugin "${plugin}" - fi - fi - - if use amd64; then - # a workaround to fix the BOOTCLASSPATH in our env file - # this is not optimal, using -Xcompressedrefs would probably make it - # expect the compressedrefs version... - dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/ - fi - - local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" - if [[ -f "${desktop_in}" ]]; then - local desktop_out="${T}/ibm_jdk-${SLOT}.desktop" - # install control panel for Gnome/KDE - # The jre also installs these so make sure that they do not have the same - # Name - sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \ - -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ - -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ - "${desktop_in}" > \ - "${desktop_out}" || die - - domenu "${desktop_out}" || die - fi - - dohtml -a html,htm,HTML -r docs || die - dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die - - set_java_env - java-vm_revdep-mask -} diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild new file mode 100644 index 000000000000..e5bcff8a48a4 --- /dev/null +++ b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild @@ -0,0 +1,256 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.1 2009/03/29 23:05:43 caster Exp $ + +inherit java-vm-2 versionator eutils + +JDK_RELEASE=$(get_version_component_range 2-3) +JAVACOMM_RELEASE=$(get_version_component_range 3) +SERVICE_RELEASE=$(get_version_component_range 4) +SERVICE_RELEASE_LINK="${SERVICE_RELEASE}" +TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" +#JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0" +# looks like they didn't bump javacomm +JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0" +JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" + +JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux" +JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux" +JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux" + +X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz" +X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz" +X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz" + +AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz" +AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz" +AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz" + +PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz" +PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz" +PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz" + +PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz" +PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz" +PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz" + +if use x86; then + JDK_DIST=${X86_JDK_DIST} + JAVACOMM_DIST=${X86_JAVACOMM_DIST} + JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG} + S="${WORKDIR}/ibm-java-i386-60" + LINK_ARCH="intel" +elif use amd64; then + JDK_DIST=${AMD64_JDK_DIST} + JAVACOMM_DIST=${AMD64_JAVACOMM_DIST} + JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG} + S="${WORKDIR}/ibm-java-x86_64-60" + LINK_ARCH="amd64" +elif use ppc; then + JDK_DIST=${PPC_JDK_DIST} + JAVACOMM_DIST=${PPC_JAVACOMM_DIST} + JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG} + S="${WORKDIR}/ibm-java-ppc-60" + LINK_ARCH="ipseries32" +elif use ppc64; then + JDK_DIST=${PPC64_JDK_DIST} + JAVACOMM_DIST=${PPC64_JAVACOMM_DIST} + JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG} + S="${WORKDIR}/ibm-java-ppc64-60" + LINK_ARCH="ipseries64" +fi + +DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK" + +SLOT="1.6" +DESCRIPTION="IBM Java Development Kit ${SLOT}" +HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" +DOWNLOADPAGE="${HOMEPAGE}linux/download.html" +# bug #125178 +ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" + +SRC_URI=" + x86? ( ${X86_JDK_DIST} ) + amd64? ( ${AMD64_JDK_DIST} ) + ppc? ( ${PPC_JDK_DIST} ) + ppc64? ( ${PPC64_JDK_DIST} ) + javacomm? ( + x86? ( ${X86_JAVACOMM_DIST} ) + amd64? ( ${AMD64_JAVACOMM_DIST} ) + ppc? ( ${PPC_JAVACOMM_DIST} ) + ppc64? ( ${PPC64_JAVACOMM_DIST} ) + )" +LICENSE="IBM-J1.6" +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86" +RESTRICT="fetch" +IUSE="X alsa doc examples javacomm nsplugin odbc" + +RDEPEND=" + ppc? ( =virtual/libstdc++-3.3 ) + ppc64? ( =virtual/libstdc++-3.3 ) + X? ( + x11-libs/libXext + x11-libs/libXft + x11-libs/libXi + x11-libs/libXp + x11-libs/libXtst + x11-libs/libX11 + amd64? ( x11-libs/libXt ) + ) + alsa? ( media-libs/alsa-lib ) + doc? ( =dev-java/java-sdk-docs-1.6.0* ) + odbc? ( dev-db/unixODBC )" + +DEPEND="" + +QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so +opt/${P}/jre/lib/i386/libj9vm24.so +opt/${P}/jre/lib/i386/libjclscar_24.so +opt/${P}/jre/lib/i386/motif21/libmawt.so +opt/${P}/jre/lib/i386/libj9thr24.so +opt/${P}/jre/lib/i386/libj9jit24.so +opt/${P}/jre/lib/i386/libj9dbg24.so +opt/${P}/jre/lib/i386/libj9gc24.so" + +QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so +opt/${P}/jre/lib/i386/j9vm/libjvm.so +opt/${P}/jre/lib/i386/libj9jvmti24.so +opt/${P}/jre/lib/i386/libj9hookable24.so +opt/${P}/jre/lib/i386/libj9vm24.so +opt/${P}/jre/lib/i386/libjclscar_24.so +opt/${P}/jre/lib/i386/libj9thr24.so +opt/${P}/jre/lib/i386/libj9dmp24.so +opt/${P}/jre/lib/i386/libj9prt24.so +opt/${P}/jre/lib/i386/libj9jit24.so +opt/${P}/jre/lib/i386/libiverel24.so +opt/${P}/jre/lib/i386/libj9trc24.so +opt/${P}/jre/lib/i386/libj9dbg24.so +opt/${P}/jre/lib/i386/libj9shr24.so +opt/${P}/jre/lib/i386/libj9gc24.so +opt/${P}/jre/lib/i386/libj9bcv24.so +opt/${P}/jre/lib/i386/classic/libjvm.so" + +QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so +opt/${P}/jre/lib/amd64/default/libj9jvmti24.so +opt/${P}/jre/lib/amd64/default/libj9hookable24.so +opt/${P}/jre/lib/amd64/default/libj9vm24.so +opt/${P}/jre/lib/amd64/default/libjclscar_24.so +opt/${P}/jre/lib/amd64/default/libj9jpi24.so +opt/${P}/jre/lib/amd64/default/libj9thr24.so +opt/${P}/jre/lib/amd64/default/libj9dmp24.so +opt/${P}/jre/lib/amd64/default/libj9prt24.so +opt/${P}/jre/lib/amd64/default/libj9jit24.so +opt/${P}/jre/lib/amd64/default/libiverel24.so +opt/${P}/jre/lib/amd64/default/libj9trc24.so +opt/${P}/jre/lib/amd64/default/libj9dbg24.so +opt/${P}/jre/lib/amd64/default/libj9shr24.so +opt/${P}/jre/lib/amd64/default/libj9gc24.so +opt/${P}/jre/lib/amd64/default/libj9bcv24.so +opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so +opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so +opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so +opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so" + +pkg_nofetch() { + einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles" + einfo "Please visit: ${DOWNLOADPAGE}" + + einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:" + einfo "${JDK_DIST}" + if use javacomm ; then + einfo "Also download ${JAVACOMM_DIST_ORIG}" + ewarn "and save it as ${JAVACOMM_DIST}" + ewarn "Renaming is needed because javacomm changes content without changing filename." + fi + + einfo "You can also use a direct link to your arch download page:" + einfo "${DIRECT_DOWNLOAD}" + einfo "Place the file(s) in: ${DISTDIR}" + einfo "Then restart emerge: 'emerge --resume'" + + einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}" + einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" + einfo "isn't updated, but the files should still available through the" + einfo "direct link to arch download page. If it doesn't work, file a bug." +} + +src_unpack() { + unpack ${JDK_DIST} + if use javacomm; then + mkdir "${WORKDIR}/javacomm/" || die + cd "${WORKDIR}/javacomm/" + unpack ${JAVACOMM_DIST} + fi + cd "${S}" + + # bug #126105 + epatch "${FILESDIR}/${PN}-jawt.h.patch" +} + +src_compile() { :; } + +src_install() { + # Copy all the files to the designated directory + dodir /opt/${P} + cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die + + if use examples; then + cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die + fi + if use javacomm; then + chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die + cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die + cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die + cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die + if use examples; then + cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die + fi + fi + + if use x86 || use ppc; then + if use nsplugin; then + local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so" + install_mozilla_plugin "${plugin}" + fi + fi + + if use amd64; then + # a workaround to fix the BOOTCLASSPATH in our env file + # this is not optimal, using -Xcompressedrefs would probably make it + # expect the compressedrefs version... + dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/ + fi + + local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop" + if [[ -f "${desktop_in}" ]]; then + local desktop_out="${T}/ibm_jdk-${SLOT}.desktop" + # install control panel for Gnome/KDE + # The jre also installs these so make sure that they do not have the same + # Name + sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \ + -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ + -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ + "${desktop_in}" > \ + "${desktop_out}" || die + + domenu "${desktop_out}" || die + fi + + dohtml -a html,htm,HTML -r docs || die + dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die + + set_java_env + java-vm_revdep-mask +} -- cgit v1.2.3-65-gdbad