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 76E2558973 for ; Wed, 20 Jan 2016 17:35:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B844021C0E6; Wed, 20 Jan 2016 17:35:07 +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 55D6321C0E6 for ; Wed, 20 Jan 2016 17:35:07 +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 9816B3409E6 for ; Wed, 20 Jan 2016 17:35:06 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 86DC31021 for ; Wed, 20 Jan 2016 17:35:04 +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: <1453311287.a2e03882eb314289ccf6acf1bc3483261e93086f.pesa@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: pesa X-VCS-Committer-Name: Davide Pesavento X-VCS-Revision: a2e03882eb314289ccf6acf1bc3483261e93086f X-VCS-Branch: master Date: Wed, 20 Jan 2016 17:35:04 +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: 65cbaa93-4907-4962-84a1-1af4673339c3 X-Archives-Hash: ed032179944749c8192076e4d0e3f372 commit: a2e03882eb314289ccf6acf1bc3483261e93086f Author: Davide Pesavento gentoo org> AuthorDate: Wed Jan 20 17:34:47 2016 +0000 Commit: Davide Pesavento gentoo org> CommitDate: Wed Jan 20 17:34:47 2016 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=a2e03882 dev-qt/qtwebkit: do not call epatch manually Package-Manager: portage-2.2.27 dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild | 6 +++--- dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild index 593d86b..6f84eba 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.6.9999.ebuild @@ -88,13 +88,13 @@ src_prepare() { Source/WebKit2/WebKit2.pri if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" + PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" + PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") fi # bug 562396 - use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" + use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ Tools/qmake/mkspecs/features/features.prf || die diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 593d86b..6f84eba 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -88,13 +88,13 @@ src_prepare() { Source/WebKit2/WebKit2.pri if use gstreamer010; then - epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" + PATCHES+=("${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch") elif ! use gstreamer; then - epatch "${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch" + PATCHES+=("${FILESDIR}/${PN}-5.2.1-disable-gstreamer.patch") fi # bug 562396 - use jit || epatch "${FILESDIR}/${PN}-5.5.1-disable-jit.patch" + use jit || PATCHES+=("${FILESDIR}/${PN}-5.5.1-disable-jit.patch") use opengl || sed -i -e '/contains(QT_CONFIG, opengl): WEBKIT_CONFIG += use_3d_graphics/d' \ Tools/qmake/mkspecs/features/features.prf || die