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