diff options
| author |   David Seifert <soap@gentoo.org> | 2017-10-15 19:23:27 -0700 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2017-10-15 19:46:43 -0700 |
| commit | c6f1c662792642bf9cd53599ee3e3289eb208680 (patch) | |
| tree | 04e98e231ec66bea2a2510e21a776fedcadc1730 /media-libs | |
| parent | media-libs/allegro: [QA] Add cmake-utils_src_prepare (diff) | |
| download | gentoo-c6f1c662792642bf9cd53599ee3e3289eb208680.tar.gz gentoo-c6f1c662792642bf9cd53599ee3e3289eb208680.tar.bz2 gentoo-c6f1c662792642bf9cd53599ee3e3289eb208680.zip | |
media-libs/assimp: [QA] Add cmake-utils_src_prepare
Package-Manager: Portage-2.3.11, Repoman-2.3.3
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/assimp/assimp-3.0.1270.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/assimp/assimp-3.1.1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/assimp/assimp-3.2-r2.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/assimp/assimp-3.2-r3.ebuild | 12 | ||||
| -rw-r--r-- | media-libs/assimp/assimp-3.3.1.ebuild | 9 | ||||
| -rw-r--r-- | media-libs/assimp/assimp-4.0.0.ebuild | 7 |
6 files changed, 18 insertions, 26 deletions
diff --git a/media-libs/assimp/assimp-3.0.1270.ebuild b/media-libs/assimp/assimp-3.0.1270.ebuild index e24f571993e7..37368a1bb93b 100644 --- a/media-libs/assimp/assimp-3.0.1270.ebuild +++ b/media-libs/assimp/assimp-3.0.1270.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -24,7 +24,7 @@ RDEPEND="${DEPEND}" S=${WORKDIR}/${PN}--${PV}-source-only src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ $(cmake-utils_use_build tools ASSIMP_TOOLS) \ $(cmake-utils_use_build static STATIC_LIB) \ diff --git a/media-libs/assimp/assimp-3.1.1.ebuild b/media-libs/assimp/assimp-3.1.1.ebuild index 576f132881d1..b3850b085c7f 100644 --- a/media-libs/assimp/assimp-3.1.1.ebuild +++ b/media-libs/assimp/assimp-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -27,7 +27,7 @@ src_prepare() { } src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ $(cmake-utils_use_build tools ASSIMP_TOOLS) \ $(cmake-utils_use_build static STATIC_LIB) \ diff --git a/media-libs/assimp/assimp-3.2-r2.ebuild b/media-libs/assimp/assimp-3.2-r2.ebuild index 8d77b0b07e5c..0e5083ca247e 100644 --- a/media-libs/assimp/assimp-3.2-r2.ebuild +++ b/media-libs/assimp/assimp-3.2-r2.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 EAPI=5 @@ -23,12 +23,10 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " -src_prepare() { - epatch "${FILESDIR}/test-cmakelists.patch" -} +PATCHES=( "${FILESDIR}/test-cmakelists.patch" ) src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ $(cmake-utils_use_build tools ASSIMP_TOOLS) \ $(cmake-utils_use_build static STATIC_LIB) \ diff --git a/media-libs/assimp/assimp-3.2-r3.ebuild b/media-libs/assimp/assimp-3.2-r3.ebuild index c4700a110fd4..4fd114b62eda 100644 --- a/media-libs/assimp/assimp-3.2-r3.ebuild +++ b/media-libs/assimp/assimp-3.2-r3.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 EAPI=5 @@ -23,13 +23,13 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " -src_prepare() { - epatch "${FILESDIR}/test-cmakelists.patch" - epatch "${FILESDIR}/findassimp.patch" -} +PATCHES=( + "${FILESDIR}/test-cmakelists.patch" + "${FILESDIR}/findassimp.patch" +) src_configure() { - mycmakeargs=( + local mycmakeargs=( $(cmake-utils_use_build samples ASSIMP_SAMPLES) \ $(cmake-utils_use_build tools ASSIMP_TOOLS) \ $(cmake-utils_use_build static STATIC_LIB) \ diff --git a/media-libs/assimp/assimp-3.3.1.ebuild b/media-libs/assimp/assimp-3.3.1.ebuild index 3fcdc67044d7..e051dd165eaf 100644 --- a/media-libs/assimp/assimp-3.3.1.ebuild +++ b/media-libs/assimp/assimp-3.3.1.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 EAPI=6 @@ -23,13 +23,10 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " -src_prepare() { - eapply "${FILESDIR}/findassimp-${PV}.patch" - eapply_user -} +PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" ) src_configure() { - mycmakeargs=( + local mycmakeargs=( -DASSIMP_BUILD_SAMPLES=$(usex samples) \ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \ -DASSIMP_BUILD_STATIC_LIB=$(usex static) \ diff --git a/media-libs/assimp/assimp-4.0.0.ebuild b/media-libs/assimp/assimp-4.0.0.ebuild index c96cc0c16511..e051dd165eaf 100644 --- a/media-libs/assimp/assimp-4.0.0.ebuild +++ b/media-libs/assimp/assimp-4.0.0.ebuild @@ -23,13 +23,10 @@ DEPEND="${RDEPEND} test? ( dev-cpp/gtest ) " -src_prepare() { - eapply "${FILESDIR}/findassimp-${PV}.patch" - eapply_user -} +PATCHES=( "${FILESDIR}/findassimp-${PV}.patch" ) src_configure() { - mycmakeargs=( + local mycmakeargs=( -DASSIMP_BUILD_SAMPLES=$(usex samples) \ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools) \ -DASSIMP_BUILD_STATIC_LIB=$(usex static) \ |