caster 14/06/27 14:34:25
Modified: ChangeLog
Added: icedtea-bin-6.1.13.3-r2.ebuild
icedtea-bin-6.1.13.3-r3.ebuild
Log:
Revbump -r0 to -r2 (straight to stable) and -r1 to -r3, so that everyone gets
the sandbox control files. Bug #502280.
(Portage version: 2.2.10/cvs/Linux x86_64, RepoMan options: --force, signed
Manifest commit with key 4E61DE84)
Revision Changes Path
1.65 dev-java/icedtea-bin/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.65&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.65&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?r1=1.64&r2=1.65
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- ChangeLog 12 Jun 2014 19:40:30 -0000 1.64
+++ ChangeLog 27 Jun 2014 14:34:24 -0000 1.65
@@ -1,6 +1,14 @@
# ChangeLog for dev-java/icedtea-bin
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.64
2014/06/12 19:40:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.65
2014/06/27 14:34:24 caster Exp $
+
+*icedtea-bin-6.1.13.3-r3 (27 Jun 2014)
+*icedtea-bin-6.1.13.3-r2 (27 Jun 2014)
+
+ 27 Jun 2014; Vlastimil Babka <[email protected]>
+ +icedtea-bin-6.1.13.3-r2.ebuild, +icedtea-bin-6.1.13.3-r3.ebuild:
+ Revbump -r0 to -r2 (straight to stable) and -r1 to -r3, so that everyone gets
+ the sandbox control files. Bug #502280.
12 Jun 2014; Jeroen Roovers <[email protected]> icedtea-bin-6.1.13.3.ebuild,
icedtea-bin-6.1.13.3-r1.ebuild:
1.1 dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r2.ebuild?rev=1.1&content-type=text/plain
Index: icedtea-bin-6.1.13.3-r2.ebuild
===================================================================
# Copyright 1999-2014 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.13.3-r2.ebuild,v
1.1 2014/06/27 14:34:25 caster Exp $
EAPI="5"
inherit java-vm-2 multilib prefix
dist="http://dev.gentoo.org/~caster/distfiles/";
TARBALL_VERSION="${PV}"
PLUGIN_VERSION="${PV}"
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 )
x86? ( ${dist}/${PN}-core-${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 selinux 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.6: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
)
selinux? ( sec-policy/selinux-java )"
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_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_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
}
1.1 dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild?rev=1.1&content-type=text/plain
Index: icedtea-bin-6.1.13.3-r3.ebuild
===================================================================
# Copyright 1999-2014 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.13.3-r3.ebuild,v
1.1 2014/06/27 14:34:25 caster Exp $
EAPI="5"
inherit java-vm-2 multilib prefix
dist="http://dev.gentoo.org/~caster/distfiles/";
TARBALL_VERSION="${PV}"
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 )
x86? ( ${dist}/${PN}-core-${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 )
)
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 selinux source webstart"
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.6: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 )
selinux? ( sec-policy/selinux-java )"
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} )"
PDEPEND="webstart? ( dev-java/icedtea-web:0 )
nsplugin? ( dev-java/icedtea-web:0[icedtea7] )"
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
# 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
if use webstart || use nsplugin; then
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings
${dest}/bin/itweb-settings
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings
${dest}/jre/bin/itweb-settings
fi
if use webstart; then
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws
${dest}/bin/javaws
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws
${dest}/jre/bin/javaws
fi
set_java_env
java-vm_revdep-mask "${dest}"
java-vm_sandbox-predict /proc/self/coredump_filter
}
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() {
if use nsplugin; then
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least
6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
elog "The nsplugin for icedtea-bin is now provided by
the icedtea-web package"
elog "If you had icedtea-bin-6 nsplugin selected, you
may see a related error below"
elog "The switch should complete properly during the
subsequent installation of icedtea-web"
elog "Afterwards you may verify the output of 'eselect
java-nsplugin list' and adjust accordingly'"
fi
fi
# Set as default VM if none exists
java-vm-2_pkg_postinst
}
