[gentoo-commits] repo/gentoo:master commit in: dev-libs/poco/, dev-libs/poco/files/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     36839682b59cea6c5997846e3a43d06f3cfee3ea
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 21:06:09 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 21:06:09 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36839682

dev-libs/poco: Drop 1.4.6_p4

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-libs/poco/Manifest                             |   2 -
 dev-libs/poco/files/1.4.6_p4-gentoo.patch          |  71 -------------
 .../files/poco-1.4.4-patch-for-libpcre-8.32.patch  |  45 --------
 dev-libs/poco/poco-1.4.6_p4.ebuild                 | 118 ---------------------
 4 files changed, 236 deletions(-)

diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index e2d003c8c1d..2fdbe4b3bef 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,3 +1 @@
-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

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 8cfc9237db0..00000000000
--- 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 d2654b59ede..00000000000
--- 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/poco-1.4.6_p4.ebuild b/dev-libs/poco/poco-1.4.6_p4.ebuild
deleted file mode 100644
index 93c4559ec12..00000000000
--- 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
-}