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 73577138334 for ; Thu, 10 Oct 2019 18:57:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEFA5E08DB; Thu, 10 Oct 2019 18:57:39 +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 85FEFE08DB for ; Thu, 10 Oct 2019 18:57:39 +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 69DCB34BAF4 for ; Thu, 10 Oct 2019 18:57:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 001FE83D for ; Thu, 10 Oct 2019 18:57:37 +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: <1570733844.0977dbfcabb86f483b2cce220361105205877c67.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: 0977dbfcabb86f483b2cce220361105205877c67 X-VCS-Branch: master Date: Thu, 10 Oct 2019 18:57:37 +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: 71312b7c-35d4-4f2f-9dd6-9130e3ab919c X-Archives-Hash: 26b0d4fda1d42e06d15523d64be3d343 commit: 0977dbfcabb86f483b2cce220361105205877c67 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 19 09:48:02 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Oct 10 18:57:24 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0977dbfc dev-libs/poco: Minor EAPI-7/DEPEND fix, sorting, whitespace cleanup Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> dev-libs/poco/poco-1.9.0-r2.ebuild | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild index 0e799b657b1..af5af0d7e30 100644 --- a/dev-libs/poco/poco-1.9.0-r2.ebuild +++ b/dev-libs/poco/poco-1.9.0-r2.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + inherit cmake-utils DESCRIPTION="C++ libraries for building network-based applications" @@ -11,7 +12,7 @@ LICENSE="Boost-1.0" SLOT="0" KEYWORDS="amd64 arm x86" -IUSE="7z cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip" +IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json libressl mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip" REQUIRED_USE=" 7z? ( xml ) file2pagecompiler? ( pagecompiler ) @@ -21,48 +22,48 @@ REQUIRED_USE=" odbc? ( data ) pagecompiler? ( json net util xml ) pocodoc? ( cppparser util xml ) - ssl? ( util ) sqlite? ( data ) + ssl? ( util ) test? ( data? ( sqlite ) json util xml ) " +BDEPEND=" + virtual/pkgconfig +" RDEPEND=" >=dev-libs/libpcre-8.42 - xml? ( dev-libs/expat ) mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= ) mariadb? ( dev-db/mariadb-connector-c:0= ) ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) + sqlite? ( dev-db/sqlite:3 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) - sqlite? ( dev-db/sqlite:3 ) + xml? ( dev-libs/expat ) zip? ( sys-libs/zlib ) " -DEPEND="${DEPEND} - virtual/pkgconfig -" +DEPEND="${RDEPEND}" S="${WORKDIR}/${PN}-${P}-release" PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" ) src_prepare() { + cmake-utils_src_prepare + if use test ; then # ignore missing tests on experimental library # and tests requiring running DB-servers, internet connections, etc. - sed -i \ - -e '/testsuite/d' \ + sed -i -e '/testsuite/d' \ {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,PDF,Redis}/CMakeLists.txt || die # Poco expands ~ using passwd, which does not match $HOME in the build environment - sed -i \ - -e '/CppUnit_addTest.*testExpand/d' \ + sed -i -e '/CppUnit_addTest.*testExpand/d' \ Foundation/testsuite/src/PathTest.cpp || die # ignore failing Crypto test since upstream does not seem to care, # see https://github.com/pocoproject/poco/issues/1209 - sed -i \ - -e '/RSATest, testRSACipherLarge/d' \ + sed -i -e '/RSATest, testRSACipherLarge/d' \ Crypto/testsuite/src/RSATest.cpp || die fi @@ -82,6 +83,10 @@ src_prepare() { mkdir -p Encodings/testsuite/data || die cmake-utils_src_prepare + + if ! use iodbc ; then + sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die + fi } src_configure() { @@ -111,10 +116,6 @@ src_configure() { -DENABLE_ZIP="$(usex zip)" ) - if ! use iodbc ; then - sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die - fi - cmake-utils_src_configure }