Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/dcmtk/
Date: Mon, 16 Oct 2017 03:34:59
Message-Id: 1508122695.db1811428cb7cfe2a41546c5f3bcaacd45922027.soap@gentoo
1 commit: db1811428cb7cfe2a41546c5f3bcaacd45922027
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 16 02:58:15 2017 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 16 02:58:15 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db181142
7
8 sci-libs/dcmtk: [QA] Add cmake-utils_src_prepare
9
10 Package-Manager: Portage-2.3.11, Repoman-2.3.3
11
12 sci-libs/dcmtk/dcmtk-3.6.0.ebuild | 26 ++++++++++++++------------
13 1 file changed, 14 insertions(+), 12 deletions(-)
14
15 diff --git a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
16 index afc167d9d7e..986977e0200 100644
17 --- a/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
18 +++ b/sci-libs/dcmtk/dcmtk-3.6.0.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2015 Gentoo Foundation
21 +# Copyright 1999-2017 Gentoo Foundation
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI="5"
25 @@ -26,17 +26,19 @@ DEPEND="${RDEPEND}
26 doc? ( app-doc/doxygen )
27 media-gfx/graphviz"
28
29 -src_prepare() {
30 +PATCHES=(
31 + "${FILESDIR}"/01_fix_perl_script_path.patch
32 + "${FILESDIR}"/02_dcmtk_3.6.0-1.patch
33 + "${FILESDIR}"/04_nostrip.patch
34 + "${FILESDIR}"/dcmtk_version_number.patch
35 + "${FILESDIR}"/png_tiff.patch
36 + "${FILESDIR}"/regression_stacksequenceisodd.patch
37 + "${FILESDIR}"/${PN}-asneeded.patch
38 + "${FILESDIR}"/${PN}-gcc472-error.patch
39 +)
40
41 - epatch \
42 - "${FILESDIR}"/01_fix_perl_script_path.patch \
43 - "${FILESDIR}"/02_dcmtk_3.6.0-1.patch \
44 - "${FILESDIR}"/04_nostrip.patch \
45 - "${FILESDIR}"/dcmtk_version_number.patch \
46 - "${FILESDIR}"/png_tiff.patch \
47 - "${FILESDIR}"/regression_stacksequenceisodd.patch \
48 - "${FILESDIR}"/${PN}-asneeded.patch \
49 - "${FILESDIR}"/${PN}-gcc472-error.patch
50 +src_prepare() {
51 + cmake-utils_src_prepare
52
53 sed -e "s:share/doc/dcmtk:&-${PV}:" \
54 -e "s:DIR \"/:DIR \"/usr/:" \
55 @@ -56,7 +58,7 @@ src_prepare() {
56 }
57
58 src_configure() {
59 - mycmakeargs="${mycmakeargs}
60 + local mycmakeargs="${mycmakeargs}
61 -DBUILD_SHARED_LIBS=ON
62 -DCMAKE_INSTALL_PREFIX=/
63 $(cmake-utils_use tiff DCMTK_WITH_TIFF)