From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 297C8138206 for ; Wed, 27 Apr 2016 21:27:43 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0807921C004; Wed, 27 Apr 2016 21:27:41 +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 99AEE21C004 for ; Wed, 27 Apr 2016 21:27:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 193F0340CF2 for ; Wed, 27 Apr 2016 21:27:39 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C2EB215F for ; Wed, 27 Apr 2016 21:27:33 +0000 (UTC) From: "Ian Stakenvicius" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Stakenvicius" Message-ID: <1461792204.8f9f5e9c5e13ed61de409d2b60722f5dd8fa60a0.axs@gentoo> Subject: [gentoo-commits] proj/mozilla:master commit in: eclass/ X-VCS-Repository: proj/mozilla X-VCS-Files: eclass/mozconfig-v6.45.eclass X-VCS-Directories: eclass/ X-VCS-Committer: axs X-VCS-Committer-Name: Ian Stakenvicius X-VCS-Revision: 8f9f5e9c5e13ed61de409d2b60722f5dd8fa60a0 X-VCS-Branch: master Date: Wed, 27 Apr 2016 21:27:33 +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: 84fcf956-27e8-45f7-b8b8-c6c615a1a3d7 X-Archives-Hash: 14428661650b9f8ec065fca8c23f1ea3 commit: 8f9f5e9c5e13ed61de409d2b60722f5dd8fa60a0 Author: Ian Stakenvicius gentoo org> AuthorDate: Wed Apr 27 21:23:24 2016 +0000 Commit: Ian Stakenvicius gentoo org> CommitDate: Wed Apr 27 21:23:24 2016 +0000 URL: https://gitweb.gentoo.org/proj/mozilla.git/commit/?id=8f9f5e9c mozconfig-v6.45.eclass: do not require newer libvpx on thunderbird-45.0 eclass/mozconfig-v6.45.eclass | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/eclass/mozconfig-v6.45.eclass b/eclass/mozconfig-v6.45.eclass index 4347827..6d1586b 100644 --- a/eclass/mozconfig-v6.45.eclass +++ b/eclass/mozconfig-v6.45.eclass @@ -120,10 +120,18 @@ RDEPEND=">=app-text/hunspell-1.2 system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( =dev-libs/libevent-2.0*:0= ) system-sqlite? ( >=dev-db/sqlite-3.9.1:3[secure-delete,debug=] ) - system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc,svc] ) system-harfbuzz? ( >=media-libs/harfbuzz-1.1.3:0=[graphite2,icu] >=media-gfx/graphite2-1.3.8 ) " +if [[ ${PV} == "45.0" ]]; then + RDEPEND+=" + system-libvpx? ( >=media-libs/libvpx-1.3.0:0=[postproc] )" +else + # 45.1.0 and above bumped the libvpx requirement + RDEPEND+=" + system-libvpx? ( >=media-libs/libvpx-1.5.0:0=[postproc] )" +fi + if [[ -n ${MOZCONFIG_OPTIONAL_GTK3} ]]; then if [[ ${MOZCONFIG_OPTIONAL_GTK3} = "enabled" ]]; then IUSE+=" +gtk3"