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 188451388C0 for ; Tue, 23 Feb 2016 01:15:16 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3406821C00F; Tue, 23 Feb 2016 01:15:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDFE321C00F for ; Tue, 23 Feb 2016 01:15:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4FF934069A for ; Tue, 23 Feb 2016 01:15:12 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9AB9614CD for ; Tue, 23 Feb 2016 01:15:11 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1456190032.0b87664bd7a24f3b07117ec6cc059898b6a33aac.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: eclass/ X-VCS-Repository: proj/qt X-VCS-Files: eclass/qt5-build.eclass X-VCS-Directories: eclass/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: 0b87664bd7a24f3b07117ec6cc059898b6a33aac X-VCS-Branch: master Date: Tue, 23 Feb 2016 01:15:11 +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: 0e8228fd-39d5-44c7-a5e8-a7648e37a7d6 X-Archives-Hash: 190448a3d8b2f87bd0f94c9db4471f7a commit: 0b87664bd7a24f3b07117ec6cc059898b6a33aac Author: Davide Pesavento gentoo org> AuthorDate: Tue Feb 23 01:13:52 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Feb 23 01:13:52 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=0b87664b qt5-build.eclass: update licensing options for Qt 5.7 http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ eclass/qt5-build.eclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index c5eb32b..40f7424 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -52,11 +52,16 @@ esac inherit eutils flag-o-matic toolchain-funcs versionator virtualx HOMEPAGE="https://www.qt.io/" -LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" QT5_MINOR_VERSION=$(get_version_component_range 2) readonly QT5_MINOR_VERSION +if [[ ${QT5_MINOR_VERSION} -ge 7 ]]; then + LICENSE="|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3" +else + LICENSE="|| ( LGPL-2.1 LGPL-3 ) FDL-1.3" +fi + if [[ ${QT5_MINOR_VERSION} -ge 6 ]]; then SLOT=5/$(get_version_component_range 1-2) else