From: Vlastimil Babka Date: Sat, 16 Dec 2006 22:47:54 +0000 (+0000) Subject: Fix warning messages about missing files - bug #158283 by Martin Mokrejs . Install the control panel desktop menuitem again. Package-Manager: portage-2.1.2_rc3-r5 --- diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog index 3dddc652f841..bf45726253b6 100644 --- a/dev-java/sun-jre-bin/ChangeLog +++ b/dev-java/sun-jre-bin/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/sun-jre-bin # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.70 2006/12/14 00:21:12 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.71 2006/12/16 22:47:54 caster Exp $ + +*sun-jre-bin-1.6.0-r1 (16 Dec 2006) + + 16 Dec 2006; Vlastimil Babka +files/construct-1.6.sh, + +sun-jre-bin-1.6.0-r1.ebuild: + Fix warning messages about missing files - bug #158283 by Martin Mokrejs + . Install the control panel desktop + menuitem again. *sun-jre-bin-1.6.0 (14 Dec 2006) diff --git a/dev-java/sun-jre-bin/Manifest b/dev-java/sun-jre-bin/Manifest index 2b46f038af9a..5d993e533520 100644 --- a/dev-java/sun-jre-bin/Manifest +++ b/dev-java/sun-jre-bin/Manifest @@ -1,3 +1,7 @@ +AUX construct-1.6.sh 6794 RMD160 d22f39b648c6a306312b54bc89218dc76d3bcfc3 SHA1 a74be01576444a16d7212255a0e2f376595cb6df SHA256 baae7893300663f5c1bb702fbf40ddd1eb086bbbd4c7665998baf54e1273dc26 +MD5 e11b521d69bf1a8a90fc16693065490c files/construct-1.6.sh 6794 +RMD160 d22f39b648c6a306312b54bc89218dc76d3bcfc3 files/construct-1.6.sh 6794 +SHA256 baae7893300663f5c1bb702fbf40ddd1eb086bbbd4c7665998baf54e1273dc26 files/construct-1.6.sh 6794 AUX construct.sh 6959 RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 SHA1 966b9c8229ef3dfb588c108124f367cc993cb581 SHA256 55ca240c8cb0e01b0548e66b0c6446437ebeff541334ead256b5139c1e14ea3f MD5 94065b612df0046d9ae758943f9f6a75 files/construct.sh 6959 RMD160 fdc0d503b412657a6b0864cfc7f18fa63bf43225 files/construct.sh 6959 @@ -52,14 +56,18 @@ EBUILD sun-jre-bin-1.5.0.10.ebuild 3839 RMD160 9953890d379a23266669ae40bec710b48 MD5 006e178438065b2ce976b59e5429c860 sun-jre-bin-1.5.0.10.ebuild 3839 RMD160 9953890d379a23266669ae40bec710b482b0ed55 sun-jre-bin-1.5.0.10.ebuild 3839 SHA256 93e25a95dd175e50a8398d90d0599214188e9a843bac505423954a671616d7fa sun-jre-bin-1.5.0.10.ebuild 3839 +EBUILD sun-jre-bin-1.6.0-r1.ebuild 3863 RMD160 449844bf07a1e8251868f16d87fe4a4a3918941d SHA1 eeb3d6bdaad41a8ba52a85e5d2cc1e41e65c99f4 SHA256 113dfc8b0f596a3dbbc44bd29c6f43090b2e517ef7e6d61e4a54d08884753017 +MD5 0c11e6dbf5390eca3703eb9149b1e813 sun-jre-bin-1.6.0-r1.ebuild 3863 +RMD160 449844bf07a1e8251868f16d87fe4a4a3918941d sun-jre-bin-1.6.0-r1.ebuild 3863 +SHA256 113dfc8b0f596a3dbbc44bd29c6f43090b2e517ef7e6d61e4a54d08884753017 sun-jre-bin-1.6.0-r1.ebuild 3863 EBUILD sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d4e72 SHA1 bf720eea7f7a7e66cafe0b747a0beb1c3278e5ec SHA256 dc9b72020dbd0084421564773c733a104845f4d4f94ad872af2c1f82a2bea4cc MD5 eaabfc7a033301ed532b757f6d8f8c35 sun-jre-bin-1.6.0.ebuild 3882 RMD160 967b27493f5dade14bccee0a626c5f70cd2d4e72 sun-jre-bin-1.6.0.ebuild 3882 SHA256 dc9b72020dbd0084421564773c733a104845f4d4f94ad872af2c1f82a2bea4cc sun-jre-bin-1.6.0.ebuild 3882 -MISC ChangeLog 13443 RMD160 c15cde206430674704162b00e04fb6d89914c8d9 SHA1 ad29a76024e6d78a608f5a2f442a3300e85a125b SHA256 14eceaf229223fa0823a6ec6f3c22b94c23c22077bb634cd8a8f32dd18e438f7 -MD5 eb0b66adfd87d7b2dfb1966c54330174 ChangeLog 13443 -RMD160 c15cde206430674704162b00e04fb6d89914c8d9 ChangeLog 13443 -SHA256 14eceaf229223fa0823a6ec6f3c22b94c23c22077bb634cd8a8f32dd18e438f7 ChangeLog 13443 +MISC ChangeLog 13753 RMD160 bbac841b2d202b32b8bfb2fa301012f0d26bdd23 SHA1 eb6a9cd0ada3d8adfecb01bad8be775ed90a26d7 SHA256 167811ecb7c76567bca4af09575a94921ffb0c3a8aa551628883f60a1a89a3e5 +MD5 08101e8f7e366767039ff79db722c356 ChangeLog 13753 +RMD160 bbac841b2d202b32b8bfb2fa301012f0d26bdd23 ChangeLog 13753 +SHA256 167811ecb7c76567bca4af09575a94921ffb0c3a8aa551628883f60a1a89a3e5 ChangeLog 13753 MISC metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 SHA1 9d97dffe17dd3ea241edafeb9a12479d4e0bc17f SHA256 3736870ea8f5be547aa7555022da8690eba4e4c1cdfeac21a6cba84a7d1cc07f MD5 c7683734eb61c03c450e551efa7b4d5a metadata.xml 240 RMD160 8c29e03b578ddd40c82afe82d42498d4c855e745 metadata.xml 240 @@ -85,3 +93,6 @@ SHA256 f1f582a1bfca18c6375dc35e75bd199066d2361ffbf7e577a592afb4b351e34d files/di MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jre-bin-1.6.0 521 RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jre-bin-1.6.0 521 SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jre-bin-1.6.0 521 +MD5 7cca7ffac6725b17472340fe8db317f6 files/digest-sun-jre-bin-1.6.0-r1 521 +RMD160 7329a96c4622d1ea677604d88299616019b8f1d2 files/digest-sun-jre-bin-1.6.0-r1 521 +SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/digest-sun-jre-bin-1.6.0-r1 521 diff --git a/dev-java/sun-jre-bin/files/construct-1.6.sh b/dev-java/sun-jre-bin/files/construct-1.6.sh new file mode 100644 index 000000000000..3e09d4621d63 --- /dev/null +++ b/dev-java/sun-jre-bin/files/construct-1.6.sh @@ -0,0 +1,273 @@ +#!/bin/bash +# construct.sh +# example construction of JRE and JDK directories from the DLJ bundles +# +# Copyright © 2006 Sun Microsystems, Inc. +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files (the +# "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to +# permit persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be +# included in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Sun, Sun Microsystems, the Sun logo and Java, Java HotSpot, +# and JVM trademarks or registered trademarks of Sun Microsystems, +# Inc. in the U.S. and other countries. + + +program=`basename $0` + +usage () { + echo "usage: ${program} path/to/unbundle-jdk path/to/linux-jdk path/to/linux-jre" +} + +getargs() { + undir=$1 + jdkdir=$2 + jredir=$3 + if [ ! -d $undir ]; then + echo "${program}: unbundle directory not found: $undir" + exit 2 + fi + # make sure javahome is the JDK + javahome=`echo $undir/*/demo` + if [ ! -d $javahome ]; then + echo "${program}: unbundle directory incorrect: $undir" + echo " expecting $undir/jdk1.5.0_xx" + exit 2 + else + javahome=`dirname $javahome` + fi + # verify JDK dir + jdkdirp=`dirname $jdkdir` + jdkbase=`basename $jdkdir` + if [ ! -d $jdkdirp ]; then + echo "${program}: parent directory for JDK does not exist: $jdkdirp" + exit 2 + fi + savedir=`pwd` + cd $jdkdirp + jdkdirp=`pwd` + cd $savedir + jdkdir=$jdkdirp/$jdkbase + # verify JRE dir + jredirp=`dirname $jredir` + jrebase=`basename $jredir` + if [ ! -d $jredirp ]; then + echo "${program}: parent directory for JRE does not exist: $jredirp" + exit 2 + fi + savedir=`pwd` + cd $jredirp + jredirp=`pwd` + cd $savedir + jredir=$jredirp/$jrebase +} + +checkfiles() { + if [ -r $jdkdir ]; then + echo "${program}: directory for JDK already exists: $jdkdir" + exit 2 + fi + if [ -r $jredir ]; then + echo "${program}: directory for JRE already exists: $jredir" + exit 2 + fi +} + +copytree() { + echo "copying over the JDK tree..." + cp -a $javahome $jdkdir +} + +linkrel() { + target=$1 + link=$2 + # make a softlink from the $link to the $target + # make this a relative link + targetb=(`echo $target | tr '/' ' '`) + linkb=(`echo $link | tr '/' ' '`) + (( n = ${#targetb[*]} )) + (( m = ${#linkb[*]} )) + c=$n # common length + if [ $m -lt $c ]; then + (( c = m )) + fi + for (( i = 0 ; i < c ; i++ )); do + if [ ${targetb[$i]} != ${linkb[$i]} ]; then + # echo components differ, stopping + break + fi + done + rel="" + for (( j = i + 1; j < m ; j++ )); do + if [ -z $rel ]; then + rel=".." + else + rel="$rel/.." + fi + done + for (( j = i; j < n ; j++ )); do + if [ -z $rel ]; then + rel=${targetb[$j]} + else + rel="$rel/${targetb[$j]}" + fi + done + ln -s $rel $link +} + +createjre() { + echo "creating JRE directory..." + # absolute link + # ln -s $jdkdir/jre $jredir + # relative link + linkrel $jdkdir/jre $jredir +} + +unpackjars() { + echo "unpacking jars..." + unpack200=$jdkdir/bin/unpack200 + if [ ! -x $unpack200 ]; then + echo "${program}: file missing $unpack200" + exit 1 + fi + cd $jdkdir + PACKED_JARS=`find . -name '*.pack'` + for i in $PACKED_JARS; do + # echo $i + jdir=`dirname $i` + jbase=`basename $i .pack` + if ! $unpack200 $jdkdir/$jdir/$jbase.pack $jdkdir/$jdir/$jbase.jar; then + echo "${program}: error unpacking $jdkdir/$jdir/$jbase.jar" + fi + if [ ! -r $jdkdir/$jdir/$jbase.jar ]; then + echo "${program}: missing $jdkdir/$jdir/$jbase.jar" + else + echo " $jdir/$jbase.jar" + # remove pack file + rm $jdkdir/$jdir/$jbase.pack + fi + done +} + +preparecds() { + # if this is a client installation... + compiler="`$jdkdir/bin/java -client -version 2>&1 | tail -n +3 | cut -d' ' -f1-4`" + if [ "X$compiler" = "XJava HotSpot(TM) Client VM" ]; then + # create the CDS archive + echo "creating the class data sharing archive..." + if ! $jdkdir/bin/java -client -Xshare:dump > /dev/null 2>&1; then + echo "returned error code $?" + fi + fi +} + +jreman () { + echo "setting up the JRE man pages..." + # note this list is slightly different for OpenSolaris bundles + jreman=/tmp/jre.man.txt +cat < $jreman +man/ja_JP.eucJP/man1/java.1 +man/ja_JP.eucJP/man1/javaws.1 +man/ja_JP.eucJP/man1/keytool.1 +man/ja_JP.eucJP/man1/orbd.1 +man/ja_JP.eucJP/man1/pack200.1 +man/ja_JP.eucJP/man1/policytool.1 +man/ja_JP.eucJP/man1/rmid.1 +man/ja_JP.eucJP/man1/rmiregistry.1 +man/ja_JP.eucJP/man1/servertool.1 +man/ja_JP.eucJP/man1/tnameserv.1 +man/ja_JP.eucJP/man1/unpack200.1 +man/man1/java.1 +man/man1/javaws.1 +man/man1/keytool.1 +man/man1/orbd.1 +man/man1/pack200.1 +man/man1/policytool.1 +man/man1/rmid.1 +man/man1/rmiregistry.1 +man/man1/servertool.1 +man/man1/tnameserv.1 +man/man1/unpack200.1 +EOF + # create jre/man directory + # mkdir $jdkdir/jre/man + # move the real JRE man pages to jre/man + # link the JDK JRE man pages to jre/man + # real JDK man pages stay where they are + for m in `cat $jreman`; do + manpath=`dirname $jdkdir/jre/$m` + mkdir -p $manpath + mv $jdkdir/$m $jdkdir/jre/$m + linkrel $jdkdir/jre/$m $jdkdir/$m + done + # link in Japanese man pages + ln -s ja_JP.eucJP $jdkdir/jre/man/ja + rm $jreman +} + +elimdups() { + echo "eliminating duplication between the JDK and JDK/jre..." + jdkcomm=/tmp/jdk.bin.comm.txt +cat < $jdkcomm +bin/ControlPanel +bin/java +bin/javaws +bin/keytool +bin/orbd +bin/pack200 +bin/policytool +bin/rmid +bin/rmiregistry +bin/servertool +bin/tnameserv +bin/unpack200 +EOF + # note there is little point in linking these common files + # COPYRIGHT + # LICENSE + # THIRDPARTYLICENSEREADME.txt + # And this file is unique to the JDK + # README.html + # And these files are unique to the JDK/jre/ + # CHANGES + # README + # Welcome.html + for p in `cat $jdkcomm`; do + rm $jdkdir/$p + # this is a relative link + ln -s ../jre/$p $jdkdir/$p + done + rm $jdkcomm +} + +if [ $# -eq 3 ] ; then + getargs $1 $2 $3 + checkfiles + copytree + createjre + unpackjars + preparecds + jreman + elimdups +else + usage + exit 1 +fi + +exit 0 + diff --git a/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0-r1 b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0-r1 new file mode 100644 index 000000000000..95693b0f544e --- /dev/null +++ b/dev-java/sun-jre-bin/files/digest-sun-jre-bin-1.6.0-r1 @@ -0,0 +1,6 @@ +MD5 2e0c075c27b09aed67f99475c3a19f83 jdk-6-dlj-linux-amd64.bin 56347832 +RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e jdk-6-dlj-linux-amd64.bin 56347832 +SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3 jdk-6-dlj-linux-amd64.bin 56347832 +MD5 f4481c4e064cec06a65d7751d9105c6d jdk-6-dlj-linux-i586.bin 62718862 +RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac jdk-6-dlj-linux-i586.bin 62718862 +SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467 jdk-6-dlj-linux-i586.bin 62718862 diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild new file mode 100644 index 000000000000..ed45f298c2d7 --- /dev/null +++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0-r1.ebuild,v 1.1 2006/12/16 22:47:54 caster Exp $ + +inherit pax-utils eutils java-vm-2 + +#MY_PVA=${PV//./_} +MY_PVA=6 +#S="${WORKDIR}/jdk${PV}" + +X86_AT="jdk-${MY_PVA}-dlj-linux-i586.bin" +AMD64_AT="jdk-${MY_PVA}-dlj-linux-amd64.bin" +if use x86; then + At=${X86_AT} +elif use amd64; then + At=${AMD64_AT} +fi +DESCRIPTION="Sun's J2SE Development Kit, version ${PV}" +HOMEPAGE="http://java.sun.com/javase/6/" +SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} ) + amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )" +SLOT="1.6" +LICENSE="dlj-1.1" +KEYWORDS="-* ~amd64 ~x86" +RESTRICT="nostrip" +IUSE="X alsa nsplugin" + +RDEPEND=" + sys-libs/glibc + alsa? ( media-libs/alsa-lib ) + X? ( || ( ( x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXp + x11-libs/libXt + x11-libs/libXtst + ) + virtual/x11 + ) + )" + +DEPEND="" + +JAVA_PROVIDE="jdbc-stdext jdbc-rowset" + +PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar lib/ext/localedata.jar lib/plugin.jar lib/javaws.jar lib/deploy.jar" + +QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so + opt/${P}/lib/i386/motif21/libmawt.so + opt/${P}/lib/i386/libdeploy.so + opt/${P}/lib/i386/server/libjvm.so" + +src_unpack() { + if [ ! -r ${DISTDIR}/${At} ]; then + die "cannot read ${At}. Please check the permission and try again." + fi + + mkdir bundled-jdk + cd bundled-jdk + sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack" + + cd .. + bash ${FILESDIR}/construct-1.6.sh bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed" +} + +src_install() { + local dirs="bin lib man" + + # Set PaX markings on all JDK/JRE executables to allow code-generation on + # the heap by the JIT compiler. + pax-mark m $(list-paxables ${S}/bin/*) + + # only X86 has the plugin and javaws + use x86 && dirs="${dirs} javaws plugin" + dodir /opt/${P} + + for i in $dirs ; do + cp -pPR $i ${D}/opt/${P}/ || die "failed to copy" + done + dodoc CHANGES README THIRDPARTYLICENSEREADME.txt + dohtml Welcome.html + dodir /opt/${P}/share/ + + if use nsplugin; then + local plugin_dir="ns7-gcc29" + if has_version '>=sys-devel/gcc-3' ; then + plugin_dir="ns7" + fi + + if use x86 ; then + install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so + else + eerror "No plugin available for amd64 arch" + fi + fi + + # TODO Don't think we still needs these -nichoj + # create dir for system preferences + #dodir /opt/${P}/jre/.systemPrefs + # Create files used as storage for system preferences. + #touch ${D}/opt/${P}/jre/.systemPrefs/.system.lock + #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.system.lock + #touch ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile + #chmod 644 ${D}/opt/${P}/jre/.systemPrefs/.systemRootModFile + + # install control panel for Gnome/KDE + sed -e "s/\(Name=Java\)/\1 Control Panel (${PN}-${SLOT})/" \ + -e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \ + -e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \ + ${D}/opt/${P}/plugin/desktop/sun_java.desktop > \ + ${T}/sun_jre-${SLOT}.desktop + + domenu ${T}/sun_jre-${SLOT}.desktop + + # bug #56444 + insinto /opt/${P}/lib/ + newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties + + set_java_env +} + +pkg_postinst() { + # Set as default VM if none exists + java-vm-2_pkg_postinst + + if ! use X; then + local xwarn="virtual/x11 and/or" + fi + + echo + ewarn "Some parts of Sun's JDK require ${xwarn} virtual/lpr to be installed." + ewarn "Be careful which Java libraries you attempt to use." + + echo + elog "Beginning with 1.5.0.10 the hotspot vm can use epoll" + elog "The epoll-based implementation of SelectorProvider is not selected by" + elog "default." + elog "Use java -Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.EPollSelectorProvider" +}