Version bump of 1.4 SLOT, now also applies the patch from bug #126105 because at...
authorVlastimil Babka <caster@gentoo.org>
Mon, 18 Dec 2006 11:39:24 +0000 (11:39 +0000)
committerVlastimil Babka <caster@gentoo.org>
Mon, 18 Dec 2006 11:39:24 +0000 (11:39 +0000)
Package-Manager: portage-2.1.2_rc3-r6

dev-java/ibm-jdk-bin/ChangeLog
dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.7 [new file with mode: 0644]
dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch [new file with mode: 0644]
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild [new file with mode: 0644]
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild

index d52673a87ed061054f3400d6c28ec28c23c31aeb..6e0eb677ac7a4104df22bf0c90059ee82e6383f6 100644 (file)
@@ -1,6 +1,18 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.97 2006/11/22 13:31:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.98 2006/12/18 11:39:24 caster Exp $
+
+*ibm-jdk-bin-1.4.2.7 (18 Dec 2006)
+
+  18 Dec 2006; Vlastimil Babka <caster@gentoo.org>
+  -files/ibm-jdk-bin-1.5.0.3-jawt-h.patch, +files/ibm-jdk-bin-jawt.h.patch,
+  ibm-jdk-bin-1.4.2.6-r4.ebuild, +ibm-jdk-bin-1.4.2.7.ebuild,
+  ibm-jdk-bin-1.5.0.3-r1.ebuild:
+  Version bump of 1.4 SLOT, now also applies the patch from bug #126105
+  because at least amd64 was broken too. Try to provide direct download URLs
+  in pkg_nofetch() so that people can download older versions not linked from
+  the download pages and we don't have to do direct to stable bumps. Hopefully
+  IBM won't break these links too often...
 
 *ibm-jdk-bin-1.5.0.3-r1 (22 Nov 2006)
 
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.7 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.4.2.7
new file mode 100644 (file)
index 0000000..a9f7245
--- /dev/null
@@ -0,0 +1,21 @@
+MD5 f8b5ad3fa9bee0b26db5311107fb417d IBMJava2-142-ia32-SDK-1.4.2-7.0.i386.rpm 58600739
+RMD160 001b31d128ed10215ca4b25c9367234ceca917c4 IBMJava2-142-ia32-SDK-1.4.2-7.0.i386.rpm 58600739
+SHA256 3c858493e83701ee083a4da922c1cfc73dde84cb8a34526d1cfbdf7601c73100 IBMJava2-142-ia32-SDK-1.4.2-7.0.i386.rpm 58600739
+MD5 1bc9d350357eaf6228a7508809b610d3 IBMJava2-142-ppc32-SDK-1.4.2-7.0.ppc.rpm 66191985
+RMD160 0b77d8c3b82acff94e866162b6bea1dc28e98812 IBMJava2-142-ppc32-SDK-1.4.2-7.0.ppc.rpm 66191985
+SHA256 c04cd708e09713a7504b87c6abbb80f2219cdf77ebb03f3c9031f75fe8813dd0 IBMJava2-142-ppc32-SDK-1.4.2-7.0.ppc.rpm 66191985
+MD5 bd6a0f5031be57ec2bcca9af5476cfdb IBMJava2-142-ppc64-SDK-1.4.2-7.0.ppc64.rpm 64389005
+RMD160 f6d29a181ec778148e69a1f05d3645c3acc7e62e IBMJava2-142-ppc64-SDK-1.4.2-7.0.ppc64.rpm 64389005
+SHA256 999af5dbc1ed0aabc6f81e9807a54861df29f2cab37a750087bc8c3a5c4a8b4d IBMJava2-142-ppc64-SDK-1.4.2-7.0.ppc64.rpm 64389005
+MD5 eac0df64f9c877f007f8602f15d938f7 IBMJava2-142-z31-SDK-1.4.2-7.0.s390.rpm 54794650
+RMD160 dbdfc1661057847d6002a8e14ca4f12267cebc02 IBMJava2-142-z31-SDK-1.4.2-7.0.s390.rpm 54794650
+SHA256 9631e42f57a72d2127504e71a23a1598a44eb88789d05d76addbbbf4260a7918 IBMJava2-142-z31-SDK-1.4.2-7.0.s390.rpm 54794650
+MD5 f105636f5bead5aa9b6d220b92ad4037 IBMJava2-AMD64-142-SDK-1.4.2-7.0.x86_64.rpm 52762987
+RMD160 57e4dda6b0dd8780bf495da0dfa10f84e8172948 IBMJava2-AMD64-142-SDK-1.4.2-7.0.x86_64.rpm 52762987
+SHA256 04bd30e3a2b5ae2cabc5c052b73afc5dd4b8196f922f6916d318d90ff7435321 IBMJava2-AMD64-142-SDK-1.4.2-7.0.x86_64.rpm 52762987
+MD5 59029c0af259531f3ca25eea4353628c IBMJava2-JAVACOMM-1.4.2-7.0.i386.rpm 121766
+RMD160 64088291369bc4f75f83467bbd674f0396e7d77e IBMJava2-JAVACOMM-1.4.2-7.0.i386.rpm 121766
+SHA256 5cc7e42477aa62d6c50668b53b21bb464aa4dcb031844994a50394d30da2626e IBMJava2-JAVACOMM-1.4.2-7.0.i386.rpm 121766
+MD5 740f71ce3a7acf6a0c5571ac238c38ba IBMJava2-JAVACOMM-AMD64-1.4.2-7.0.x86_64.rpm 123608
+RMD160 58ca636893249e0c476d316c491f09568aaa995b IBMJava2-JAVACOMM-AMD64-1.4.2-7.0.x86_64.rpm 123608
+SHA256 519300df0c1144e600c29172f84cdeea739b29f83640b8f6b69b3d02996ed3ed IBMJava2-JAVACOMM-AMD64-1.4.2-7.0.x86_64.rpm 123608
diff --git a/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch b/dev-java/ibm-jdk-bin/files/ibm-jdk-bin-jawt.h.patch
new file mode 100644 (file)
index 0000000..c3fa40c
--- /dev/null
@@ -0,0 +1,12 @@
+--- include/jawt.h     2006/07/20 23:02:04     1.1
++++ include/jawt.h     2006/07/20 23:03:13
+@@ -298,7 +298,9 @@ typedef struct jawt {
+  * Get the AWT native structure.  This function returns JNI_FALSE if
+  * an error occurs.
+  */
++#ifdef _JNI_IMPORT_OR_EXPORT_
+ _JNI_IMPORT_OR_EXPORT_
++#endif
+ jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt);
+ #define JAWT_VERSION_1_3 0x00010003
index 6ca4f1512c96d43ca20af31e40dd08ef4d945cfa..810d8c328b256d6f25f9ffa4ccbd9eba52570309 100644 (file)
@@ -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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.8 2006/10/15 18:29:38 dertobi123 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.6-r4.ebuild,v 1.9 2006/12/18 11:39:24 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator rpm
@@ -13,23 +13,30 @@ if use x86 ; then
        JDK_DIST="IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm"
        JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm"
        S="${WORKDIR}/opt/IBMJava2-142"
+       LINK_ARCH="ia32"
 elif use amd64 ; then
        JDK_DIST="IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm"
        JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm"
        S="${WORKDIR}/opt/IBMJava2-amd64-142"
+       LINK_ARCH="amd64"
 elif use ppc ; then
        JDK_DIST="IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm"
        JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc.rpm"
        S="${WORKDIR}/opt/IBMJava2-ppc-142"
+       LINK_ARCH="ip32"
 elif use ppc64 ; then
        JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
        JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
        S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+       LINK_ARCH="ip64"
 elif use s390 ; then
        JDK_DIST="IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm"
        S="${WORKDIR}/opt/IBMJava2-s390-142"
+       LINK_ARCH="s39031"
 fi
 
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
+
 DESCRIPTION="IBM Java Development Kit"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
@@ -89,11 +96,15 @@ pkg_nofetch() {
        if use javacomm ; then
                einfo "${JAVACOMM_DIST}"
        fi
+       einfo "Direct link:"
+       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}"
+       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. If it doesn't work, file a bug."
 }
 
 src_compile() { true; }
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild
new file mode 100644 (file)
index 0000000..7ceabea
--- /dev/null
@@ -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/ibm-jdk-bin/ibm-jdk-bin-1.4.2.7.ebuild,v 1.1 2006/12/18 11:39:24 caster Exp $
+
+JAVA_SUPPORTS_GENERATION_1="true"
+inherit java-vm-2 eutils versionator rpm
+
+JDK_RELEASE=$(get_version_component_range 1-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+if use x86 ; then
+       JDK_DIST="IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm"
+       JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm"
+       S="${WORKDIR}/opt/IBMJava2-142"
+       LINK_ARCH="ia32"
+elif use amd64 ; then
+       JDK_DIST="IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm"
+       JAVACOMM_DIST="IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm"
+       S="${WORKDIR}/opt/IBMJava2-amd64-142"
+       LINK_ARCH="amd64"
+elif use ppc ; then
+       JDK_DIST="IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm"
+       JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc.rpm"
+       S="${WORKDIR}/opt/IBMJava2-ppc-142"
+       LINK_ARCH="ip32"
+elif use ppc64 ; then
+       JDK_DIST="IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm"
+       JAVACOMM_DIST="IBMJava2-JAVACOMM-${RPM_PV}.ppc64.rpm"
+       S="${WORKDIR}/opt/IBMJava2-ppc64-142"
+       LINK_ARCH="ip64"
+elif use s390 ; then
+       JDK_DIST="IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm"
+       S="${WORKDIR}/opt/IBMJava2-s390-142"
+       LINK_ARCH="s39031"
+fi
+
+DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK"
+
+DESCRIPTION="IBM Java Development Kit"
+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? ( IBMJava2-142-ia32-SDK-${RPM_PV}.i386.rpm )
+               amd64? ( IBMJava2-AMD64-142-SDK-${RPM_PV}.x86_64.rpm )
+               ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
+               ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
+               s390? ( IBMJava2-142-z31-SDK-${RPM_PV}.s390.rpm )
+               javacomm? (
+                                       x86? ( IBMJava2-JAVACOMM-${RPM_PV}.i386.rpm )
+                                       amd64? ( IBMJava2-JAVACOMM-AMD64-${RPM_PV}.x86_64.rpm )
+                                       ppc? ( IBMJava2-142-ppc32-SDK-${RPM_PV}.ppc.rpm )
+                                       ppc64? ( IBMJava2-142-ppc64-SDK-${RPM_PV}.ppc64.rpm )
+                                 )"
+
+LICENSE="IBM-J1.4"
+SLOT="1.4"
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="X alsa doc javacomm nsplugin"
+
+RDEPEND="
+               =virtual/libstdc++-3.3
+               alsa? ( media-libs/alsa-lib )
+               X? (
+                       x11-libs/libXt
+                       x11-libs/libX11
+                       x11-libs/libXtst
+                       x11-libs/libXp
+                       x11-libs/libXext
+                       x11-libs/libXi
+                       x11-libs/libXmu
+               )
+               x86? ( nsplugin? ( =x11-libs/gtk+-1* =dev-libs/glib-1* ) )
+               doc? ( =dev-java/java-sdk-docs-1.4.2* )"
+
+
+RESTRICT="fetch"
+
+QA_TEXTRELS_amd64="opt/${P}/jre/bin/libj9jit22.so
+       opt/${P}/jre/bin/libjclscar_22.so"
+QA_TEXTRELS_ppc64="opt/${P}/jre/bin/classic/libjvm.so"
+QA_TEXTRELS_ppc="opt/${P}/jre/bin/libjitc.so
+       opt/${P}/jre/bin/libjaas.so"
+QA_TEXTRELS_x86="opt/${P}/jre/bin/lib*.so
+       opt/${P}/jre/bin/javaplugin.so
+       opt/${P}/jre/bin/classic/libjvm.so
+       opt/${P}/jre/bin/classic/libcore.so"
+
+pkg_nofetch() {
+       einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
+       einfo "Please visit: ${DOWNLOADPAGE}"
+
+       einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:"
+       einfo "${JDK_DIST}"
+       if use javacomm ; then
+               einfo "${JAVACOMM_DIST}"
+       fi
+       einfo "Direct link:"
+       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. If it doesn't work, file a bug."
+}
+
+src_unpack() {
+       rpm_src_unpack
+       cd "${S}"
+
+       # bug #126105
+       epatch "${FILESDIR}/${PN}-jawt-h.patch"
+}
+
+src_compile() { true; }
+
+src_install() {
+       # javaws is on x86 only
+       if use x86; then
+               # The javaws execution script is 777 why?
+               chmod 0755 ${S}/jre/javaws/javaws
+
+               # bug #147259
+               dosym ../jre/javaws/javaws /opt/${P}/bin/javaws
+               dosym ../javaws/javaws /opt/${P}/jre/bin/javaws
+       fi
+
+       # Copy all the files to the designated directory
+       mkdir -p ${D}opt/${P}
+       cp -pR ${S}/{bin,jre,lib,include} ${D}opt/${P}/
+
+       mkdir -p ${D}/opt/${P}/share
+       cp -pPR ${S}/{demo,src.jar} ${D}opt/${P}/share/
+
+       # setting the ppc stuff
+       if use ppc; then
+               dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc.so
+               dosed s:/proc/cpuinfo:/etc//cpuinfo:g /opt/${P}/jre/bin/libjitc_g.so
+               insinto /etc
+               doins ${FILESDIR}/cpuinfo
+       fi
+
+       if use x86 && use nsplugin; then
+               local plugin="libjavaplugin_oji.so"
+
+               if has_version '>=sys-devel/gcc-3' ; then
+                       plugin="libjavaplugin_ojigcc3.so"
+               fi
+
+               install_mozilla_plugin /opt/${P}/jre/bin/${plugin}
+       elif use x86; then
+               rm ${D}/opt/${P}/jre/bin/libjavaplugin*.so
+       fi
+
+       if ! use alsa; then
+               rm ${D}/opt/${P}/jre/bin/libjsoundalsa.so \
+                       || eerror "${D}/opt/${P}/jre/bin/libjsoundalsa.so not found"
+       fi
+
+       dohtml -a html,htm,HTML -r docs
+       dodoc ${S}/docs/COPYRIGHT
+
+       set_java_env
+}
+
+pkg_postinst() {
+       java-vm-2_pkg_postinst
+
+       if ! use X; then
+               ewarn
+               ewarn "You have not enabled the X useflag.  It is possible that"
+               ewarn "you do not have an X server installed.  Please note that"
+               ewarn "some parts of the IBM JDK require an X server to properly"
+               ewarn "function.  Be careful which Java libraries you attempt to"
+               ewarn "use with your installation."
+               ewarn
+       fi
+}
index 4d2ce33cc92a1ec70e1a9f7447e81174a8607976..c5402f8aced07c7fd05db9c8f88d3341fbb719bc 100644 (file)
@@ -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/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild,v 1.1 2006/11/22 13:31:57 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.3-r1.ebuild,v 1.2 2006/12/18 11:39:24 caster Exp $
 
 inherit java-vm-2 versionator eutils rpm
 
@@ -24,20 +24,26 @@ if use x86; then
        JDK_DIST=${X86_JDK_DIST}
        JAVACOMM_DIST=${X86_JAVACOMM_DIST}
        S="${WORKDIR}/opt/ibm/java2-i386-50"
+       LINK_ARCH="intel"
 elif use amd64; then
        JDK_DIST=${AMD64_JDK_DIST}
        JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
        S="${WORKDIR}/opt/ibm/java2-x86_64-50"
+       LINK_ARCH="amd64"
 elif use ppc; then
        JDK_DIST=${PPC_JDK_DIST}
        JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
        S="${WORKDIR}/opt/ibm/java2-ppc-50"
+       LINK_ARCH="ipseries32"
 elif use ppc64; then
        JDK_DIST=${PPC64_JDK_DIST}
        JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
        S="${WORKDIR}/opt/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}&S_TACT=105AGX05&S_CMP=JDK"
+
 SLOT="1.5"
 DESCRIPTION="IBM Java Development Kit ${SLOT}"
 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
@@ -187,13 +193,16 @@ pkg_nofetch() {
        if use javacomm ; then
                einfo "${JAVACOMM_DIST}"
        fi
+
+       einfo "Direct link:"
+       einfo "${DIRECT_DOWNLOAD}"
        einfo "Place the file(s) in: ${DISTDIR}"
-       einfo "Then run emerge =${VMHANDLE}*"
+       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}"
-       einfo "If it's not even there, you can also try rewriting the link of the"
-       einfo "newer SR# into SR${SERVICE_RELEASE}, while cursing IBM."
+       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. If it doesn't work, file a bug."
 }
 
 src_unpack() {
@@ -201,7 +210,7 @@ src_unpack() {
        cd "${S}"
 
        # bug #126105
-       epatch "${FILESDIR}/${P}-jawt-h.patch"
+       epatch "${FILESDIR}/${PN}-jawt-h.patch"
 }
 
 src_compile() { :; }