From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 25E64139085 for ; Fri, 3 Feb 2017 03:41:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5102BE0D3F; Fri, 3 Feb 2017 03:41:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 288F2E0D3F for ; Fri, 3 Feb 2017 03:41:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1FA87340EDA for ; Fri, 3 Feb 2017 03:41:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0585A3CB7 for ; Fri, 3 Feb 2017 03:41:08 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1486093233.af41d67611aa734ac98f3261819ec93b889a0c86.anarchy@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-v6.51.eclass X-VCS-Directories: eclass/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: af41d67611aa734ac98f3261819ec93b889a0c86 X-VCS-Branch: master Date: Fri, 3 Feb 2017 03:41:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b3b244d2-e8a9-47a8-9c5c-9a24b2411340 X-Archives-Hash: 2e3ef7458f667d1b58b082bbc1bd0576 commit: af41d67611aa734ac98f3261819ec93b889a0c86 Author: Jory A. Pratt gentoo org> AuthorDate: Fri Feb 3 03:40:33 2017 +0000 Commit: Jory Pratt gentoo org> CommitDate: Fri Feb 3 03:40:33 2017 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=af41d676 eclass/mozconfig-v6.51 : Remove all QT references code was removed in 50.0 eclass/mozconfig-v6.51.eclass | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/eclass/mozconfig-v6.51.eclass b/eclass/mozconfig-v6.51.eclass index d27e22a..638309f 100644 --- a/eclass/mozconfig-v6.51.eclass +++ b/eclass/mozconfig-v6.51.eclass @@ -149,24 +149,6 @@ else RDEPEND+=" >=x11-libs/gtk+-2.18:2" fi -if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then - inherit qmake-utils - if [[ ${MOZCONFIG_OPTIONAL_QT5} = "enabled" ]]; then - IUSE+=" +qt5" - else - IUSE+=" qt5" - fi - RDEPEND+=" - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtprintsupport:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - dev-qt/qtdeclarative:5 - )" -fi if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then if [[ ${MOZCONFIG_OPTIONAL_WIFI} = "enabled" ]]; then IUSE+=" +wifi" @@ -180,13 +162,6 @@ if [[ -n ${MOZCONFIG_OPTIONAL_WIFI} ]]; then net-misc/networkmanager ) )" fi -if [[ -n ${MOZCONFIG_OPTIONAL_JIT} ]]; then - if [[ ${MOZCONFIG_OPTIONAL_JIT} = "enabled" ]]; then - IUSE+=" +jit" - else - IUSE+=" jit" - fi -fi DEPEND="app-arch/zip app-arch/unzip @@ -201,14 +176,6 @@ RDEPEND+=" REQUIRED_USE=" system-harfbuzz? ( system-icu )" -# only one of gtk3 or qt5 should be permitted to be selected, since only one will be used. -[[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \ - REQUIRED_USE+=" ?? ( gtk3 qt5 )" - -# only one of gtk2 or qt5 should be permitted to be selected, since only one will be used. -[[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]] && [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]] && \ - REQUIRED_USE+=" ?? ( gtk2 qt5 )" - # @FUNCTION: mozconfig_config # @DESCRIPTION: # Set common configure options for mozilla packages.