commit: 2b5d25609dfe7a6dd1caab7d6e73a7ddf3e5f354 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Thu Sep 27 14:42:26 2018 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Thu Sep 27 16:19:05 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5d2560
mozconfig-v6.60.eclass: Remove dead code Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> eclass/mozconfig-v6.60.eclass | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) diff --git a/eclass/mozconfig-v6.60.eclass b/eclass/mozconfig-v6.60.eclass index 101db58a81f..f8b6b65811f 100644 --- a/eclass/mozconfig-v6.60.eclass +++ b/eclass/mozconfig-v6.60.eclass @@ -1,7 +1,7 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # -# @ECLASS: mozconfig-v6.58.eclass +# @ECLASS: mozconfig-v6.60.eclass # @MAINTAINER: # mozilla team <[email protected]> # @SUPPORTED_EAPIS: 5 6 7 @@ -74,16 +74,6 @@ inherit flag-o-matic toolchain-funcs mozcoreconf-v6 # Set the variable to "enabled" if the use flag should be enabled by default. # Set the variable to any value if the use flag should exist but not be default-enabled. -# @ECLASS-VARIABLE: MOZCONFIG_OPTIONAL_QT5 -# @DESCRIPTION: -# Set this variable before the inherit line, when an ebuild can provide -# optional qt5 support via IUSE="qt5". Currently this would include -# ebuilds for firefox, but thunderbird and seamonkey could follow in the future. -# -# Leave the variable UNSET if qt5 support should not be available. -# Set the variable to "enabled" if the use flag should be enabled by default. -# Set the variable to any value if the use flag should exist but not be default-enabled. - # use-flags common among all mozilla ebuilds IUSE="${IUSE} dbus debug neon pulseaudio selinux startup-notification system-harfbuzz system-icu system-jpeg system-libevent system-sqlite system-libvpx" @@ -295,21 +285,6 @@ mozconfig_config() { toolkit_comment="gtk2 use flag" fi fi - if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then - if use qt5; then - toolkit="cairo-qt" - toolkit_comment="qt5 use flag" - # need to specify these vars because the qt5 versions are not found otherwise, - # and setting --with-qtdir overrides the pkg-config include dirs - local i - for i in qmake moc rcc; do - echo "export HOST_${i^^}=\"$(qt5_get_bindir)/${i}\"" \ - >> "${S}"/.mozconfig || die - done - echo 'unset QTDIR' >> "${S}"/.mozconfig || die - mozconfig_annotate '+qt5' --disable-gio - fi - fi mozconfig_annotate "${toolkit_comment}" --enable-default-toolkit=${toolkit} # Instead of the standard --build= and --host=, mozilla uses --host instead
