[gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/

[David Seifert]

commit:     db1811428cb7cfe2a41546c5f3bcaacd45922027
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 16 02:58:15 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Oct 16 02:58:15 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db181142

sci-libs/dcmtk: [QA] Add cmake-utils_src_prepare

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild 
b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
index afc167d9d7e..986977e0200 100644
--- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
+++ b/sci-libs/dcmtk/dcmtk-3.6.0.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"
@@ -26,17 +26,19 @@ DEPEND="${RDEPEND}
        doc? ( app-doc/doxygen )
        media-gfx/graphviz"
 
-src_prepare() {
+PATCHES=(
+       "${FILESDIR}"/01_fix_perl_script_path.patch
+       "${FILESDIR}"/02_dcmtk_3.6.0-1.patch
+       "${FILESDIR}"/04_nostrip.patch
+       "${FILESDIR}"/dcmtk_version_number.patch
+       "${FILESDIR}"/png_tiff.patch
+       "${FILESDIR}"/regression_stacksequenceisodd.patch
+       "${FILESDIR}"/${PN}-asneeded.patch
+       "${FILESDIR}"/${PN}-gcc472-error.patch
+)
 
-       epatch \
-               "${FILESDIR}"/01_fix_perl_script_path.patch \
-               "${FILESDIR}"/02_dcmtk_3.6.0-1.patch \
-               "${FILESDIR}"/04_nostrip.patch \
-               "${FILESDIR}"/dcmtk_version_number.patch \
-               "${FILESDIR}"/png_tiff.patch \
-               "${FILESDIR}"/regression_stacksequenceisodd.patch \
-               "${FILESDIR}"/${PN}-asneeded.patch \
-               "${FILESDIR}"/${PN}-gcc472-error.patch
+src_prepare() {
+       cmake-utils_src_prepare
 
        sed -e "s:share/doc/dcmtk:&-${PV}:" \
                -e "s:DIR \"/:DIR \"/usr/:" \
@@ -56,7 +58,7 @@ src_prepare() {
 }
 
 src_configure() {
-       mycmakeargs="${mycmakeargs}
+       local mycmakeargs="${mycmakeargs}
                -DBUILD_SHARED_LIBS=ON
                -DCMAKE_INSTALL_PREFIX=/
                $(cmake-utils_use tiff DCMTK_WITH_TIFF)