diff options
author | 2007-12-16 20:13:03 +0000 | |
---|---|---|
committer | 2007-12-16 20:13:03 +0000 | |
commit | 6395410c04e0809cea6555e8e60f3b30941e13df (patch) | |
tree | 1b008df358d0f9e0f77c86d41c045716eff82bea /dev-java | |
parent | amd64 stable wrt #201984 (diff) | |
download | gentoo-2-6395410c04e0809cea6555e8e60f3b30941e13df.tar.gz gentoo-2-6395410c04e0809cea6555e8e60f3b30941e13df.tar.bz2 gentoo-2-6395410c04e0809cea6555e8e60f3b30941e13df.zip |
Add odbc USE flag and revdep-rebuild control file for bug #177925, tweak the deps.
(Portage version: 2.1.4_rc9)
Diffstat (limited to 'dev-java')
-rw-r--r-- | dev-java/ibm-jre-bin/ChangeLog | 8 | ||||
-rw-r--r-- | dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.6 | 12 | ||||
-rw-r--r-- | dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild | 43 | ||||
-rw-r--r-- | dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild | 49 | ||||
-rw-r--r-- | dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6.ebuild | 240 |
5 files changed, 31 insertions, 321 deletions
diff --git a/dev-java/ibm-jre-bin/ChangeLog b/dev-java/ibm-jre-bin/ChangeLog index 57146e22d7f5..c8e187b544f9 100644 --- a/dev-java/ibm-jre-bin/ChangeLog +++ b/dev-java/ibm-jre-bin/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-java/ibm-jre-bin # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.81 2007/12/16 17:16:32 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.82 2007/12/16 20:13:03 caster Exp $ + + 16 Dec 2007; Vlastimil Babka <caster@gentoo.org> + ibm-jre-bin-1.4.2.9.ebuild, -ibm-jre-bin-1.5.0.6.ebuild, + ibm-jre-bin-1.5.0.6-r1.ebuild: + Add odbc USE flag and revdep-rebuild control file for bug #177925, tweak the + deps. 16 Dec 2007; Vlastimil Babka <caster@gentoo.org> ibm-jre-bin-1.6.0.0.ebuild: diff --git a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.6 b/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.6 deleted file mode 100644 index d53d868f2514..000000000000 --- a/dev-java/ibm-jre-bin/files/digest-ibm-jre-bin-1.5.0.6 +++ /dev/null @@ -1,12 +0,0 @@ -MD5 473e099189e9e8b4a39fa2a4be34143e ibm-java2-jre-5.0-6.0-linux-i386.tgz 43484118 -RMD160 e07c82a30248f137285a7d7c24511e96421a3245 ibm-java2-jre-5.0-6.0-linux-i386.tgz 43484118 -SHA256 bf9a89e4341a3f761519bf6d53b641b8c4abfa08655e655e1ecef61a8ca87099 ibm-java2-jre-5.0-6.0-linux-i386.tgz 43484118 -MD5 2250c9eea6641a562d6139831d9ef1b9 ibm-java2-jre-5.0-6.0-linux-ppc.tgz 50320536 -RMD160 ebc98dde508a1990e1c9745333509b6deecb9697 ibm-java2-jre-5.0-6.0-linux-ppc.tgz 50320536 -SHA256 740cc4610ffb5c9ec0c98146906976c1c37b7ed20d550e71cb318fb9d4541e58 ibm-java2-jre-5.0-6.0-linux-ppc.tgz 50320536 -MD5 7ab489a31c09d1a84468153e73d148e8 ibm-java2-jre-5.0-6.0-linux-ppc64.tgz 49588981 -RMD160 b8df215a3d69aa23a6672fa91ddc94915d3bb158 ibm-java2-jre-5.0-6.0-linux-ppc64.tgz 49588981 -SHA256 1cbafb5bee54e5856330a479f72f7b997fd034745ede705e3926d2cb4c80538b ibm-java2-jre-5.0-6.0-linux-ppc64.tgz 49588981 -MD5 12ea59fc1bb538af0bac4b9d9972a3dc ibm-java2-jre-5.0-6.0-linux-x86_64.tgz 45671486 -RMD160 f4f62cac048f118585d19181705338879f223351 ibm-java2-jre-5.0-6.0-linux-x86_64.tgz 45671486 -SHA256 1ddb9b2bfbb43359d33a9833bbf67523ee2be30f9c0f0f8894e5cf4b5635a37a ibm-java2-jre-5.0-6.0-linux-x86_64.tgz 45671486 diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild index c03f1b218eb8..f6602faf5f78 100644 --- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild @@ -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-jre-bin/ibm-jre-bin-1.4.2.9.ebuild,v 1.5 2007/08/12 14:35:33 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.9.ebuild,v 1.6 2007/12/16 20:13:03 caster Exp $ inherit java-vm-2 eutils versionator @@ -51,19 +51,18 @@ SLOT="1.4" KEYWORDS="-* amd64 ppc ppc64 x86" IUSE="X alsa nsplugin" -RDEPEND=" +RDEPEND="x86? ( net-libs/libnet ) =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* ) )" + x11-libs/libXp + x11-libs/libXtst + x11-libs/libXt + x11-libs/libX11 + )" DEPEND="" RESTRICT="fetch" @@ -101,7 +100,7 @@ src_install() { # javaws is on x86 only if use x86; then # The javaws execution script is 777 why? - chmod 0755 ${S}/jre/javaws/javaws + chmod 0755 "${S}"/jre/javaws/javaws # bug #147259 dosym ../javaws/javaws /opt/${P}/bin/javaws @@ -109,7 +108,7 @@ src_install() { # Copy all the files to the designated directory dodir /opt/${P} - cp -pR ${S}/jre/* ${D}opt/${P}/ + cp -pR "${S}"/jre/* "${D}"/opt/${P}/ if use x86 && use nsplugin; then local plugin="libjavaplugin_oji.so" @@ -119,31 +118,11 @@ src_install() { 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 + 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 + java-vm_revdep-mask } diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild index d3fd4811890d..3e39fb664343 100644 --- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild +++ b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild @@ -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-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.1 2007/12/12 15:14:09 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.2 2007/12/16 20:13:03 caster Exp $ inherit java-vm-2 versionator eutils @@ -50,24 +50,26 @@ SRC_URI="x86? ( ${X86_JRE_DIST} ) LICENSE="IBM-J1.5" KEYWORDS="-* amd64 ppc ppc64 x86" RESTRICT="fetch" -IUSE="X alsa nsplugin" +IUSE="X alsa nsplugin odbc" -RDEPEND=" +RDEPEND="x86? ( net-libs/libnet ) =virtual/libstdc++-3.3 - X? ( x11-libs/libXt - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXp + X? ( x11-libs/libXext + x11-libs/libXft x11-libs/libXi x11-libs/libXmu - x11-libs/libXft - ) + x11-libs/libXp + x11-libs/libXtst + x11-libs/libXt + x11-libs/libX11 + ) alsa? ( media-libs/alsa-lib ) 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}/bin/libjclscar_23.so @@ -188,14 +190,6 @@ src_install() { dodir /opt/${P} cp -pR "${S}"/jre/* "${D}/opt/${P}/" - # 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}/bin/" @@ -205,8 +199,6 @@ src_install() { 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}/bin/${plugin} @@ -214,27 +206,12 @@ src_install() { 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 || die dodoc "${S}/COPYRIGHT" || die 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 + java-vm_revdep-mask } diff --git a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6.ebuild b/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6.ebuild deleted file mode 100644 index d69777502f29..000000000000 --- a/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6.ebuild +++ /dev/null @@ -1,240 +0,0 @@ -# Copyright 1999-2007 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.5.0.6.ebuild,v 1.5 2007/11/18 18:18:41 dertobi123 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}" -TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" - -JRE_DIST_PREFIX="ibm-java2-jre-${TGZ_PV}-linux" - -X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz" -AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz" -PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz" -PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz" - -if use x86; then - JRE_DIST=${X86_JRE_DIST} - S="${WORKDIR}/ibm-java2-i386-50" - LINK_ARCH="intel" -elif use amd64; then - JRE_DIST=${AMD64_JRE_DIST} - S="${WORKDIR}/ibm-java2-x86_64-50" - LINK_ARCH="amd64" -elif use ppc; then - JRE_DIST=${PPC_JRE_DIST} - S="${WORKDIR}/ibm-java2-ppc-50" - LINK_ARCH="ipseries32" -elif use ppc64; then - JRE_DIST=${PPC64_JRE_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 Runtime Environment ${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_JRE_DIST} ) - amd64? ( ${AMD64_JRE_DIST} ) - ppc? ( ${PPC_JRE_DIST} ) - ppc64? ( ${PPC64_JRE_DIST} )" -LICENSE="IBM-J1.5" -KEYWORDS="-* amd64 ppc ppc64 x86" -RESTRICT="fetch" -IUSE="X alsa 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 - ) - alsa? ( media-libs/alsa-lib ) - nsplugin? ( - x86? ( =x11-libs/gtk+-2* =x11-libs/gtk+-1* ) - ppc? ( =x11-libs/gtk+-1* ) - )" -DEPEND="" - -QA_EXECSTACK_amd64="opt/${P}/bin/libjclscar_23.so - opt/${P}/bin/libj9vrb23.so - opt/${P}/bin/libj9vm23.so - opt/${P}/bin/libj9trc23.so - opt/${P}/bin/libj9thr23.so - opt/${P}/bin/libj9shr23.so - opt/${P}/bin/libj9prt23.so - opt/${P}/bin/libj9jvmti23.so - opt/${P}/bin/libj9jpi23.so - opt/${P}/bin/libj9jit23.so - opt/${P}/bin/libj9jextract.so - opt/${P}/bin/libj9hookable23.so - opt/${P}/bin/libj9gc23.so - opt/${P}/bin/libj9dyn23.so - opt/${P}/bin/libj9dmp23.so - opt/${P}/bin/libj9dbg23.so - opt/${P}/bin/libj9bcv23.so - opt/${P}/bin/libiverel23.so - opt/${P}/bin/classic/libjvm.so - opt/${P}/bin/j9vm/libjvm.so" - -QA_TEXTRELS_amd64="opt/${P}/bin/libjclscar_23.so - opt/${P}/bin/libj9jit23.so" - -QA_EXECSTACK_x86="opt/${P}/bin/j9vm/libjvm.so - opt/${P}/bin/libj9jvmti23.so - opt/${P}/bin/libj9hookable23.so - opt/${P}/bin/libj9vm23.so - opt/${P}/bin/libj9dyn23.so - opt/${P}/bin/libjclscar_23.so - opt/${P}/bin/libj9jpi23.so - opt/${P}/bin/libj9thr23.so - opt/${P}/bin/libj9dmp23.so - opt/${P}/bin/libj9prt23.so - opt/${P}/bin/libj9jit23.so - opt/${P}/bin/libiverel23.so - opt/${P}/bin/libj9trc23.so - opt/${P}/bin/libj9dbg23.so - opt/${P}/bin/libj9jextract.so - opt/${P}/bin/libj9shr23.so - opt/${P}/bin/libj9gc23.so - opt/${P}/bin/libj9vrb23.so - opt/${P}/bin/libj9bcv23.so - opt/${P}/bin/libj9aotrt23.so - opt/${P}/bin/classic/libjvm.so" - -QA_TEXTRELS_ppc="opt/${P}/bin/classic/libjvm.so - opt/${P}/bin/j9vm/libjvm.so - opt/${P}/bin/libj9aotrt23.so - opt/${P}/bin/libj9dbg23.so - opt/${P}/bin/libj9gc23.so - opt/${P}/bin/libj9gcchk23.so - opt/${P}/bin/libj9jextract.so - opt/${P}/bin/libj9jit23.so - opt/${P}/bin/libj9jitd23.so - opt/${P}/bin/libj9jpi23.so - opt/${P}/bin/libj9jvmti23.so - opt/${P}/bin/libj9prt23.so - opt/${P}/bin/libj9thr23.so - opt/${P}/bin/libj9thr23.so - opt/${P}/bin/libj9ute23.so - opt/${P}/bin/libj9vm23.so - opt/${P}/bin/libj9vm23.so - opt/${P}/bin/libjaas.so - opt/${P}/bin/libjclscar_23.so - opt/${P}/bin/libjsig.so -" - -QA_TEXTRELS_ppc64="opt/${P}/bin/libj9jextract.so - opt/${P}/bin/libjsig.so - opt/${P}/bin/libj9jitd23.so - opt/${P}/bin/libj9ute23.so - opt/${P}/bin/classic/libjvm.so - opt/${P}/bin/libj9prt23.so - opt/${P}/bin/libjclscar_23.so - opt/${P}/bin/j9vm/libjvm.so - opt/${P}/bin/libj9gc23.so - opt/${P}/bin/libj9dbg23.so - opt/${P}/bin/libj9thr23.so - opt/${P}/bin/libj9jpi23.so - opt/${P}/bin/libj9gcchk23.so - opt/${P}/bin/libj9vm23.so - opt/${P}/bin/libj9jit23.so" - -QA_TEXTRELS_x86="opt/${P}/bin/lib*.so - opt/${P}/bin/j9vm/libjvm.so - opt/${P}/bin/xawt/libmawt.so - opt/${P}/bin/javaplugin.so - opt/${P}/bin/motif21/libmawt.so - opt/${P}/bin/headless/libmawt.so - opt/${P}/bin/classic/libjvm.so - opt/${P}/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 "${JRE_DIST}" - - 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_compile() { :; } - -src_install() { - # Copy all the files to the designated directory - dodir /opt/${P} - cp -pR ${S}/jre/* ${D}/opt/${P}/ - - # 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}/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}/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 || die - dodoc ${S}/COPYRIGHT || die - - 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 -} |