Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Vlastimil Babka (caster)" <caster@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-java/sun-jre-bin: ChangeLog sun-jre-bin-1.6.0.18-r1.ebuild
Date: Wed, 03 Feb 2010 11:30:29
Message-Id: E1NcdRD-0000QR-0V@stork.gentoo.org
1 caster 10/02/03 11:30:27
2
3 Modified: ChangeLog
4 Added: sun-jre-bin-1.6.0.18-r1.ebuild
5 Log:
6 Revbump to change the naming and default browser plugin on x86. The default variant (without suffix) is now the 'plugin2' which works with Firefox 3+ including 3.6. The old plugin has '-old_oji' suffix and doesn't work in FF 3.6. Users that had the old plugin set will be switched to the new default automatically.
7 (Portage version: 2.2_rc62/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.168 dev-java/sun-jre-bin/ChangeLog
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?rev=1.168&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?rev=1.168&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/ChangeLog?r1=1.167&r2=1.168
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v
19 retrieving revision 1.167
20 retrieving revision 1.168
21 diff -u -r1.167 -r1.168
22 --- ChangeLog 23 Jan 2010 22:23:07 -0000 1.167
23 +++ ChangeLog 3 Feb 2010 11:30:26 -0000 1.168
24 @@ -1,6 +1,16 @@
25 # ChangeLog for dev-java/sun-jre-bin
26 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.167 2010/01/23 22:23:07 caster Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.168 2010/02/03 11:30:26 caster Exp $
29 +
30 +*sun-jre-bin-1.6.0.18-r1 (03 Feb 2010)
31 +
32 + 03 Feb 2010; Vlastimil Babka <caster@g.o>
33 + +sun-jre-bin-1.6.0.18-r1.ebuild:
34 + Revbump to change the naming and default browser plugin on x86. The
35 + default variant (without suffix) is now the 'plugin2' which works with
36 + Firefox 3+ including 3.6. The old plugin has '-old_oji' suffix and doesn't
37 + work in FF 3.6. Users that had the old plugin set will be switched to the
38 + new default automatically.
39
40 23 Jan 2010; Vlastimil Babka <caster@g.o>
41 sun-jre-bin-1.6.0.18.ebuild, metadata.xml:
42
43
44
45 1.1 dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18-r1.ebuild
46
47 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18-r1.ebuild?rev=1.1&view=markup
48 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18-r1.ebuild?rev=1.1&content-type=text/plain
49
50 Index: sun-jre-bin-1.6.0.18-r1.ebuild
51 ===================================================================
52 # Copyright 1999-2010 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 # $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.18-r1.ebuild,v 1.1 2010/02/03 11:30:26 caster Exp $
55
56 inherit versionator pax-utils eutils java-vm-2
57
58 UPDATE="$(get_version_component_range 4)"
59 UPDATE="${UPDATE#0}"
60 MY_PV="$(get_version_component_range 2)u${UPDATE}"
61
62 SUFFIX=".bin"
63 X86_AT="jdk-${MY_PV}-dlj-linux-i586${SUFFIX}"
64 AMD64_AT="jdk-${MY_PV}-dlj-linux-amd64${SUFFIX}"
65
66 DESCRIPTION="Sun's Java SE Runtime Environment"
67 HOMEPAGE="http://java.sun.com/javase/6/"
68 URL_BASE="http://download.java.net/dlj/binaries"
69 SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
70 amd64? ( ${URL_BASE}/${AMD64_AT} )"
71 SLOT="1.6"
72 LICENSE="dlj-1.1"
73 KEYWORDS="-* ~amd64 ~x86"
74 RESTRICT="strip"
75 IUSE="X alsa jce nsplugin odbc"
76
77 DEPEND="jce? ( =dev-java/sun-jce-bin-1.6.0* )"
78 RDEPEND="${DEPEND}
79 sys-libs/glibc
80 x86? ( =virtual/libstdc++-3.3 )
81 alsa? ( media-libs/alsa-lib )
82 X? (
83 x11-libs/libXext
84 x11-libs/libXi
85 x11-libs/libXp
86 x11-libs/libXtst
87 amd64? ( x11-libs/libXt )
88 x11-libs/libX11
89 )
90 odbc? ( dev-db/unixODBC )"
91
92 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
93
94 QA_TEXTRELS_x86="opt/${P}/lib/i386/client/libjvm.so
95 opt/${P}/lib/i386/motif21/libmawt.so
96 opt/${P}/lib/i386/libdeploy.so
97 opt/${P}/lib/i386/server/libjvm.so"
98
99 src_unpack() {
100 mkdir bundled-jdk
101 cd bundled-jdk
102 sh "${DISTDIR}"/${A} --accept-license --unpack || die "Failed to unpack"
103
104 cd ..
105 bash "${FILESDIR}/construct-1.6.sh" bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
106 }
107
108 src_compile() {
109 # Set PaX markings on all JDK/JRE executables to allow code-generation on
110 # the heap by the JIT compiler. This has to be done before CDS - #215225
111 pax-mark m $(list-paxables "${S}"/bin/*)
112
113 # see bug #207282
114 if use x86; then
115 einfo "Creating the Class Data Sharing archives"
116 "${S}"/bin/java -client -Xshare:dump || die
117 "${S}"/bin/java -server -Xshare:dump || die
118 fi
119 }
120
121 src_install() {
122 local dirs="bin lib man"
123
124 # only X86 has the plugin and javaws
125 use x86 && dirs="${dirs} javaws plugin"
126 dodir /opt/${P}
127
128 cp -pPR $dirs "${D}/opt/${P}/" || die "failed to copy"
129
130 dodoc README THIRDPARTYLICENSEREADME.txt || die
131 dohtml Welcome.html || die
132 dodir /opt/${P}/share/
133
134 if use jce; then
135 cd "${D}/opt/${P}/lib/security"
136 dodir /opt/${P}/lib/security/strong-jce
137 mv "${D}"/opt/${P}/lib/security/US_export_policy.jar \
138 "${D}"/opt/${P}/lib/security/strong-jce || die
139 mv "${D}"/opt/${P}/lib/security/local_policy.jar \
140 "${D}"/opt/${P}/lib/security/strong-jce || die
141 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/lib/security/
142 dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/lib/security/
143 fi
144
145 if use nsplugin; then
146 local plugin_dir="ns7-gcc29"
147 if has_version '>=sys-devel/gcc-3' ; then
148 plugin_dir="ns7"
149 fi
150
151 if use x86 ; then
152 install_mozilla_plugin /opt/${P}/lib/i386/libnpjp2.so
153 install_mozilla_plugin /opt/${P}/plugin/i386/$plugin_dir/libjavaplugin_oji.so old_oji
154 else
155 install_mozilla_plugin /opt/${P}/lib/amd64/libnpjp2.so
156 fi
157 fi
158
159 # install control panel for Gnome/KDE
160 if [[ -e "${D}/opt/${P}/plugin/desktop/sun_java.desktop" ]]; then
161 sed -e "s/\(Name=Java\)/\1 Control Panel for Sun JRE ${SLOT}/" \
162 -e "s#Exec=.*#Exec=/opt/${P}/bin/ControlPanel#" \
163 -e "s#Icon=.*#Icon=/opt/${P}/plugin/desktop/sun_java.png#" \
164 "${D}/opt/${P}/plugin/desktop/sun_java.desktop" > \
165 "${T}/sun_jre-${SLOT}.desktop" || die
166 domenu "${T}/sun_jre-${SLOT}.desktop" || die
167 fi
168
169 # bug #56444
170 insinto /opt/${P}/lib/
171 newins "${FILESDIR}"/fontconfig.Gentoo.properties fontconfig.properties
172
173 set_java_env
174 java-vm_revdep-mask
175 }
176
177 pkg_postinst() {
178 # Set as default VM if none exists
179 java-vm-2_pkg_postinst
180
181 if use x86 && use nsplugin; then
182 elog
183 elog "Two variants of the nsplugin are available via eselect java-nsplugin:"
184 elog "Note that starting with ${PN}-1.6.0.18-r1 their naming and the default changed,"
185 elog "users with the old plugin set are switched to the new default automatically."
186 elog "The default ${VMHANDLE} is the new 'plugin2' which works in Firefox 3 (xulrunner-1.9)"
187 elog "and newer, the ${VMHANDLE}-old_oji is the old plugin using the OJI API"
188 elog "that was removed in Firefox 3.6 (xulrunner-1.9.2)."
189 elog "For more info see https://jdk6.dev.java.net/plugin2/"
190 elog
191 fi
192
193 if use amd64 && use nsplugin; then
194 elog
195 elog "The amd64 version ships the new 'plugin2' browser plugin which works"
196 elog "in Firefox 3+ and other recent browser versions."
197 elog "For more info see https://jdk6.dev.java.net/plugin2/"
198 elog
199 fi
200 }
Report Message
Find on MARC Find on Google Groups