commit: 08dbfe123b59d1fb49b4eda6e38fabc86315ccec Author: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> AuthorDate: Thu Oct 22 23:32:21 2015 +0000 Commit: Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org> CommitDate: Thu Oct 22 23:52:18 2015 +0000 URL: https://gitweb.gentoo.org/proj/java.git/commit/?id=08dbfe12
dev-java/icedtea: Rename X/awt USE flag to headless to match upstream terminology. Package-Manager: portage-2.2.20.1 dev-java/icedtea/ChangeLog | 6 ++++++ dev-java/icedtea/icedtea-3.0.0_pre06.ebuild | 8 ++++---- dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild | 10 +++++----- dev-java/icedtea/icedtea-6.9999.ebuild | 10 +++++----- dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild | 12 ++++++------ dev-java/icedtea/icedtea-7.2.7.0_pre00.ebuild | 12 ++++++------ dev-java/icedtea/metadata.xml | 2 +- 7 files changed, 33 insertions(+), 27 deletions(-) diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 9c978fe..db537b1 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -2,6 +2,12 @@ # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 22 Oct 2015; Andrew John Hughes <[email protected]> + icedtea-3.0.0_pre06.ebuild, icedtea-6.1.13.8-r1.ebuild, icedtea-6.9999.ebuild, + icedtea-7.2.6.1-r1.ebuild, icedtea-7.2.7.0_pre00.ebuild, metadata.xml: + dev-java/icedtea: Rename X/awt USE flag to headless to match upstream + terminology. + *icedtea-6.1.13.8-r1 (22 Oct 2015) *icedtea-7.2.6.1-r1 (22 Oct 2015) diff --git a/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild b/dev-java/icedtea/icedtea-3.0.0_pre06.ebuild index 485976a..5665e7b 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="+X +alsa cacao cjk +cups debug doc examples jamvm +jbootstrap +nsplugin +IUSE="+alsa cacao cjk +cups debug doc examples headless 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 - X? ( + !headless? ( ${CUPS_COMMON_DEP} ${X_COMMON_DEP} media-fonts/dejavu @@ -323,7 +323,7 @@ src_install() { # Ensures HeadlessGraphicsEnvironment is used. # Hack; we should get IcedTea to support passing --disable-headful - if ! use X; then + if use headless ; 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 X || ! use alsa || ! use cups; then + if use headless || ! 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.8-r1.ebuild b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild index ff53a11..18438c6 100644 --- a/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild +++ b/dev-java/icedtea/icedtea-6.1.13.8-r1.ebuild @@ -37,7 +37,7 @@ SLOT="6" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" RESTRICT="test" -IUSE="+alsa +awt cacao cjk +cups debug doc examples +gtk javascript +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux source systemtap test zero +webstart" @@ -81,7 +81,6 @@ RDEPEND="${COMMON_DEP} !dev-java/icedtea-web:6 media-fonts/dejavu alsa? ( ${ALSA_COMMON_DEP} ) - awt? ( ${X_COMMON_DEP} ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts @@ -91,6 +90,7 @@ RDEPEND="${COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) gtk? ( >=x11-libs/gtk+-2.8:2 ) + !headless? ( ${X_COMMON_DEP} ) selinux? ( sec-policy/selinux-java )" # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. @@ -233,8 +233,8 @@ src_configure() { --with-abs-install-dir="${EPREFIX}/usr/$(get_libdir)/icedtea${SLOT}" \ --with-pkgversion="Gentoo package ${PF}" \ --disable-downloading --disable-Werror \ - $(use_enable awt system-gif) \ - $(use_enable awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable kerberos system-kerberos) \ @@ -276,7 +276,7 @@ src_install() { rm -v jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if ! use awt ; then + if use headless ; 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 8f52b8f..84574cf 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 +awt cacao cjk +cups debug doc examples +gtk javascript +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless javascript +jbootstrap kerberos +nsplugin +nss pax_kernel pulseaudio selinux source systemtap test zero +webstart" @@ -80,7 +80,6 @@ RDEPEND="${COMMON_DEP} !dev-java/icedtea-web:6 media-fonts/dejavu alsa? ( ${ALSA_COMMON_DEP} ) - awt? ( ${X_COMMON_DEP} ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts @@ -90,6 +89,7 @@ RDEPEND="${COMMON_DEP} ) cups? ( ${CUPS_COMMON_DEP} ) gtk? ( >=x11-libs/gtk+-2.8:2 ) + !headless? ( ${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 awt system-gif) \ - $(use_enable awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless 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 awt ; then + if use headless ; 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.1-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild index 9645c54..ac397b9 100644 --- a/dev-java/icedtea/icedtea-7.2.6.1-r1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.6.1-r1.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="~amd64 ~arm ~x86" RESTRICT="test" -IUSE="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel pulseaudio sctp selinux smartcard source +sunec test zero +webstart" -REQUIRED_USE="gtk? ( awt )" +REQUIRED_USE="gtk? ( !headless )" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -118,7 +118,6 @@ RDEPEND="${COMMON_DEP} >=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu alsa? ( ${ALSA_COMMON_DEP} ) - awt? ( ${X_COMMON_DEP} ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts @@ -127,6 +126,7 @@ RDEPEND="${COMMON_DEP} media-fonts/sazanami ) cups? ( ${CUPS_COMMON_DEP} ) + !headless? ( ${X_COMMON_DEP} ) selinux? ( sec-policy/selinux-java )" # Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. @@ -308,8 +308,8 @@ src_configure() { --disable-hotspot-tests --disable-jdk-tests \ --enable-system-lcms --enable-system-jpeg \ --enable-system-zlib \ - $(use_enable awt system-gif) \ - $(use_enable awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless system-png) \ $(use_enable !debug optimizations) \ $(use_enable doc docs) \ $(use_enable gtk system-gtk) \ @@ -350,7 +350,7 @@ src_install() { rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die fi - if ! use awt; then + if use headless; 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 bbb7b41..14fc818 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="+awt +alsa cacao cjk +cups debug doc examples +gtk infinality +IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless infinality jamvm javascript +jbootstrap kerberos +nsplugin nss pax_kernel pulseaudio sctp selinux smartcard source +sunec test zero +webstart" -REQUIRED_USE="gtk? ( awt )" +REQUIRED_USE="gtk? ( !headless )" # Ideally the following were optional at build time. ALSA_COMMON_DEP=" @@ -118,7 +118,6 @@ RDEPEND="${COMMON_DEP} >=gnome-base/gsettings-desktop-schemas-3.12.2 media-fonts/dejavu alsa? ( ${ALSA_COMMON_DEP} ) - awt? ( ${X_COMMON_DEP} ) cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts @@ -127,6 +126,7 @@ RDEPEND="${COMMON_DEP} media-fonts/sazanami ) cups? ( ${CUPS_COMMON_DEP} ) + !headless? ( ${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 awt system-gif) \ - $(use_enable awt system-png) \ + $(use_enable !headless system-gif) \ + $(use_enable !headless 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 awt; then + if use headless; 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 3b78fab..ccb7c05 100644 --- a/dev-java/icedtea/metadata.xml +++ b/dev-java/icedtea/metadata.xml @@ -15,8 +15,8 @@ </maintainer> <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="awt">Install non-headless AWT libraries, needed by some GUIs (used to be X flag)</flag> <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="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>
