1 |
caster 13/05/28 20:17:47 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: icedtea-bin-6.1.12.5.ebuild |
5 |
Removed: icedtea-bin-6.1.12.2.ebuild |
6 |
Log: |
7 |
Version bump, security bug #466822. Installs libpng-1.5 or libpng-1.6 file depending on what is detected, bug #464914. |
8 |
|
9 |
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84) |
10 |
|
11 |
Revision Changes Path |
12 |
1.45 dev-java/icedtea-bin/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.45&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.45&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?r1=1.44&r2=1.45 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v |
21 |
retrieving revision 1.44 |
22 |
retrieving revision 1.45 |
23 |
diff -u -r1.44 -r1.45 |
24 |
--- ChangeLog 29 Apr 2013 05:21:17 -0000 1.44 |
25 |
+++ ChangeLog 28 May 2013 20:17:47 -0000 1.45 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for dev-java/icedtea-bin |
28 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.44 2013/04/29 05:21:17 caster Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.45 2013/05/28 20:17:47 caster Exp $ |
31 |
+ |
32 |
+*icedtea-bin-6.1.12.5 (27 May 2013) |
33 |
+ |
34 |
+ 27 May 2013; Vlastimil Babka <caster@g.o> |
35 |
+ -icedtea-bin-6.1.12.2.ebuild, +icedtea-bin-6.1.12.5.ebuild: |
36 |
+ Version bump, security bug #466822. Installs libpng-1.5 or libpng-1.6 file |
37 |
+ depending on what is detected, bug #464914. |
38 |
|
39 |
*icedtea-bin-7.2.3.9 (29 Apr 2013) |
40 |
|
41 |
|
42 |
|
43 |
|
44 |
1.1 dev-java/icedtea-bin/icedtea-bin-6.1.12.5.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.5.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.5.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: icedtea-bin-6.1.12.5.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2013 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.5.ebuild,v 1.1 2013/05/28 20:17:47 caster Exp $ |
54 |
|
55 |
EAPI="4" |
56 |
|
57 |
inherit java-vm-2 multilib prefix |
58 |
|
59 |
dist="http://dev.gentoo.org/~caster/distfiles/" |
60 |
TARBALL_VERSION="${PV}" |
61 |
PLUGIN_VERSION="${PVR}" |
62 |
|
63 |
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" |
64 |
HOMEPAGE="http://icedtea.classpath.org" |
65 |
SRC_URI=" |
66 |
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 |
67 |
${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 ) |
68 |
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 |
69 |
${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 ) |
70 |
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 ) |
71 |
examples? ( |
72 |
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 ) |
73 |
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 ) |
74 |
) |
75 |
nsplugin? ( |
76 |
amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 ) |
77 |
x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 ) |
78 |
) |
79 |
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )" |
80 |
|
81 |
LICENSE="GPL-2-with-linking-exception" |
82 |
SLOT="6" |
83 |
KEYWORDS="-* ~amd64 ~x86" |
84 |
|
85 |
IUSE="+X +alsa cjk +cups doc examples nsplugin source" |
86 |
REQUIRED_USE="nsplugin? ( X )" |
87 |
RESTRICT="strip" |
88 |
|
89 |
# 423161 |
90 |
QA_PREBUILT="opt/.*" |
91 |
|
92 |
ALSA_COMMON_DEP=" |
93 |
>=media-libs/alsa-lib-1.0.20" |
94 |
CUPS_COMMON_DEP=" |
95 |
>=net-print/cups-1.4" |
96 |
X_COMMON_DEP=" |
97 |
dev-libs/glib |
98 |
>=media-libs/freetype-2.3.9:2 |
99 |
>=x11-libs/gtk+-2.20.1:2 |
100 |
>=x11-libs/libX11-1.3 |
101 |
>=x11-libs/libXext-1.1 |
102 |
>=x11-libs/libXi-1.3 |
103 |
>=x11-libs/libXtst-1.1" |
104 |
|
105 |
COMMON_DEP=" |
106 |
>=media-libs/giflib-4.1.6-r1 |
107 |
>=media-libs/libpng-1.5 |
108 |
>=sys-devel/gcc-4.3 |
109 |
>=sys-libs/glibc-2.11.2 |
110 |
>=sys-libs/zlib-1.2.3-r1 |
111 |
virtual/jpeg |
112 |
nsplugin? ( |
113 |
>=dev-libs/atk-1.30.0 |
114 |
>=dev-libs/glib-2.20.5:2 |
115 |
>=dev-libs/nspr-4.8 |
116 |
>=x11-libs/cairo-1.8.8 |
117 |
>=x11-libs/pango-1.24.5 |
118 |
|
119 |
)" |
120 |
|
121 |
RDEPEND="${COMMON_DEP} |
122 |
X? ( |
123 |
${X_COMMON_DEP} |
124 |
media-fonts/dejavu |
125 |
cjk? ( |
126 |
media-fonts/arphicfonts |
127 |
media-fonts/baekmuk-fonts |
128 |
media-fonts/lklug |
129 |
media-fonts/lohit-fonts |
130 |
media-fonts/sazanami |
131 |
) |
132 |
) |
133 |
alsa? ( ${ALSA_COMMON_DEP} ) |
134 |
cups? ( ${CUPS_COMMON_DEP} )" |
135 |
|
136 |
src_unpack() { |
137 |
unpack ${A} |
138 |
|
139 |
if has_version '=media-libs/libpng-1.5*:0'; then |
140 |
elog "Installing libpng-1.5 ABI version" |
141 |
elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.6" |
142 |
elog "Note that revdep-rebuild will not do it automatically due to the mask file." |
143 |
local arch=${ARCH} |
144 |
use x86 && arch=i386 |
145 |
mv -v ${PN}-libpng15-${PV}/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die |
146 |
else |
147 |
einfo "Installing libpng-1.6 ABI version" |
148 |
fi |
149 |
} |
150 |
|
151 |
src_install() { |
152 |
local dest="/opt/${P}" |
153 |
local ddest="${ED}/${dest}" |
154 |
dodir "${dest}" |
155 |
|
156 |
# Ensures HeadlessGraphicsEnvironment is used. |
157 |
if ! use X; then |
158 |
rm -r jre/lib/$(get_system_arch)/xawt || die |
159 |
fi |
160 |
|
161 |
# doins can't handle symlinks. |
162 |
cp -pRP bin include jre lib man "${ddest}" || die |
163 |
|
164 |
# Remove on next bump as the needed marks are already set by icedtea ebuild. |
165 |
java-vm_set-pax-markings "${ddest}" |
166 |
|
167 |
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} |
168 |
|
169 |
if use doc; then |
170 |
dohtml -r ../doc/html/* |
171 |
fi |
172 |
|
173 |
if use examples; then |
174 |
cp -pRP share/{demo,sample} "${ddest}" || die |
175 |
fi |
176 |
|
177 |
if use source; then |
178 |
cp src.zip "${ddest}" || die |
179 |
fi |
180 |
|
181 |
if use nsplugin; then |
182 |
cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die |
183 |
install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so" |
184 |
docinto icedtea-web |
185 |
dodoc ../doc/icedtea-web/* |
186 |
fi |
187 |
|
188 |
# Remove after next bump, handled by icedtea ebuild. Bug 390663 |
189 |
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die |
190 |
eprefixify "${T}"/fontconfig.Gentoo.properties |
191 |
insinto "${dest}"/jre/lib |
192 |
doins "${T}"/fontconfig.Gentoo.properties |
193 |
|
194 |
set_java_env |
195 |
java-vm_revdep-mask "${dest}" |
196 |
} |
197 |
|
198 |
pkg_preinst() { |
199 |
if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then |
200 |
# portage would preserve the symlink otherwise, related to bug #384397 |
201 |
rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin" |
202 |
elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*" |
203 |
elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4" |
204 |
elog "If you had icedtea6-bin as system VM, the change should be automatic, however" |
205 |
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed" |
206 |
elog "and the same holds for any user VM settings. Sorry for the inconvenience." |
207 |
fi |
208 |
} |
209 |
|
210 |
pkg_postinst() { |
211 |
# Set as default VM if none exists |
212 |
java-vm-2_pkg_postinst |
213 |
|
214 |
if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then |
215 |
elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin" |
216 |
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+" |
217 |
elog "such as Firefox 3.5+ and recent Chromium versions." |
218 |
fi |
219 |
} |