From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1SohIa-00041F-6H for garchives@archives.gentoo.org; Tue, 10 Jul 2012 20:44:44 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B61EE09FC; Tue, 10 Jul 2012 20:44:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 4C8E8E09FC for ; Tue, 10 Jul 2012 20:44:36 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5F131B4019 for ; Tue, 10 Jul 2012 20:44:35 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4996DE543E for ; Tue, 10 Jul 2012 20:44:33 +0000 (UTC) From: "Davide Pesavento" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Davide Pesavento" Message-ID: <1341952860.795492a32914714ec203cc402ffdde2c220c394c.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: 795492a32914714ec203cc402ffdde2c220c394c X-VCS-Branch: master Date: Tue, 10 Jul 2012 20:44: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 Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c200b3f4-ab86-4cba-9483-0d364385771e X-Archives-Hash: afc08575549f27c9acd7f4464f38c19c commit: 795492a32914714ec203cc402ffdde2c220c394c Author: Davide Pesavento gmail com> AuthorDate: Tue Jul 10 20:41:00 2012 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Tue Jul 10 20:41:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/qt.git;a=3Dco= mmit;h=3D795492a3 [qt5-build.eclass] Stop using base_src_prepare() for patching. --- eclass/qt5-build.eclass | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass index 94a8752..23fe05c 100644 --- a/eclass/qt5-build.eclass +++ b/eclass/qt5-build.eclass @@ -15,7 +15,7 @@ case ${EAPI} in *) die "qt5-build.eclass: unsupported EAPI=3D${EAPI:-0}" ;; esac =20 -inherit base eutils flag-o-matic multilib toolchain-funcs versionator +inherit eutils flag-o-matic multilib toolchain-funcs versionator =20 if [[ ${PV} =3D=3D *9999* ]]; then QT5_BUILD_TYPE=3D"live" @@ -194,7 +194,9 @@ qt5-build_src_prepare() { tc-export CC CXX RANLIB STRIP export LD=3D"$(tc-getCXX)" # qmake-generated Makefiles use LD/LINK for = linking =20 - base_src_prepare + # patching + [[ -n ${PATCHES[@]} ]] && epatch "${PATCHES[@]}" + epatch_user } =20 # @FUNCTION: qt5-build_src_configure