1 |
caster 08/02/26 16:28:59 |
2 |
|
3 |
Modified: ChangeLog ibm-jre-bin-1.6.0.0.ebuild |
4 |
ibm-jre-bin-1.5.0.6-r1.ebuild |
5 |
Added: ibm-jre-bin-1.4.2.10.ebuild |
6 |
Log: |
7 |
Version bump, security bug #198644; remove unneeded libnet deps. |
8 |
(Portage version: 2.1.4.4) |
9 |
|
10 |
Revision Changes Path |
11 |
1.85 dev-java/ibm-jre-bin/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?rev=1.85&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?rev=1.85&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog?r1=1.84&r2=1.85 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v |
20 |
retrieving revision 1.84 |
21 |
retrieving revision 1.85 |
22 |
diff -u -r1.84 -r1.85 |
23 |
--- ChangeLog 17 Jan 2008 20:12:18 -0000 1.84 |
24 |
+++ ChangeLog 26 Feb 2008 16:28:59 -0000 1.85 |
25 |
@@ -1,6 +1,13 @@ |
26 |
# ChangeLog for dev-java/ibm-jre-bin |
27 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.84 2008/01/17 20:12:18 tgall Exp $ |
29 |
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ChangeLog,v 1.85 2008/02/26 16:28:59 caster Exp $ |
31 |
+ |
32 |
+*ibm-jre-bin-1.4.2.10 (26 Feb 2008) |
33 |
+ |
34 |
+ 26 Feb 2008; Vlastimil Babka <caster@g.o> |
35 |
+ +ibm-jre-bin-1.4.2.10.ebuild, ibm-jre-bin-1.5.0.6-r1.ebuild, |
36 |
+ ibm-jre-bin-1.6.0.0.ebuild: |
37 |
+ Version bump, security bug #198644; remove unneeded libnet deps. |
38 |
|
39 |
17 Jan 2008; Tom Gall <tgall@g.o> ibm-jre-bin-1.6.0.0.ebuild: |
40 |
added ~ppc64, bug #166789 |
41 |
|
42 |
|
43 |
|
44 |
1.5 dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild?rev=1.5&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild?rev=1.5&content-type=text/plain |
48 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild?r1=1.4&r2=1.5 |
49 |
|
50 |
Index: ibm-jre-bin-1.6.0.0.ebuild |
51 |
=================================================================== |
52 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild,v |
53 |
retrieving revision 1.4 |
54 |
retrieving revision 1.5 |
55 |
diff -u -r1.4 -r1.5 |
56 |
--- ibm-jre-bin-1.6.0.0.ebuild 17 Jan 2008 20:12:18 -0000 1.4 |
57 |
+++ ibm-jre-bin-1.6.0.0.ebuild 26 Feb 2008 16:28:59 -0000 1.5 |
58 |
@@ -1,6 +1,6 @@ |
59 |
# Copyright 1999-2008 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild,v 1.4 2008/01/17 20:12:18 tgall Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.6.0.0.ebuild,v 1.5 2008/02/26 16:28:59 caster Exp $ |
63 |
|
64 |
inherit java-vm-2 versionator eutils |
65 |
|
66 |
@@ -52,7 +52,7 @@ |
67 |
RESTRICT="fetch" |
68 |
IUSE="X alsa nsplugin odbc" |
69 |
|
70 |
-RDEPEND="x86? ( net-libs/libnet ) |
71 |
+RDEPEND=" |
72 |
X? ( |
73 |
x11-libs/libXext |
74 |
x11-libs/libXft |
75 |
|
76 |
|
77 |
|
78 |
1.3 dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild |
79 |
|
80 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild?rev=1.3&view=markup |
81 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild?rev=1.3&content-type=text/plain |
82 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild?r1=1.2&r2=1.3 |
83 |
|
84 |
Index: ibm-jre-bin-1.5.0.6-r1.ebuild |
85 |
=================================================================== |
86 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v |
87 |
retrieving revision 1.2 |
88 |
retrieving revision 1.3 |
89 |
diff -u -r1.2 -r1.3 |
90 |
--- ibm-jre-bin-1.5.0.6-r1.ebuild 16 Dec 2007 20:13:03 -0000 1.2 |
91 |
+++ ibm-jre-bin-1.5.0.6-r1.ebuild 26 Feb 2008 16:28:59 -0000 1.3 |
92 |
@@ -1,6 +1,6 @@ |
93 |
-# Copyright 1999-2007 Gentoo Foundation |
94 |
+# Copyright 1999-2008 Gentoo Foundation |
95 |
# Distributed under the terms of the GNU General Public License v2 |
96 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.2 2007/12/16 20:13:03 caster Exp $ |
97 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.5.0.6-r1.ebuild,v 1.3 2008/02/26 16:28:59 caster Exp $ |
98 |
|
99 |
inherit java-vm-2 versionator eutils |
100 |
|
101 |
@@ -52,8 +52,7 @@ |
102 |
RESTRICT="fetch" |
103 |
IUSE="X alsa nsplugin odbc" |
104 |
|
105 |
-RDEPEND="x86? ( net-libs/libnet ) |
106 |
- =virtual/libstdc++-3.3 |
107 |
+RDEPEND="=virtual/libstdc++-3.3 |
108 |
X? ( |
109 |
x11-libs/libXext |
110 |
x11-libs/libXft |
111 |
|
112 |
|
113 |
|
114 |
1.1 dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild |
115 |
|
116 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild?rev=1.1&view=markup |
117 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild?rev=1.1&content-type=text/plain |
118 |
|
119 |
Index: ibm-jre-bin-1.4.2.10.ebuild |
120 |
=================================================================== |
121 |
# Copyright 1999-2008 Gentoo Foundation |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/ibm-jre-bin/ibm-jre-bin-1.4.2.10.ebuild,v 1.1 2008/02/26 16:28:59 caster Exp $ |
124 |
|
125 |
inherit java-vm-2 eutils versionator |
126 |
|
127 |
JDK_RELEASE=$(get_version_component_range 1-3) |
128 |
SERVICE_RELEASE=$(get_version_component_range 4) |
129 |
RPM_PV="${JDK_RELEASE}-${SERVICE_RELEASE}.0" |
130 |
|
131 |
JRE_DIST_PREFIX="IBMJava2-JRE-${RPM_PV}" |
132 |
|
133 |
X86_JRE_DIST="${JRE_DIST_PREFIX}.tgz" |
134 |
# wonder why amd64 has this extra special AMD64 in its filename... |
135 |
AMD64_JRE_DIST="IBMJava2-JRE-AMD64-${RPM_PV}.x86_64.tgz" |
136 |
PPC_JRE_DIST="${JRE_DIST_PREFIX}.ppc.tgz" |
137 |
PPC64_JRE_DIST="${JRE_DIST_PREFIX}.ppc64.tgz" |
138 |
|
139 |
if use x86; then |
140 |
JRE_DIST=${X86_JRE_DIST} |
141 |
S="${WORKDIR}/IBMJava2-142" |
142 |
LINK_ARCH="ia32" |
143 |
elif use amd64; then |
144 |
JRE_DIST=${AMD64_JRE_DIST} |
145 |
S="${WORKDIR}/IBMJava2-amd64-142" |
146 |
LINK_ARCH="amd64" |
147 |
elif use ppc; then |
148 |
JRE_DIST=${PPC_JRE_DIST} |
149 |
S="${WORKDIR}/IBMJava2-ppc-142" |
150 |
LINK_ARCH="ip32" |
151 |
elif use ppc64; then |
152 |
JRE_DIST=${PPC64_JRE_DIST} |
153 |
S="${WORKDIR}/IBMJava2-ppc64-142" |
154 |
LINK_ARCH="ip64" |
155 |
fi |
156 |
|
157 |
DIRECT_DOWNLOAD="https://www14.software.ibm.com/webapp/iwm/web/preLogin.do?source=lxdk&S_PKG=${LINK_ARCH}142sr${SERVICE_RELEASE}&cp=UTF-8&S_TACT=105AGX05&S_CMP=JDK" |
158 |
|
159 |
DESCRIPTION="IBM Java Runtime Environment" |
160 |
HOMEPAGE="http://www.ibm.com/developerworks/java/jdk/" |
161 |
DOWNLOADPAGE="${HOMEPAGE}linux/download.html" |
162 |
ALT_DOWNLOADPAGE="${HOMEPAGE}linux/older_download.html" |
163 |
|
164 |
SRC_URI="x86? ( ${X86_JRE_DIST} ) |
165 |
amd64? ( ${AMD64_JRE_DIST} ) |
166 |
ppc? ( ${PPC_JRE_DIST} ) |
167 |
ppc64? ( ${PPC64_JRE_DIST} )" |
168 |
|
169 |
LICENSE="IBM-J1.4" |
170 |
SLOT="1.4" |
171 |
KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86" |
172 |
IUSE="X alsa nsplugin" |
173 |
|
174 |
RDEPEND="=virtual/libstdc++-3.3 |
175 |
alsa? ( media-libs/alsa-lib ) |
176 |
X? ( |
177 |
x11-libs/libXext |
178 |
x11-libs/libXi |
179 |
x11-libs/libXmu |
180 |
x11-libs/libXp |
181 |
x11-libs/libXtst |
182 |
x11-libs/libXt |
183 |
x11-libs/libX11 |
184 |
)" |
185 |
DEPEND="" |
186 |
|
187 |
RESTRICT="fetch" |
188 |
|
189 |
QA_TEXTRELS_x86="opt/${P}/bin/lib*.so |
190 |
opt/${P}/bin/javaplugin.so |
191 |
opt/${P}/bin/classic/libjvm.so |
192 |
opt/${P}/bin/classic/libcore.so" |
193 |
QA_TEXTRELS_amd64=" |
194 |
opt/${P}/bin/libj9jit22.so |
195 |
opt/${P}/bin/libjclscar_22.so |
196 |
" |
197 |
|
198 |
pkg_nofetch() { |
199 |
einfo "Due to license restrictions, we cannot redistribute or fetch the distfiles" |
200 |
einfo "Please visit: ${DOWNLOADPAGE}" |
201 |
|
202 |
einfo "Under Java 1.4.2, download SR${SERVICE_RELEASE} for your arch:" |
203 |
einfo "${JRE_DIST}" |
204 |
|
205 |
einfo "Direct link:" |
206 |
einfo "${DIRECT_DOWNLOAD}" |
207 |
einfo "Place the file(s) in: ${DISTDIR}" |
208 |
einfo "Then restart emerge: 'emerge --resume'" |
209 |
|
210 |
einfo "Note: if SR${SERVICE_RELEASE} is not available at ${DOWNLOADPAGE}" |
211 |
einfo "it may have been moved to ${ALT_DOWNLOADPAGE}. Lately that page" |
212 |
einfo "isn't updated, but the files should still available through the" |
213 |
einfo "direct link. If it doesn't work, file a bug." |
214 |
} |
215 |
|
216 |
src_compile() { :; } |
217 |
|
218 |
src_install() { |
219 |
# javaws is on x86 only |
220 |
if use x86; then |
221 |
# The javaws execution script is 777 why? |
222 |
chmod 0755 "${S}"/jre/javaws/javaws |
223 |
|
224 |
# bug #147259 |
225 |
dosym ../javaws/javaws /opt/${P}/bin/javaws |
226 |
fi |
227 |
|
228 |
# Copy all the files to the designated directory |
229 |
dodir /opt/${P} |
230 |
cp -pR "${S}"/jre/* "${D}"/opt/${P}/ |
231 |
|
232 |
if use x86 && use nsplugin; then |
233 |
local plugin="libjavaplugin_oji.so" |
234 |
|
235 |
if has_version '>=sys-devel/gcc-3' ; then |
236 |
plugin="libjavaplugin_ojigcc3.so" |
237 |
fi |
238 |
|
239 |
install_mozilla_plugin /opt/${P}/bin/${plugin} |
240 |
fi |
241 |
|
242 |
dohtml -a html,htm,HTML -r docs |
243 |
dodoc "${S}"/docs/COPYRIGHT |
244 |
|
245 |
set_java_env |
246 |
java-vm_revdep-mask |
247 |
} |
248 |
|
249 |
|
250 |
|
251 |
-- |
252 |
gentoo-commits@l.g.o mailing list |