gentoo resync : 24.03.2019

4 files changed, 33 insertions, 254 deletions

diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index b26475883e09..cd052bc7aebd 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -3,12 +3,9 @@ AUX poco-1.4.4-patch-for-libpcre-8.32.patch 1970 BLAKE2B 0a07795b410bcff83a89c4d
 AUX poco-1.7.2-iodbc-incdir.patch 321 BLAKE2B 640c0b69e8c925d48da6f2bfc59cd2c77a02662ad1d8d447bb8c7ca23234ca1859c4aa9497d5703ef5f675d9096606254a9142770c6fffa4334cf71b1ca6953f SHA512 f3a0b4032fd4f71f0281d58c00241b1cd2f92da1a23a8501c420949621167d1fc7e2a2ed3ec48b6f75d35569f6443e3391eaf19a8c8fbd17e24d1cbd9ffd892d
 DIST poco-1.4.6-all-doc.zip 2072762 BLAKE2B 51b8426d050e7ae373fbb0f3959657e37f1c3aeda75f5bf5cd3dc99e08414a9e65f61ea71dee6d8c40148f41157e2eac0888e64c5020707352c74b262ffae741 SHA512 458e1a3c6a6017b5ae5efcbd0d7b2bbf50aedd6ddc7ae7befddac07ed133b7243208aadd6ecdb17b3fa273e04eb0da4d73b1d3e5591aee98b754e430b2248e52
 DIST poco-1.4.6p4-all.tar.bz2 3158594 BLAKE2B 76accf617ddd087131a5960c131680451959704fee4b17b65bf85367a172d2fe023c9c7efde59fe5bd4142c7ca153734fb4ccbbf06bd5d0365a59d6e75a328a5 SHA512 ae4e1190a0ba719f807d0abaf1c47ff445a8f5867157f209260672546f3755ff021c7073bc8d5e656be383d5667dc15ad7eae8208728053fb61439c4c80a7fca
-DIST poco-1.7.6.tar.gz 8044937 BLAKE2B ad9bf61eb00ce4e1ef5079e07be04ceff79bf823cba49ffb0e144a1e579d9de4f6f8d3df6b629c522de5c2b7b4c7df0933777686b72190d717e407bc28ae2a49 SHA512 a02b7ff66acf080942517b3b8644d6e5c7136c5edc6e58fd13083a74b97b5619253fc9db7863284a565226f95410ad4da1fa9738d14885f560aeb03c1f7c18aa
 DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9
 EBUILD poco-1.4.6_p4-r1.ebuild 3448 BLAKE2B 8f15cfcb7f3ab49d75bf3dab8990dd48766391f0c20819efed6ec965b463a594ca0b2ec60030d224436deb9b1a1cb03298ad33c72f6e8b94fed28321a634140a SHA512 b3ef11fedf1a849d83f87b90fcf3be6d9a5d85b2981ceedda5eb699657bdaf150bc45e1451563e76f26f2b7a3e7fe82d9fe5d8790607fa9ef38dc70ce78e0815
 EBUILD poco-1.4.6_p4.ebuild 3384 BLAKE2B 82795ed8256b63859142d760d1c4999ab504be036d00bd2338058318bb7e864372c333822c3b3ede153aa4f4608a22e62d2c797269a10846ee120304fba1a9a2 SHA512 9365431a50298aadfa1d91d3d859dbddd8b3a028aacb4eeb4d01564d063a91d198da08bdb6e8f886b7dbe1ab4f9285fe5e5a334a471bb136b908cf89c4e3bc64
-EBUILD poco-1.7.6-r1.ebuild 3459 BLAKE2B fe1c70a9ce4c586d12de415839d7e4a5aa5697f03a454a9fa5f63a11b50f468201d73f4c35015a5647ac3461cd7cc76e53e2cc5395d1f0f17f12d0de4f498cd5 SHA512 0183d4d71578e8388e5502875bb6a42baec9519e2b1da7a560cc26cb3415aacd40ec30a337db3d02ea60d0e048ec51c2f931fcbf587f115f4337b9e5aa7e1af5
-EBUILD poco-1.7.6.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
 EBUILD poco-1.9.0-r1.ebuild 3722 BLAKE2B 723574fb374480e40b3edde419aa2a0da210505b5b005606da5305792e258db125c635ddc4761654824327b28f6f45dec0187eb3405541f38d5906ca7a4eb66c SHA512 64778f824f6d6410f01fc644d1129f3bf551bf74dc4d7fe1ecde0eadf88a8877e0bff0432113c37163659358bebcd8e811b6e273a6c0b7e15031af08791a17bc
-EBUILD poco-1.9.0.ebuild 3300 BLAKE2B 33dc2684437edacfe8a5d10a896a1ee7d6a61884227f0b219f685a833bf858b6780364c3d2a4bb5df20378bb5505b2581486f10338011c18a40d40be1d6c9e2d SHA512 ee364da0aba59006680a7b399180384ded5072b65daea64e42b97ae207644f2137d45e4095bb3cde105eb8ed21f60e8513de7eb0f4acce6e69e6b281c9a0f257
+EBUILD poco-1.9.0-r2.ebuild 3715 BLAKE2B 634523173c8bf922a3dc48a9de972b0af949d044c923e4eaa2675274546f70e2080323264579f63d4ca57c437e820443f3e3d9d07df6ed5045acd2b21cbcda03 SHA512 7d2373e8c179e079bea3f194ca7f7e74bafa31dba4e4c960c7fb0720a754ebd05accc2cba0b7bb9f72653ce1d556ee1ef3f02021d4a303fd6c8859f0c2666a89
 MISC metadata.xml 2515 BLAKE2B e85987607f2d7d0fc4f957b797a9bd7406dd6224a4fa73bd054c31206e4ef1cdbe8b300d00efb4249ed0b21bb1c991340b746a3db3deea0c79c07dc7aae34458 SHA512 3f4ec81bc65b14a82b599d47ae2a2b80f58f35bf1138b469f2341e2262f9ed13c2ef286f0b5f4354d14a58fd50676a77f373adad86e056c45a427d8b784bd592
diff --git a/dev-libs/poco/poco-1.7.6.ebuild b/dev-libs/poco/poco-1.7.6.ebuild
deleted file mode 100644
index e4cc18980d1b..000000000000
--- a/dev-libs/poco/poco-1.7.6.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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 apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
-REQUIRED_USE="7z? ( xml )
-	apache? ( net util )
-	file2pagecompiler? ( pagecompiler )
-	iodbc? ( odbc )
-	mongodb? ( data )
-	mysql? ( data )
-	odbc? ( data )
-	pagecompiler? ( json net util xml )
-	pocodoc? ( cppparser util xml )
-	sqlite? ( data )
-	test? ( data? ( sqlite ) json util xml )"
-
-RDEPEND=">=dev-libs/libpcre-8.13
-	xml? ( dev-libs/expat )
-	apache? ( dev-libs/apr
-		dev-libs/apr-util
-		www-servers/apache )
-	mysql? ( virtual/mysql )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	zip? ( sys-libs/zlib )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}-release"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
-
-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}/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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR="$(usex apache)"
-		-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)"
-	)
-
-	if ! use iodbc ; then
-		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		for sd in */samples ; do
-			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
-			doins -r ${sd}
-		done
-		find "${D}/usr/share/doc/${PF}/examples" \
-			-iname "*.sln" -or -iname "*.vcproj" -or \
-			-iname "*.vmsbuild" -or -iname "*.properties" \
-			| xargs rm
-	fi
-}
diff --git a/dev-libs/poco/poco-1.7.6-r1.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index 0f6dc7386860..e2ade79bc880 100644
--- a/dev-libs/poco/poco-1.7.6-r1.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
+EAPI=7
 inherit cmake-utils
 
 DESCRIPTION="C++ libraries for building network-based applications"
@@ -10,10 +9,11 @@ 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 apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
-REQUIRED_USE="7z? ( xml )
-	apache? ( net util )
+KEYWORDS="amd64 ~arm ~x86"
+
+IUSE="7z cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl mariadb +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
+REQUIRED_USE="
+	7z? ( xml )
 	file2pagecompiler? ( pagecompiler )
 	iodbc? ( odbc )
 	mongodb? ( data )
@@ -21,25 +21,28 @@ REQUIRED_USE="7z? ( xml )
 	odbc? ( data )
 	pagecompiler? ( json net util xml )
 	pocodoc? ( cppparser util xml )
+	ssl? ( util )
 	sqlite? ( data )
-	test? ( data? ( sqlite ) json util xml )"
+	test? ( data? ( sqlite ) json util xml )
+"
 
-RDEPEND=">=dev-libs/libpcre-8.13
+RDEPEND="
+	>=dev-libs/libpcre-8.42
 	xml? ( dev-libs/expat )
-	apache? ( dev-libs/apr
-		dev-libs/apr-util
-		www-servers/apache )
-	mysql? ( dev-db/mysql-connector-c:0= )
+	mysql? ( !mariadb? ( dev-db/mysql-connector-c:0= )
+		 mariadb? ( dev-db/mariadb-connector-c:0= ) )
 	odbc? ( iodbc? ( dev-db/libiodbc )
 		!iodbc? ( dev-db/unixODBC ) )
 	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl )
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
 	)
 	sqlite? ( dev-db/sqlite:3 )
-	zip? ( sys-libs/zlib )"
+	zip? ( sys-libs/zlib )
+"
 DEPEND="${DEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}/${PN}-${P}-release"
 
@@ -63,17 +66,26 @@ src_prepare() {
 			Crypto/testsuite/src/RSATest.cpp || die
 	fi
 
-	# Fix MySQL detection
-	sed -i -e 's/mysqlclient_r/mysqlclient/' \
-		-e 's/STATUS "Couldn/FATAL_ERROR "Couldn/' \
+	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
+
 	cmake-utils_src_prepare
 }
 
 src_configure() {
+	# apache support is dead and buggy, https://github.com/pocoproject/poco/issues/1764
 	local mycmakeargs=(
 		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR="$(usex apache)"
+		-DENABLE_APACHECONNECTOR=OFF
 		-DENABLE_CPPPARSER="$(usex cppparser)"
 		-DENABLE_CRYPTO="$(usex ssl)"
 		-DENABLE_DATA="$(usex data)"
diff --git a/dev-libs/poco/poco-1.9.0.ebuild b/dev-libs/poco/poco-1.9.0.ebuild
deleted file mode 100644
index e4cc18980d1b..000000000000
--- a/dev-libs/poco/poco-1.9.0.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-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 apache cppparser +crypto +data examples +file2pagecompiler +json +pagecompiler iodbc libressl +mongodb mysql +net odbc pdf pocodoc sqlite +ssl test +util +xml +zip"
-REQUIRED_USE="7z? ( xml )
-	apache? ( net util )
-	file2pagecompiler? ( pagecompiler )
-	iodbc? ( odbc )
-	mongodb? ( data )
-	mysql? ( data )
-	odbc? ( data )
-	pagecompiler? ( json net util xml )
-	pocodoc? ( cppparser util xml )
-	sqlite? ( data )
-	test? ( data? ( sqlite ) json util xml )"
-
-RDEPEND=">=dev-libs/libpcre-8.13
-	xml? ( dev-libs/expat )
-	apache? ( dev-libs/apr
-		dev-libs/apr-util
-		www-servers/apache )
-	mysql? ( virtual/mysql )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
-	ssl? (
-		!libressl? ( <dev-libs/openssl-1.1.0:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	sqlite? ( dev-db/sqlite:3 )
-	zip? ( sys-libs/zlib )"
-DEPEND="${DEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}-release"
-
-PATCHES=( "${FILESDIR}/${PN}-1.7.2-iodbc-incdir.patch" )
-
-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}/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
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPOCO_UNBUNDLED=ON
-		-DENABLE_APACHECONNECTOR="$(usex apache)"
-		-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)"
-	)
-
-	if ! use iodbc ; then
-		sed -i -e 's|iodbc||' cmake/FindODBC.cmake || die
-	fi
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	if use examples ; then
-		for sd in */samples ; do
-			insinto /usr/share/doc/${PF}/examples/${sd%/samples}
-			doins -r ${sd}
-		done
-		find "${D}/usr/share/doc/${PF}/examples" \
-			-iname "*.sln" -or -iname "*.vcproj" -or \
-			-iname "*.vmsbuild" -or -iname "*.properties" \
-			| xargs rm
-	fi
-}