chewi 15/05/23 23:17:18
Modified: icedtea-bin-7.2.5.5.ebuild
icedtea-bin-6.1.13.7.ebuild ChangeLog
Log:
~arm (7) and ~ppc (6 and 7) keywords. Unfortunately patchelf doesn't
work on arm.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key
9C6D7DE4)
Revision Changes Path
1.2 dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild?r1=1.1&r2=1.2
Index: icedtea-bin-7.2.5.5.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icedtea-bin-7.2.5.5.ebuild 10 May 2015 20:45:35 -0000 1.1
+++ icedtea-bin-7.2.5.5.ebuild 23 May 2015 23:17:18 -0000 1.2
@@ -1,29 +1,30 @@
# Copyright 1999-2015 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.5.5.ebuild,v 1.1
2015/05/10 20:45:35 chewi Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.5.5.ebuild,v 1.2
2015/05/23 23:17:18 chewi Exp $
EAPI="5"
-inherit java-vm-2 multilib prefix versionator
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
-dist="http://dev.gentoo.org/~chewi/distfiles/";
+dist="http://dev.gentoo.org/~chewi/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.xz )
- x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.xz )
- doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
- examples? (
- amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.xz
)
- x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.xz )
- )
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+for arch in amd64 arm ppc x86; do
+ SRC_URI+="
+ ${arch}? (
+ ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+ examples? (
${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+ )"
+done
+
LICENSE="GPL-2-with-linking-exception"
SLOT="7"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~arm ~ppc ~x86"
IUSE="+X +alsa cjk +cups doc examples nsplugin pulseaudio selinux source
webstart"
REQUIRED_USE="nsplugin? ( X )"
@@ -80,12 +81,20 @@
selinux? ( sec-policy/selinux-java )
>=gnome-base/gsettings-desktop-schemas-3.12.2"
-DEPEND="dev-util/patchelf"
+DEPEND="!arm? ( dev-util/patchelf )"
PDEPEND="webstart? ( dev-java/icedtea-web:0[icedtea7] )
nsplugin? ( dev-java/icedtea-web:0[icedtea7,nsplugin] )
pulseaudio? ( dev-java/icedtea-sound )"
+pkg_pretend() {
+ if [[ "$(tc-is-softfloat)" != "no" ]]; then
+ die "These binaries require a hardfloat system."
+ elif use arm && [[ "${CHOST}" != armv7* ]]; then
+ die "These binaries require an ARMv7 CPU."
+ fi
+}
+
src_prepare() {
# Ensures HeadlessGraphicsEnvironment is used.
if ! use X; then
@@ -96,19 +105,27 @@
sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:'
jre/lib/fontconfig.Gentoo.properties || die
eprefixify jre/lib/fontconfig.Gentoo.properties
- # Fix the RPATHs.
+ # Fix the RPATHs, except on arm.
# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
- local old="/usr/$(get_libdir)/icedtea${SLOT}"
- local new="${EPREFIX}/opt/${P}"
- local elf rpath
-
- for elf in $(find -type f -executable ! -name "*.cgi" || die); do
- rpath=$(patchelf --print-rpath "${elf}" || die "patchelf
${elf}")
-
- if [[ -n "${rpath}" ]]; then
- patchelf --set-rpath "${rpath//${old}/${new}}" "${elf}"
|| die "patchelf ${elf}"
- fi
- done
+ # https://github.com/NixOS/patchelf/issues/8
+ if use arm; then
+ ewarn "The RPATHs on these binaries are normally modified to
avoid"
+ ewarn "conflicts with an icedtea installation built from
source. This"
+ ewarn "is currently not possible on ARM so please refrain from"
+ ewarn "installing dev-java/icedtea on the same system."
+ else
+ local old="/usr/$(get_libdir)/icedtea${SLOT}"
+ local new="${EPREFIX}/opt/${P}"
+ local elf rpath
+
+ for elf in $(find -type f -executable ! -name "*.cgi" || die);
do
+ rpath=$(patchelf --print-rpath "${elf}" || die
"patchelf ${elf}")
+
+ if [[ -n "${rpath}" ]]; then
+ patchelf --set-rpath "${rpath//${old}/${new}}"
"${elf}" || die "patchelf ${elf}"
+ fi
+ done
+ fi
}
src_install() {
1.2 dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild?rev=1.2&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild?rev=1.2&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild?r1=1.1&r2=1.2
Index: icedtea-bin-6.1.13.7.ebuild
===================================================================
RCS file:
/var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icedtea-bin-6.1.13.7.ebuild 10 May 2015 20:45:35 -0000 1.1
+++ icedtea-bin-6.1.13.7.ebuild 23 May 2015 23:17:18 -0000 1.2
@@ -1,29 +1,30 @@
# Copyright 1999-2015 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.7.ebuild,v 1.1
2015/05/10 20:45:35 chewi Exp $
+# $Header:
/var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.7.ebuild,v 1.2
2015/05/23 23:17:18 chewi Exp $
EAPI="5"
inherit java-vm-2 prefix versionator
-dist="http://dev.gentoo.org/~chewi/distfiles/";
+dist="http://dev.gentoo.org/~chewi/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.xz )
- x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.xz )
- doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
- examples? (
- amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.xz
)
- x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.xz )
- )
+SRC_URI="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+for arch in amd64 ppc x86; do
+ SRC_URI+="
+ ${arch}? (
+ ${dist}/${PN}-core-${TARBALL_VERSION}-${arch}.tar.xz
+ examples? (
${dist}/${PN}-examples-${TARBALL_VERSION}-${arch}.tar.xz )
+ )"
+done
+
LICENSE="GPL-2-with-linking-exception"
SLOT="6"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 ~ppc ~x86"
IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
REQUIRED_USE="nsplugin? ( X )"
1.80 dev-java/icedtea-bin/ChangeLog
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.80&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?rev=1.80&content-type=text/plain
diff :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/icedtea-bin/ChangeLog?r1=1.79&r2=1.80
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -r1.79 -r1.80
--- ChangeLog 10 May 2015 20:45:35 -0000 1.79
+++ ChangeLog 23 May 2015 23:17:18 -0000 1.80
@@ -1,6 +1,11 @@
# ChangeLog for dev-java/icedtea-bin
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.79
2015/05/10 20:45:35 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.80
2015/05/23 23:17:18 chewi Exp $
+
+ 23 May 2015; James Le Cuirot <[email protected]> icedtea-bin-6.1.13.7.ebuild,
+ icedtea-bin-7.2.5.5.ebuild:
+ ~arm (7) and ~ppc (6 and 7) keywords. Unfortunately patchelf doesn't work on
+ arm.
*icedtea-bin-6.1.13.7 (10 May 2015)
*icedtea-bin-7.2.5.5 (10 May 2015)
