commit: 8c3ac02e46ac320c8206e46d2144cb43718ca175 Author: David Roman <davidroman96 <AT> gmail <DOT> com> AuthorDate: Mon Nov 23 16:33:06 2020 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Nov 24 03:47:38 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3ac02e
dev-libs/poco: verbump to 1.10.1 Closes: https://bugs.gentoo.org/665880 Closes: https://bugs.gentoo.org/707106 Package-Manager: Portage-3.0.10, Repoman-3.0.2 Signed-off-by: David Roman <davidroman96 <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/18378 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/poco/Manifest | 1 + dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch | 13 ++ dev-libs/poco/metadata.xml | 9 +- dev-libs/poco/poco-1.10.1.ebuild | 138 +++++++++++++++++++++ 4 files changed, 160 insertions(+), 1 deletion(-) diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index 2fdbe4b3bef..0dc485b0a31 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1 +1,2 @@ +DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9 diff --git a/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch b/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch new file mode 100644 index 00000000000..afac9bc7922 --- /dev/null +++ b/dev-libs/poco/files/poco-1.10.1-iodbc-incdir.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake +index 55318b520..fb7efbffe 100644 +--- a/cmake/FindODBC.cmake ++++ b/cmake/FindODBC.cmake +@@ -34,7 +34,7 @@ find_path(ODBC_INCLUDE_DIR + ${ODBC_ROOT_INCLUDE_DIRS} + PATHS + ${PC_ODBC_INCLUDE_DIRS} +- /usr/include ++ /usr/include/iodbc + /usr/local/include + /usr/local/odbc/include + /usr/local/iodbc/include diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml index 6c90e505339..efd7d2d6116 100644 --- a/dev-libs/poco/metadata.xml +++ b/dev-libs/poco/metadata.xml @@ -1,7 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <!-- maintainer-needed --> + <maintainer type="person"> + <email>[email protected]</email> + <name>David Roman</name> + </maintainer> + <maintainer type="project"> + <email>[email protected]</email> + <name>Proxy Maintainers</name> + </maintainer> <longdescription> POCO, the C++ Portable Components, is a collection of open source C++ class libraries that simplify and accelerate the development of diff --git a/dev-libs/poco/poco-1.10.1.ebuild b/dev-libs/poco/poco-1.10.1.ebuild new file mode 100644 index 00000000000..1c464f71967 --- /dev/null +++ b/dev-libs/poco/poco-1.10.1.ebuild @@ -0,0 +1,138 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +DESCRIPTION="C++ libraries for building network-based applications" +HOMEPAGE="https://pocoproject.org/"; +SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P}.tar.gz" +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" + +IUSE="7z cppparser +crypto +data examples +file2pagecompiler iodbc +json libressl mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip" +RESTRICT="!test? ( test )" +REQUIRED_USE=" + 7z? ( xml ) + file2pagecompiler? ( pagecompiler ) + iodbc? ( odbc ) + mongodb? ( data ) + mysql? ( data ) + odbc? ( data ) + pagecompiler? ( json net util xml ) + pocodoc? ( cppparser util xml ) + sqlite? ( data ) + ssl? ( util ) + test? ( data? ( sqlite ) json util xml ) +" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + >=dev-libs/libpcre-8.42 + 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= ) + ) + xml? ( dev-libs/expat ) + zip? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/${PN}-${P}-release" + +PATCHES=( "${FILESDIR}/${PN}-1.10.1-iodbc-incdir.patch" ) + +src_prepare() { + cmake_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' \ + {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' \ + 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' \ + Crypto/testsuite/src/RSATest.cpp || die + fi + + if use mariadb ; then + # Fix MariaDB detection + sed -i -e 's~/usr/include/mysql~~' \ + -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ + cmake/FindMySQL.cmake || die + else + # Fix MySQL detection + sed -i -e 's/mysqlclient_r/mysqlclient/' \ + -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ + cmake/FindMySQL.cmake || die + fi + + # Add missing directory that breaks the build + mkdir -p Encodings/testsuite/data || die + + if ! use iodbc ; then + sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die + fi +} + +src_configure() { + # apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764 + local mycmakeargs=( + -DPOCO_UNBUNDLED=ON + -DENABLE_APACHECONNECTOR=OFF + -DENABLE_CPPPARSER="$(usex cppparser)" + -DENABLE_CRYPTO="$(usex ssl)" + -DENABLE_DATA="$(usex data)" + -DENABLE_DATA_MYSQL="$(usex mysql)" + -DENABLE_DATA_ODBC="$(usex odbc)" + -DENABLE_DATA_SQLITE="$(usex sqlite)" + -DENABLE_JSON="$(usex util)" + -DENABLE_MONGODB="$(usex mongodb)" + -DENABLE_NET="$(usex net)" + -DENABLE_NETSSL="$(usex ssl)" + -DENABLE_NETSSL_WIN=OFF + -DENABLE_PAGECOMPILER="$(usex pagecompiler)" + -DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)" + -DENABLE_PDF="$(usex pdf)" + -DENABLE_POCODOC="$(usex pocodoc)" + -DENABLE_SEVENZIP="$(usex 7z)" + -DENABLE_TESTS="$(usex test)" + -DENABLE_UTIL="$(usex util)" + -DENABLE_XML="$(usex xml)" + -DENABLE_ZIP="$(usex zip)" + ) + + cmake_src_configure +} + +src_test() { + POCO_BASE="${S}" cmake_src_test +} + +src_install() { + cmake_src_install + + if use examples ; then + for sd in */samples ; do + docinto examples/${sd%/samples} + dodoc -r ${sd} + done + find "${D}/usr/share/doc/${PF}/examples" \ + -iname "*.sln" -or -iname "*.vcproj" -or \ + -iname "*.vmsbuild" -or -iname "*.properties" \ + | xargs rm + fi +}
