From 752d6256e5204b958b0ef7905675a940b5e9172f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 12 May 2022 16:42:50 +0300 Subject: gentoo resync : 12.05.2022 --- dev-libs/poco/Manifest | 7 +- dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch | 13 -- dev-libs/poco/metadata.xml | 1 + dev-libs/poco/poco-1.11.2.ebuild | 137 ++++++++++++++++++++++ dev-libs/poco/poco-1.9.0-r2.ebuild | 137 ---------------------- 5 files changed, 141 insertions(+), 154 deletions(-) delete mode 100644 dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch create mode 100644 dev-libs/poco/poco-1.11.2.ebuild delete mode 100644 dev-libs/poco/poco-1.9.0-r2.ebuild (limited to 'dev-libs/poco') diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index aecafe812f9f..cfdf61fc6cc4 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1,7 +1,6 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43fdf1db53cb0139f3cab5eb8ca67ca30dfa97058e4db4618d27ab2cd642e205349f5f70970fd2a4961a018aa7e1c5dac SHA512 1a155b10e98cdce8659a9308ac70e8114361a0062a1af469dc774b5d32bc00b5f1aa0e873fa5061625527ddeb006fdf29939b1899939a193d8724e491dedba10 -AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73 -DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9 +DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e98561ec4286ed09693b638d565fbf084c3e40eff3f6a9a88cff167b1d774da08e8c8424986aefe13d029a540afe2 SHA512 3f9e46dbfb0a85f19389b269725cb6272172d993d8239f13da8110c0c6ce9ed2b6595708d5dba91a027292c74358c87da988e22587a74011e84707816a6a277c EBUILD poco-1.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6 -EBUILD poco-1.9.0-r2.ebuild 3763 BLAKE2B aba656a0393b241efaa6f94568d799b75a6a1aa2b65157b59bb2ef3f74e2cac2a587ecdc989d994050aaadcb9e5ec3febdbd685deb3556ffad07dfe6aacc950b SHA512 0bd3e60116ee8aeae272edb85a5e16134ad4e4b529b5008ef9d522dc46977340d54b3cc11b2a35b173d6b5b234c7d8c7329b733069eae3bbec04e3403531d3e7 -MISC metadata.xml 2584 BLAKE2B 666f63e00f654571eece88d1d4679673323570c5b68e4dda840ec94413461307a1b2eade7acd89852e0bf5163cafce9ed7d75c55fa3be7071a2d9445ffcbdca4 SHA512 c6526c758b0d06cc5b2b57b56f6e61f92950f88f62e38967948edcaa2b3fc618836b667ff57dc9b8c52e71e5921b14181376c79a8cfead7e607cfbc554f73dfd +EBUILD poco-1.11.2.ebuild 3881 BLAKE2B f3b8beb999657398871b46b7e8c8285a35dfd447fc063a26f2480ae713a915d5c8ebe86d4eedf460409251ac245016c0e7ecf05e9d03670e95b73d1ea2e7d43f SHA512 d890ce83447bb34b448fcb261e77036f5714e666d3e790e127abcdf2f38b90c7e98dd4cfc3feb4515429c1d27a91915e185de22c434a3c93a4c5332f123a578b +MISC metadata.xml 2644 BLAKE2B 397adfc4fd51bebcd784cea4e8cb99f7eef7013ccb5b391202d22816bd5831641ba7e22f2a5350fd8cf6103d810c1553e279ef37b23d99135fe9637c8ef46308 SHA512 2d6cfc831e51575aac6f6ad43bb70c7e71c39ea8623d05042afa34496213df2016977c962cfc65e215a3fc698e12cfdd60e9badeafdc2832bb30e830741a5efb diff --git a/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch b/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch deleted file mode 100644 index e41d8f390d9f..000000000000 --- a/dev-libs/poco/files/poco-1.7.2-iodbc-incdir.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/cmake/FindODBC.cmake b/cmake/FindODBC.cmake -index 9e229ed..5d79c7e 100644 ---- a/cmake/FindODBC.cmake -+++ b/cmake/FindODBC.cmake -@@ -16,7 +16,7 @@ - find_path(ODBC_INCLUDE_DIRECTORIES - NAMES sql.h - HINTS -- /usr/include -+ /usr/include/iodbc - /usr/include/odbc - /usr/local/include - /usr/local/include/odbc diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml index e87aecd0e1e0..fca24ff1efb4 100644 --- a/dev-libs/poco/metadata.xml +++ b/dev-libs/poco/metadata.xml @@ -31,6 +31,7 @@ done quickly and working on the features that make their application unique. Add Support for the 7z archive format + Add ActiveRecord support Build and install a minimal C++ parser Encryption and digital signing classes Database abstraction layer to easily send/retrieve data to/from various databases diff --git a/dev-libs/poco/poco-1.11.2.ebuild b/dev-libs/poco/poco-1.11.2.ebuild new file mode 100644 index 000000000000..260b3ec77580 --- /dev/null +++ b/dev-libs/poco/poco-1.11.2.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +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" +S="${WORKDIR}/${PN}-${P}-release" + +LICENSE="Boost-1.0" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +IUSE="7z activerecord cppparser +crypto +data examples +file2pagecompiler iodbc +json 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 + activerecord? ( !app-arch/arc ) + 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? ( + dev-libs/openssl:0= + ) + xml? ( dev-libs/expat ) + zip? ( sys-libs/zlib ) +" +DEPEND="${RDEPEND}" + +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_ACTIVERECORD="$(usex activerecord)" + -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 -v || die + fi +} diff --git a/dev-libs/poco/poco-1.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild deleted file mode 100644 index 191b5135b95c..000000000000 --- a/dev-libs/poco/poco-1.9.0-r2.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2022 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 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? ( - dev-libs/openssl:0= - ) - xml? ( dev-libs/expat ) - zip? ( sys-libs/zlib ) -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/${PN}-${P}-release" - -PATCHES=( "${FILESDIR}/${PN}-1.7.2-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 -} -- cgit v1.2.3