1 |
caster 14/06/02 22:28:44 |
2 |
|
3 |
Modified: metadata.xml ChangeLog |
4 |
Added: icedtea-bin-7.2.4.7.ebuild |
5 |
Log: |
6 |
Version bump, bug #508270. Add a webstart USE flag that enables creating a javaws symlink to the respective binary from icedtea-web. Fixes bug #504678. |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84) |
9 |
|
10 |
Revision Changes Path |
11 |
1.2 dev-java/icedtea-bin/metadata.xml |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/metadata.xml?rev=1.2&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/metadata.xml?rev=1.2&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/metadata.xml?r1=1.1&r2=1.2 |
16 |
|
17 |
Index: metadata.xml |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/metadata.xml,v |
20 |
retrieving revision 1.1 |
21 |
retrieving revision 1.2 |
22 |
diff -u -r1.1 -r1.2 |
23 |
--- metadata.xml 30 Oct 2011 13:53:19 -0000 1.1 |
24 |
+++ metadata.xml 2 Jun 2014 22:28:44 -0000 1.2 |
25 |
@@ -2,4 +2,7 @@ |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
<herd>java</herd> |
29 |
+<use> |
30 |
+ <flag name="webstart">Provide javaws command through symlink to icedtea-web</flag> |
31 |
+</use> |
32 |
</pkgmetadata> |
33 |
|
34 |
|
35 |
|
36 |
1.60 dev-java/icedtea-bin/ChangeLog |
37 |
|
38 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.60&view=markup |
39 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.60&content-type=text/plain |
40 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?r1=1.59&r2=1.60 |
41 |
|
42 |
Index: ChangeLog |
43 |
=================================================================== |
44 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v |
45 |
retrieving revision 1.59 |
46 |
retrieving revision 1.60 |
47 |
diff -u -r1.59 -r1.60 |
48 |
--- ChangeLog 31 May 2014 20:51:01 -0000 1.59 |
49 |
+++ ChangeLog 2 Jun 2014 22:28:44 -0000 1.60 |
50 |
@@ -1,6 +1,13 @@ |
51 |
# ChangeLog for dev-java/icedtea-bin |
52 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
53 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.59 2014/05/31 20:51:01 caster Exp $ |
54 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.60 2014/06/02 22:28:44 caster Exp $ |
55 |
+ |
56 |
+*icedtea-bin-7.2.4.7 (02 Jun 2014) |
57 |
+ |
58 |
+ 02 Jun 2014; Vlastimil Babka <caster@g.o> +icedtea-bin-7.2.4.7.ebuild, |
59 |
+ metadata.xml: |
60 |
+ Version bump, bug #508270. Add a webstart USE flag that enables creating a |
61 |
+ javaws symlink to the respective binary from icedtea-web. Fixes bug #504678. |
62 |
|
63 |
*icedtea-bin-6.1.13.3 (31 May 2014) |
64 |
|
65 |
|
66 |
|
67 |
|
68 |
1.1 dev-java/icedtea-bin/icedtea-bin-7.2.4.7.ebuild |
69 |
|
70 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.7.ebuild?rev=1.1&view=markup |
71 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.7.ebuild?rev=1.1&content-type=text/plain |
72 |
|
73 |
Index: icedtea-bin-7.2.4.7.ebuild |
74 |
=================================================================== |
75 |
# Copyright 1999-2014 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.7.ebuild,v 1.1 2014/06/02 22:28:44 caster Exp $ |
78 |
|
79 |
EAPI="5" |
80 |
|
81 |
inherit java-vm-2 multilib prefix versionator |
82 |
|
83 |
dist="http://dev.gentoo.org/~caster/distfiles/" |
84 |
TARBALL_VERSION="${PV}" |
85 |
PLUGIN_VERSION="${PVR}" |
86 |
|
87 |
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK" |
88 |
HOMEPAGE="http://icedtea.classpath.org" |
89 |
SRC_URI=" |
90 |
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 ) |
91 |
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 ) |
92 |
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 ) |
93 |
examples? ( |
94 |
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 ) |
95 |
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 ) |
96 |
) |
97 |
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )" |
98 |
|
99 |
LICENSE="GPL-2-with-linking-exception" |
100 |
SLOT="7" |
101 |
KEYWORDS="-* ~amd64 ~x86" |
102 |
|
103 |
IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart" |
104 |
REQUIRED_USE="nsplugin? ( X )" |
105 |
RESTRICT="strip" |
106 |
|
107 |
# 423161 |
108 |
QA_PREBUILT="opt/.*" |
109 |
|
110 |
ALSA_COMMON_DEP=" |
111 |
>=media-libs/alsa-lib-1.0.20" |
112 |
CUPS_COMMON_DEP=" |
113 |
>=net-print/cups-1.4" |
114 |
X_COMMON_DEP=" |
115 |
>=dev-libs/atk-1.30.0 |
116 |
>=dev-libs/glib-2.20.5:2 |
117 |
>=media-libs/fontconfig-2.6.0-r2:1.0 |
118 |
>=media-libs/freetype-2.4.9:2 |
119 |
>=x11-libs/cairo-1.8.8 |
120 |
x11-libs/gdk-pixbuf:2 |
121 |
>=x11-libs/gtk+-2.24:2 |
122 |
>=x11-libs/libX11-1.4 |
123 |
>=x11-libs/libXext-1.3 |
124 |
>=x11-libs/libXi-1.6 |
125 |
x11-libs/libXrender |
126 |
>=x11-libs/libXtst-1.2 |
127 |
>=x11-libs/pango-1.24.5" |
128 |
|
129 |
COMMON_DEP=" |
130 |
>=media-libs/giflib-4.1.6-r1 |
131 |
media-libs/lcms:2 |
132 |
>=media-libs/libpng-1.6:0= |
133 |
>=sys-devel/gcc-4.5.4 |
134 |
>=sys-libs/glibc-2.15 |
135 |
>=sys-libs/zlib-1.2.3-r1 |
136 |
|| ( virtual/jpeg:62 media-libs/jpeg:62 ) |
137 |
selinux? ( sec-policy/selinux-java )" |
138 |
|
139 |
# cups is needed for X. #390945 #390975 |
140 |
RDEPEND="${COMMON_DEP} |
141 |
X? ( |
142 |
${CUPS_COMMON_DEP} |
143 |
${X_COMMON_DEP} |
144 |
media-fonts/dejavu |
145 |
cjk? ( |
146 |
media-fonts/arphicfonts |
147 |
media-fonts/baekmuk-fonts |
148 |
media-fonts/lklug |
149 |
media-fonts/lohit-fonts |
150 |
media-fonts/sazanami |
151 |
) |
152 |
) |
153 |
alsa? ( ${ALSA_COMMON_DEP} ) |
154 |
cups? ( ${CUPS_COMMON_DEP} )" |
155 |
|
156 |
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] ) |
157 |
nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )" |
158 |
|
159 |
src_install() { |
160 |
local dest="/opt/${P}" |
161 |
local ddest="${ED}/${dest}" |
162 |
dodir "${dest}" |
163 |
|
164 |
# Ensures HeadlessGraphicsEnvironment is used. |
165 |
if ! use X; then |
166 |
rm -r jre/lib/$(get_system_arch)/xawt || die |
167 |
fi |
168 |
|
169 |
# doins can't handle symlinks. |
170 |
cp -pRP bin include jre lib man "${ddest}" || die |
171 |
|
172 |
# Remove on next bump as the needed marks are already set by icedtea ebuild. |
173 |
java-vm_set-pax-markings "${ddest}" |
174 |
|
175 |
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} |
176 |
|
177 |
if use doc; then |
178 |
dohtml -r ../doc/html/* |
179 |
fi |
180 |
|
181 |
if use examples; then |
182 |
cp -pRP share/{demo,sample} "${ddest}" || die |
183 |
fi |
184 |
|
185 |
if use source; then |
186 |
cp src.zip "${ddest}" || die |
187 |
fi |
188 |
|
189 |
# Remove after next bump, handled by icedtea ebuild. Bug 390663 |
190 |
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die |
191 |
eprefixify "${T}"/fontconfig.Gentoo.properties |
192 |
insinto "${dest}"/jre/lib |
193 |
doins "${T}"/fontconfig.Gentoo.properties |
194 |
|
195 |
if use webstart || use nsplugin; then |
196 |
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/bin/itweb-settings |
197 |
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/jre/bin/itweb-settings |
198 |
fi |
199 |
if use webstart; then |
200 |
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/bin/javaws |
201 |
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/jre/bin/javaws |
202 |
fi |
203 |
|
204 |
set_java_env |
205 |
java-vm_revdep-mask "${dest}" |
206 |
java-vm_sandbox-predict /proc/self/coredump_filter |
207 |
} |
208 |
|
209 |
pkg_postinst() { |
210 |
if use nsplugin; then |
211 |
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then |
212 |
elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package" |
213 |
elog "If you had icedtea-bin-7 nsplugin selected, you may see a related error below" |
214 |
elog "The switch should complete properly during the subsequent installation of icedtea-web" |
215 |
elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'" |
216 |
fi |
217 |
fi |
218 |
|
219 |
# Set as default VM if none exists |
220 |
java-vm-2_pkg_postinst |
221 |
} |