diff options
Diffstat (limited to 'dev-libs/poco')
| -rw-r--r-- | dev-libs/poco/Manifest | 8 | ||||
| -rw-r--r-- | dev-libs/poco/metadata.xml | 2 | ||||
| -rw-r--r-- | dev-libs/poco/poco-1.11.2-r1.ebuild | 141 | ||||
| -rw-r--r-- | dev-libs/poco/poco-1.13.3.ebuild (renamed from dev-libs/poco/poco-1.12.2-r2.ebuild) | 36 |
4 files changed, 23 insertions, 164 deletions
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index eb334e74bc76..acc19bbecd79 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1,8 +1,6 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43fdf1db53cb0139f3cab5eb8ca67ca30dfa97058e4db4618d27ab2cd642e205349f5f70970fd2a4961a018aa7e1c5dac SHA512 1a155b10e98cdce8659a9308ac70e8114361a0062a1af469dc774b5d32bc00b5f1aa0e873fa5061625527ddeb006fdf29939b1899939a193d8724e491dedba10 -DIST poco-1.11.2.tar.gz 10935312 BLAKE2B 66b4cdb6cb4b5dd4f5f0eee744e1d147d66e98561ec4286ed09693b638d565fbf084c3e40eff3f6a9a88cff167b1d774da08e8c8424986aefe13d029a540afe2 SHA512 3f9e46dbfb0a85f19389b269725cb6272172d993d8239f13da8110c0c6ce9ed2b6595708d5dba91a027292c74358c87da988e22587a74011e84707816a6a277c -DIST poco-1.12.2.tar.gz 11268579 BLAKE2B fe23216884d1effb7e93072c5e90d5eabf813c6cf0326af5c4b6d3646d54e5411966485e97d50960df97cd545b3a265eb4b43c1cb041ff97b4457f53f6bd06bc SHA512 86b6b106e9a677397c73139e949a65925e78611cad478fc4206a6a7365613307fc1549b1160faf6ca8f02fb7f7ae58858c3913cb701111b7cbb5ffcbe5363bb3 DIST poco-1.12.4.tar.gz 11296139 BLAKE2B 45e1214616e78041d5ca512cee46621c006fe21f51231f3261dc40ca4941eb3cd4e52db493aa826779784f9d3f35cfd08e3e9d08fb35ebec2d610fb6528c635a SHA512 730700a24b5a00d44aa85914e7d3c9eff76969a123a67315ba5e9b2d18c0ace70d2664d8a611496851f497aa4985d36685a67813a95e814461ae0fffdb460d91 -EBUILD poco-1.11.2-r1.ebuild 3964 BLAKE2B ac053087d7eeca9274152973fd7a9a2ed21ac99c7c6aa5b85dce4667f9063e8c93c177a7ce0ef678950a80a17e8001ff8a497a367e3f57411501ef73192cc1f8 SHA512 950f19be0ef462fc7312f4c1bb2d2f74e3e15766d8c1345ae884219415df01b00b76fba3ac8110183e73908be848d4259a6c31633275de27981836afffd7a180 -EBUILD poco-1.12.2-r2.ebuild 4018 BLAKE2B 3b9672f94a9a57813d9f28ab7a8ad07ebc6acb3d077d0797d53a8c8b481b6ec842c7f23c06f60060854a0ec7cc5b3501a62e522467a843718fcc687b9d5ee4de SHA512 ea689e6f51b9fcd21e1e511322a083b58a1fc765085bbb39fd9ef630c9c42076b440c5f7a7efd09b0631431eae36e17c434d9c391311dd63949ccd55b695c144 +DIST poco-1.13.3.tar.gz 11332562 BLAKE2B 04380cae92bbd2427873f0ea1a3fcade244ee5168390e26081983ded9faaf22e456bdd4ae87f9c77bafc92155f860ea9f56678ec2204bcd7c51a871e7f00d759 SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92 EBUILD poco-1.12.4.ebuild 4220 BLAKE2B 9be84416a479873236f983cc7b7eed506361e35b6200b8b0f328bc476fec5cf6521a4991198418284136e389cd5ac2a867cf8fd4b66c5251705e781ea51ad2b8 SHA512 dd99c1db6e4e00d31dbe115a972464011b4b138c8f6ef785d3083a7112215fc7655dc199a4b3a913298ac0b9d8ca6c10d63a8d05c0d974ca17f599022f6a2109 -MISC metadata.xml 2851 BLAKE2B ebfb720cf7dd8bda9f0e1af356b22eb4e9461c179d965b8ac01d654ee7d9424436c223acf6782bfb5db98e49eb04808861795d980e0dfac7ebe6e5913e078b9f SHA512 32194a768ebc061ecf8859bddc86d89c2215c0017878800f580f47002010d7d57959f89ee8c74bf0e4b2d865d8e3b37f52a523a2b9289a1486fabc147ba52e1d +EBUILD poco-1.13.3.ebuild 3912 BLAKE2B 6d5e85d516a4b38df40d4cc38baf4fdadb69827ee799a2b0c0b295a8d444b2d5ab41f3f3e6d198ac06caf514d73e9f5cb69c629d2440b4df16bc3b1fdea9d391 SHA512 e99a2f7f3d51dbd508863cb2ef1604fe749a5cd66c9a6629b67752954a51897b9becd130dd205d113fffa600b14b564b1ea18c2fb0285799c4ae834e29b42b68 +MISC metadata.xml 2808 BLAKE2B 4c2ade2415149e209d4ca091a09640c108a8fc182b9c8636f9d52fc8ade3ff89e871f436aaccfc2534f1c91aa3f4213eb16da69d0defcd3faf612e2c8a0fb40e SHA512 5a2aa5c7299d5f9f275364ec22f4d9f426116f02fde30698591e60299e42d54c4a39f2a01a0308fc1407c5065e0bfeaae0698db09713688cbe80faf041fc4c07 diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml index 47052fc34e8a..f73e85906ed1 100644 --- a/dev-libs/poco/metadata.xml +++ b/dev-libs/poco/metadata.xml @@ -33,7 +33,6 @@ done quickly and working on the features that make their application unique. <flag name="7z">Add Support for the 7z archive format</flag> <flag name="activerecord">Add ActiveRecord support</flag> <flag name="cppparser">Build and install a minimal C++ parser</flag> - <flag name="crypto" restrict="<=dev-libs/poco-1.12.2-r1">Encryption and digital signing classes</flag> <flag name="data">Database abstraction layer to easily send/retrieve data to/from various databases</flag> <flag name="file2pagecompiler">Utility to convert ordinary files to Page Compiler source files</flag> <flag name="json">Add JSON support</flag> @@ -44,6 +43,7 @@ done quickly and working on the features that make their application unique. <flag name="pagecompiler">Simple compiler translating HTML pages containing embedded C++ code into HTTPRequestHandler classes</flag> <flag name="pocodoc">POCO documentation generator</flag> <flag name="prometheus">Add prometheus monitoring system support</flag> + <flag name="ssl">Encryption and digital signing classes</flag> <flag name="util">Several utility classes (like logger, timer, config file parser)</flag> <flag name="zip">Add support for the zip & gz archive formats</flag> </use> diff --git a/dev-libs/poco/poco-1.11.2-r1.ebuild b/dev-libs/poco/poco-1.11.2-r1.ebuild deleted file mode 100644 index e9754d726988..000000000000 --- a/dev-libs/poco/poco-1.11.2-r1.ebuild +++ /dev/null @@ -1,141 +0,0 @@ -# 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_ACTIVERECORD_COMPILER="$(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_DATA_POSTGRESQL=OFF - -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.12.2-r2.ebuild b/dev-libs/poco/poco-1.13.3.ebuild index 61de015e64b6..1ab18c28679e 100644 --- a/dev-libs/poco/poco-1.12.2-r2.ebuild +++ b/dev-libs/poco/poco-1.13.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -11,11 +11,13 @@ SRC_URI="https://github.com/pocoproject/${PN}/archive/${P}-release.tar.gz -> ${P S="${WORKDIR}/${PN}-${P}-release" LICENSE="Boost-1.0" -SLOT="0" +# SHARED_LIBRARY_VERSION -> "${S}"/libversion +SLOT="0/103" KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" IUSE="7z activerecord cppparser +data examples +file2pagecompiler iodbc +json jwt mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite +ssl test +util +xml +zip" RESTRICT="!test? ( test )" REQUIRED_USE=" + activerecord? ( util xml ) 7z? ( xml ) file2pagecompiler? ( pagecompiler ) iodbc? ( odbc ) @@ -28,15 +30,19 @@ REQUIRED_USE=" pocodoc? ( cppparser util xml ) sqlite? ( data ) ssl? ( util ) - test? ( data? ( sqlite ) json util xml ) + test? ( data? ( sqlite ) activerecord json jwt pdf util xml ) +" + +BDEPEND=" + test? ( dev-util/cppunit ) + virtual/pkgconfig " -BDEPEND="virtual/pkgconfig" RDEPEND=" >=dev-libs/libpcre2-10.40 activerecord? ( !app-arch/arc ) - mysql? ( dev-db/mysql-connector-c:0= ) - mariadb? ( dev-db/mariadb-connector-c:0= ) + mysql? ( dev-db/mysql-connector-c:= ) + mariadb? ( dev-db/mariadb-connector-c:= ) postgres? ( dev-db/postgresql:= ) odbc? ( iodbc? ( dev-db/libiodbc ) @@ -44,30 +50,29 @@ RDEPEND=" ) sqlite? ( dev-db/sqlite:3 ) ssl? ( - dev-libs/openssl:0= + dev-libs/openssl:= ) 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 [[ ${SLOT} != 0/$(< "${S}"/libversion) ]] ; then + die "Please update subslot in ebuild to the version in ${S}/libversion!" + fi + 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 + {Data/{MySQL,ODBC},MongoDB,Net,NetSSL_OpenSSL,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 # Fix MariaDB and MySQL detection @@ -76,9 +81,6 @@ src_prepare() { -e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \ cmake/FindMySQL.cmake || die - # 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 |