media-libs/assimp: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

diff --git a/media-libs/assimp/assimp-3.0.1270.ebuild b/media-libs/assimp/assimp-3.0.1270.ebuild
index e24f571993e779cf8a151f7ce6586756c6eac32d..37368a1bb93b9615a1b14bbc2206c2afc95f7da8 100644 (file)
--- 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 576f132881d1c8bdbed83032162ab8908ec48e0c..b3850b085c7f9330ce9e3cfa9b7d68e840c4b88b 100644 (file)
--- 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 8d77b0b07e5c9c2c9cc38ffa9a867153c171081e..0e5083ca247efa100c3a35233faf29eaefbecccb 100644 (file)
--- 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 c4700a110fd4aecdbfae38abec749a6fe4336ecb..4fd114b62eda063e54c67aa1a7a0ceaef38b567e 100644 (file)
--- 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 3fcdc67044d79db779c29ea9a82ba220c9d47613..e051dd165eafc0140b957cfe984d265a158ebdb7 100644 (file)
--- 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 c96cc0c16511b5bd32b7c418adbaab257899dd8d..e051dd165eafc0140b957cfe984d265a158ebdb7 100644 (file)
--- 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) \