* [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-bin: ChangeLog icedtea-bin-7.2.4.1.ebuild icedtea-bin-6.1.12.6-r1.ebuild
@ 2013-08-18 21:35 Vlastimil Babka (caster)
0 siblings, 0 replies; only message in thread
From: Vlastimil Babka (caster) @ 2013-08-18 21:35 UTC (permalink / raw
To: gentoo-commits
caster 13/08/18 21:35:01
Modified: ChangeLog
Added: icedtea-bin-7.2.4.1.ebuild
icedtea-bin-6.1.12.6-r1.ebuild
Log:
Version bump (slot 7), security bug #477210 / revbump (slot 6). Built against libjpeg.so.62, bug #479442. Also upgraded the build environment, which bumped most of the runtime deps (gcc 4.5.4, glibc-2.15 etc).
(Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84)
Revision Changes Path
1.51 dev-java/icedtea-bin/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.51&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.51&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?r1=1.50&r2=1.51
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- ChangeLog 27 Jul 2013 22:04:24 -0000 1.50
+++ ChangeLog 18 Aug 2013 21:35:01 -0000 1.51
@@ -1,6 +1,15 @@
# ChangeLog for dev-java/icedtea-bin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.50 2013/07/27 22:04:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.51 2013/08/18 21:35:01 caster Exp $
+
+*icedtea-bin-7.2.4.1 (18 Aug 2013)
+*icedtea-bin-6.1.12.6-r1 (18 Aug 2013)
+
+ 18 Aug 2013; Vlastimil Babka <caster@gentoo.org>
+ +icedtea-bin-6.1.12.6-r1.ebuild, +icedtea-bin-7.2.4.1.ebuild:
+ Version bump (slot 7), security bug #477210 / revbump (slot 6). Built against
+ libjpeg.so.62, bug #479442. Also upgraded the build environment, which bumped
+ most of the runtime deps (gcc 4.5.4, glibc-2.15 etc).
27 Jul 2013; Agostino Sarubbo <ago@gentoo.org> icedtea-bin-6.1.12.6.ebuild:
Stable for x86, wrt bug #477210
1.1 dev-java/icedtea-bin/icedtea-bin-7.2.4.1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.1.ebuild?rev=1.1&content-type=text/plain
Index: icedtea-bin-7.2.4.1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.4.1.ebuild,v 1.1 2013/08/18 21:35:01 caster Exp $
EAPI="5"
inherit java-vm-2 multilib prefix
dist="http://dev.gentoo.org/~caster/distfiles/"
TARBALL_VERSION="${PV}"
PLUGIN_VERSION="${PVR}"
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
examples? (
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
)
nsplugin? (
amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
)
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
KEYWORDS="-* ~amd64 ~x86"
IUSE="+X +alsa cjk +cups doc examples nsplugin source"
REQUIRED_USE="nsplugin? ( X )"
RESTRICT="strip"
# 423161
QA_PREBUILT="opt/.*"
ALSA_COMMON_DEP="
>=media-libs/alsa-lib-1.0.20"
CUPS_COMMON_DEP="
>=net-print/cups-1.4"
X_COMMON_DEP="
>=dev-libs/atk-1.30.0
>=dev-libs/glib-2.20.5:2
>=media-libs/fontconfig-2.6.0-r2:1.0
>=media-libs/freetype-2.4.9:2
>=x11-libs/cairo-1.8.8
x11-libs/gdk-pixbuf:2
>=x11-libs/gtk+-2.24:2
>=x11-libs/libX11-1.4
>=x11-libs/libXext-1.3
>=x11-libs/libXi-1.6
x11-libs/libXrender
>=x11-libs/libXtst-1.2
>=x11-libs/pango-1.24.5"
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
media-libs/lcms:2
>=media-libs/libpng-1.5:0=
>=sys-devel/gcc-4.5.4
>=sys-libs/glibc-2.15
>=sys-libs/zlib-1.2.3-r1
|| ( virtual/jpeg:62 media-libs/jpeg:62 )"
# cups is needed for X. #390945 #390975
RDEPEND="${COMMON_DEP}
X? (
${CUPS_COMMON_DEP}
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
media-fonts/lklug
media-fonts/lohit-fonts
media-fonts/sazanami
)
)
alsa? ( ${ALSA_COMMON_DEP} )
cups? ( ${CUPS_COMMON_DEP} )"
src_unpack() {
unpack ${A}
if has_version '=media-libs/libpng-1.5*:0'; then
einfo "Installing libpng-1.5 ABI version"
local arch=${ARCH}
use x86 && arch=i386
mv -v ${PN}-libpng15-${PV}/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
else
einfo "Installing libpng-1.6 ABI version"
fi
}
src_install() {
local dest="/opt/${P}"
local ddest="${ED}/${dest}"
dodir "${dest}"
# Ensures HeadlessGraphicsEnvironment is used.
if ! use X; then
rm -r jre/lib/$(get_system_arch)/xawt || die
fi
# doins can't handle symlinks.
cp -pRP bin include jre lib man "${ddest}" || die
# Remove on next bump as the needed marks are already set by icedtea ebuild.
java-vm_set-pax-markings "${ddest}"
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
if use doc; then
dohtml -r ../doc/html/*
fi
if use examples; then
cp -pRP share/{demo,sample} "${ddest}" || die
fi
if use source; then
cp src.zip "${ddest}" || die
fi
if use nsplugin; then
cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
docinto icedtea-web
dodoc ../doc/icedtea-web/*
fi
# Remove after next bump, handled by icedtea ebuild. Bug 390663
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
eprefixify "${T}"/fontconfig.Gentoo.properties
insinto "${dest}"/jre/lib
doins "${T}"/fontconfig.Gentoo.properties
set_java_env
java-vm_revdep-mask "${dest}"
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_postinst() {
# Set as default VM if none exists
java-vm-2_pkg_postinst
if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
elog "such as Firefox 3.5+ and recent Chromium versions."
fi
}
1.1 dev-java/icedtea-bin/icedtea-bin-6.1.12.6-r1.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.6-r1.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.6-r1.ebuild?rev=1.1&content-type=text/plain
Index: icedtea-bin-6.1.12.6-r1.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.12.6-r1.ebuild,v 1.1 2013/08/18 21:35:01 caster Exp $
EAPI="5"
inherit java-vm-2 multilib prefix
dist="http://dev.gentoo.org/~caster/distfiles/"
TARBALL_VERSION="${PVR}"
PLUGIN_VERSION="${PVR}"
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
${dist}/${PN}-libpng15-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
${dist}/${PN}-libpng15-${TARBALL_VERSION}-x86.tar.bz2 )
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
examples? (
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
)
nsplugin? (
amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
)
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
LICENSE="GPL-2-with-linking-exception"
SLOT="6"
KEYWORDS="-* ~amd64 ~x86"
IUSE="+X +alsa cjk +cups doc examples nsplugin source"
REQUIRED_USE="nsplugin? ( X )"
RESTRICT="strip"
# 423161
QA_PREBUILT="opt/.*"
ALSA_COMMON_DEP="
>=media-libs/alsa-lib-1.0.20"
CUPS_COMMON_DEP="
>=net-print/cups-1.4"
X_COMMON_DEP="
>=dev-libs/glib-2.32:2
>=media-libs/freetype-2.4.9:2
>=x11-libs/gtk+-2.24:2
>=x11-libs/libX11-1.4
>=x11-libs/libXext-1.3
>=x11-libs/libXi-1.6
>=x11-libs/libXtst-1.2"
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
>=media-libs/libpng-1.5:0=
>=sys-devel/gcc-4.5.4
>=sys-libs/glibc-2.15
>=sys-libs/zlib-1.2.3-r1
|| ( virtual/jpeg:62 media-libs/jpeg:62 )
nsplugin? (
>=dev-libs/atk-1.30.0
>=dev-libs/nspr-4.8
>=x11-libs/cairo-1.8.8
>=x11-libs/pango-1.24.5
)"
RDEPEND="${COMMON_DEP}
X? (
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
media-fonts/lklug
media-fonts/lohit-fonts
media-fonts/sazanami
)
)
alsa? ( ${ALSA_COMMON_DEP} )
cups? ( ${CUPS_COMMON_DEP} )"
src_unpack() {
unpack ${A}
if has_version '=media-libs/libpng-1.5*:0'; then
einfo "Installing libpng-1.5 ABI version"
local arch=${ARCH}
use x86 && arch=i386
mv -v ${PN}-libpng15-${PV}/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
else
einfo "Installing libpng-1.6 ABI version"
fi
}
src_install() {
local dest="/opt/${P}"
local ddest="${ED}/${dest}"
dodir "${dest}"
# Ensures HeadlessGraphicsEnvironment is used.
if ! use X; then
rm -r jre/lib/$(get_system_arch)/xawt || die
fi
# doins can't handle symlinks.
cp -pRP bin include jre lib man "${ddest}" || die
# Remove on next bump as the needed marks are already set by icedtea ebuild.
java-vm_set-pax-markings "${ddest}"
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
if use doc; then
dohtml -r ../doc/html/*
fi
if use examples; then
cp -pRP share/{demo,sample} "${ddest}" || die
fi
if use source; then
cp src.zip "${ddest}" || die
fi
if use nsplugin; then
cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
docinto icedtea-web
dodoc ../doc/icedtea-web/*
fi
# Remove after next bump, handled by icedtea ebuild. Bug 390663
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
eprefixify "${T}"/fontconfig.Gentoo.properties
insinto "${dest}"/jre/lib
doins "${T}"/fontconfig.Gentoo.properties
set_java_env
java-vm_revdep-mask "${dest}"
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
fi
}
pkg_postinst() {
# Set as default VM if none exists
java-vm-2_pkg_postinst
if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
elog "such as Firefox 3.5+ and recent Chromium versions."
fi
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-08-18 21:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-18 21:35 [gentoo-commits] gentoo-x86 commit in dev-java/icedtea-bin: ChangeLog icedtea-bin-7.2.4.1.ebuild icedtea-bin-6.1.12.6-r1.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