From: Vlastimil Babka Date: Mon, 18 Dec 2006 12:12:40 +0000 (+0000) Subject: Version bump. Try to provide direct download URLs in pkg_nofetch() so that people... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c295141029578094431313a1f19298a82706227b;p=gentoo.git Version bump. 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... Package-Manager: portage-2.1.2_rc3-r6 --- diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog index a00c3fdc729e..410e5b38b245 100644 --- a/dev-java/ibm-jre-bin/ChangeLog +++ b/dev-java/ibm-jre-bin/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-java/ibm-jre-bin # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.52 2006/10/18 00:30:58 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.53 2006/12/18 12:12:40 caster Exp $ + +*ibm-jre-bin-1.4.2.7 (18 Dec 2006) + + 18 Dec 2006; Vlastimil Babka + ibm-jre-bin-1.4.2.6-r5.ebuild, +ibm-jre-bin-1.4.2.7.ebuild: + Version bump. 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... 18 Oct 2006; Joshua Nichols -files/ibm-jre-bin-1.4.2.03, -files/ibm-jre-bin-1.4.2.04, diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest index bbd1355780d2..9ab60cade3c5 100644 --- a/dev-java/ibm-jre-bin/Manifest +++ b/dev-java/ibm-jre-bin/Manifest @@ -3,17 +3,25 @@ MD5 f439934534b2526e2e541a8dad2834f3 files/ibm-jre-bin-1.4.env 976 RMD160 64fea85f255b474072a5633b34e087e00ab0ea2d files/ibm-jre-bin-1.4.env 976 SHA256 4d11de0d1018ab18f7f9e2e09748feab5f49e27f303d6c4d755cb6df0375ede2 files/ibm-jre-bin-1.4.env 976 DIST IBMJava2-142-ia32-JRE-1.4.2-6.0.i386.rpm 39863762 RMD160 578184c83e1a5218ac660747e5d8f068dd786fbd SHA1 e705aec29a39e05879c8ef4e3a73e9d1dff7a336 SHA256 524313f234f962c28c320da65309b4bdc234c021b09ba825140aa33fa434d5eb +DIST IBMJava2-142-ia32-JRE-1.4.2-7.0.i386.rpm 39935307 RMD160 bb066ea5985742afda7d4bf56c2a3b363c1b4f08 SHA1 a04c46538a7cf2f73266811208c6d68dd47a8f7b SHA256 c8e49c77be6dedab5ae74795e4a0d62b9ed94ea876b84b30ccca39498ba2928b DIST IBMJava2-142-ppc32-JRE-1.4.2-6.0.ppc.rpm 43065108 RMD160 1f062e1b2037aaf1faf09b8aa541ec969b9cd371 SHA1 609a9490fe1f95f835909908e6a0ae3ee0548f20 SHA256 b5836f3a011b9935750d8a03b5176d65b0e2819d0ed55611764b2d3ce0438322 +DIST IBMJava2-142-ppc32-JRE-1.4.2-7.0.ppc.rpm 48186821 RMD160 f80cd77b09034cfcc88b2d536621d2daf9677060 SHA1 570d8e7937ef6fe64f85d4d0890e61dbec49575d SHA256 8dc3814420714fd3640b39aa443210c8b0c73eb1541c5b91095d64dbd2712456 DIST IBMJava2-142-ppc64-JRE-1.4.2-6.0.ppc64.rpm 40218069 RMD160 45adc2239fb81c89e1871d25aaa79c8e670559cb SHA1 2d3fb13758312bc72fdd5858372f20b360ae10ba SHA256 a6ff07257ce9729409b49add9fd164412acb08fbcf8833826610f8e1578046bf +DIST IBMJava2-142-ppc64-JRE-1.4.2-7.0.ppc64.rpm 46399922 RMD160 b3a5eb88614e86bce79922bf83a082502bf0e49b SHA1 b9064bd1070baa34d1990621a76e4ce8446f96fd SHA256 7b94778b89a3a6cda333b18ade5d1e30334c4b64a9d49f492d86de9c5063955b DIST IBMJava2-AMD64-142-JRE-1.4.2-6.0.x86_64.rpm 34624859 RMD160 cacd2c9e0ee7d05e682f0a79973f018be2784289 SHA1 1ebcdd4152bb70a4bec4d82c9b54b68d63a152cc SHA256 e0854e6fc44931bef3a6b9e8860d67c8538c604667dd01e43a0baab4530226f3 -EBUILD ibm-jre-bin-1.4.2.6-r5.ebuild 3544 RMD160 89f51295829e9606cd034d129387111a9d02cb5a SHA1 1c6e387415f90ecf55e20f862478633e77dc23cf SHA256 1d4edd9f858c7744522c0c949d168942f4df412ed8e731c304675221ae7ae860 -MD5 c76363d430c08d0cda1c4f8e76dc6bbe ibm-jre-bin-1.4.2.6-r5.ebuild 3544 -RMD160 89f51295829e9606cd034d129387111a9d02cb5a ibm-jre-bin-1.4.2.6-r5.ebuild 3544 -SHA256 1d4edd9f858c7744522c0c949d168942f4df412ed8e731c304675221ae7ae860 ibm-jre-bin-1.4.2.6-r5.ebuild 3544 -MISC ChangeLog 8114 RMD160 33b5d8e2a24adf37da7a5b1ee467b011093173f2 SHA1 cbd1a89f0e73dec353aa89312337859b64b9c82f SHA256 f36075d85039fa0505111f45163cec6dde6882ed8ba346e924ff859dda90a03e -MD5 97fcbd8b905eab0b50d4cb6491747e09 ChangeLog 8114 -RMD160 33b5d8e2a24adf37da7a5b1ee467b011093173f2 ChangeLog 8114 -SHA256 f36075d85039fa0505111f45163cec6dde6882ed8ba346e924ff859dda90a03e ChangeLog 8114 +DIST IBMJava2-AMD64-142-JRE-1.4.2-7.0.x86_64.rpm 34666938 RMD160 8e97b89a740b33a36698a7476381d9f6f5f35d66 SHA1 18a60d802af183e6c18da0d184f72d37b13e237d SHA256 bc575b72df9cec3e3a41a9f06abaa3f5b7b4b52e1fd32529c72526e3b7a05a15 +EBUILD ibm-jre-bin-1.4.2.6-r5.ebuild 3982 RMD160 0469a52d90c12b09ba86817de185f1d220b36170 SHA1 dd68cd9c594e54e0bbf72f68ed1d29205b6eb674 SHA256 253fe0c2f2766816676e012134641fbe9179a1f2dcd985de7753a3dfc83068c3 +MD5 2ddd1882c16b919d3e6c45ee5a7d42da ibm-jre-bin-1.4.2.6-r5.ebuild 3982 +RMD160 0469a52d90c12b09ba86817de185f1d220b36170 ibm-jre-bin-1.4.2.6-r5.ebuild 3982 +SHA256 253fe0c2f2766816676e012134641fbe9179a1f2dcd985de7753a3dfc83068c3 ibm-jre-bin-1.4.2.6-r5.ebuild 3982 +EBUILD ibm-jre-bin-1.4.2.7.ebuild 3983 RMD160 a324fbd7c8dde6bbbe895ea3646714622e5ba06a SHA1 7f26d7a5c1a55302ccb823ada4c6d5a96ea02fc2 SHA256 68fead0b5c98715a971f54377d03fe479a8b0489bb6fb1b7e7a67bd7d1c3765d +MD5 d4add8cc9fa28c5eb59782e1d1ee5050 ibm-jre-bin-1.4.2.7.ebuild 3983 +RMD160 a324fbd7c8dde6bbbe895ea3646714622e5ba06a ibm-jre-bin-1.4.2.7.ebuild 3983 +SHA256 68fead0b5c98715a971f54377d03fe479a8b0489bb6fb1b7e7a67bd7d1c3765d ibm-jre-bin-1.4.2.7.ebuild 3983 +MISC ChangeLog 8516 RMD160 7b1fbfae9dc4867dab63a785bdaaccb16f2d60e4 SHA1 0ec3229bb6a4c696e1eff76d76a95ac7749bdc15 SHA256 0d5653353b8d0d1b6a58deaad01d7735aadd454f891f8382b522fdca9246a8cf +MD5 8a4cde64f4dd4c5c8eec690a3d017bd1 ChangeLog 8516 +RMD160 7b1fbfae9dc4867dab63a785bdaaccb16f2d60e4 ChangeLog 8516 +SHA256 0d5653353b8d0d1b6a58deaad01d7735aadd454f891f8382b522fdca9246a8cf ChangeLog 8516 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -21,3 +29,6 @@ SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata MD5 43b47e83c0ca5cb84bd78aa981f4589c files/digest-ibm-jre-bin-1.4.2.6-r5 1243 RMD160 d80a42d6a04c74ba4d3c63c5811c1c5f5e2b1840 files/digest-ibm-jre-bin-1.4.2.6-r5 1243 SHA256 0c19ee8e3ce149f371667caa7a552f7d7d9247a43225550025911397a44ceedd files/digest-ibm-jre-bin-1.4.2.6-r5 1243 +MD5 ed5b97549a7715b03569c1d20eb25097 files/digest-ibm-jre-bin-1.4.2.7 1243 +RMD160 74ce3f0a87f66102420ef1a312f5ce6a88a2d6e2 files/digest-ibm-jre-bin-1.4.2.7 1243 +SHA256 596c196df9df11a6272772c830bfc72432300d316997eb59d6a8047a016c981f files/digest-ibm-jre-bin-1.4.2.7 1243 diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.7 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.7 new file mode 100644 index 000000000000..7c5b10acee90 --- /dev/null +++ b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.4.2.7 @@ -0,0 +1,12 @@ +MD5 a71617fc4bbad3d20308e37511c26e2e IBMJava2-142-ia32-JRE-1.4.2-7.0.i386.rpm 39935307 +RMD160 bb066ea5985742afda7d4bf56c2a3b363c1b4f08 IBMJava2-142-ia32-JRE-1.4.2-7.0.i386.rpm 39935307 +SHA256 c8e49c77be6dedab5ae74795e4a0d62b9ed94ea876b84b30ccca39498ba2928b IBMJava2-142-ia32-JRE-1.4.2-7.0.i386.rpm 39935307 +MD5 a59bde6e6d89b35648c47a908318ed27 IBMJava2-142-ppc32-JRE-1.4.2-7.0.ppc.rpm 48186821 +RMD160 f80cd77b09034cfcc88b2d536621d2daf9677060 IBMJava2-142-ppc32-JRE-1.4.2-7.0.ppc.rpm 48186821 +SHA256 8dc3814420714fd3640b39aa443210c8b0c73eb1541c5b91095d64dbd2712456 IBMJava2-142-ppc32-JRE-1.4.2-7.0.ppc.rpm 48186821 +MD5 8b93f557147a283100c3a1d5b4ba9039 IBMJava2-142-ppc64-JRE-1.4.2-7.0.ppc64.rpm 46399922 +RMD160 b3a5eb88614e86bce79922bf83a082502bf0e49b IBMJava2-142-ppc64-JRE-1.4.2-7.0.ppc64.rpm 46399922 +SHA256 7b94778b89a3a6cda333b18ade5d1e30334c4b64a9d49f492d86de9c5063955b IBMJava2-142-ppc64-JRE-1.4.2-7.0.ppc64.rpm 46399922 +MD5 efd97135a71ff65a2186f783771da002 IBMJava2-AMD64-142-JRE-1.4.2-7.0.x86_64.rpm 34666938 +RMD160 8e97b89a740b33a36698a7476381d9f6f5f35d66 IBMJava2-AMD64-142-JRE-1.4.2-7.0.x86_64.rpm 34666938 +SHA256 bc575b72df9cec3e3a41a9f06abaa3f5b7b4b52e1fd32529c72526e3b7a05a15 IBMJava2-AMD64-142-JRE-1.4.2-7.0.x86_64.rpm 34666938 diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild index a6ab1a47f221..05731e238d94 100644 --- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.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/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild,v 1.6 2006/10/15 18:31:11 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.6-r5.ebuild,v 1.7 2006/12/18 12:12:40 caster Exp $ inherit java-vm-2 eutils versionator rpm @@ -11,18 +11,24 @@ RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" if use x86 ; then JRE_DIST="IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm" S="${WORKDIR}/opt/IBMJava2-142" + LINK_ARCH="ia32" elif use amd64 ; then JRE_DIST="IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm" S="${WORKDIR}/opt/IBMJava2-amd64-142" + LINK_ARCH="amd64" elif use ppc ; then JRE_DIST="IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm" S="${WORKDIR}/opt/IBMJava2-ppc-142" + LINK_ARCH="ip32" elif use ppc64 ; then JRE_DIST="IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm" S="${WORKDIR}/opt/IBMJava2-ppc64-142" + LINK_ARCH="ip64" fi -DESCRIPTION="IBM Java Development Kit" +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 Runtime Environment" HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" DOWNLOADPAGE="${HOMEPAGE}linux/download.html" ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" @@ -69,11 +75,16 @@ pkg_nofetch() { einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:" einfo "${JRE_DIST}" - einfo "Place the file in: ${DISTDIR}" + + 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() { :; } diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.7.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.7.ebuild new file mode 100644 index 000000000000..e74d9963d703 --- /dev/null +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.7.ebuild @@ -0,0 +1,141 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.7.ebuild,v 1.1 2006/12/18 12:12:40 caster Exp $ + +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 + JRE_DIST="IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm" + S="${WORKDIR}/opt/IBMJava2-142" + LINK_ARCH="ia32" +elif use amd64 ; then + JRE_DIST="IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm" + S="${WORKDIR}/opt/IBMJava2-amd64-142" + LINK_ARCH="amd64" +elif use ppc ; then + JRE_DIST="IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm" + S="${WORKDIR}/opt/IBMJava2-ppc-142" + LINK_ARCH="ip32" +elif use ppc64 ; then + JRE_DIST="IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm" + S="${WORKDIR}/opt/IBMJava2-ppc64-142" + LINK_ARCH="ip64" +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 Runtime Environment" +HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" +DOWNLOADPAGE="${HOMEPAGE}linux/download.html" +ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" + +SRC_URI="x86? ( IBMJava2-142-ia32-JRE-${RPM_PV}.i386.rpm ) + amd64? ( IBMJava2-AMD64-142-JRE-${RPM_PV}.x86_64.rpm ) + ppc? ( IBMJava2-142-ppc32-JRE-${RPM_PV}.ppc.rpm ) + ppc64? ( IBMJava2-142-ppc64-JRE-${RPM_PV}.ppc64.rpm )" + +LICENSE="IBM-J1.4" +SLOT="1.4" +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86" +IUSE="X alsa 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* ) )" +DEPEND="" + +RESTRICT="fetch" + +QA_TEXTRELS_x86="opt/${P}/bin/lib*.so + opt/${P}/bin/javaplugin.so + opt/${P}/bin/classic/libjvm.so + opt/${P}/bin/classic/libcore.so" +QA_TEXTRELS_amd64=" + opt/${P}/bin/libj9jit22.so + opt/${P}/bin/libjclscar_22.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 "${JRE_DIST}" + + 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_compile() { :; } + +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 ../javaws/javaws /opt/${P}/bin/javaws + fi + + # Copy all the files to the designated directory + dodir /opt/${P} + cp -pR ${S}/jre/* ${D}opt/${P}/ + + 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}/bin/${plugin} + elif use x86; then + rm ${D}/opt/${P}/bin/libjavaplugin*.so + fi + + if ! use alsa; then + rm ${D}/opt/${P}/bin/libjsoundalsa.so \ + || eerror "${D}/opt/${P}/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 JRE require an X server to properly" + ewarn "function. Be careful which Java libraries you attempt to" + ewarn "use with your installation." + ewarn + fi +}