public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/
Date: Sun,  3 Jan 2016 11:27:30 +0000 (UTC)	[thread overview]
Message-ID: <1451820444.ec132de82f98877ea73767ced84ec596bb03d8e3.chewi@gentoo> (raw)

commit:     ec132de82f98877ea73767ced84ec596bb03d8e3
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  3 11:26:54 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jan  3 11:27:24 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec132de8

dev-java/icedtea-bin: Allow usage of newer icedtea-web

Package-Manager: portage-2.2.26

 dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild | 185 +++++++++++++++++++++
 1 file changed, 185 insertions(+)

diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
new file mode 100644
index 0000000..1825a68
--- /dev/null
+++ b/dev-java/icedtea-bin/icedtea-bin-7.2.6.3-r1.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit java-vm-2 multilib prefix toolchain-funcs versionator
+
+dist="https://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="doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.xz )
+	source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.xz )"
+
+for arch in amd64 arm ppc ppc64 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 ~arm ~ppc ~ppc64 ~x86"
+
+IUSE="+alsa cjk +cups doc examples +gtk headless-awt nsplugin nss pulseaudio selinux source webstart"
+REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
+
+RESTRICT="preserve-libs strip"
+QA_PREBUILT="opt/.*"
+
+# gsettings-desktop-schemas is needed for native proxy support. #431972
+RDEPEND=">=dev-libs/glib-2.42:2
+	>=dev-libs/nss-3.16.1-r1
+	>=dev-libs/nspr-4.10
+	>=gnome-base/gsettings-desktop-schemas-3.12.2
+	media-fonts/dejavu
+	>=media-libs/fontconfig-2.11:1.0
+	>=media-libs/freetype-2.5.5:2
+	>=media-libs/lcms-2.6:2
+	>=sys-devel/gcc-4.9.3
+	>=sys-libs/glibc-2.21
+	>=sys-libs/zlib-1.2.8-r1
+	virtual/jpeg:62
+	alsa? ( >=media-libs/alsa-lib-1.0 )
+	!headless-awt? (
+		>=media-libs/giflib-4.1.6-r1
+		media-libs/libpng:0/16
+		>=x11-libs/libX11-1.6
+		>=x11-libs/libXext-1.3
+		>=x11-libs/libXi-1.7
+		>=x11-libs/libXrender-0.9.8
+		>=x11-libs/libXtst-1.2
+	)
+	cjk? (
+		media-fonts/arphicfonts
+		media-fonts/baekmuk-fonts
+		media-fonts/lklug
+		media-fonts/lohit-fonts
+		media-fonts/sazanami
+	)
+	cups? ( >=net-print/cups-2.0 )
+	gtk? (
+		>=dev-libs/atk-2.16.0
+		>=x11-libs/cairo-1.14.2
+		x11-libs/gdk-pixbuf:2
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/pango-1.36
+	)
+	selinux? ( sec-policy/selinux-java )"
+
+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."
+	fi
+}
+
+src_prepare() {
+	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
+
+	if ! use gtk; then
+		rm -v jre/lib/$(get_system_arch)/libjavagtk.* || die
+	fi
+
+	# NSS is already required because of SunEC. The nss flag in the
+	# icedtea package just comments or uncomments this line.
+	sed -i "/=sun\.security\.pkcs11\.SunPKCS11/s/^#*$(usex nss '/' '/#')/" jre/lib/security/java.security || die
+
+	if [[ -n "${EPREFIX}" ]]; then
+		# The binaries are built on a non-prefixed system so the
+		# fontconfig needs to have prefixes inserted.
+		sed -i 's:=/:=@GENTOO_PORTAGE_EPREFIX@/:' jre/lib/fontconfig.Gentoo.properties || die
+		eprefixify jre/lib/fontconfig.Gentoo.properties
+	fi
+
+	# Fix the RPATHs, except on arm.
+	# https://bugs.gentoo.org/show_bug.cgi?id=543658#c3
+	# 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() {
+	local dest="/opt/${P}"
+	local ddest="${ED}${dest#/}"
+	dodir "${dest}"
+
+	# doins doesn't preserve executable bits.
+	cp -pRP bin include jre lib man "${ddest}" || die
+
+	dodoc doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
+	use doc && dodoc -r doc/html
+
+	if use examples; then
+		cp -pRP demo sample "${ddest}" || die
+	fi
+
+	if use source; then
+		cp src.zip "${ddest}" || die
+	fi
+
+	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
+
+	# Both icedtea itself and the icedtea ebuild set PAX markings but we
+	# disable them for the icedtea-bin build because the line below will
+	# respect end-user settings when icedtea-bin is actually installed.
+	java-vm_set-pax-markings "${ddest}"
+
+	set_java_env
+	java-vm_revdep-mask "${dest}"
+	java-vm_sandbox-predict /proc/self/coredump_filter
+}
+
+pkg_postinst() {
+	if use nsplugin; then
+		if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 7.2.4.3 ${REPLACING_VERSIONS} ]]; then
+			elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
+			elog "If you had icedtea-bin-7 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
+}


             reply	other threads:[~2016-01-03 11:27 UTC|newest]

Thread overview: 158+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-03 11:27 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-04 10:07 [gentoo-commits] repo/gentoo:master commit in: dev-java/icedtea-bin/ Miroslav Šulc
2024-03-04  7:57 Sam James
2024-03-04  7:57 Sam James
2024-03-04  7:51 Sam James
2024-03-04  7:51 Sam James
2021-11-29 13:03 Miroslav Šulc
2021-11-28 19:53 Miroslav Šulc
2021-11-27 21:07 Miroslav Šulc
2020-09-05  6:32 Georgy Yakovlev
2020-05-24  4:09 Georgy Yakovlev
2020-05-15 11:47 Agostino Sarubbo
2020-05-14 21:26 Mart Raudsepp
2020-05-14 13:25 Agostino Sarubbo
2020-05-14 13:22 Agostino Sarubbo
2020-05-14  7:58 Georgy Yakovlev
2020-03-31  8:33 Georgy Yakovlev
2020-03-31  7:22 Agostino Sarubbo
2020-03-30  7:27 Georgy Yakovlev
2020-03-29  7:29 Mikle Kolyada
2020-03-28 22:46 Mart Raudsepp
2020-03-28  5:05 Georgy Yakovlev
2020-03-28  5:05 Georgy Yakovlev
2020-01-03  5:19 Georgy Yakovlev
2020-01-02  0:05 Georgy Yakovlev
2019-10-25 18:55 Georgy Yakovlev
2019-08-19  4:37 Georgy Yakovlev
2019-08-19  4:37 Georgy Yakovlev
2019-08-18 21:51 Agostino Sarubbo
2019-08-17 20:41 Sergei Trofimovich
2019-08-16 22:38 Thomas Deutschmann
2019-08-16 21:36 Aaron Bauman
2019-08-16  2:54 Georgy Yakovlev
2019-08-15 19:10 Georgy Yakovlev
2019-07-22  2:52 Aaron Bauman
2019-06-22  9:38 Sergei Trofimovich
2019-06-21 11:07 Agostino Sarubbo
2019-06-21  8:03 Agostino Sarubbo
2019-06-02  5:13 Georgy Yakovlev
2019-06-01 22:23 Georgy Yakovlev
2019-05-10 19:49 Georgy Yakovlev
2019-05-10  5:31 Georgy Yakovlev
2019-02-03 22:55 Georgy Yakovlev
2019-02-03 22:55 Georgy Yakovlev
2019-01-31 22:43 Georgy Yakovlev
2019-01-29 15:49 Mikle Kolyada
2019-01-26 17:30 Sergei Trofimovich
2019-01-19 11:37 Georgy Yakovlev
2019-01-19  3:48 Georgy Yakovlev
2018-11-08 22:05 James Le Cuirot
2018-11-07 23:28 Sergei Trofimovich
2018-10-21 19:35 James Le Cuirot
2018-10-13 22:26 James Le Cuirot
2018-10-09 21:24 Thomas Deutschmann
2018-10-08  9:14 Mikle Kolyada
2018-10-07 21:49 James Le Cuirot
2018-06-10 21:48 Aaron Bauman
2018-06-10  8:10 James Le Cuirot
2018-04-08 18:46 James Le Cuirot
2018-04-08  6:03 Matt Turner
2018-03-11  2:16 Thomas Deutschmann
2018-03-10 18:25 Agostino Sarubbo
2018-03-08 22:17 James Le Cuirot
2017-11-16 21:06 James Le Cuirot
2017-11-16 19:48 Sergei Trofimovich
2017-11-09 20:16 James Le Cuirot
2017-11-08 13:38 Agostino Sarubbo
2017-11-05 21:29 Thomas Deutschmann
2017-11-04 17:53 James Le Cuirot
2017-09-27 21:41 James Le Cuirot
2017-09-27  8:59 Sergei Trofimovich
2017-09-04 22:24 James Le Cuirot
2017-09-04 13:54 Aaron Bauman
2017-09-04 13:54 Aaron Bauman
2017-09-04 13:29 Aaron Bauman
2017-09-04 13:29 Aaron Bauman
2017-08-12  9:40 James Le Cuirot
2017-08-01 19:29 James Le Cuirot
2017-08-01 19:29 James Le Cuirot
2017-07-24 20:46 James Le Cuirot
2017-07-15 18:17 James Le Cuirot
2017-05-29 11:30 Agostino Sarubbo
2017-05-28 22:31 James Le Cuirot
2017-05-28 22:11 James Le Cuirot
2017-05-26 14:59 Agostino Sarubbo
2017-05-26 14:05 Agostino Sarubbo
2017-05-22 13:31 Agostino Sarubbo
2017-05-22 10:05 James Le Cuirot
2017-05-11 11:45 James Le Cuirot
2017-05-11 11:45 James Le Cuirot
2017-03-19 20:55 Thomas Deutschmann
2017-03-07 21:56 James Le Cuirot
2017-03-05 11:52 James Le Cuirot
2017-02-24 10:30 James Le Cuirot
2017-02-24  0:34 Michael Weber
2017-02-20 22:49 James Le Cuirot
2017-01-30 13:09 Agostino Sarubbo
2017-01-29 23:15 James Le Cuirot
2017-01-18 10:16 James Le Cuirot
2016-11-20 14:04 James Le Cuirot
2016-11-20 13:08 Agostino Sarubbo
2016-11-20 13:04 Agostino Sarubbo
2016-11-19 17:18 James Le Cuirot
2016-11-19 17:18 James Le Cuirot
2016-10-05 19:40 James Le Cuirot
2016-09-29  9:23 James Le Cuirot
2016-09-29  9:06 Agostino Sarubbo
2016-09-16  8:47 Benda XU
2016-08-14  9:34 Jeroen Roovers
2016-08-07 10:45 Agostino Sarubbo
2016-08-05 20:07 James Le Cuirot
2016-08-05 19:44 James Le Cuirot
2016-08-04 22:16 James Le Cuirot
2016-08-03 21:52 Austin English
2016-06-27 20:51 James Le Cuirot
2016-06-27  8:48 Agostino Sarubbo
2016-05-17 21:43 James Le Cuirot
2016-04-27 12:34 Jeroen Roovers
2016-04-26 19:01 James Le Cuirot
2016-04-26 11:19 Agostino Sarubbo
2016-04-25 20:55 James Le Cuirot
2016-04-24 10:17 James Le Cuirot
2016-04-10 17:22 James Le Cuirot
2016-04-06 15:34 James Le Cuirot
2016-04-05 10:49 Jeroen Roovers
2016-04-01 21:47 James Le Cuirot
2016-03-27 11:33 James Le Cuirot
2016-03-27  9:38 Agostino Sarubbo
2016-03-27  9:37 Agostino Sarubbo
2016-03-27  8:44 James Le Cuirot
2016-03-15  7:06 James Le Cuirot
2016-03-02 11:25 James Le Cuirot
2016-03-01 22:43 James Le Cuirot
2016-02-25 13:20 James Le Cuirot
2016-01-24 17:43 James Le Cuirot
2016-01-24 16:22 Agostino Sarubbo
2016-01-24 16:21 Agostino Sarubbo
2016-01-23 23:01 James Le Cuirot
2016-01-23 22:42 James Le Cuirot
2016-01-16 14:50 James Le Cuirot
2015-12-26 12:15 James Le Cuirot
2015-12-26 12:03 Agostino Sarubbo
2015-12-11 10:41 Agostino Sarubbo
2015-12-11 10:40 Agostino Sarubbo
2015-12-09 13:13 James Le Cuirot
2015-11-22 21:00 James Le Cuirot
2015-11-16 14:16 James Le Cuirot
2015-11-16  9:08 Agostino Sarubbo
2015-11-16  9:08 Agostino Sarubbo
2015-11-15 16:21 James Le Cuirot
2015-11-15 11:01 James Le Cuirot
2015-11-14 23:17 James Le Cuirot
2015-09-08  9:32 James Le Cuirot
2015-09-08  7:27 Agostino Sarubbo
2015-09-07 22:43 James Le Cuirot
2015-09-06  8:49 Agostino Sarubbo
2015-09-06  8:48 Agostino Sarubbo
2015-09-02 23:00 James Le Cuirot

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1451820444.ec132de82f98877ea73767ced84ec596bb03d8e3.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox