1.4: fix elog wording; 1.5: Revbump that adds examples USE flag that controls install...
authorVlastimil Babka <caster@gentoo.org>
Fri, 20 Apr 2007 10:49:24 +0000 (10:49 +0000)
committerVlastimil Babka <caster@gentoo.org>
Fri, 20 Apr 2007 10:49:24 +0000 (10:49 +0000)
Package-Manager: portage-2.1.2.4

dev-java/ibm-jdk-bin/ChangeLog
dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.4-r1 [new file with mode: 0644]
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild
dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild [new file with mode: 0644]

index 83e89757651b9ba324255f50f5004b9c48898dd0..337b0e81dc28e5c3aa87bbc417971f6a0046716f 100644 (file)
@@ -1,6 +1,16 @@
 # ChangeLog for dev-java/ibm-jdk-bin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.111 2007/04/19 22:43:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.112 2007/04/20 10:49:24 caster Exp $
+
+*ibm-jdk-bin-1.5.0.4-r1 (20 Apr 2007)
+
+  20 Apr 2007; Vlastimil Babka <caster@gentoo.org>
+  ibm-jdk-bin-1.4.2.8.ebuild, +ibm-jdk-bin-1.5.0.4-r1.ebuild:
+  1.4: fix elog wording; 1.5: Revbump that adds examples USE flag that
+  controls installing of demos, and doc flag that pulls java-sdk-docs for
+  consistency. The src.jar file moved to expected location per bug #2241,
+  previously used location contains symlink that will be removed in next
+  version bump.
 
 *ibm-jdk-bin-1.4.2.8 (19 Apr 2007)
 
diff --git a/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.4-r1 b/dev-java/ibm-jdk-bin/files/digest-ibm-jdk-bin-1.5.0.4-r1
new file mode 100644 (file)
index 0000000..f27cd56
--- /dev/null
@@ -0,0 +1,24 @@
+MD5 2e462fe061d249d8aaea257a76053d16 ibm-java2-javacomm-5.0-4.0-linux-i386.tgz 119405
+RMD160 6e541ac4df70e733a45871773496198e3163ff6f ibm-java2-javacomm-5.0-4.0-linux-i386.tgz 119405
+SHA256 d792a5eddb60b22cc749652c7fb8df56894c2bd88b423766256a9dc1744fbd30 ibm-java2-javacomm-5.0-4.0-linux-i386.tgz 119405
+MD5 83894e09a88c465ca0e597dd533a8442 ibm-java2-javacomm-5.0-4.0-linux-ppc.tgz 125880
+RMD160 038be068de80bae2812467653191ff73b3b4ee02 ibm-java2-javacomm-5.0-4.0-linux-ppc.tgz 125880
+SHA256 923decac2431404904595b5255f243d974b11a5ffd9edf1862f4746009fe3350 ibm-java2-javacomm-5.0-4.0-linux-ppc.tgz 125880
+MD5 2d5fc7d20f513189abc97d19a86a3564 ibm-java2-javacomm-5.0-4.0-linux-ppc64.tgz 128431
+RMD160 c3af18a32dc57efa7ec513bfbf5df0b52b25e088 ibm-java2-javacomm-5.0-4.0-linux-ppc64.tgz 128431
+SHA256 5ef3fefedea359841ee2af666c5bf576f136e20b1696b0453c6532fc05851fa5 ibm-java2-javacomm-5.0-4.0-linux-ppc64.tgz 128431
+MD5 111f683fac9fc78dc4b30094451d1f75 ibm-java2-javacomm-5.0-4.0-linux-x86_64.tgz 122199
+RMD160 416e235d29459e7c5b46fcabc0a682f2001bb27a ibm-java2-javacomm-5.0-4.0-linux-x86_64.tgz 122199
+SHA256 7c9aba9ec8c3960bb820c49d42ea8da7a0576ad414f988b2febf249119548946 ibm-java2-javacomm-5.0-4.0-linux-x86_64.tgz 122199
+MD5 bb50df74f7a10453df0ee3f99fb7d6b3 ibm-java2-sdk-5.0-4.0-linux-i386.tgz 63131883
+RMD160 8fe10c1fe553a6e068b9ae2159b65c596df8916e ibm-java2-sdk-5.0-4.0-linux-i386.tgz 63131883
+SHA256 9cb43fb0923377ebc56c813654c20ccf2be197996876283dc8958e83c432617d ibm-java2-sdk-5.0-4.0-linux-i386.tgz 63131883
+MD5 09247aca136ef9d0588e23f876e03213 ibm-java2-sdk-5.0-4.0-linux-ppc.tgz 70809857
+RMD160 d5fa3c81ce17ec4e8f01e6c0c25fd47e3ce9c8b0 ibm-java2-sdk-5.0-4.0-linux-ppc.tgz 70809857
+SHA256 75a847bbcd45515d47422493e4293111765bd80cf4e13a69e05b88396c132767 ibm-java2-sdk-5.0-4.0-linux-ppc.tgz 70809857
+MD5 b14948f41b09fbe96c2679aca7eab294 ibm-java2-sdk-5.0-4.0-linux-ppc64.tgz 68878329
+RMD160 ec5a13b217565397abac856185fd2826a91115a8 ibm-java2-sdk-5.0-4.0-linux-ppc64.tgz 68878329
+SHA256 d3c689b9e02229e8a75da4352b18283975af32470be006bb61488b47caa21bd5 ibm-java2-sdk-5.0-4.0-linux-ppc64.tgz 68878329
+MD5 98fb08312afc47bc5f5755a1838137aa ibm-java2-sdk-5.0-4.0-linux-x86_64.tgz 64578845
+RMD160 9a60526d1364f80f27c395a9737f4f7608be3ef0 ibm-java2-sdk-5.0-4.0-linux-x86_64.tgz 64578845
+SHA256 b8f1efd379d4eb18525723ad0ea432f540afa8ca0ce6adbeb6b929d4a3cb7c8f ibm-java2-sdk-5.0-4.0-linux-x86_64.tgz 64578845
index aec027f9a8fb3148704f8d1e64f5b559e58cd19b..7f8f675dd49af48714830073fedf1abd1154ab00 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.8.ebuild,v 1.1 2007/04/19 22:43:26 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.4.2.8.ebuild,v 1.2 2007/04/20 10:49:24 caster Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils versionator
@@ -196,11 +196,11 @@ pkg_postinst() {
                ewarn
        fi
        elog ""
-       elog "Starting with 1.4.2.8 the demos are installed only with USE=examples enabled"
+       elog "Starting with 1.4.2.8 demos are installed only with USE=examples"
        elog ""
        elog "Starting with 1.4.2.8 the src.jar is installed to the standard"
        elog "location. It is still symlinked to the old location (/opt/${P}/share)"
        elog "but it will be removed if there will ever be a version bump."
-       elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241 and"
+       elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241"
        elog "for more details."
 }
diff --git a/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild b/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.5.0.4-r1.ebuild
new file mode 100644 (file)
index 0000000..831e838
--- /dev/null
@@ -0,0 +1,294 @@
+# Copyright 1999-2007 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.4-r1.ebuild,v 1.1 2007/04/20 10:49:24 caster Exp $
+
+inherit java-vm-2 versionator eutils
+
+JDK_RELEASE=$(get_version_component_range 2-3)
+SERVICE_RELEASE=$(get_version_component_range 4)
+RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
+
+JDK_DIST_PREFIX="ibm-java2-sdk-${RPM_PV}-linux"
+JAVACOMM_DIST_PREFIX="ibm-java2-javacomm-${RPM_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}&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"
+
+RDEPEND="
+               =virtual/libstdc++-3.3
+               X? ( || (
+                                       (
+                                               x11-libs/libXt
+                                               x11-libs/libX11
+                                               x11-libs/libXtst
+                                               x11-libs/libXp
+                                               x11-libs/libXext
+                                               x11-libs/libXi
+                                               x11-libs/libXmu
+                                               x11-libs/libXft
+                                       )
+                                       virtual/x11
+                               )
+                       )
+               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* )
+               )"
+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} ${D}/opt/${P}/
+
+       dodir /opt/${P}/share
+       if use examples; then
+               cp -pPR ${S}/demo ${D}/opt/${P}/share/
+       fi
+
+       cp -pPR ${S}/src.jar "${D}/opt/${P}/"
+       dosym "../src.jar" /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
+
+
+       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}
+       #       rm "${jrebindest}/${x86plugin}" "${jrebindest}/libjavaplugin_nscpgtk2.so" || \
+       #               eerror "Failed to delete gtk2 javaplugin."
+       fi
+
+       plugin=/opt/${P}/jre/bin/${plugin}
+
+       if use x86 || use ppc; then
+               if use nsplugin; then
+                       install_mozilla_plugin ${plugin}
+               else
+                       rm "${jrebindest}/*javaplugin*.so" || \
+                               eerror "Failed to delete javaplugin shared libraries"
+               fi
+       fi
+
+       use !alsa && rm "${jrebindest}/libjsoundalsa.so"
+
+       dohtml -a html,htm,HTML -r docs
+       dodoc ${S}/COPYRIGHT
+
+       set_java_env
+}
+
+pkg_postinst() {
+       java-vm-2_pkg_postinst
+       if ! use X; then
+               echo
+               ewarn "You're not using X so its possible that you dont have"
+               ewarn "a X server installed, please read the following warning: "
+               ewarn "Some parts of IBM JDK require XFree86 to be installed."
+               ewarn "Be careful which Java libraries you attempt to use."
+       fi
+
+       elog ""
+       elog "Starting with 1.5.0.4-r1 demos are installed only with USE=examples"
+       elog ""
+       elog "Starting with 1.5.0.4-r1 the src.jar is installed to the standard"
+       elog "location. It is still symlinked to the old location (/opt/${P}/share)"
+       elog "but it will be removed if there will ever be a version bump."
+       elog "See https://bugs.gentoo.org/show_bug.cgi?id=2241"
+       elog "for more details."
+}