commit: 130b857abae7d59970828532ee59b55f65e4c34e Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> AuthorDate: Sun Feb 26 02:54:03 2017 +0000 Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> CommitDate: Sun Feb 26 03:09:26 2017 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=130b857a
dev-qt/qt3d: ensure that system media-libs/assimp is used Package-Manager: Portage-2.3.3, Repoman-2.3.1 dev-qt/qt3d/qt3d-5.8.0.ebuild | 7 +++++++ dev-qt/qt3d/qt3d-5.8.9999.ebuild | 9 ++++++++- dev-qt/qt3d/qt3d-5.9999.ebuild | 9 ++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dev-qt/qt3d/qt3d-5.8.0.ebuild b/dev-qt/qt3d/qt3d-5.8.0.ebuild index 4f238ff7..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8.0.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.0.ebuild @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5.8.9999.ebuild b/dev-qt/qt3d/qt3d-5.8.9999.ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.8.9999.ebuild +++ b/dev-qt/qt3d/qt3d-5.8.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +} diff --git a/dev-qt/qt3d/qt3d-5.9999.ebuild b/dev-qt/qt3d/qt3d-5.9999.ebuild index aad66b97..e869a76b 100644 --- a/dev-qt/qt3d/qt3d-5.9999.ebuild +++ b/dev-qt/qt3d/qt3d-5.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,5 +18,12 @@ DEPEND=" ~dev-qt/qtcore-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + >=media-libs/assimp-3.1.1 " RDEPEND="${DEPEND}" + +src_prepare() { + rm -r src/3rdparty/assimp/{code,contrib,include} || die + + qt5-build_src_prepare +}