From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 54335138334 for ; Fri, 11 Oct 2019 18:28:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 58BC5E0869; Fri, 11 Oct 2019 18:28:47 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3B6C7E0869 for ; Fri, 11 Oct 2019 18:28:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1811934BBD3 for ; Fri, 11 Oct 2019 18:28:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6ECBB7FD for ; Fri, 11 Oct 2019 18:28:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1570818513.e9fdc8d9d9948e6673058bc49347c365cfbaad32.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/poco/poco-1.9.0-r2.ebuild X-VCS-Directories: dev-libs/poco/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: e9fdc8d9d9948e6673058bc49347c365cfbaad32 X-VCS-Branch: master Date: Fri, 11 Oct 2019 18:28:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b6aaa1bd-7543-438a-9193-75323cb17dfe X-Archives-Hash: 95900a5f9aca832ef2113066f90d9c4a commit: e9fdc8d9d9948e6673058bc49347c365cfbaad32 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Oct 11 18:26:08 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Oct 11 18:28:33 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fdc8d9 dev-libs/poco: Drop duplicate cmake-utils_src_prepare call Conflict resolution mistake Closes: https://bugs.gentoo.org/697502 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/poco/poco-1.9.0-r2.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild index af5af0d7e30..f2c9dd98dac 100644 --- a/dev-libs/poco/poco-1.9.0-r2.ebuild +++ b/dev-libs/poco/poco-1.9.0-r2.ebuild @@ -82,8 +82,6 @@ src_prepare() { # Add missing directory that breaks the build mkdir -p Encodings/testsuite/data || die - cmake-utils_src_prepare - if ! use iodbc ; then sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die fi