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 BD916138CA3 for ; Sun, 15 Mar 2015 14:44:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 150F1E0A44; Sun, 15 Mar 2015 14:44:24 +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 AB8D1E0A44 for ; Sun, 15 Mar 2015 14:44:23 +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 A194F34084C for ; Sun, 15 Mar 2015 14:44:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4838013CFC for ; Sun, 15 Mar 2015 14:44:19 +0000 (UTC) From: "Michael Palimaka" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Palimaka" Message-ID: <1426430615.daa797d94e8158f4bacb01d31b75cc4eb1db22bf.kensington@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.4.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild dev-qt/qtwebkit/qtwebkit-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebkit/ X-VCS-Committer: kensington X-VCS-Committer-Name: Michael Palimaka X-VCS-Revision: daa797d94e8158f4bacb01d31b75cc4eb1db22bf X-VCS-Branch: master Date: Sun, 15 Mar 2015 14:44:19 +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: c6d9c369-0771-4319-8be7-afe356adfab8 X-Archives-Hash: 559eab36969b7b8c125e19bb801cf38b commit: daa797d94e8158f4bacb01d31b75cc4eb1db22bf Author: Michael Palimaka gentoo org> AuthorDate: Sun Mar 15 14:43:35 2015 +0000 Commit: Michael Palimaka gentoo org> CommitDate: Sun Mar 15 14:43:35 2015 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=daa797d9 [dev-qt/qtwebkit] Remove bundled library to ensure it cannot be used. Package-Manager: portage-2.2.17 dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild | 3 +++ dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild | 3 +++ dev-qt/qtwebkit/qtwebkit-5.9999.ebuild | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild index 48021cc..0cfb6a9 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.4.9999.ebuild @@ -69,6 +69,9 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) src_prepare() { + # ensure bundled library cannot be used + rm -r Source/ThirdParty/leveldb || die + if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" elif ! use gstreamer; then diff --git a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild index 48021cc..0cfb6a9 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.5.9999.ebuild @@ -69,6 +69,9 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) src_prepare() { + # ensure bundled library cannot be used + rm -r Source/ThirdParty/leveldb || die + if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" elif ! use gstreamer; then diff --git a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild index 48021cc..0cfb6a9 100644 --- a/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild +++ b/dev-qt/qtwebkit/qtwebkit-5.9999.ebuild @@ -69,6 +69,9 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${PN}-5.4.1-leveldb.patch" ) src_prepare() { + # ensure bundled library cannot be used + rm -r Source/ThirdParty/leveldb || die + if use gstreamer010; then epatch "${FILESDIR}/${PN}-5.3.2-use-gstreamer010.patch" elif ! use gstreamer; then