gentoo resync : 19.07.2019

2 files changed, 0 insertions, 116 deletions

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[];