gentoo auto-resync : 18:12:2022 - 09:41:22

3 files changed, 149 insertions, 2 deletions

diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index e185850a182a..a9965595cc5c 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -2,7 +2,9 @@ AUX poco-1.10.1-iodbc-incdir.patch 369 BLAKE2B 345540ebd9c448a21e6c8adccba040a43
 DIST poco-1.10.1.tar.gz 10224204 BLAKE2B 644bb2134c571e10b63937ca15b3f5d7255767bcc99dd6b6107a13d64ed7ac83d499d74f04084c666bbf5ef6f033d57d2fb1de0b8b8487844e3aaf8cefe6fba8 SHA512 40aa8049c68651f461280937c1c733e13d1cedbec12bc44a7f3a6c131d31229c5445067052441427071f6102fd1965d238b2222c0689279dd156b4e261ac9e73
 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.10.1.ebuild 3785 BLAKE2B ca9eeac5cedc288c23fef5400d2428704b09aa707fcdbe02d12d9905caf3d72beed144a1588e6a440c66f59751f7b7e3d9e81cbcc86acbfaee0dd27222e54028 SHA512 f67bb94b6b08ed7f5d17d3c3b6f7186d7d7bd834bb8eedf1db045e001d683ac8ddc3be94ef3e2e1e0a27c65ee5b88525e46208907dfda88c7b17fa5d4c1261d6
 EBUILD poco-1.11.2-r1.ebuild 3964 BLAKE2B ac053087d7eeca9274152973fd7a9a2ed21ac99c7c6aa5b85dce4667f9063e8c93c177a7ce0ef678950a80a17e8001ff8a497a367e3f57411501ef73192cc1f8 SHA512 950f19be0ef462fc7312f4c1bb2d2f74e3e15766d8c1345ae884219415df01b00b76fba3ac8110183e73908be848d4259a6c31633275de27981836afffd7a180
-EBUILD poco-1.12.2-r1.ebuild 4016 BLAKE2B 8d3cf023d1ead1584f44bb668a3b0e8e0dac5b0ea20d68bbc24cebfe49efb44952b576a2c110f8b47968983c85bdfd8ce2753ebe59e259993da1f16e479c1e9c SHA512 199df50e77dd646628d2bd9815b405c533fac278509a23568138c561bad2856aa6470b68c8863efd684279bb214632cfde91796940f2f806320a07fa4c563caf
+EBUILD poco-1.12.2-r2.ebuild 4018 BLAKE2B 3b9672f94a9a57813d9f28ab7a8ad07ebc6acb3d077d0797d53a8c8b481b6ec842c7f23c06f60060854a0ec7cc5b3501a62e522467a843718fcc687b9d5ee4de SHA512 ea689e6f51b9fcd21e1e511322a083b58a1fc765085bbb39fd9ef630c9c42076b440c5f7a7efd09b0631431eae36e17c434d9c391311dd63949ccd55b695c144
+EBUILD poco-1.12.4.ebuild 4197 BLAKE2B 43b370fb2b9aa0141a6164e24af3483266047dda193cb681e74ee96e9b0b448eb4a941df9227401c8bd76fa995312c79b3ec11b92e7d9597a8c10b6c450b6488 SHA512 459d9e6b81241810d734b76d7af92ce82b828495841844497a3a42414502945d510fdd211e13d9d5fe1383dc0f1a28fe6526ef3babaa2ed6734f470073d420c3
 MISC metadata.xml 2851 BLAKE2B ebfb720cf7dd8bda9f0e1af356b22eb4e9461c179d965b8ac01d654ee7d9424436c223acf6782bfb5db98e49eb04808861795d980e0dfac7ebe6e5913e078b9f SHA512 32194a768ebc061ecf8859bddc86d89c2215c0017878800f580f47002010d7d57959f89ee8c74bf0e4b2d865d8e3b37f52a523a2b9289a1486fabc147ba52e1d
diff --git a/dev-libs/poco/poco-1.12.2-r1.ebuild b/dev-libs/poco/poco-1.12.2-r2.ebuild
index b1bc0558e7d7..61de015e64b6 100644
--- a/dev-libs/poco/poco-1.12.2-r1.ebuild
+++ b/dev-libs/poco/poco-1.12.2-r2.ebuild
@@ -33,7 +33,7 @@ REQUIRED_USE="
 
 BDEPEND="virtual/pkgconfig"
 RDEPEND="
-	>=dev-libs/libpcre-8.42
+	>=dev-libs/libpcre2-10.40
 	activerecord? ( !app-arch/arc )
 	mysql? ( dev-db/mysql-connector-c:0= )
 	mariadb? ( dev-db/mariadb-connector-c:0= )
diff --git a/dev-libs/poco/poco-1.12.4.ebuild b/dev-libs/poco/poco-1.12.4.ebuild
new file mode 100644
index 000000000000..596b7ffa8933
--- /dev/null
+++ b/dev-libs/poco/poco-1.12.4.ebuild
@@ -0,0 +1,145 @@
+# 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"
+# SHARED_LIBRARY_VERSION -> "${S}"/libversion
+SLOT="0/94"
+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="
+	7z? ( xml )
+	file2pagecompiler? ( pagecompiler )
+	iodbc? ( odbc )
+	jwt? ( json ssl )
+	mongodb? ( data )
+	mysql? ( data )
+	odbc? ( data )
+	postgres? ( 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/libpcre2-10.40
+	activerecord? ( !app-arch/arc )
+	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 )
+	)
+	sqlite? ( dev-db/sqlite:3 )
+	ssl? (
+		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
+		# 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
+	sed -i -e 's~/usr/include/mysql~~' \
+		-e 's/mysqlclient_r/mysqlclient/' \
+		-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
+}
+
+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_POSTGRESQL="$(usex postgres)"
+		-DENABLE_DATA_SQLITE="$(usex sqlite)"
+		-DENABLE_JSON="$(usex util)"
+		-DENABLE_JWT="$(usex jwt)"
+		-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_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
+}