diff options
author | Andreas Sturmlechner <asturm@gentoo.org> | 2019-05-19 11:48:02 +0200 |
---|---|---|
committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-10-10 20:57:24 +0200 |
commit | 0977dbfcabb86f483b2cce220361105205877c67 (patch) | |
tree | 17572ee5efc9b6ed032ef91ea6320c3cd10fb3a8 | |
parent | media-gfx/darktable: Drop broken 2.6.1 (diff) | |
download | gentoo-0977dbfcabb86f483b2cce220361105205877c67.tar.gz gentoo-0977dbfcabb86f483b2cce220361105205877c67.tar.bz2 gentoo-0977dbfcabb86f483b2cce220361105205877c67.zip |
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 <asturm@gentoo.org>
-rw-r--r-- | dev-libs/poco/poco-1.9.0-r2.ebuild | 35 |
1 files 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 0e799b657b11..af5af0d7e30f 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 } |