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