Diff poco-1.11.2-r1 with a poco-1.12.2-r2

/usr/portage/dev-libs/poco/poco-1.12.2-r2.ebuild 2023-10-09 14:52:29.752368357 +0300
12 12

  
13 13
LICENSE="Boost-1.0"
14 14
SLOT="0"
15
KEYWORDS="amd64 arm arm64 ppc64 x86"
16
IUSE="7z activerecord cppparser +crypto +data examples +file2pagecompiler iodbc +json mariadb +mongodb mysql +net odbc +pagecompiler pdf pocodoc sqlite +ssl test +util +xml +zip"
15
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
16
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"
17 17
RESTRICT="!test? ( test )"
18 18
REQUIRED_USE="
19 19
	7z? ( xml )
20 20
	file2pagecompiler? ( pagecompiler )
21 21
	iodbc? ( odbc )
22
	jwt? ( json ssl )
22 23
	mongodb? ( data )
23 24
	mysql? ( data )
24 25
	odbc? ( data )
26
	postgres? ( data )
25 27
	pagecompiler? ( json net util xml )
26 28
	pocodoc? ( cppparser util xml )
27 29
	sqlite? ( data )
......
31 33

  
32 34
BDEPEND="virtual/pkgconfig"
33 35
RDEPEND="
34
	>=dev-libs/libpcre-8.42
36
	>=dev-libs/libpcre2-10.40
35 37
	activerecord? ( !app-arch/arc )
36
	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
37
	mariadb? ( dev-db/mariadb-connector-c:0= ) )
38
	mysql? ( dev-db/mysql-connector-c:0= )
39
	mariadb? ( dev-db/mariadb-connector-c:0= )
40
	postgres? ( dev-db/postgresql:= )
38 41
	odbc? (
39 42
		iodbc? ( dev-db/libiodbc )
40 43
		!iodbc? ( dev-db/unixODBC )
......
44 47
		dev-libs/openssl:0=
45 48
	)
46 49
	xml? ( dev-libs/expat )
47
	zip? ( sys-libs/zlib )
50
	zip? ( sys-libs/zlib:= )
48 51
"
49 52
DEPEND="${RDEPEND}"
50 53

  
......
67 70
			Crypto/testsuite/src/RSATest.cpp || die
68 71
	fi
69 72

  
70
	if use mariadb ; then
71
		# Fix MariaDB detection
72
		sed -i -e 's~/usr/include/mysql~~' \
73
			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
73
	# Fix MariaDB and MySQL detection
74
	sed -i -e 's~/usr/include/mysql~~' \
75
		-e 's/mysqlclient_r/mysqlclient/' \
76
		-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
74 77
		cmake/FindMySQL.cmake || die
75
	else
76
		# Fix MySQL detection
77
		sed -i -e 's/mysqlclient_r/mysqlclient/' \
78
			-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
79
		cmake/FindMySQL.cmake || die
80
	fi
81 78

  
82 79
	# Add missing directory that breaks the build
83 80
	mkdir -p Encodings/testsuite/data || die
......
99 96
		-DENABLE_DATA="$(usex data)"
100 97
		-DENABLE_DATA_MYSQL="$(usex mysql)"
101 98
		-DENABLE_DATA_ODBC="$(usex odbc)"
99
		-DENABLE_DATA_POSTGRESQL="$(usex postgres)"
102 100
		-DENABLE_DATA_SQLITE="$(usex sqlite)"
103
		-DENABLE_DATA_POSTGRESQL=OFF
104 101
		-DENABLE_JSON="$(usex util)"
102
		-DENABLE_JWT="$(usex jwt)"
105 103
		-DENABLE_MONGODB="$(usex mongodb)"
106 104
		-DENABLE_NET="$(usex net)"
107 105
		-DENABLE_NETSSL="$(usex ssl)"
......
110 108
		-DENABLE_PAGECOMPILER_FILE2PAGE="$(usex file2pagecompiler)"
111 109
		-DENABLE_PDF="$(usex pdf)"
112 110
		-DENABLE_POCODOC="$(usex pocodoc)"
111
		-DENABLE_PROMETHEUS="$(usex prometheus)"
113 112
		-DENABLE_SEVENZIP="$(usex 7z)"
114 113
		-DENABLE_TESTS="$(usex test)"
115 114
		-DENABLE_UTIL="$(usex util)"
......
121 120
}
122 121

  
123 122
src_test() {
124
	POCO_BASE="${S}" cmake_src_test
123
	POCO_BASE="${S}" cmake_src_test -E DataPostgreSQL
125 124
}
126 125

  
127 126
src_install() {
Thank you!