commit: 514458531ae633f33d9ed83f277f28b417d9ae94 Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Tue Nov 17 21:44:21 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Tue Nov 17 21:44:21 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=51445853
dev-java/icedtea: Bring in headless USE flag renaming from main tree. Package-Manager: portage-2.2.20.1 dev-java/icedtea/ChangeLog | 5 +++++ dev-java/icedtea/icedtea-3.0.0_pre06.ebuild | 10 +++++----- dev-java/icedtea/icedtea-6.1.13.9.ebuild | 10 +++++----- dev-java/icedtea/icedtea-6.9999.ebuild | 10 +++++----- dev-java/icedtea/icedtea-7.2.6.3.ebuild | 14 +++++++------- dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild | 12 ++++++------ dev-java/icedtea/metadata.xml | 2 +- 7 files changed, 34 insertions(+), 29 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 99b3b69..0f2729f 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 17 Nov 2015; Andrew John Hughes <[email protected]> + icedtea-3.0.0_pre06.ebuild, icedtea-6.1.13.9.ebuild, icedtea-6.9999.ebuild, + icedtea-7.2.6.3.ebuild, icedtea-7.2.7.0_pre00.ebuild, metadata.xml: + dev-java/icedtea: Bring in headless USE flag renaming from main tree. + *icedtea-7.2.6.3 (17 Nov 2015) 17 Nov 2015; Andrew John Hughes <[email protected]> diff --git a/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild index 5665e7b..5d10c7e 100644 --- a/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild +++ b/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild @@ -62,7 +62,7 @@ EHG_REVISION="${ICEDTEA_PKG}${ICEDTEA_PRE}" 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" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="+alsa cacao cjk +cups debug doc examples headless jamvm +jbootstrap +nsplugin +IUSE="+alsa cacao cjk +cups debug doc examples headless-awt jamvm +jbootstrap +nsplugin +nss pax_kernel pulseaudio sctp selinux smartcard +source test zero +webstart" # Ideally the following were optional at build time. @@ -108,7 +108,7 @@ COMMON_DEP=" # cups is needed for X. #390945 #390975 RDEPEND="${COMMON_DEP} !dev-java/icedtea:0 - !headless? ( + !headless-awt? ( ${CUPS_COMMON_DEP} ${X_COMMON_DEP} media-fonts/dejavu @@ -321,9 +321,9 @@ src_install() { local dest="/usr/$(get_libdir)/icedtea${SLOT}" local ddest="${ED}${dest#/}" - # Ensures HeadlessGraphicsEnvironment is used. + # Ensures Headless-AwtGraphicsEnvironment is used. # Hack; we should get IcedTea to support passing --disable-headful - if use headless ; then + if use headless-awt ; then rm -vf "${ddest}"/jre/lib/$(get_system_arch)/libawt_xawt.so || die fi @@ -361,7 +361,7 @@ src_install() { chmod 644 "${ddest}/jre/lib/security/cacerts" || die set_java_env "${FILESDIR}/icedtea.env" - if use headless || ! use alsa || ! use cups; then + if use headless-awt || ! use alsa || ! use cups; then java-vm_revdep-mask "${dest}" fi java-vm_sandbox-predict /proc/self/coredump_filter diff --git a/dev-java/icedtea/icedtea-6.1.13.9.ebuild b/dev-java/icedtea/icedtea-6.1.13.9.ebuild index 15c6d9a..dc2b043 100644 --- a/dev-java/icedtea/icedtea-6.1.13.9.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.9.ebuild @@ -37,7 +37,7 @@ SLOT="6" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless javascript +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" @@ -90,7 +90,7 @@ RDEPEND="${COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) gtk? ( >=x11-libs/gtk+-2.8:2 ) - !headless? ( ${X_COMMON_DEP} ) + !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. @@ -229,8 +229,8 @@ src_configure() { --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ --with-pkgversion="Gentoo package ${PF}" \ --disable-downloading --disable-Werror \ - $(use_enable !headless system-gif) \ - $(use_enable !headless system-png) \ + $(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) \ @@ -272,7 +272,7 @@ src_install() { rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless ; then + if use headless-awt ; then rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \ {,jre/}bin/policytool bin/appletviewer || die fi diff --git a/dev-java/icedtea/icedtea-6.9999.ebuild b/dev-java/icedtea/icedtea-6.9999.ebuild index aa14d2f..a0a4cfb 100644 --- a/dev-java/icedtea/icedtea-6.9999.ebuild +++ b/dev-java/icedtea/icedtea-6.9999.ebuild @@ -36,7 +36,7 @@ SLOT="6" KEYWORDS="" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless javascript +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" @@ -89,7 +89,7 @@ RDEPEND="${COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) gtk? ( >=x11-libs/gtk+-2.8:2 ) - !headless? ( ${X_COMMON_DEP} ) + !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. @@ -230,8 +230,8 @@ src_configure() { --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ --with-pkgversion="Gentoo package ${PF}" \ --disable-downloading --disable-Werror \ - $(use_enable !headless system-gif) \ - $(use_enable !headless system-png) \ + $(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) \ @@ -273,7 +273,7 @@ src_install() { rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless ; then + if use headless-awt ; then rm -vr jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*} \ {,jre/}bin/policytool bin/appletviewer || die fi diff --git a/dev-java/icedtea/icedtea-7.2.6.3.ebuild b/dev-java/icedtea/icedtea-7.2.6.3.ebuild index e670a7a..10f5bca 100644 --- a/dev-java/icedtea/icedtea-7.2.6.3.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.3.ebuild @@ -57,14 +57,14 @@ SRC_URI=" ${DROP_URL}/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" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel pulseaudio sctp selinux smartcard source +sunec test zero +webstart" -REQUIRED_USE="gtk? ( !headless )" +REQUIRED_USE="gtk? ( !headless-awt )" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -126,7 +126,7 @@ RDEPEND="${COMMON_DEP} media-fonts/sazanami ) cups? ( ${CUPS_COMMON_DEP} ) - !headless? ( ${X_COMMON_DEP} ) + !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. @@ -304,8 +304,8 @@ src_configure() { --disable-hotspot-tests --disable-jdk-tests \ --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib \ - $(use_enable !headless system-gif) \ - $(use_enable !headless system-png) \ + $(use_enable !headless-awt system-gif) \ + $(use_enable !headless-awt system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable gtk system-gtk) \ @@ -346,7 +346,7 @@ src_install() { rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless; then + if use headless-awt; then rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die fi diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild index 14fc818..579e2d9 100644 --- a/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild +++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild @@ -60,11 +60,11 @@ LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 M KEYWORDS="" RESTRICT="test" -IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel pulseaudio sctp selinux smartcard source +sunec test zero +webstart" -REQUIRED_USE="gtk? ( !headless )" +REQUIRED_USE="gtk? ( !headless-awt )" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -126,7 +126,7 @@ RDEPEND="${COMMON_DEP} media-fonts/sazanami ) cups? ( ${CUPS_COMMON_DEP} ) - !headless? ( ${X_COMMON_DEP} ) + !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. @@ -301,8 +301,8 @@ src_configure() { --disable-hotspot-tests --disable-jdk-tests \ --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib \ - $(use_enable !headless system-gif) \ - $(use_enable !headless system-png) \ + $(use_enable !headless-awt system-gif) \ + $(use_enable !headless-awt system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable gtk system-gtk) \ @@ -343,7 +343,7 @@ src_install() { rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if use headless; then + if use headless-awt; then rm -vr "${ddest}"/jre/lib/$(get_system_arch)/{xawt,libsplashscreen.*,libjavagtk.*} \ "${ddest}"/{,jre/}bin/policytool "${ddest}"/bin/appletviewer || die fi diff --git a/dev-java/icedtea/metadata.xml b/dev-java/icedtea/metadata.xml index ccb7c05..83663b2 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -16,7 +16,7 @@ <longdescription>The IcedTea project provides a harness to build the source code from OpenJDK (http://openjdk.java.net) using Free Software build tools along with additional tools such as a browser plugin and Web Start support via NetX. </longdescription> <use> <flag name="cacao">Use the CACAO virtual machine rather than HotSpot.</flag> - <flag name="headless">Don't install graphical libraries (used to be USE="-X")</flag> + <flag name="headless-awt">Don't install the X backend for AWT, needed by some GUIs (used to be X flag)</flag> <flag name="infinality">Enable better font rendering using fontconfig.</flag> <flag name="jamvm">Use the JamVM virtual machine rather than HotSpot.</flag> <flag name="jbootstrap">If possible, recompile the final IcedTea executables with itself.</flag>
