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 DCAF11395E2 for ; Thu, 1 Dec 2016 08:55:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4AEB21C093; Thu, 1 Dec 2016 08:55:38 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 CA0BE21C093 for ; Thu, 1 Dec 2016 08:55:38 +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 A2BAF340F53 for ; Thu, 1 Dec 2016 08:55:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E05349A for ; Thu, 1 Dec 2016 08:55:36 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1480582491.d3c8e2368a60cb467e290fffa3804da9fda4a391.polynomial-c@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-v6.49.eclass X-VCS-Directories: eclass/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: d3c8e2368a60cb467e290fffa3804da9fda4a391 X-VCS-Branch: master Date: Thu, 1 Dec 2016 08:55:36 +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: 6cae09fc-2281-4f16-8f4e-8c359d8b2f6b X-Archives-Hash: 78c8f946256a9212d40e96714c4a003b commit: d3c8e2368a60cb467e290fffa3804da9fda4a391 Author: Lars Wendler gentoo org> AuthorDate: Thu Dec 1 08:49:51 2016 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Dec 1 08:54:51 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=d3c8e236 mozconfig-v6.49.eclass: Make dependency on gtk+:2 optional (bug #601326). eclass/mozconfig-v6.49.eclass | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/eclass/mozconfig-v6.49.eclass b/eclass/mozconfig-v6.49.eclass index 1b52c1a..7f9ed15 100644 --- a/eclass/mozconfig-v6.49.eclass +++ b/eclass/mozconfig-v6.49.eclass @@ -94,7 +94,6 @@ RDEPEND=">=app-text/hunspell-1.2:= dev-libs/atk dev-libs/expat >=x11-libs/cairo-1.10[X] - >=x11-libs/gtk+-2.18:2 x11-libs/gdk-pixbuf >=x11-libs/pango-1.22.0 >=media-libs/libpng-1.6.21:0=[apng] @@ -135,7 +134,8 @@ if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then IUSE+=" gtk3" fi RDEPEND+=" - gtk3? ( >=x11-libs/gtk+-3.4.0:3 )" + gtk3? ( >=x11-libs/gtk+-3.4.0:3 ) + !gtk3? ( >=x11-libs/gtk+-2.18:2 )" elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then if [[ ${MOZCONFIG_OPTIONAL_GTK2ONLY} = "enabled" ]]; then IUSE+=" +gtk2" @@ -143,7 +143,11 @@ elif [[ -n ${MOZCONFIG_OPTIONAL_GTK2ONLY} ]]; then IUSE+=" gtk2" fi RDEPEND+=" + gtk2? ( >=x11-libs/gtk+-2.18:2 ) !gtk2? ( >=x11-libs/gtk+-3.4.0:3 )" +else + RDEPEND+=" + >=x11-libs/gtk+-2.18:2" fi if [[ -n ${MOZCONFIG_OPTIONAL_QT5} ]]; then inherit qmake-utils