mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-07-30 22:48:07 -07:00
dev-java/icedtea: Version bump to 6.1.13.9
Sorry for changing the X/awt flag again but upstream preferred the term headless, which is technically more accurate than awt, so I compromised and went with headless-awt. Package-Manager: portage-2.2.20.1
This commit is contained in:
James Le Cuirot
@@ -10,4 +10,6 @@ DIST icedtea-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b
|
||||
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
|
||||
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4
|
||||
DIST icedtea6-1.13.8.tar.xz 4566076 SHA256 fcbc623957e393a00d6189cb88288fed21c21860485092ea7719a12fbbc00adb SHA512 16ab0ec383809467266f9e55ce7d0333187041db3796aa940bc91078557397728b5c2b13b80d20b171b133da589207cbb7b9906719dd949af91df1cac207c9ec WHIRLPOOL 193b67b98c90b42252b894b4032d057073570a7b4460dd8c9f8f2ddce0647c6268702b8ceb519251d4eca489213ff20e384f0653cf8fae034947f72c8d0fa2a4
|
||||
DIST icedtea6-1.13.9.tar.xz 4573884 SHA256 61e0fb2ed0fc2d793a42e24d2192423f8a7ccb04f130d82d5889a0ecf52bc965 SHA512 b1a6e7d36904e3a9cea620c86dc656324bc99622d470f021f86a66c77919d8faf774d199f42669f9813f1ca4c41f2a920a66f9927d33eeca5476edd26438822a WHIRLPOOL 32586b8563cb7c9246bfb1731d409a03d0367b653dff866f9a3e8b4deb1f09d6405e8e103a94681fe3e80ba4dd042782a2defec409f0b020c1d3c263bf3feec1
|
||||
DIST openjdk-6-src-b36-22_jul_2015.tar.xz 33757312 SHA256 c9df23d208b3b61f5f57c030accca2f7b3218a97bd140668506265ececdf26f4 SHA512 52ce3ca2feae2fb00e0363d5c0a7e03efc79b8fe803049ee91e252e436433b6bcba0e0536f886f4def8297d34fb6c1bdcc5ddbbcac9344abee172c0adf6e126e WHIRLPOOL 026e1629cc0bf1ff0342d68eca3a9c822d51c2eea3a1cbf828aa001e59cce5946eca5681d89890fd7968f52b51592e5a472eb6f8e033a1906631da5c50b78684
|
||||
DIST openjdk-6-src-b37-11_nov_2015.tar.xz 33790124 SHA256 462ac2c28f6dbfb4a18eb46efca232b907d6027f7618715cbc4de5dd73b89e8d SHA512 e7da587e5cb5a99d3a92bc64ae1bc668bd470cd5664f097197d87af07aa32414903c1b212693449e471b933ed6b1bc7e754fb56ccd7af23038d766dbfdf8eba8 WHIRLPOOL 685fd308007bc236b2c461c09186f910ef5c829a3f557fad5b37902d0550b66d7be82502a66209c99430639d875356f5249fa5047f46468983d164aa156aed17
|
||||
|
||||
351
dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
Normal file
351
dev-java/icedtea/icedtea-6.1.13.9-r1.ebuild
Normal file
@@ -0,0 +1,351 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
|
||||
|
||||
# *********************************************************
|
||||
# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
|
||||
# *********************************************************
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit check-reqs java-pkg-2 java-vm-2 multiprocessing pax-utils versionator virtualx
|
||||
|
||||
ICEDTEA_PKG=${PN}$(replace_version_separator 1 -)
|
||||
ICEDTEA_BRANCH=$(get_version_component_range 1-3)
|
||||
OPENJDK_BUILD="37"
|
||||
OPENJDK_DATE="11_nov_2015"
|
||||
OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.xz"
|
||||
# Download cacao and jamvm regardless for use with EXTRA_ECONF
|
||||
CACAO_TARBALL="68fe50ac34ec.tar.gz"
|
||||
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
|
||||
|
||||
CACAO_GENTOO_TARBALL="icedtea-cacao-${CACAO_TARBALL}"
|
||||
JAMVM_GENTOO_TARBALL="icedtea-${JAMVM_TARBALL}"
|
||||
|
||||
DESCRIPTION="A harness to build OpenJDK using Free Software build tools and dependencies"
|
||||
HOMEPAGE="http://icedtea.classpath.org"
|
||||
SRC_PKG="${ICEDTEA_PKG}.tar.xz"
|
||||
SRC_URI="
|
||||
http://icedtea.classpath.org/download/source/${SRC_PKG}
|
||||
https://java.net/downloads/openjdk6/${OPENJDK_TARBALL}
|
||||
http://icedtea.classpath.org/download/drops/cacao/${CACAO_TARBALL} -> ${CACAO_GENTOO_TARBALL}
|
||||
http://icedtea.classpath.org/download/drops/jamvm/${JAMVM_TARBALL} -> ${JAMVM_GENTOO_TARBALL}"
|
||||
|
||||
LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
|
||||
SLOT="6"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
RESTRICT="test"
|
||||
|
||||
IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt
|
||||
javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio
|
||||
selinux source systemtap test zero +webstart"
|
||||
|
||||
# Ideally the following were optional at build time.
|
||||
ALSA_COMMON_DEP="
|
||||
>=media-libs/alsa-lib-1.0"
|
||||
CUPS_COMMON_DEP="
|
||||
>=net-print/cups-1.2.12"
|
||||
X_COMMON_DEP="
|
||||
>=media-libs/giflib-4.1.6:=
|
||||
>=media-libs/libpng-1.2:0=
|
||||
>=x11-libs/libX11-1.1.3
|
||||
>=x11-libs/libXext-1.1.1
|
||||
>=x11-libs/libXi-1.1.3
|
||||
>=x11-libs/libXrender-0.9.4
|
||||
>=x11-libs/libXtst-1.0.3
|
||||
x11-libs/libXt"
|
||||
X_DEPEND="
|
||||
>=x11-libs/libXau-1.0.3
|
||||
>=x11-libs/libXdmcp-1.0.2
|
||||
>=x11-libs/libXinerama-1.0.2
|
||||
x11-proto/inputproto
|
||||
>=x11-proto/xextproto-7.1.1
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xproto"
|
||||
|
||||
COMMON_DEP="
|
||||
>=media-libs/freetype-2.3.5:2=
|
||||
>=media-libs/lcms-2.5
|
||||
>=sys-libs/zlib-1.2.3:=
|
||||
virtual/jpeg:0=
|
||||
javascript? ( dev-java/rhino:1.6 )
|
||||
kerberos? ( virtual/krb5 )
|
||||
nss? ( >=dev-libs/nss-3.12.5-r1 )
|
||||
pulseaudio? ( >=media-sound/pulseaudio-0.9.11:= )
|
||||
systemtap? ( >=dev-util/systemtap-1 )"
|
||||
|
||||
# media-fonts/lklug needs ppc ppc64 keywords
|
||||
RDEPEND="${COMMON_DEP}
|
||||
!dev-java/icedtea6
|
||||
!dev-java/icedtea-web:6
|
||||
media-fonts/dejavu
|
||||
alsa? ( ${ALSA_COMMON_DEP} )
|
||||
cjk? (
|
||||
media-fonts/arphicfonts
|
||||
media-fonts/baekmuk-fonts
|
||||
media-fonts/lklug
|
||||
media-fonts/lohit-fonts
|
||||
media-fonts/sazanami
|
||||
)
|
||||
cups? ( ${CUPS_COMMON_DEP} )
|
||||
gtk? ( >=x11-libs/gtk+-2.8:2 )
|
||||
!headless-awt? ( ${X_COMMON_DEP} )
|
||||
selinux? ( sec-policy/selinux-java )"
|
||||
|
||||
# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present.
|
||||
# ca-certificates, perl and openssl are used for the cacerts keystore generation
|
||||
DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} ${X_DEPEND}
|
||||
|| (
|
||||
>=dev-java/gcj-jdk-4.3
|
||||
dev-java/icedtea-bin:6
|
||||
dev-java/icedtea:6
|
||||
)
|
||||
app-arch/cpio
|
||||
app-arch/unzip
|
||||
app-arch/zip
|
||||
app-misc/ca-certificates
|
||||
>=dev-java/ant-core-1.8.2
|
||||
dev-lang/perl
|
||||
>=dev-libs/libxslt-1.1.26
|
||||
dev-libs/openssl
|
||||
sys-apps/lsb-release
|
||||
virtual/pkgconfig
|
||||
pax_kernel? ( sys-apps/elfix )"
|
||||
|
||||
PDEPEND="webstart? ( dev-java/icedtea-web:0 )
|
||||
nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
|
||||
|
||||
S="${WORKDIR}"/${ICEDTEA_PKG}
|
||||
|
||||
icedtea_check_requirements() {
|
||||
local CHECKREQS_DISK_BUILD
|
||||
|
||||
if use doc; then
|
||||
CHECKREQS_DISK_BUILD="8500M"
|
||||
else
|
||||
CHECKREQS_DISK_BUILD="8000M"
|
||||
fi
|
||||
|
||||
check-reqs_pkg_${EBUILD_PHASE}
|
||||
}
|
||||
|
||||
pkg_pretend() {
|
||||
icedtea_check_requirements
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
icedtea_check_requirements
|
||||
|
||||
JAVA_PKG_WANT_BUILD_VM="
|
||||
icedtea-6 icedtea-bin-6
|
||||
gcj-jdk"
|
||||
JAVA_PKG_WANT_SOURCE="1.5"
|
||||
JAVA_PKG_WANT_TARGET="1.5"
|
||||
|
||||
java-vm-2_pkg_setup
|
||||
java-pkg-2_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
unpack ${SRC_PKG}
|
||||
}
|
||||
|
||||
java_prepare() {
|
||||
# For bootstrap builds as the sandbox control file might not yet exist.
|
||||
addpredict /proc/self/coredump_filter
|
||||
|
||||
# icedtea doesn't like some locales. #330433 #389717
|
||||
export LANG="C" LC_ALL="C"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local cacao_config config hotspot_port use_cacao use_zero zero_config
|
||||
local vm=$(java-pkg_get-current-vm)
|
||||
|
||||
# gcj-jdk ensures ecj is present.
|
||||
if use jbootstrap || has "${vm}" gcj-jdk; then
|
||||
use jbootstrap || einfo "bootstrap is necessary when building with ${vm}, ignoring USE=\"-jbootstrap\""
|
||||
config+=" --enable-bootstrap"
|
||||
else
|
||||
config+=" --disable-bootstrap"
|
||||
fi
|
||||
|
||||
# Use Zero if requested
|
||||
if use zero; then
|
||||
use_zero="yes"
|
||||
fi
|
||||
|
||||
# Use CACAO if requested
|
||||
if use cacao; then
|
||||
use_cacao="yes"
|
||||
fi
|
||||
|
||||
# Are we on a architecture with a HotSpot port?
|
||||
# In-tree JIT ports are available for amd64, arm, sparc and x86.
|
||||
if { use amd64 || use arm || use sparc || use x86; }; then
|
||||
hotspot_port="yes"
|
||||
fi
|
||||
|
||||
# Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ...
|
||||
# Otherwise use CACAO on ppc and Zero on anything else
|
||||
if test "x${hotspot_port}" != "xyes"; then
|
||||
if { use ppc || use ppc64; }; then
|
||||
use_cacao="yes"
|
||||
else
|
||||
use_zero="yes"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Turn on CACAO if needed (non-HS archs) or requested
|
||||
if test "x${use_cacao}" = "xyes"; then
|
||||
if test "x${hotspot_port}" = "xyes"; then
|
||||
ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.'
|
||||
ewarn 'If so, please rebuild with USE="-cacao"'
|
||||
fi
|
||||
cacao_config="--enable-cacao"
|
||||
|
||||
# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2611
|
||||
export DISTRIBUTION_PATCHES="${SLOT}-cacao-dynmaxheap.patch"
|
||||
ln -snf "${FILESDIR}/${DISTRIBUTION_PATCHES}" || die
|
||||
fi
|
||||
|
||||
# Turn on Zero if needed (non-HS/CACAO archs) or requested
|
||||
if test "x${use_zero}" = "xyes"; then
|
||||
zero_config="--enable-zero"
|
||||
fi
|
||||
|
||||
config+=" --with-parallel-jobs=$(makeopts_jobs)"
|
||||
|
||||
if use javascript ; then
|
||||
config+=" --with-rhino=$(java-pkg_getjar rhino-1.6 js.jar)"
|
||||
else
|
||||
config+=" --without-rhino"
|
||||
fi
|
||||
|
||||
unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
|
||||
|
||||
econf ${config} \
|
||||
--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
|
||||
--with-cacao-src-zip="${DISTDIR}/${CACAO_GENTOO_TARBALL}" \
|
||||
--with-jamvm-src-zip="${DISTDIR}/${JAMVM_GENTOO_TARBALL}" \
|
||||
--with-jdk-home="$(java-config -O)" \
|
||||
--with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \
|
||||
--with-pkgversion="Gentoo package ${PF}" \
|
||||
--disable-downloading --disable-Werror \
|
||||
$(use_enable !headless-awt system-gif) \
|
||||
$(use_enable !headless-awt system-png) \
|
||||
$(use_enable !debug optimizations) \
|
||||
$(use_enable doc docs) \
|
||||
$(use_enable kerberos system-kerberos) \
|
||||
$(use_enable nss) \
|
||||
$(use_with pax_kernel pax "${EPREFIX}/usr/sbin/paxmark.sh") \
|
||||
$(use_enable pulseaudio pulse-java) \
|
||||
$(use_enable systemtap) \
|
||||
${zero_config} ${cacao_config}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Would use GENTOO_VM otherwise.
|
||||
export ANT_RESPECT_JAVA_HOME=TRUE
|
||||
|
||||
# With ant >=1.8.2 all required tasks are part of ant-core
|
||||
export ANT_TASKS="none"
|
||||
|
||||
emake
|
||||
}
|
||||
|
||||
src_test() {
|
||||
# Use Xvfb for tests
|
||||
unset DISPLAY
|
||||
|
||||
Xemake check
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
|
||||
local ddest="${ED}${dest#/}"
|
||||
dodir "${dest}"
|
||||
|
||||
dodoc README NEWS AUTHORS
|
||||
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
|
||||
|
||||
cd openjdk.build/j2sdk-image || die
|
||||
|
||||
if ! use alsa; then
|
||||
rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die
|
||||
fi
|
||||
|
||||
if use headless-awt ; then
|
||||
rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \
|
||||
{,jre/}bin/policytool bin/appletviewer || die
|
||||
fi
|
||||
|
||||
# Don't hide classes
|
||||
rm lib/ct.sym || die
|
||||
|
||||
#402507
|
||||
mkdir jre/.systemPrefs || die
|
||||
touch jre/.systemPrefs/.system.lock || die
|
||||
touch jre/.systemPrefs/.systemRootModFile || die
|
||||
|
||||
# doins doesn't preserve executable bits.
|
||||
cp -vRP bin include jre lib man "${ddest}" || die
|
||||
|
||||
dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README
|
||||
|
||||
if use doc; then
|
||||
docinto html
|
||||
dodoc -r ../docs/*
|
||||
fi
|
||||
|
||||
if use examples; then
|
||||
cp -vRP demo sample "${ddest}" || die
|
||||
fi
|
||||
|
||||
if use source; then
|
||||
cp src.zip "${ddest}" || die
|
||||
fi
|
||||
|
||||
# provided by icedtea-web but we need it in JAVA_HOME to work with run-java-tool
|
||||
if use webstart || use nsplugin; then
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/bin/itweb-settings
|
||||
dosym /usr/libexec/icedtea-web/itweb-settings ${dest}/jre/bin/itweb-settings
|
||||
fi
|
||||
if use webstart; then
|
||||
dosym /usr/libexec/icedtea-web/javaws ${dest}/bin/javaws
|
||||
dosym /usr/libexec/icedtea-web/javaws ${dest}/jre/bin/javaws
|
||||
fi
|
||||
|
||||
# Fix the permissions.
|
||||
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
|
||||
|
||||
# Needs to be done before generating cacerts
|
||||
java-vm_set-pax-markings "${ddest}"
|
||||
|
||||
# We need to generate keystore - bug #273306
|
||||
einfo "Generating cacerts file from certificates in ${EPREFIX}/usr/share/ca-certificates/"
|
||||
mkdir "${T}/certgen" && cd "${T}/certgen" || die
|
||||
cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
|
||||
for c in "${EPREFIX}"/usr/share/ca-certificates/*/*.crt; do
|
||||
openssl x509 -text -in "${c}" >> all.crt || die
|
||||
done
|
||||
./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
|
||||
cp -vRP cacerts "${ddest}/jre/lib/security/" || die
|
||||
chmod 644 "${ddest}/jre/lib/security/cacerts" || die
|
||||
|
||||
set_java_env "${FILESDIR}/icedtea.env"
|
||||
java-vm_sandbox-predict /proc/self/coredump_filter
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then
|
||||
# portage would preserve the symlink otherwise, related to bug #384397
|
||||
rm -f "${EROOT}/usr/lib/jvm/icedtea6"
|
||||
elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*"
|
||||
elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1"
|
||||
elog "If you had icedtea6 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
|
||||
}
|
||||
Reference in New Issue
Block a user