* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web: ChangeLog icedtea-web-1.3.1.ebuild icedtea-web-1.3.1-r7.ebuild icedtea-web-1.2.1-r1.ebuild icedtea-web-1.2.1-r8.ebuild
@ 2012-11-14 21:59 Vlastimil Babka (caster)
0 siblings, 0 replies; only message in thread
From: Vlastimil Babka (caster) @ 2012-11-14 21:59 UTC (permalink / raw
To: gentoo-commits
caster 12/11/14 21:59:24
Modified: ChangeLog
Added: icedtea-web-1.3.1.ebuild
icedtea-web-1.3.1-r7.ebuild
Removed: icedtea-web-1.2.1-r1.ebuild
icedtea-web-1.2.1-r8.ebuild
Log:
Version bump, security bug #442478. Install with -j1 for bug #440906.
(Portage version: 2.2.0_alpha141/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84)
Revision Changes Path
1.30 dev-java/icedtea-web/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/ChangeLog?r1=1.29&r2=1.30
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog 25 Sep 2012 14:02:46 -0000 1.29
+++ ChangeLog 14 Nov 2012 21:59:24 -0000 1.30
@@ -1,6 +1,15 @@
# ChangeLog for dev-java/icedtea-web
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.29 2012/09/25 14:02:46 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.30 2012/11/14 21:59:24 caster Exp $
+
+*icedtea-web-1.3.1-r7 (14 Nov 2012)
+*icedtea-web-1.3.1 (14 Nov 2012)
+
+ 14 Nov 2012; Vlastimil Babka <caster@gentoo.org>
+ -icedtea-web-1.2.1-r1.ebuild, -icedtea-web-1.2.1-r8.ebuild,
+ -files/icedtea-web-1.2.1-memcpy.patch, +icedtea-web-1.3.1.ebuild,
+ +icedtea-web-1.3.1-r7.ebuild, -files/fix-plugin-in-icedtea-7.patch:
+ Version bump, security bug #442478. Install with -j1 for bug #440906.
25 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -icedtea-web-1.2.ebuild,
-icedtea-web-1.2-r7.ebuild, -icedtea-web-1.2.1.ebuild,
1.1 dev-java/icedtea-web/icedtea-web-1.3.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3.1.ebuild?rev=1.1&content-type=text/plain
Index: icedtea-web-1.3.1.ebuild
===================================================================
# Copyright 1999-2012 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.3.1.ebuild,v 1.1 2012/11/14 21:59:24 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="4"
inherit autotools eutils java-pkg-2 java-vm-2
DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="6"
KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
IUSE="build doc gtk2 gtk3 javascript +nsplugin test"
COMMON_DEP="
dev-java/icedtea:${SLOT}
nsplugin? (
>=dev-libs/glib-2.16
gtk2? (
!gtk3? ( >=x11-libs/gtk+-2.6:2 )
gtk3? ( x11-libs/gtk+:3 )
)
!gtk2? ( x11-libs/gtk+:3 )
)"
RDEPEND="${COMMON_DEP}"
# Need system junit 4.8+. Bug #389795
DEPEND="${COMMON_DEP}
virtual/pkgconfig
javascript? ( dev-java/rhino:1.6 )
nsplugin? ( net-misc/npapi-sdk )
test? ( >=dev-java/junit-4.8:4 )"
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="icedtea-${SLOT} icedtea${SLOT}"
JAVA_PKG_WANT_SOURCE="1.6"
JAVA_PKG_WANT_TARGET="1.6"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
VMHANDLE="icedtea-${SLOT}"
}
src_prepare() {
# bug #356645
epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
eautoreconf
}
src_configure() {
local vmhome=$(java-config -O)
if use build; then
icedteadir="${ICEDTEA_BIN_DIR}"
[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
installdir="/opt/icedtea-web-bin-${SLOT}"
else
icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
[[ "${vmhome}" == "${icedteadir}" ]] \
|| die "Unexpected install location of IcedTea ${SLOT} '${vmhome}'"
fi
einfo "Installing IcedTea-Web in '${installdir}'"
einfo "Installing IcedTea-Web for IcedTea${SLOT} in '${icedteadir}'"
local gtk_ver=3
use gtk2 && gtk_ver=2
use gtk3 && gtk_ver=3
local myconf=(
# 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
--prefix="${installdir}"
--mandir="${icedteadir}"/man
--infodir="${installdir}"/share/info
--datadir="${installdir}"/share
--with-jdk-home="${icedteadir}"
--with-gtk=${gtk_ver}
$(use_enable doc docs)
$(use_enable nsplugin plugin)
$(use_with javascript rhino)
)
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
econf "${myconf[@]}"
}
src_compile() {
# we need this to override the src_compile from java-pkg-2
default
}
src_install() {
# bug #440906
MAKEOPTS+=" -j1" default
if use nsplugin; then
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"
fi
}
pkg_prerm() {
# override the java-vm-2 eclass check for removing a system VM, as it
# doesn't make sense here.
:;
}
1.1 dev-java/icedtea-web/icedtea-web-1.3.1-r7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3.1-r7.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.3.1-r7.ebuild?rev=1.1&content-type=text/plain
Index: icedtea-web-1.3.1-r7.ebuild
===================================================================
# Copyright 1999-2012 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.3.1-r7.ebuild,v 1.1 2012/11/14 21:59:24 caster Exp $
# Build written by Andrew John Hughes (ahughes@redhat.com)
EAPI="4"
inherit autotools eutils java-pkg-2 java-vm-2
DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
SLOT="7"
KEYWORDS="~amd64 ~ia64 ~x86"
IUSE="build doc gtk2 gtk3 javascript +nsplugin test"
COMMON_DEP="
dev-java/icedtea:${SLOT}
nsplugin? (
>=dev-libs/glib-2.16
gtk2? (
!gtk3? ( >=x11-libs/gtk+-2.6:2 )
gtk3? ( x11-libs/gtk+:3 )
)
!gtk2? ( x11-libs/gtk+:3 )
)"
RDEPEND="${COMMON_DEP}"
# Need system junit 4.8+. Bug #389795
DEPEND="${COMMON_DEP}
virtual/pkgconfig
javascript? ( dev-java/rhino:1.6 )
nsplugin? ( net-misc/npapi-sdk )
test? ( >=dev-java/junit-4.8:4 )"
pkg_setup() {
JAVA_PKG_WANT_BUILD_VM="icedtea-${SLOT} icedtea${SLOT}"
JAVA_PKG_WANT_SOURCE="1.6"
JAVA_PKG_WANT_TARGET="1.6"
java-vm-2_pkg_setup
java-pkg-2_pkg_setup
VMHANDLE="icedtea-${SLOT}"
}
src_prepare() {
# bug #356645
epatch "${FILESDIR}"/0002-Respect-LDFLAGS.patch
eautoreconf
}
src_configure() {
local vmhome=$(java-config -O)
if use build; then
icedteadir="${ICEDTEA_BIN_DIR}"
[[ -z ${icedteadir} ]] && die "USE=build is an internal flag and should not be enabled"
installdir="/opt/icedtea-web-bin-${SLOT}"
else
icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
[[ "${vmhome}" == "${icedteadir}" ]] \
|| die "Unexpected install location of IcedTea ${SLOT} '${vmhome}'"
fi
einfo "Installing IcedTea-Web in '${installdir}'"
einfo "Installing IcedTea-Web for IcedTea${SLOT} in '${icedteadir}'"
local gtk_ver=3
use gtk2 && gtk_ver=2
use gtk3 && gtk_ver=3
local myconf=(
# 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
--prefix="${installdir}"
--mandir="${icedteadir}"/man
--infodir="${installdir}"/share/info
--datadir="${installdir}"/share
--with-jdk-home="${icedteadir}"
--with-gtk=${gtk_ver}
$(use_enable doc docs)
$(use_enable nsplugin plugin)
$(use_with javascript rhino)
)
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
econf "${myconf[@]}"
}
src_compile() {
# we need this to override the src_compile from java-pkg-2
default
}
src_install() {
# bug #440906
MAKEOPTS+=" -j1" default
if use nsplugin; then
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"
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:[~2012-11-14 21:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-14 21:59 [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-web: ChangeLog icedtea-web-1.3.1.ebuild icedtea-web-1.3.1-r7.ebuild icedtea-web-1.2.1-r1.ebuild icedtea-web-1.2.1-r8.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