1 |
caster 11/09/29 13:06:23 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: icedtea-web-1.1.3.ebuild |
5 |
Log: |
6 |
Version bump, npapi-sdk support now upstream. |
7 |
|
8 |
(Portage version: 2.2.0_alpha59/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.11 dev-java/icedtea-web/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.11&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.11&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?r1=1.10&r2=1.11 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v |
20 |
retrieving revision 1.10 |
21 |
retrieving revision 1.11 |
22 |
diff -u -r1.10 -r1.11 |
23 |
--- ChangeLog 18 Sep 2011 21:53:18 -0000 1.10 |
24 |
+++ ChangeLog 29 Sep 2011 13:06:23 -0000 1.11 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for dev-java/icedtea-web |
27 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.10 2011/09/18 21:53:18 caster Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.11 2011/09/29 13:06:23 caster Exp $ |
30 |
+ |
31 |
+*icedtea-web-1.1.3 (29 Sep 2011) |
32 |
+ |
33 |
+ 29 Sep 2011; Vlastimil Babka <caster@g.o> +icedtea-web-1.1.3.ebuild: |
34 |
+ Version bump, npapi-sdk support now upstream. |
35 |
|
36 |
*icedtea-web-1.1.2-r1 (18 Sep 2011) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 dev-java/icedtea-web/icedtea-web-1.1.3.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: icedtea-web-1.1.3.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2011 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.3.ebuild,v 1.1 2011/09/29 13:06:23 caster Exp $ |
51 |
# Build written by Andrew John Hughes (ahughes@××××××.com) |
52 |
|
53 |
EAPI="2" |
54 |
|
55 |
inherit autotools eutils java-pkg-2 java-vm-2 |
56 |
|
57 |
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2" |
58 |
SLOT="6" |
59 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" |
60 |
|
61 |
DESCRIPTION="FOSS Java browser plugin and Web Start implementation" |
62 |
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz" |
63 |
HOMEPAGE="http://icedtea.classpath.org" |
64 |
|
65 |
IUSE="build doc +nsplugin" |
66 |
|
67 |
RDEPEND="dev-java/icedtea:${SLOT}" |
68 |
DEPEND="${RDEPEND} |
69 |
nsplugin? ( |
70 |
|| ( net-misc/npapi-sdk |
71 |
>=net-libs/xulrunner-1.9.1 ) )" |
72 |
|
73 |
# a bit of hack so the VM switching is triggered without causing dependency troubles |
74 |
JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6" |
75 |
JAVA_PKG_WANT_SOURCE="1.6" |
76 |
JAVA_PKG_WANT_TARGET="1.6" |
77 |
|
78 |
pkg_setup() { |
79 |
# quite a hack since java-config does not provide a way for a package |
80 |
# to limit supported VM's for building and their preferred order |
81 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
82 |
einfo "Honoring user-set JAVA_PKG_FORCE_VM" |
83 |
elif has_version dev-java/icedtea:${SLOT}; then |
84 |
JAVA_PKG_FORCE_VM="icedtea${SLOT}" |
85 |
else |
86 |
JAVA_PKG_FORCE_VM="" |
87 |
# don't die just yet if merging a binpkg - bug #258423 |
88 |
DIE_IF_NOT_BINPKG=true |
89 |
fi |
90 |
|
91 |
# if the previous failed, don't even run java eclasses pkg_setup |
92 |
# as it might also die when no VM is present |
93 |
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then |
94 |
einfo "Forced vm ${JAVA_PKG_FORCE_VM}" |
95 |
java-vm-2_pkg_setup |
96 |
java-pkg-2_pkg_setup |
97 |
fi |
98 |
} |
99 |
|
100 |
unset_vars() { |
101 |
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS |
102 |
} |
103 |
|
104 |
src_unpack() { |
105 |
if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then |
106 |
die "Unable to find a supported VM for building" |
107 |
fi |
108 |
|
109 |
default |
110 |
} |
111 |
|
112 |
src_prepare() { |
113 |
# bug #356645 |
114 |
epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch |
115 |
eautoreconf |
116 |
} |
117 |
|
118 |
src_configure() { |
119 |
local vmhome=$(java-config -O) |
120 |
|
121 |
if use build; then |
122 |
icedteadir="${ICEDTEA_BIN_DIR}" |
123 |
installdir="/opt/icedtea${SLOT}-web-bin" |
124 |
else |
125 |
icedteadir="/usr/$(get_libdir)/icedtea${SLOT}" |
126 |
installdir="/usr/$(get_libdir)/icedtea${SLOT}-web" |
127 |
fi |
128 |
|
129 |
unset_vars |
130 |
|
131 |
if use build || [[ ${vmhome} == ${icedteadir} ]] ; then |
132 |
VMHANDLE="icedtea${SLOT}" |
133 |
else |
134 |
die "Unexpected install location of IcedTea${SLOT}" |
135 |
fi |
136 |
|
137 |
einfo "Installing IcedTea-Web in ${installdir}" |
138 |
einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}" |
139 |
if [ ! -e ${vmhome} ] ; then |
140 |
eerror "Could not find JDK install directory ${vmhome}." |
141 |
die |
142 |
fi |
143 |
|
144 |
# we need to override all *dir variables that econf sets |
145 |
# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know |
146 |
# the suffix the man page will end up compressed with, anyway |
147 |
econf \ |
148 |
--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \ |
149 |
--with-jdk-home=${icedteadir} \ |
150 |
$(use_enable doc docs) \ |
151 |
$(use_enable nsplugin plugin) \ |
152 |
|| die "configure failed" |
153 |
} |
154 |
|
155 |
src_compile() { |
156 |
# we need this to override the src_compile from java-pkg-2 |
157 |
default |
158 |
} |
159 |
|
160 |
src_install() { |
161 |
# parallel make problem bug #372235 |
162 |
emake -j1 DESTDIR="${D}" install || die "Install failed" |
163 |
dodoc AUTHORS README NEWS || die |
164 |
|
165 |
if use nsplugin; then |
166 |
local arch=${ARCH}; |
167 |
use x86 && arch=i386; |
168 |
install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so"; |
169 |
fi |
170 |
|
171 |
for binary in javaws itweb-settings; do |
172 |
dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary} |
173 |
dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary} |
174 |
done |
175 |
} |
176 |
|
177 |
pkg_postinst() { |
178 |
java-vm_check-nsplugin |
179 |
java_mozilla_clean_ |
180 |
|
181 |
if use nsplugin; then |
182 |
elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin" |
183 |
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later" |
184 |
elog "such as Firefox 3.5+, Chromium and perhaps some others too." |
185 |
fi |
186 |
} |
187 |
|
188 |
pkg_prerm() { |
189 |
# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here |
190 |
:; |
191 |
} |