* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web: ChangeLog icedtea-web-1.1.1.ebuild icedtea-web-1.0.1.ebuild icedtea-web-1.0.2.ebuild
@ 2011-07-22 9:08 Vlastimil Babka (caster)
0 siblings, 0 replies; only message in thread
From: Vlastimil Babka (caster) @ 2011-07-22 9:08 UTC (permalink / raw
To: gentoo-commits
caster 11/07/22 09:08:37
Modified: ChangeLog
Added: icedtea-web-1.1.1.ebuild
Removed: icedtea-web-1.0.1.ebuild icedtea-web-1.0.2.ebuild
Log:
Version bump, security bug #375977.
(Portage version: 2.2.0_alpha45/cvs/Linux x86_64)
Revision Changes Path
1.7 dev-java/icedtea-web/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?r1=1.6&r2=1.7
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ChangeLog 20 Jun 2011 12:34:46 -0000 1.6
+++ ChangeLog 22 Jul 2011 09:08:37 -0000 1.7
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/icedtea-web
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.6 2011/06/20 12:34:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.7 2011/07/22 09:08:37 caster Exp $
+
+*icedtea-web-1.1.1 (22 Jul 2011)
+
+ 22 Jul 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.0.1.ebuild,
+ -icedtea-web-1.0.2.ebuild, +icedtea-web-1.1.1.ebuild:
+ Version bump, security bug #375977.
20 Jun 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.ebuild:
Disable parallel make install until bug #372235 is resolved.
1.1 dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild?rev=1.1&content-type=text/plain
Index: icedtea-web-1.1.1.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild,v 1.1 2011/07/22 09:08:37 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="2"
inherit eutils java-pkg-2 java-vm-2
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="6"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
HOMEPAGE="http://icedtea.classpath.org"
IUSE="build doc +nsplugin"
RDEPEND="dev-java/icedtea:${SLOT}
nsplugin? ( >=net-libs/xulrunner-1.9.1 )"
DEPEND="${RDEPEND}"
# a bit of hack so the VM switching is triggered without causing dependency troubles
JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
JAVA_PKG_WANT_SOURCE="1.6"
JAVA_PKG_WANT_TARGET="1.6"
pkg_setup() {
# quite a hack since java-config does not provide a way for a package
# to limit supported VM's for building and their preferred order
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
einfo "Honoring user-set JAVA_PKG_FORCE_VM"
elif has_version dev-java/icedtea:${SLOT}; then
JAVA_PKG_FORCE_VM="icedtea${SLOT}"
else
JAVA_PKG_FORCE_VM=""
# don't die just yet if merging a binpkg - bug #258423
DIE_IF_NOT_BINPKG=true
fi
# if the previous failed, don't even run java eclasses pkg_setup
# as it might also die when no VM is present
if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
fi
}
unset_vars() {
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
}
src_unpack() {
if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
die "Unable to find a supported VM for building"
fi
default
}
src_configure() {
local vmhome=$(java-config -O)
if use build; then
icedteadir="${ICEDTEA_BIN_DIR}"
installdir="/opt/icedtea${SLOT}-web-bin"
else
icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
fi
unset_vars
if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
VMHANDLE="icedtea${SLOT}"
else
die "Unexpected install location of IcedTea${SLOT}"
fi
einfo "Installing IcedTea-Web in ${installdir}"
einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
if [ ! -e ${vmhome} ] ; then
eerror "Could not find JDK install directory ${vmhome}."
die
fi
# we need to override all *dir variables that econf sets
# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
# the suffix the man page will end up compressed with, anyway
econf \
--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
--with-jdk-home=${icedteadir} \
$(use_enable doc docs) \
$(use_enable nsplugin plugin) \
|| die "configure failed"
}
src_compile() {
# we need this to override the src_compile from java-pkg-2
default
}
src_install() {
# parallel make problem bug #372235
emake -j1 DESTDIR="${D}" install || die "Install failed"
dodoc AUTHORS README NEWS || die
if use nsplugin; then
local arch=${ARCH};
use x86 && arch=i386;
install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
fi
for binary in javaws itweb-settings; do
dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
done
}
pkg_postinst() {
java-vm_check-nsplugin
java_mozilla_clean_
if use nsplugin; then
elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
elog "such as Firefox 3.5+, Chromium and perhaps some others too."
fi
}
pkg_prerm() {
# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
:;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-07-22 9:08 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-07-22 9:08 [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web: ChangeLog icedtea-web-1.1.1.ebuild icedtea-web-1.0.1.ebuild icedtea-web-1.0.2.ebuild Vlastimil Babka (caster)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox