gentoo resync : 19.07.2019

8 files changed, 13 insertions, 497 deletions

diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index 9e73e6ac773f..4a4fde2b25bd 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,11 +1,4 @@
-AUX 1.4.6_p4-gentoo.patch 2899 BLAKE2B 868b2057a3f51a92d64552393608f51e115a7b50d58d4b5138476c82394e4b30514e9ba6b9310681c1fa1a63b1902cbf4f813ec339def74afe25f23fd7ac869c SHA512 d43ffa2422b8fcf465b94d9cf075ce855a90339949cc662e8c8ab81cdc744cdb7aa6563f872a12bffe87526385b9a6decf2b21f244e2b66c1871b6d578de0e79
-AUX poco-1.4.4-patch-for-libpcre-8.32.patch 1970 BLAKE2B 0a07795b410bcff83a89c4d1d9ede1d39bbddc39c0503ed89afb761e0ff3c736a55c355178c55a3ce765835664f7b218a0e64fe8f9f39ca4c29b4335b95af1a0 SHA512 955a1ed90c1a3ebe50e110ef650853e9e8784aa9ca7c8806478ee4689d886b31f6afb6f613d290dd19b174243001083d975135175027615bf182ad41a9c413b7
 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.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.9.0-r1.ebuild 3722 BLAKE2B 723574fb374480e40b3edde419aa2a0da210505b5b005606da5305792e258db125c635ddc4761654824327b28f6f45dec0187eb3405541f38d5906ca7a4eb66c SHA512 64778f824f6d6410f01fc644d1129f3bf551bf74dc4d7fe1ecde0eadf88a8877e0bff0432113c37163659358bebcd8e811b6e273a6c0b7e15031af08791a17bc
-EBUILD poco-1.9.0-r2.ebuild 3714 BLAKE2B 9296a7fe398efcd6298bb8c90ddfce995b359b722f1ff15226ee22ccfcf59f5014b7233bcfd5d1572615161806cfa1e61d07bcb28e2be6b1141ce7febcb2c9d2 SHA512 0b63019468b49b8861bd1263d6172c004511cfd0f15139fca8fd6eb0e54aa8eb865d1ac224d66d146619ce103bae672874f591083a1189669cafc1364425b2f8
-MISC metadata.xml 2433 BLAKE2B b3c6b5beada86b353bef110aa1bffcfb863accc1c0fa1f42aa947c528c4eb54a52a68bb1c21e27ee3b969ff8cae234702df5089ed77ed2fbafdd51e119fae1d9 SHA512 7e118ec7574d9d86f05dee1cfa828da3e54ded0b9c79e11074d85f5613966afc875a0234c45d5c6dbbd015d07899909c28df28ef2ff9ffd4f2acbf5e55bb623b
+EBUILD poco-1.9.0-r2.ebuild 3850 BLAKE2B 4a527b3b1a416c97f9cf4a9b093f262cbd9243e3e24d8af4a868b2fe55e0adb45d21290a6735a26a364572165a2518bc8d50eff5091ce883169b2d223ca74a8a SHA512 e8fc21f64b36e82b064648f6108ae6e9c64117bde3f5d092d49ffbcdd704c90d71d8d121756c06eed8c82cf8e4e75c3a5b7f966ebccec89a76f0957091287f3d
+MISC metadata.xml 2354 BLAKE2B c376c105867c39c9bd2fbeb553f40acd95d71307b5c89b0e2d685862fa901b06c3056ff7996b4a1bce8b70f70bad45678c6a0d41567564dc009841f520fe8b3e SHA512 9263939c5e0120e2687446859db4fbfd84072f1d1ae37cb993b1eb69c39dddc828aadf95ef9fed86f8bea65ce24e041740dd48523ad68756b45ef47454c64a8c
diff --git a/dev-libs/poco/files/1.4.6_p4-gentoo.patch b/dev-libs/poco/files/1.4.6_p4-gentoo.patch
deleted file mode 100644
index 8cfc9237db01..000000000000
--- a/dev-libs/poco/files/1.4.6_p4-gentoo.patch
+++ /dev/null
@@ -1,71 +0,0 @@
---- components	2012-11-18 16:56:59.000000000 +0100
-+++ components	2012-12-06 12:29:07.779546771 +0100
-@@ -1,14 +1,8 @@
--CppUnit
- Foundation
- XML
- Util
- Net
--Crypto
--NetSSL_OpenSSL
- Data
--Data/SQLite
--Data/ODBC
--Data/MySQL
- Zip
- PageCompiler
- PageCompiler/File2Page
---- Data/ODBC/ODBC.make	2014-04-18 13:41:55.000000000 +0200
-+++ Data/ODBC/ODBC.make.new	2014-12-29 13:44:03.000000000 +0100
-@@ -14,9 +14,9 @@
- ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?))
- ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu
- else ifeq (0, $(shell test -d /usr/lib64; echo $$?))
--ODBCLIBDIR = /usr/lib64
-+ODBCLIBDIR = /usr/$(LIBDIR)
- else 
--ODBCLIBDIR = /usr/lib
-+ODBCLIBDIR = /usr/$(LIBDIR)
- endif
- endif
- 
-@@ -35,10 +35,10 @@
- # -DODBCVER=0x0300: SQLHandle declaration issue
- # -DNOMINMAX      : MIN/MAX macros defined in windows conflict with libstdc++
- CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?))
-+else ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -lodbc
- COMMONFLAGS += -DPOCO_UNIXODBC
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?))
-+else ifeq (unixodbc, $(GENTOO_ODBC))
- SYSLIBS += -liodbc -liodbcinst
- COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc
- else
---- Makefile	2012-11-18 16:57:00.000000000 +0100
-+++ Makefile	2012-12-06 12:29:07.779546771 +0100
-@@ -33,7 +33,7 @@
- 
- install: libexecs
- 	mkdir -p $(INSTALLDIR)/include/Poco
--	mkdir -p $(INSTALLDIR)/lib
-+	mkdir -p $(INSTALLDIR)/$(LIBDIR)
- 	mkdir -p $(INSTALLDIR)/bin
- 	for comp in $(COMPONENTS) ; do \
- 		if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
-@@ -43,11 +43,11 @@
- 			find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
- 		fi ; \
- 	done
--	find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
--	find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
-+	find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \;
-+	find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \;
- 
--libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec
--tests    =  Foundation-tests XML-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests
-+libexecs =  Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec
-+tests    =  Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests
- samples  =  Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples
- 
- .PHONY: $(libexecs)
diff --git a/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch b/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch
deleted file mode 100644
index d2654b59edec..000000000000
--- a/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Index: poco-1.5.0/Foundation/Makefile
-===================================================================
---- poco-1.5.0.orig/Foundation/Makefile
-+++ poco-1.5.0/Foundation/Makefile
-@@ -45,6 +45,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables
- 
- ifdef POCO_UNBUNDLED
- 	SYSLIBS += -lpcre -lz
-+	objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables
- else
- 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
- endif
-Index: poco-1.5.0/Foundation/src/pcre_internal.h
-===================================================================
---- poco-1.5.0.orig/Foundation/src/pcre_internal.h
-+++ poco-1.5.0/Foundation/src/pcre_internal.h
-@@ -1109,6 +1109,16 @@ typedef struct {
- } ucp_type_table;
- 
- 
-+/* renamed to avoid clashes with system pcre */
-+#define _pcre_utf8_table1      _poco__pcre_utf8_table1
-+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size
-+#define _pcre_utf8_table2      _poco__pcre_utf8_table2
-+#define _pcre_utf8_table3      _poco__pcre_utf8_table3
-+#define _pcre_utf8_table4      _poco__pcre_utf8_table4
-+#define _pcre_utt              _poco__pcre_utt
-+#define _pcre_utt_size         _poco__pcre_utt_size
-+#define _pcre_utt_names        _poco__pcre_utt_names
-+#define _pcre_OP_lengths       _poco__pcre_OP_lengths
- /* Internal shared data tables. These are tables that are used by more than one
- of the exported public functions. They have to be "external" in the C sense,
- but are not part of the PCRE public API. The data for these tables is in the
-@@ -1153,6 +1163,11 @@ typedef struct {
-   pcre_int32 other_case;
- } ucd_record;
- 
-+/* renamed to avoid clashes with system pcre */
-+#define _pcre_ucd_records _poco__pcre_ucd_records
-+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1
-+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2
-+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype
- extern const ucd_record  _pcre_ucd_records[];
- extern const uschar      _pcre_ucd_stage1[];
- extern const pcre_uint16 _pcre_ucd_stage2[];
diff --git a/dev-libs/poco/metadata.xml b/dev-libs/poco/metadata.xml
index 56b0f650afc8..6c90e505339c 100644
--- a/dev-libs/poco/metadata.xml
+++ b/dev-libs/poco/metadata.xml
@@ -24,7 +24,6 @@ done quickly and working on the features that make their application unique.
 	</upstream>
 	<use>
 		<flag name="7z">Add Support for the 7z archive format</flag>
-		<flag name="apache">Enable support to write Apache modules using POCO</flag>
 		<flag name="cppparser">Build and install a minimal C++ parser</flag>
 		<flag name="crypto">Encryption and digital signing classes</flag>
 		<flag name="data">Database abstraction layer to easily send/retrieve data to/from various databases</flag>
diff --git a/dev-libs/poco/poco-1.4.6_p4-r1.ebuild b/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
deleted file mode 100644
index c148f9b0f5e9..000000000000
--- a/dev-libs/poco/poco-1.4.6_p4-r1.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib versionator
-
-MY_P="${P/_}"
-MY_DOCP="${PN}-$(get_version_component_range 1-3)-all-doc"
-
-DESCRIPTION="C++ libraries for building network-based applications"
-HOMEPAGE="https://pocoproject.org/"
-SRC_URI="https://pocoproject.org/releases/poco-$(get_version_component_range 1-3)/${MY_P}-all.tar.bz2
-	doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )"
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="doc examples iodbc libressl mysql odbc sqlite ssl test"
-
-DEPEND=">=dev-libs/libpcre-8.13
-	dev-libs/expat
-	sys-libs/zlib
-	mysql? ( virtual/mysql )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
-	ssl? (
-		!libressl? ( dev-libs/openssl:0= )
-		libressl? ( dev-libs/libressl )
-	)
-	sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}-all"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/poco-1.4.4-patch-for-libpcre-8.32.patch
-}
-
-src_configure() {
-	targets="libexecs"
-	odbc="unixodbc"
-
-	if use ssl; then
-		targets="${targets} NetSSL_OpenSSL-libexec Crypto-libexec"
-		echo NetSSL_OpenSSL >> components
-		echo Crypto >> components
-	fi
-	if use odbc; then
-		targets="${targets} Data/ODBC-libexec"
-		echo Data/ODBC >> components
-		if use iodbc; then
-			append-flags "-I/usr/include/iodbc"
-			odbc="iodbc"
-		fi
-	fi
-	if use sqlite; then
-		targets="${targets} Data/SQLite-libexec"
-		echo Data/SQLite >> components
-	fi
-	if use mysql; then
-		targets="${targets} Data/MySQL-libexec"
-		echo Data/MySQL >> components
-	fi
-
-	if use test; then
-		targets="${targets} cppunit tests"
-		echo CppUnit >> components
-		use ssl && targets="${targets} NetSSL_OpenSSL-tests Crypto-tests"
-		use odbc && targets="${targets} Data/ODBC-tests"
-		use sqlite && targets="${targets} Data/SQLite-tests"
-		use mysql && targets="${targets} Data/MySQL-tests"
-	fi
-
-	local myconf
-	use test || myconf="--no-tests"
-	# not autoconf
-	./configure \
-		--no-samples ${myconf} \
-		--prefix=/usr \
-		--unbundled \
-		|| die "configure failed"
-
-	sed -i \
-		-e 's|-O2||g' \
-		-e "s|CC      = .*|CC      = $(tc-getCC)|" \
-		-e "s|CXX     = .*|CXX     = $(tc-getCXX)|" \
-		-e "s|RANLIB  = .*|RANLIB  = $(tc-getRANLIB)|" \
-		-e "s|LIB     = ar|LIB     = $(tc-getAR)|" \
-		-e "s|STRIP   = .*|STRIP   = /bin/true|" \
-		-e "s|CFLAGS          = |CFLAGS          = ${CFLAGS}|" \
-		-e "s|CXXFLAGS        = |CXXFLAGS        = ${CXXFLAGS} |" \
-		-e "s|LINKFLAGS       =|LINKFLAGS       = ${LDFLAGS} |" \
-		-e "s|SHAREDOPT_LINK  = -Wl,-rpath,\$(LIBPATH)|SHAREDOPT_LINK  =|" \
-		build/config/Linux build/config/FreeBSD || die "sed failed"
-	sed -i -e "s|SHLIBFLAGS)|SHLIBFLAGS) ${LDFLAGS}|" build/rules/lib || die
-}
-
-src_compile() {
-	emake POCO_PREFIX=/usr GENTOO_ODBC="${odbc}" LIBDIR="$(get_libdir)" ${targets} || die "emake failed"
-}
-
-src_install() {
-	emake POCO_PREFIX=/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGELOG CONTRIBUTORS NEWS README
-
-	use doc && dohtml -r "${WORKDIR}/${MY_DOCP}"/*
-
-	if use examples ; then
-		for d in Net XML Data Util NetSSL_OpenSSL Foundation ; do
-			insinto /usr/share/doc/${PF}/examples/${d}
-			doins -r ${d}/samples
-		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.4.6_p4.ebuild b/dev-libs/poco/poco-1.4.6_p4.ebuild
deleted file mode 100644
index 93c4559ec12a..000000000000
--- a/dev-libs/poco/poco-1.4.6_p4.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib versionator
-
-MY_P="${P/_}"
-MY_DOCP="${PN}-$(get_version_component_range 1-3)-all-doc"
-
-DESCRIPTION="C++ libraries for building network-based applications"
-HOMEPAGE="https://pocoproject.org/"
-SRC_URI="https://pocoproject.org/releases/poco-$(get_version_component_range 1-3)/${MY_P}-all.tar.bz2
-	doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )"
-LICENSE="Boost-1.0"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="doc examples iodbc mysql odbc sqlite ssl test"
-
-DEPEND=">=dev-libs/libpcre-8.13
-	dev-libs/expat
-	sys-libs/zlib
-	mysql? ( virtual/mysql )
-	odbc? ( iodbc? ( dev-db/libiodbc )
-		!iodbc? ( dev-db/unixODBC ) )
-	ssl? ( dev-libs/openssl:0= )
-	sqlite? ( dev-db/sqlite:3 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}-all"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${PV}-gentoo.patch \
-		"${FILESDIR}"/poco-1.4.4-patch-for-libpcre-8.32.patch
-}
-
-src_configure() {
-	targets="libexecs"
-	odbc="unixodbc"
-
-	if use ssl; then
-		targets="${targets} NetSSL_OpenSSL-libexec Crypto-libexec"
-		echo NetSSL_OpenSSL >> components
-		echo Crypto >> components
-	fi
-	if use odbc; then
-		targets="${targets} Data/ODBC-libexec"
-		echo Data/ODBC >> components
-		if use iodbc; then
-			append-flags "-I/usr/include/iodbc"
-			odbc="iodbc"
-		fi
-	fi
-	if use sqlite; then
-		targets="${targets} Data/SQLite-libexec"
-		echo Data/SQLite >> components
-	fi
-	if use mysql; then
-		targets="${targets} Data/MySQL-libexec"
-		echo Data/MySQL >> components
-	fi
-
-	if use test; then
-		targets="${targets} cppunit tests"
-		echo CppUnit >> components
-		use ssl && targets="${targets} NetSSL_OpenSSL-tests Crypto-tests"
-		use odbc && targets="${targets} Data/ODBC-tests"
-		use sqlite && targets="${targets} Data/SQLite-tests"
-		use mysql && targets="${targets} Data/MySQL-tests"
-	fi
-
-	local myconf
-	use test || myconf="--no-tests"
-	# not autoconf
-	./configure \
-		--no-samples ${myconf} \
-		--prefix=/usr \
-		--unbundled \
-		|| die "configure failed"
-
-	sed -i \
-		-e 's|-O2||g' \
-		-e "s|CC      = .*|CC      = $(tc-getCC)|" \
-		-e "s|CXX     = .*|CXX     = $(tc-getCXX)|" \
-		-e "s|RANLIB  = .*|RANLIB  = $(tc-getRANLIB)|" \
-		-e "s|LIB     = ar|LIB     = $(tc-getAR)|" \
-		-e "s|STRIP   = .*|STRIP   = /bin/true|" \
-		-e "s|CFLAGS          = |CFLAGS          = ${CFLAGS}|" \
-		-e "s|CXXFLAGS        = |CXXFLAGS        = ${CXXFLAGS} |" \
-		-e "s|LINKFLAGS       =|LINKFLAGS       = ${LDFLAGS} |" \
-		-e "s|SHAREDOPT_LINK  = -Wl,-rpath,\$(LIBPATH)|SHAREDOPT_LINK  =|" \
-		build/config/Linux build/config/FreeBSD || die "sed failed"
-	sed -i -e "s|SHLIBFLAGS)|SHLIBFLAGS) ${LDFLAGS}|" build/rules/lib || die
-}
-
-src_compile() {
-	emake POCO_PREFIX=/usr GENTOO_ODBC="${odbc}" LIBDIR="$(get_libdir)" ${targets} || die "emake failed"
-}
-
-src_install() {
-	emake POCO_PREFIX=/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc CHANGELOG CONTRIBUTORS NEWS README
-
-	use doc && dohtml -r "${WORKDIR}/${MY_DOCP}"/*
-
-	if use examples ; then
-		for d in Net XML Data Util NetSSL_OpenSSL Foundation ; do
-			insinto /usr/share/doc/${PF}/examples/${d}
-			doins -r ${d}/samples
-		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.9.0-r1.ebuild b/dev-libs/poco/poco-1.9.0-r1.ebuild
deleted file mode 100644
index a00decb0b061..000000000000
--- a/dev-libs/poco/poco-1.9.0-r1.ebuild
+++ /dev/null
@@ -1,128 +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 mariadb +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? ( !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 )
-	)
-	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
-
-	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() {
-	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.9.0-r2.ebuild b/dev-libs/poco/poco-1.9.0-r2.ebuild
index dabc308f3bb4..0e799b657b11 100644
--- a/dev-libs/poco/poco-1.9.0-r2.ebuild
+++ b/dev-libs/poco/poco-1.9.0-r2.ebuild
@@ -9,7 +9,7 @@ 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"
+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="
@@ -54,7 +54,7 @@ src_prepare() {
 		# 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
+			{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' \
@@ -67,17 +67,20 @@ src_prepare() {
 	fi
 
 	if use mariadb ; then
-	        # Fix MariaDB detection
+		# 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
+		# 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
+
 	cmake-utils_src_prepare
 }
 
@@ -115,6 +118,10 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
+src_test() {
+	POCO_BASE="${S}" cmake-utils_src_test
+}
+
 src_install() {
 	cmake-utils_src_install