commit: d5ac67c75cf5816da51dc3bef834bdfe7a599aa3 Author: David Roman <droman <AT> ifae <DOT> es> AuthorDate: Thu May 29 12:23:33 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sun Jun 8 05:07:14 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5ac67c7
dev-libs/poco: drop 1.14.0-r1 Signed-off-by: David Roman <droman <AT> ifae.es> Part-of: https://github.com/gentoo/gentoo/pull/42328 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-libs/poco/Manifest | 1 - .../poco/files/poco-1.14.0-missing-utf8proc.patch | 58 --------- dev-libs/poco/poco-1.14.0-r1.ebuild | 142 --------------------- 3 files changed, 201 deletions(-) diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index 60580a5dff97..14c908b08112 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1,3 +1,2 @@ DIST poco-1.13.3.tar.gz 11332562 BLAKE2B 04380cae92bbd2427873f0ea1a3fcade244ee5168390e26081983ded9faaf22e456bdd4ae87f9c77bafc92155f860ea9f56678ec2204bcd7c51a871e7f00d759 SHA512 084064fb462c9e7993d069ebdf395802af900ed92c5b294465a2c246162bb86caa3505985de329e8110d3e9fb3bc39ae9536d523843729d4ed5ce00c35289d92 -DIST poco-1.14.0.tar.gz 12158142 BLAKE2B 3ae9a520941634ac9aa72d323541d6433ac2e73d4d19e0654f932ea031d17870ca4ad764a8e3c5e68d69c5dc9750d779102d80d6d810598db275f269928ae8ea SHA512 4475a0ede5d06e4ce9537295fec92fa39b8fd5635d1cfb38498be4f707bc62b4a8b57672d2a15b557114e4115cc45480d27d0c856b7bd982eeec7adad9ff2582 DIST poco-1.14.1.tar.gz 12160003 BLAKE2B 8fe985b8b3c4ab93df57fc63dbea97612c7f748ca0319b5ffea931bdd438f0d563d17e47da259cc9de30311ec5c9622c9420c64058d4c6075bff1a70a819dca9 SHA512 e192818a5f731ec6f6bddf062573d7bedfd15754157f145882c2c9d9bce497b92cf23f639f989d9e5605cb83029c4f303752cab655b525b5a5b5e5b704714725 diff --git a/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch b/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch deleted file mode 100644 index 82f5d0c46036..000000000000 --- a/dev-libs/poco/files/poco-1.14.0-missing-utf8proc.patch +++ /dev/null @@ -1,58 +0,0 @@ -https://bugs.gentoo.org/947508 -https://github.com/pocoproject/poco/pull/4816 - -From b5873caae53ef9adaecd7d10897c47b0b4812b3e Mon Sep 17 00:00:00 2001 -From: Matej Kenda <[email protected]> -Date: Wed, 11 Dec 2024 16:18:04 +0100 -Subject: [PATCH] CMake: fix for missing utf8proc with unbundled build, - resolves #4798 (#4816) - -* fix(cmake): Add missing install and find dependency for utf8proc in unbundled build. - -* chore(gitignore): Corrected path to Qt creator generated build files. ---- - .gitignore | 2 +- - CMakeLists.txt | 4 ++-- - Foundation/cmake/PocoFoundationConfig.cmake | 1 + - 3 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/.gitignore b/.gitignore -index 4c163f64de..3a5ed86f82 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -48,7 +48,7 @@ config.make - - # Qt Creator # - ######### --build/ -+build/Qt_* - - # CMake # - ######## -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 861c27c565..2d120e68fb 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -557,8 +557,8 @@ install( - ) - - if(POCO_UNBUNDLED) -- install(FILES cmake/FindPCRE2.cmake -- DESTINATION "${PocoConfigPackageLocation}") -+ install(FILES cmake/FindPCRE2.cmake DESTINATION "${PocoConfigPackageLocation}") -+ install(FILES cmake/FindUtf8Proc.cmake DESTINATION "${PocoConfigPackageLocation}") - endif() - - message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator") -diff --git a/Foundation/cmake/PocoFoundationConfig.cmake b/Foundation/cmake/PocoFoundationConfig.cmake -index 82c5788940..32b5d83023 100644 ---- a/Foundation/cmake/PocoFoundationConfig.cmake -+++ b/Foundation/cmake/PocoFoundationConfig.cmake -@@ -3,6 +3,7 @@ if(@POCO_UNBUNDLED@) - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") - find_dependency(ZLIB REQUIRED) - find_dependency(PCRE2 REQUIRED) -+ find_dependency(Utf8Proc REQUIRED) - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/PocoFoundationTargets.cmake") diff --git a/dev-libs/poco/poco-1.14.0-r1.ebuild b/dev-libs/poco/poco-1.14.0-r1.ebuild deleted file mode 100644 index da344de3d85d..000000000000 --- a/dev-libs/poco/poco-1.14.0-r1.ebuild +++ /dev/null @@ -1,142 +0,0 @@ -# Copyright 1999-2025 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" -# SHARED_LIBRARY_VERSION -> "${S}"/libversion -SLOT="0/110" -KEYWORDS="amd64 arm arm64 ppc64 x86" -IUSE="7z activerecord avahi cppparser +crypt +data examples +file2pagecompiler iodbc mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc postgres prometheus sqlite test +util +xml +zip" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - activerecord? ( util xml ) - 7z? ( xml ) - file2pagecompiler? ( pagecompiler ) - iodbc? ( odbc ) - mongodb? ( data ) - mysql? ( data ) - odbc? ( data ) - postgres? ( data ) - pagecompiler? ( net util xml ) - pocodoc? ( cppparser util xml ) - sqlite? ( data ) - crypt? ( util ) - test? ( data? ( sqlite ) activerecord cppparser crypt pdf prometheus xml ) -" - -BDEPEND=" - virtual/pkgconfig -" - -RDEPEND=" - >=dev-libs/libpcre2-10.40:= - dev-libs/libutf8proc:= - - activerecord? ( !app-arch/arc ) - avahi? ( net-dns/avahi:= ) - mysql? ( dev-db/mysql-connector-c:= ) - mariadb? ( dev-db/mariadb-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - odbc? ( - iodbc? ( dev-db/libiodbc ) - !iodbc? ( dev-db/unixODBC ) - ) - pdf? ( media-libs/libpng:= ) - sqlite? ( dev-db/sqlite:3 ) - crypt? ( - dev-libs/openssl:= - ) - xml? ( dev-libs/expat ) - zip? ( sys-libs/zlib:= ) -" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-missing-utf8proc.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,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 - fi - - sed -i 's/ENABLE_DNSSD_AVHAI/ENABLE_DNSSD_AVAHI/' DNSSD/CMakeLists.txt || die -} - -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 crypt)" - -DENABLE_DATA="$(usex data)" - -DENABLE_DATA_MYSQL="$(usex mysql)" - -DENABLE_DATA_ODBC="$(usex odbc)" - -DENABLE_DATA_POSTGRESQL="$(usex postgres)" - -DENABLE_DATA_SQLITE="$(usex sqlite)" - -DENABLE_DNSSD="$(usex avahi)" - -DENABLE_DNSSD_AVAHI="$(usex avahi)" - -DENABLE_JSON="$(usex util)" - -DENABLE_JWT="$(usex crypt)" - -DENABLE_MONGODB="$(usex mongodb)" - -DENABLE_NET="$(usex net)" - -DENABLE_NETSSL="$(usex crypt)" - -DENABLE_NETSSL_WIN=OFF - -DENABLE_PAGECOMPILER="$(usex pagecompiler)" - -DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)" - -DENABLE_PDF="$(usex pdf)" - -DENABLE_POCODOC="$(usex pocodoc)" - -DENABLE_PROMETHEUS="$(usex prometheus)" - -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 -E DataPostgreSQL -} - -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 -}
