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