[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebkit/

[Michael Palimaka]

commit:     daa797d94e8158f4bacb01d31b75cc4eb1db22bf
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 14:43:35 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> 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