1 |
caster 07/12/16 13:47:25 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: ibm-jre-bin-1.6.0.0.ebuild |
5 |
Log: |
6 |
Version bump, bug #166789; Don't export JAVA in 1.5's env file. |
7 |
(Portage version: 2.1.4_rc9) |
8 |
|
9 |
Revision Changes Path |
10 |
1.80 dev-java/ibm-jre-bin/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?rev=1.80&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?rev=1.80&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?r1=1.79&r2=1.80 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v |
19 |
retrieving revision 1.79 |
20 |
retrieving revision 1.80 |
21 |
diff -u -r1.79 -r1.80 |
22 |
--- ChangeLog 12 Dec 2007 15:14:09 -0000 1.79 |
23 |
+++ ChangeLog 16 Dec 2007 13:47:25 -0000 1.80 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for dev-java/ibm-jre-bin |
26 |
# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.79 2007/12/12 15:14:09 caster Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.80 2007/12/16 13:47:25 caster Exp $ |
29 |
+ |
30 |
+*ibm-jre-bin-1.6.0.0 (16 Dec 2007) |
31 |
+ |
32 |
+ 16 Dec 2007; Vlastimil Babka <caster@g.o> |
33 |
+ files/ibm-jre-bin-1.5.env, +files/ibm-jre-bin-1.6.env, |
34 |
+ +ibm-jre-bin-1.6.0.0.ebuild: |
35 |
+ Version bump, bug #166789; Don't export JAVA in 1.5's env file. |
36 |
|
37 |
*ibm-jre-bin-1.5.0.6-r1 (12 Dec 2007) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.1 dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: ibm-jre-bin-1.6.0.0.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2007 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild,v 1.1 2007/12/16 13:47:25 caster Exp $ |
52 |
|
53 |
inherit java-vm-2 versionator eutils |
54 |
|
55 |
JDK_RELEASE=$(get_version_component_range 2-3) |
56 |
SERVICE_RELEASE=$(get_version_component_range 4) |
57 |
SERVICE_RELEASE_LINK="${SERVICE_RELEASE}" |
58 |
TGZ_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" |
59 |
|
60 |
JRE_DIST_PREFIX="ibm-java-jre-${TGZ_PV}-linux" |
61 |
|
62 |
X86_JRE_DIST="${JRE_DIST_PREFIX}-i386.tgz" |
63 |
AMD64_JRE_DIST="${JRE_DIST_PREFIX}-x86_64.tgz" |
64 |
PPC_JRE_DIST="${JRE_DIST_PREFIX}-ppc.tgz" |
65 |
PPC64_JRE_DIST="${JRE_DIST_PREFIX}-ppc64.tgz" |
66 |
|
67 |
if use x86; then |
68 |
JRE_DIST=${X86_JRE_DIST} |
69 |
S="${WORKDIR}/ibm-java-i386-60" |
70 |
LINK_ARCH="intel" |
71 |
elif use amd64; then |
72 |
JRE_DIST=${AMD64_JRE_DIST} |
73 |
S="${WORKDIR}/ibm-java-x86_64-60" |
74 |
LINK_ARCH="amd64" |
75 |
elif use ppc; then |
76 |
JRE_DIST=${PPC_JRE_DIST} |
77 |
S="${WORKDIR}/ibm-java-ppc-60" |
78 |
LINK_ARCH="ipseries32" |
79 |
elif use ppc64; then |
80 |
JRE_DIST=${PPC64_JRE_DIST} |
81 |
S="${WORKDIR}/ibm-java-ppc64-60" |
82 |
LINK_ARCH="ipseries64" |
83 |
fi |
84 |
|
85 |
DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=swg-sdk6&S_PKG=${LINK_ARCH}&S_TACT=105AGX05&S_CMP=JDK" |
86 |
|
87 |
SLOT="1.6" |
88 |
DESCRIPTION="IBM Java Runtime Environment ${SLOT}" |
89 |
HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" |
90 |
DOWNLOADPAGE="${HOMEPAGE}linux/download.html" |
91 |
# bug #125178 |
92 |
ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" |
93 |
|
94 |
SRC_URI="x86? ( ${X86_JRE_DIST} ) |
95 |
amd64? ( ${AMD64_JRE_DIST} ) |
96 |
ppc? ( ${PPC_JRE_DIST} ) |
97 |
ppc64? ( ${PPC64_JRE_DIST} )" |
98 |
LICENSE="IBM-J1.6" |
99 |
KEYWORDS="-* ~amd64 ~x86" |
100 |
RESTRICT="fetch" |
101 |
IUSE="X alsa nsplugin" |
102 |
|
103 |
RDEPEND="x86? ( net-libs/libnet ) |
104 |
X? ( |
105 |
x11-libs/libXext |
106 |
x11-libs/libXft |
107 |
x11-libs/libXi |
108 |
x11-libs/libXp |
109 |
x11-libs/libXtst |
110 |
x11-libs/libX11 |
111 |
amd64? ( x11-libs/libXt ) |
112 |
) |
113 |
alsa? ( media-libs/alsa-lib )" |
114 |
DEPEND="" |
115 |
|
116 |
QA_TEXTRELS_x86="opt/${P}/lib/i386/libj9jvmti24.so |
117 |
opt/${P}/lib/i386/libj9vm24.so |
118 |
opt/${P}/lib/i386/libjclscar_24.so |
119 |
opt/${P}/lib/i386/motif21/libmawt.so |
120 |
opt/${P}/lib/i386/libj9thr24.so |
121 |
opt/${P}/lib/i386/libj9jit24.so |
122 |
opt/${P}/lib/i386/libj9dbg24.so |
123 |
opt/${P}/lib/i386/libj9gc24.so" |
124 |
|
125 |
QA_EXECSTACK_x86="opt/${P}/bin/classic/libjvm.so |
126 |
opt/${P}/lib/i386/j9vm/libjvm.so |
127 |
opt/${P}/lib/i386/libj9jvmti24.so |
128 |
opt/${P}/lib/i386/libj9hookable24.so |
129 |
opt/${P}/lib/i386/libj9vm24.so |
130 |
opt/${P}/lib/i386/libjclscar_24.so |
131 |
opt/${P}/lib/i386/libj9thr24.so |
132 |
opt/${P}/lib/i386/libj9dmp24.so |
133 |
opt/${P}/lib/i386/libj9prt24.so |
134 |
opt/${P}/lib/i386/libj9jit24.so |
135 |
opt/${P}/lib/i386/libiverel24.so |
136 |
opt/${P}/lib/i386/libj9trc24.so |
137 |
opt/${P}/lib/i386/libj9dbg24.so |
138 |
opt/${P}/lib/i386/libj9shr24.so |
139 |
opt/${P}/lib/i386/libj9gc24.so |
140 |
opt/${P}/lib/i386/libj9bcv24.so |
141 |
opt/${P}/lib/i386/classic/libjvm.so" |
142 |
|
143 |
QA_TEXTRELS_amd64="opt/${P}/lib/amd64/libjclscar_24.so |
144 |
opt/${P}/lib/amd64/libj9jit24.so" |
145 |
|
146 |
QA_EXECSTACK_amd64="opt/${P}/bin/classic/libjvm.so |
147 |
opt/${P}/lib/amd64/j9vm/libjvm.so |
148 |
opt/${P}/lib/amd64/libj9jvmti24.so |
149 |
opt/${P}/lib/amd64/libj9hookable24.so |
150 |
opt/${P}/lib/amd64/libj9vm24.so |
151 |
opt/${P}/lib/amd64/libjclscar_24.so |
152 |
opt/${P}/lib/amd64/libj9thr24.so |
153 |
opt/${P}/lib/amd64/libj9dmp24.so |
154 |
opt/${P}/lib/amd64/libj9prt24.so |
155 |
opt/${P}/lib/amd64/libj9jit24.so |
156 |
opt/${P}/lib/amd64/libiverel24.so |
157 |
opt/${P}/lib/amd64/libj9trc24.so |
158 |
opt/${P}/lib/amd64/libj9dbg24.so |
159 |
opt/${P}/lib/amd64/libj9shr24.so |
160 |
opt/${P}/lib/amd64/libj9gc24.so |
161 |
opt/${P}/lib/amd64/libj9bcv24.so |
162 |
opt/${P}/lib/amd64/classic/libjvm.so" |
163 |
|
164 |
pkg_nofetch() { |
165 |
einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles" |
166 |
einfo "Please visit: ${DOWNLOADPAGE}" |
167 |
|
168 |
einfo "Under Java SE 6, download GA for your arch:" #SR${SERVICE_RELEASE} |
169 |
einfo "${JRE_DIST}" |
170 |
|
171 |
einfo "You can use direct link to your arch download page:" |
172 |
einfo "${DIRECT_DOWNLOAD}" |
173 |
einfo "Place the file(s) in: ${DISTDIR}" |
174 |
einfo "Then restart emerge: 'emerge --resume'" |
175 |
|
176 |
einfo "Note: if GA is not available at ${DOWNLOADPAGE}" |
177 |
einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" |
178 |
einfo "isn't updated, but the files should still available through the" |
179 |
einfo "direct link to arch download page. If it doesn't work, file a bug." |
180 |
} |
181 |
|
182 |
src_compile() { :; } |
183 |
|
184 |
src_install() { |
185 |
# Copy all the files to the designated directory |
186 |
dodir /opt/${P} |
187 |
cp -pR "${S}"/jre/* "${D}/opt/${P}/" |
188 |
|
189 |
if use x86 || use ppc; then |
190 |
if use nsplugin; then |
191 |
local plugin="/opt/${P}/plugin/$(get_system_arch)/ns7/libjavaplugin_oji.so" |
192 |
install_mozilla_plugin "${plugin}" |
193 |
fi |
194 |
fi |
195 |
|
196 |
local desktop_in="${D}/opt/${P}/plugin/desktop/sun_java.desktop" |
197 |
if [[ -f "${desktop_in}" ]]; then |
198 |
local desktop_out="${T}/ibm_jre-${SLOT}.desktop" |
199 |
# install control panel for Gnome/KDE |
200 |
# The jdk also installs these so make sure that they do not have the same |
201 |
# Name |
202 |
sed -e "s/\(Name=\)Java/\1 Java Control Panel for IBM JRE ${SLOT}/" \ |
203 |
-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/jcontrol#" \ |
204 |
-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \ |
205 |
"${desktop_in}" > \ |
206 |
"${desktop_out}" || die |
207 |
|
208 |
domenu "${desktop_out}" || die |
209 |
fi |
210 |
|
211 |
dohtml -a html,htm,HTML -r docs || die |
212 |
dodoc "${S}"/{copyright,notices.txt,readmefirst.lnx.txt} || die |
213 |
|
214 |
set_java_env |
215 |
} |
216 |
|
217 |
pkg_postinst() { |
218 |
java-vm-2_pkg_postinst |
219 |
if ! use X; then |
220 |
echo |
221 |
ewarn "You're not using X so its possible that you dont have" |
222 |
ewarn "a X server installed, please read the following warning: " |
223 |
ewarn "Some parts of IBM JDK require XFree86 to be installed." |
224 |
ewarn "Be careful which Java libraries you attempt to use." |
225 |
fi |
226 |
} |
227 |
|
228 |
|
229 |
|
230 |
-- |
231 |
gentoo-commits@g.o mailing list |