Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/
Date: Fri, 11 Oct 2019 18:28:48
Message-Id: 1570818513.e9fdc8d9d9948e6673058bc49347c365cfbaad32.asturm@gentoo
1 commit: e9fdc8d9d9948e6673058bc49347c365cfbaad32
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 11 18:26:08 2019 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 11 18:28:33 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fdc8d9
7
8 dev-libs/poco: Drop duplicate cmake-utils_src_prepare call
9
10 Conflict resolution mistake
11
12 Closes: https://bugs.gentoo.org/697502
13 Package-Manager: Portage-2.3.76, Repoman-2.3.17
14 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
15
16 dev-libs/poco/poco-1.9.0-r2.ebuild | 2 --
17 1 file changed, 2 deletions(-)
18
19 diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
20 index af5af0d7e30..f2c9dd98dac 100644
21 --- a/dev-libs/poco/poco-1.9.0-r2.ebuild
22 +++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
23 @@ -82,8 +82,6 @@ src_prepare() {
24 # Add missing directory that breaks the build
25 mkdir -p Encodings/testsuite/data || die
26
27 - cmake-utils_src_prepare
28 -
29 if ! use iodbc ; then
30 sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
31 fi