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 41F491384B4 for ; Thu, 19 Nov 2015 16:28:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83B1DE07A3; Thu, 19 Nov 2015 16:28:51 +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 27F36E07A3 for ; Thu, 19 Nov 2015 16:28:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 17BC334090B for ; Thu, 19 Nov 2015 16:28:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B713A96 for ; Thu, 19 Nov 2015 16:28:44 +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: <1447950109.e7965ab4d0f98974f7abb148bcf00abafd6d698f.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: e7965ab4d0f98974f7abb148bcf00abafd6d698f X-VCS-Branch: master Date: Thu, 19 Nov 2015 16:28:44 +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: 61913ec3-02fe-4f53-9f0f-6715570d9202 X-Archives-Hash: ef739e5496d24bb9b033890565279a29 commit: e7965ab4d0f98974f7abb148bcf00abafd6d698f Author: Davide Pesavento gentoo org> AuthorDate: Thu Nov 19 16:21:49 2015 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Thu Nov 19 16:21:49 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=e7965ab4 qt5-build.eclass: stop passing some obsolete options to configure They were unused since the early Qt 5.0.0 days, and now upstream officially dropped them so the configure won't accept them anymore. See fa8dbbff8895e7e1fdf1e6b0a9f3d821cd2caf2f and e824abd987d77efaa085fe1f9fb514d270798d55 in qtbase. eclass/qt5-build.eclass | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 85ac374..930619d 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -10,7 +10,7 @@ # @BLURB: Eclass for Qt5 split ebuilds. # @DESCRIPTION: # This eclass contains various functions that are used when building Qt5. -# Requires EAPI 5. +# Requires EAPI 5 or 6. case ${EAPI} in 5|6) : ;; @@ -19,7 +19,7 @@ esac inherit eutils flag-o-matic toolchain-funcs versionator virtualx -if [[ ${EAPI} == 5 ]] ; then +if [[ ${EAPI} == 5 ]]; then inherit multilib fi @@ -204,11 +204,10 @@ qt5-build_src_prepare() { fi if [[ ${EAPI} == 5 ]]; then - # apply patches [[ ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" epatch_user else - default_src_prepare + default fi } @@ -619,8 +618,7 @@ qt5_base_configure() { # disable obsolete/unused X11-related flags # (not shown in ./configure -help output) - -no-mitshm -no-xcursor -no-xfixes -no-xinerama -no-xinput - -no-xrandr -no-xshape -no-xsync -no-xvideo + -no-mitshm -no-xcursor -no-xfixes -no-xrandr -no-xshape -no-xsync # always enable session management support: it doesn't need extra deps # at configure time and turning it off is dangerous, see bug 518262