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/ibm-jdk-bin: ChangeLog ibm-jdk-bin-1.6.0.4.ebuild ibm-jdk-bin-1.6.0.2-r1.ebuild ibm-jdk-bin-1.5.0.8a.ebuild
Date: Sun, 29 Mar 2009 23:05:45
Message-Id: E1Lo44V-000140-7K@stork.gentoo.org
1 caster 09/03/29 23:05:43
2
3 Modified: ChangeLog
4 Added: ibm-jdk-bin-1.6.0.4.ebuild
5 Removed: ibm-jdk-bin-1.6.0.2-r1.ebuild
6 ibm-jdk-bin-1.5.0.8a.ebuild
7 Log:
8 Version bump, security bug #252416.
9 (Portage version: 2.2_rc28/cvs/Linux x86_64)
10
11 Revision Changes Path
12 1.191 dev-java/ibm-jdk-bin/ChangeLog
13
14 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog?rev=1.191&view=markup
15 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog?rev=1.191&content-type=text/plain
16 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog?r1=1.190&r2=1.191
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v
21 retrieving revision 1.190
22 retrieving revision 1.191
23 diff -u -r1.190 -r1.191
24 --- ChangeLog 26 Jan 2009 16:47:55 -0000 1.190
25 +++ ChangeLog 29 Mar 2009 23:05:43 -0000 1.191
26 @@ -1,6 +1,13 @@
27 # ChangeLog for dev-java/ibm-jdk-bin
28 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.190 2009/01/26 16:47:55 ranger Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ChangeLog,v 1.191 2009/03/29 23:05:43 caster Exp $
31 +
32 +*ibm-jdk-bin-1.6.0.4 (29 Mar 2009)
33 +
34 + 29 Mar 2009; Vlastimil Babka <caster@g.o>
35 + -ibm-jdk-bin-1.5.0.8a.ebuild, -ibm-jdk-bin-1.6.0.2-r1.ebuild,
36 + +ibm-jdk-bin-1.6.0.4.ebuild:
37 + Version bump, security bug #252416.
38
39 26 Jan 2009; Brent Baude <ranger@g.o> ibm-jdk-bin-1.6.0.3.ebuild:
40 Marking ibm-jdk-bin-1.6.0.3 ppc64 for bug 252357
41
42
43
44 1.1 dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild
45
46 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild?rev=1.1&view=markup
47 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild?rev=1.1&content-type=text/plain
48
49 Index: ibm-jdk-bin-1.6.0.4.ebuild
50 ===================================================================
51 # Copyright 1999-2009 Gentoo Foundation
52 # Distributed under the terms of the GNU General Public License v2
53 # $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jdk-bin/ibm-jdk-bin-1.6.0.4.ebuild,v 1.1 2009/03/29 23:05:43 caster Exp $
54
55 inherit java-vm-2 versionator eutils
56
57 JDK_RELEASE=$(get_version_component_range 2-3)
58 JAVACOMM_RELEASE=$(get_version_component_range 3)
59 SERVICE_RELEASE=$(get_version_component_range 4)
60 SERVICE_RELEASE_LINK="${SERVICE_RELEASE}"
61 TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
62 #JAVACOMM_PV="3.${JAVACOMM_RELEASE}-${SERVICE_RELEASE}.0"
63 # looks like they didn't bump javacomm
64 JAVACOMM_PV_ORIG="3.${JAVACOMM_RELEASE}-0.0"
65 JAVACOMM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0"
66
67 JDK_DIST_PREFIX="ibm-java-sdk-${TGZ_PV}-linux"
68 JAVACOMM_DIST_PREFIX="ibm-java-javacomm-${JAVACOMM_PV}-linux"
69 JAVACOMM_DIST_PREFIX_ORIG="ibm-java-javacomm-${JAVACOMM_PV_ORIG}-linux"
70
71 X86_JDK_DIST="${JDK_DIST_PREFIX}-i386.tgz"
72 X86_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-i386.tgz"
73 X86_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-i386.tgz"
74
75 AMD64_JDK_DIST="${JDK_DIST_PREFIX}-x86_64.tgz"
76 AMD64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-x86_64.tgz"
77 AMD64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-x86_64.tgz"
78
79 PPC_JDK_DIST="${JDK_DIST_PREFIX}-ppc.tgz"
80 PPC_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc.tgz"
81 PPC_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc.tgz"
82
83 PPC64_JDK_DIST="${JDK_DIST_PREFIX}-ppc64.tgz"
84 PPC64_JAVACOMM_DIST="${JAVACOMM_DIST_PREFIX}-ppc64.tgz"
85 PPC64_JAVACOMM_DIST_ORIG="${JAVACOMM_DIST_PREFIX_ORIG}-ppc64.tgz"
86
87 if use x86; then
88 JDK_DIST=${X86_JDK_DIST}
89 JAVACOMM_DIST=${X86_JAVACOMM_DIST}
90 JAVACOMM_DIST_ORIG=${X86_JAVACOMM_DIST_ORIG}
91 S="${WORKDIR}/ibm-java-i386-60"
92 LINK_ARCH="intel"
93 elif use amd64; then
94 JDK_DIST=${AMD64_JDK_DIST}
95 JAVACOMM_DIST=${AMD64_JAVACOMM_DIST}
96 JAVACOMM_DIST_ORIG=${AMD64_JAVACOMM_DIST_ORIG}
97 S="${WORKDIR}/ibm-java-x86_64-60"
98 LINK_ARCH="amd64"
99 elif use ppc; then
100 JDK_DIST=${PPC_JDK_DIST}
101 JAVACOMM_DIST=${PPC_JAVACOMM_DIST}
102 JAVACOMM_DIST_ORIG=${PPC_JAVACOMM_DIST_ORIG}
103 S="${WORKDIR}/ibm-java-ppc-60"
104 LINK_ARCH="ipseries32"
105 elif use ppc64; then
106 JDK_DIST=${PPC64_JDK_DIST}
107 JAVACOMM_DIST=${PPC64_JAVACOMM_DIST}
108 JAVACOMM_DIST_ORIG=${PPC64_JAVACOMM_DIST_ORIG}
109 S="${WORKDIR}/ibm-java-ppc64-60"
110 LINK_ARCH="ipseries64"
111 fi
112
113 DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}_6sr${SERVICE_RELEASE}&S_TACT=105AGX05&S_CMP=JDK"
114
115 SLOT="1.6"
116 DESCRIPTION="IBM Java Development Kit ${SLOT}"
117 HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/"
118 DOWNLOADPAGE="${HOMEPAGE}linux/download.html"
119 # bug #125178
120 ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html"
121
122 SRC_URI="
123 x86? ( ${X86_JDK_DIST} )
124 amd64? ( ${AMD64_JDK_DIST} )
125 ppc? ( ${PPC_JDK_DIST} )
126 ppc64? ( ${PPC64_JDK_DIST} )
127 javacomm? (
128 x86? ( ${X86_JAVACOMM_DIST} )
129 amd64? ( ${AMD64_JAVACOMM_DIST} )
130 ppc? ( ${PPC_JAVACOMM_DIST} )
131 ppc64? ( ${PPC64_JAVACOMM_DIST} )
132 )"
133 LICENSE="IBM-J1.6"
134 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
135 RESTRICT="fetch"
136 IUSE="X alsa doc examples javacomm nsplugin odbc"
137
138 RDEPEND="
139 ppc? ( =virtual/libstdc++-3.3 )
140 ppc64? ( =virtual/libstdc++-3.3 )
141 X? (
142 x11-libs/libXext
143 x11-libs/libXft
144 x11-libs/libXi
145 x11-libs/libXp
146 x11-libs/libXtst
147 x11-libs/libX11
148 amd64? ( x11-libs/libXt )
149 )
150 alsa? ( media-libs/alsa-lib )
151 doc? ( =dev-java/java-sdk-docs-1.6.0* )
152 odbc? ( dev-db/unixODBC )"
153
154 DEPEND=""
155
156 QA_TEXTRELS_x86="opt/${P}/jre/lib/i386/libj9jvmti24.so
157 opt/${P}/jre/lib/i386/libj9vm24.so
158 opt/${P}/jre/lib/i386/libjclscar_24.so
159 opt/${P}/jre/lib/i386/motif21/libmawt.so
160 opt/${P}/jre/lib/i386/libj9thr24.so
161 opt/${P}/jre/lib/i386/libj9jit24.so
162 opt/${P}/jre/lib/i386/libj9dbg24.so
163 opt/${P}/jre/lib/i386/libj9gc24.so"
164
165 QA_EXECSTACK_x86="opt/${P}/jre/bin/classic/libjvm.so
166 opt/${P}/jre/lib/i386/j9vm/libjvm.so
167 opt/${P}/jre/lib/i386/libj9jvmti24.so
168 opt/${P}/jre/lib/i386/libj9hookable24.so
169 opt/${P}/jre/lib/i386/libj9vm24.so
170 opt/${P}/jre/lib/i386/libjclscar_24.so
171 opt/${P}/jre/lib/i386/libj9thr24.so
172 opt/${P}/jre/lib/i386/libj9dmp24.so
173 opt/${P}/jre/lib/i386/libj9prt24.so
174 opt/${P}/jre/lib/i386/libj9jit24.so
175 opt/${P}/jre/lib/i386/libiverel24.so
176 opt/${P}/jre/lib/i386/libj9trc24.so
177 opt/${P}/jre/lib/i386/libj9dbg24.so
178 opt/${P}/jre/lib/i386/libj9shr24.so
179 opt/${P}/jre/lib/i386/libj9gc24.so
180 opt/${P}/jre/lib/i386/libj9bcv24.so
181 opt/${P}/jre/lib/i386/classic/libjvm.so"
182
183 QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/default/libjvm.so
184 opt/${P}/jre/lib/amd64/default/libj9jvmti24.so
185 opt/${P}/jre/lib/amd64/default/libj9hookable24.so
186 opt/${P}/jre/lib/amd64/default/libj9vm24.so
187 opt/${P}/jre/lib/amd64/default/libjclscar_24.so
188 opt/${P}/jre/lib/amd64/default/libj9jpi24.so
189 opt/${P}/jre/lib/amd64/default/libj9thr24.so
190 opt/${P}/jre/lib/amd64/default/libj9dmp24.so
191 opt/${P}/jre/lib/amd64/default/libj9prt24.so
192 opt/${P}/jre/lib/amd64/default/libj9jit24.so
193 opt/${P}/jre/lib/amd64/default/libiverel24.so
194 opt/${P}/jre/lib/amd64/default/libj9trc24.so
195 opt/${P}/jre/lib/amd64/default/libj9dbg24.so
196 opt/${P}/jre/lib/amd64/default/libj9shr24.so
197 opt/${P}/jre/lib/amd64/default/libj9gc24.so
198 opt/${P}/jre/lib/amd64/default/libj9bcv24.so
199 opt/${P}/jre/lib/amd64/compressedrefs/libjvm.so
200 opt/${P}/jre/lib/amd64/compressedrefs/libj9jvmti24.so
201 opt/${P}/jre/lib/amd64/compressedrefs/libj9hookable24.so
202 opt/${P}/jre/lib/amd64/compressedrefs/libj9vm24.so
203 opt/${P}/jre/lib/amd64/compressedrefs/libjclscar_24.so
204 opt/${P}/jre/lib/amd64/compressedrefs/libj9jpi24.so
205 opt/${P}/jre/lib/amd64/compressedrefs/libj9thr24.so
206 opt/${P}/jre/lib/amd64/compressedrefs/libj9dmp24.so
207 opt/${P}/jre/lib/amd64/compressedrefs/libj9prt24.so
208 opt/${P}/jre/lib/amd64/compressedrefs/libj9jit24.so
209 opt/${P}/jre/lib/amd64/compressedrefs/libiverel24.so
210 opt/${P}/jre/lib/amd64/compressedrefs/libj9trc24.so
211 opt/${P}/jre/lib/amd64/compressedrefs/libj9dbg24.so
212 opt/${P}/jre/lib/amd64/compressedrefs/libj9shr24.so
213 opt/${P}/jre/lib/amd64/compressedrefs/libj9gc24.so
214 opt/${P}/jre/lib/amd64/compressedrefs/libj9bcv24.so"
215
216 pkg_nofetch() {
217 einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles"
218 einfo "Please visit: ${DOWNLOADPAGE}"
219
220 einfo "Under Java SE 6, download SR${SERVICE_RELEASE} for your arch:"
221 einfo "${JDK_DIST}"
222 if use javacomm ; then
223 einfo "Also download ${JAVACOMM_DIST_ORIG}"
224 ewarn "and save it as ${JAVACOMM_DIST}"
225 ewarn "Renaming is needed because javacomm changes content without changing filename."
226 fi
227
228 einfo "You can also use a direct link to your arch download page:"
229 einfo "${DIRECT_DOWNLOAD}"
230 einfo "Place the file(s) in: ${DISTDIR}"
231 einfo "Then restart emerge: 'emerge --resume'"
232
233 einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}"
234 einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page"
235 einfo "isn't updated, but the files should still available through the"
236 einfo "direct link to arch download page. If it doesn't work, file a bug."
237 }
238
239 src_unpack() {
240 unpack ${JDK_DIST}
241 if use javacomm; then
242 mkdir "${WORKDIR}/javacomm/" || die
243 cd "${WORKDIR}/javacomm/"
244 unpack ${JAVACOMM_DIST}
245 fi
246 cd "${S}"
247
248 # bug #126105
249 epatch "${FILESDIR}/${PN}-jawt.h.patch"
250 }
251
252 src_compile() { :; }
253
254 src_install() {
255 # Copy all the files to the designated directory
256 dodir /opt/${P}
257 cp -pR "${S}"/{bin,jre,lib,include,src.zip} "${D}/opt/${P}/" || die
258
259 if use examples; then
260 cp -pPR "${S}"/demo "${D}"/opt/${P}/ || die
261 fi
262 if use javacomm; then
263 chmod -x "${WORKDIR}"/javacomm/*/jar/*.jar "${WORKDIR}"/javacomm/*/lib/*.properties || die
264 cp -pR "${WORKDIR}"/javacomm/*/jar/*.jar "${D}"/opt/${P}/jre/lib/ext/ || die
265 cp -pR "${WORKDIR}"/javacomm/*/lib/*.properties "${D}"/opt/${P}/jre/lib/ || die
266 cp -pR "${WORKDIR}"/javacomm/*/lib/*.so "${D}"/opt/${P}/jre/lib/$(get_system_arch)/ || die
267 if use examples; then
268 cp -pPR "${WORKDIR}"/javacomm/*/examples "${D}"/opt/${P}/ || die
269 fi
270 fi
271
272 if use x86 || use ppc; then
273 if use nsplugin; then
274 local plugin="/opt/${P}/jre/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so"
275 install_mozilla_plugin "${plugin}"
276 fi
277 fi
278
279 if use amd64; then
280 # a workaround to fix the BOOTCLASSPATH in our env file
281 # this is not optimal, using -Xcompressedrefs would probably make it
282 # expect the compressedrefs version...
283 dosym /opt/${P}/jre/lib/amd64/default/jclSC160/vm.jar /opt/${P}/jre/lib/
284 fi
285
286 local desktop_in="${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop"
287 if [[ -f "${desktop_in}" ]]; then
288 local desktop_out="${T}/ibm_jdk-${SLOT}.desktop"
289 # install control panel for Gnome/KDE
290 # The jre also installs these so make sure that they do not have the same
291 # Name
292 sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JDK ${SLOT}/" \
293 -e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \
294 -e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
295 "${desktop_in}" > \
296 "${desktop_out}" || die
297
298 domenu "${desktop_out}" || die
299 fi
300
301 dohtml -a html,htm,HTML -r docs || die
302 dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die
303
304 set_java_env
305 java-vm_revdep-mask
306 }
Report Message
Find on MARC Find on Google Groups