| 1 |
commit: 36839682b59cea6c5997846e3a43d06f3cfee3ea |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 18 21:06:09 2019 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 18 21:06:09 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36839682 |
| 7 |
|
| 8 |
dev-libs/poco: Drop 1.4.6_p4 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-libs/poco/Manifest | 2 - |
| 14 |
dev-libs/poco/files/1.4.6_p4-gentoo.patch | 71 ------------- |
| 15 |
.../files/poco-1.4.4-patch-for-libpcre-8.32.patch | 45 -------- |
| 16 |
dev-libs/poco/poco-1.4.6_p4.ebuild | 118 --------------------- |
| 17 |
4 files changed, 236 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest |
| 20 |
index e2d003c8c1d..2fdbe4b3bef 100644 |
| 21 |
--- a/dev-libs/poco/Manifest |
| 22 |
+++ b/dev-libs/poco/Manifest |
| 23 |
@@ -1,3 +1 @@ |
| 24 |
-DIST poco-1.4.6-all-doc.zip 2072762 BLAKE2B 51b8426d050e7ae373fbb0f3959657e37f1c3aeda75f5bf5cd3dc99e08414a9e65f61ea71dee6d8c40148f41157e2eac0888e64c5020707352c74b262ffae741 SHA512 458e1a3c6a6017b5ae5efcbd0d7b2bbf50aedd6ddc7ae7befddac07ed133b7243208aadd6ecdb17b3fa273e04eb0da4d73b1d3e5591aee98b754e430b2248e52 |
| 25 |
-DIST poco-1.4.6p4-all.tar.bz2 3158594 BLAKE2B 76accf617ddd087131a5960c131680451959704fee4b17b65bf85367a172d2fe023c9c7efde59fe5bd4142c7ca153734fb4ccbbf06bd5d0365a59d6e75a328a5 SHA512 ae4e1190a0ba719f807d0abaf1c47ff445a8f5867157f209260672546f3755ff021c7073bc8d5e656be383d5667dc15ad7eae8208728053fb61439c4c80a7fca |
| 26 |
DIST poco-1.9.0.tar.gz 10012966 BLAKE2B 98848e87008c71dc5131dbd1c2b17afc414074a3e26237918baf231b4e56ce3d69347cf7a3017715895f4ee56a428672fcb804fb3c732da0000ccc9790b0081d SHA512 de2346d62b2e89ba04abe62a83f6ede7a496e80bcbe53a880a1aa8e87a8ebd9a430dd70fdc6aada836bb1021c6df21375fd0cbcf62dbb6e29a2f65d6d90cf2b9 |
| 27 |
|
| 28 |
diff --git a/dev-libs/poco/files/1.4.6_p4-gentoo.patch b/dev-libs/poco/files/1.4.6_p4-gentoo.patch |
| 29 |
deleted file mode 100644 |
| 30 |
index 8cfc9237db0..00000000000 |
| 31 |
--- a/dev-libs/poco/files/1.4.6_p4-gentoo.patch |
| 32 |
+++ /dev/null |
| 33 |
@@ -1,71 +0,0 @@ |
| 34 |
---- components 2012-11-18 16:56:59.000000000 +0100 |
| 35 |
-+++ components 2012-12-06 12:29:07.779546771 +0100 |
| 36 |
-@@ -1,14 +1,8 @@ |
| 37 |
--CppUnit |
| 38 |
- Foundation |
| 39 |
- XML |
| 40 |
- Util |
| 41 |
- Net |
| 42 |
--Crypto |
| 43 |
--NetSSL_OpenSSL |
| 44 |
- Data |
| 45 |
--Data/SQLite |
| 46 |
--Data/ODBC |
| 47 |
--Data/MySQL |
| 48 |
- Zip |
| 49 |
- PageCompiler |
| 50 |
- PageCompiler/File2Page |
| 51 |
---- Data/ODBC/ODBC.make 2014-04-18 13:41:55.000000000 +0200 |
| 52 |
-+++ Data/ODBC/ODBC.make.new 2014-12-29 13:44:03.000000000 +0100 |
| 53 |
-@@ -14,9 +14,9 @@ |
| 54 |
- ifeq (0, $(shell test -d /usr/lib/$(OSARCH)-linux-gnu; echo $$?)) |
| 55 |
- ODBCLIBDIR = /usr/lib/$(OSARCH)-linux-gnu |
| 56 |
- else ifeq (0, $(shell test -d /usr/lib64; echo $$?)) |
| 57 |
--ODBCLIBDIR = /usr/lib64 |
| 58 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 59 |
- else |
| 60 |
--ODBCLIBDIR = /usr/lib |
| 61 |
-+ODBCLIBDIR = /usr/$(LIBDIR) |
| 62 |
- endif |
| 63 |
- endif |
| 64 |
- |
| 65 |
-@@ -35,10 +35,10 @@ |
| 66 |
- # -DODBCVER=0x0300: SQLHandle declaration issue |
| 67 |
- # -DNOMINMAX : MIN/MAX macros defined in windows conflict with libstdc++ |
| 68 |
- CXXFLAGS += -DODBCVER=0x0300 -DNOMINMAX |
| 69 |
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(LIBLINKEXT); echo $$?)) |
| 70 |
-+else ifeq (unixodbc, $(GENTOO_ODBC)) |
| 71 |
- SYSLIBS += -lodbc |
| 72 |
- COMMONFLAGS += -DPOCO_UNIXODBC |
| 73 |
--else ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(LIBLINKEXT); echo $$?)) |
| 74 |
-+else ifeq (unixodbc, $(GENTOO_ODBC)) |
| 75 |
- SYSLIBS += -liodbc -liodbcinst |
| 76 |
- COMMONFLAGS += -DPOCO_IODBC -I/usr/include/iodbc |
| 77 |
- else |
| 78 |
---- Makefile 2012-11-18 16:57:00.000000000 +0100 |
| 79 |
-+++ Makefile 2012-12-06 12:29:07.779546771 +0100 |
| 80 |
-@@ -33,7 +33,7 @@ |
| 81 |
- |
| 82 |
- install: libexecs |
| 83 |
- mkdir -p $(INSTALLDIR)/include/Poco |
| 84 |
-- mkdir -p $(INSTALLDIR)/lib |
| 85 |
-+ mkdir -p $(INSTALLDIR)/$(LIBDIR) |
| 86 |
- mkdir -p $(INSTALLDIR)/bin |
| 87 |
- for comp in $(COMPONENTS) ; do \ |
| 88 |
- if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \ |
| 89 |
-@@ -43,11 +43,11 @@ |
| 90 |
- find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \ |
| 91 |
- fi ; \ |
| 92 |
- done |
| 93 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \; |
| 94 |
-- find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \; |
| 95 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/$(LIBDIR) \; |
| 96 |
-+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; |
| 97 |
- |
| 98 |
--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 |
| 99 |
--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 |
| 100 |
-+libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec PageCompiler-libexec |
| 101 |
-+tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests |
| 102 |
- samples = Foundation-samples XML-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples |
| 103 |
- |
| 104 |
- .PHONY: $(libexecs) |
| 105 |
|
| 106 |
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 |
| 107 |
deleted file mode 100644 |
| 108 |
index d2654b59ede..00000000000 |
| 109 |
--- a/dev-libs/poco/files/poco-1.4.4-patch-for-libpcre-8.32.patch |
| 110 |
+++ /dev/null |
| 111 |
@@ -1,45 +0,0 @@ |
| 112 |
-Index: poco-1.5.0/Foundation/Makefile |
| 113 |
-=================================================================== |
| 114 |
---- poco-1.5.0.orig/Foundation/Makefile |
| 115 |
-+++ poco-1.5.0/Foundation/Makefile |
| 116 |
-@@ -45,6 +45,7 @@ pcre_utf8_objects = pcre_ucd pcre_tables |
| 117 |
- |
| 118 |
- ifdef POCO_UNBUNDLED |
| 119 |
- SYSLIBS += -lpcre -lz |
| 120 |
-+ objects += $(pcre_utf8_objects) # unicode.cpp uses internal pcre tables |
| 121 |
- else |
| 122 |
- objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects) |
| 123 |
- endif |
| 124 |
-Index: poco-1.5.0/Foundation/src/pcre_internal.h |
| 125 |
-=================================================================== |
| 126 |
---- poco-1.5.0.orig/Foundation/src/pcre_internal.h |
| 127 |
-+++ poco-1.5.0/Foundation/src/pcre_internal.h |
| 128 |
-@@ -1109,6 +1109,16 @@ typedef struct { |
| 129 |
- } ucp_type_table; |
| 130 |
- |
| 131 |
- |
| 132 |
-+/* renamed to avoid clashes with system pcre */ |
| 133 |
-+#define _pcre_utf8_table1 _poco__pcre_utf8_table1 |
| 134 |
-+#define _pcre_utf8_table1_size _poco__pcre_utf8_table1_size |
| 135 |
-+#define _pcre_utf8_table2 _poco__pcre_utf8_table2 |
| 136 |
-+#define _pcre_utf8_table3 _poco__pcre_utf8_table3 |
| 137 |
-+#define _pcre_utf8_table4 _poco__pcre_utf8_table4 |
| 138 |
-+#define _pcre_utt _poco__pcre_utt |
| 139 |
-+#define _pcre_utt_size _poco__pcre_utt_size |
| 140 |
-+#define _pcre_utt_names _poco__pcre_utt_names |
| 141 |
-+#define _pcre_OP_lengths _poco__pcre_OP_lengths |
| 142 |
- /* Internal shared data tables. These are tables that are used by more than one |
| 143 |
- of the exported public functions. They have to be "external" in the C sense, |
| 144 |
- but are not part of the PCRE public API. The data for these tables is in the |
| 145 |
-@@ -1153,6 +1163,11 @@ typedef struct { |
| 146 |
- pcre_int32 other_case; |
| 147 |
- } ucd_record; |
| 148 |
- |
| 149 |
-+/* renamed to avoid clashes with system pcre */ |
| 150 |
-+#define _pcre_ucd_records _poco__pcre_ucd_records |
| 151 |
-+#define _pcre_ucd_stage1 _poco__pcre_ucd_stage1 |
| 152 |
-+#define _pcre_ucd_stage2 _poco__pcre_ucd_stage2 |
| 153 |
-+#define _pcre_ucp_gentype _poco__pcre_ucp_gentype |
| 154 |
- extern const ucd_record _pcre_ucd_records[]; |
| 155 |
- extern const uschar _pcre_ucd_stage1[]; |
| 156 |
- extern const pcre_uint16 _pcre_ucd_stage2[]; |
| 157 |
|
| 158 |
diff --git a/dev-libs/poco/poco-1.4.6_p4.ebuild b/dev-libs/poco/poco-1.4.6_p4.ebuild |
| 159 |
deleted file mode 100644 |
| 160 |
index 93c4559ec12..00000000000 |
| 161 |
--- a/dev-libs/poco/poco-1.4.6_p4.ebuild |
| 162 |
+++ /dev/null |
| 163 |
@@ -1,118 +0,0 @@ |
| 164 |
-# Copyright 1999-2019 Gentoo Authors |
| 165 |
-# Distributed under the terms of the GNU General Public License v2 |
| 166 |
- |
| 167 |
-EAPI="5" |
| 168 |
- |
| 169 |
-inherit eutils toolchain-funcs flag-o-matic multilib versionator |
| 170 |
- |
| 171 |
-MY_P="${P/_}" |
| 172 |
-MY_DOCP="${PN}-$(get_version_component_range 1-3)-all-doc" |
| 173 |
- |
| 174 |
-DESCRIPTION="C++ libraries for building network-based applications" |
| 175 |
-HOMEPAGE="https://pocoproject.org/" |
| 176 |
-SRC_URI="https://pocoproject.org/releases/poco-$(get_version_component_range 1-3)/${MY_P}-all.tar.bz2 |
| 177 |
- doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )" |
| 178 |
-LICENSE="Boost-1.0" |
| 179 |
-SLOT="0" |
| 180 |
-KEYWORDS="amd64 arm x86" |
| 181 |
-IUSE="doc examples iodbc mysql odbc sqlite ssl test" |
| 182 |
- |
| 183 |
-DEPEND=">=dev-libs/libpcre-8.13 |
| 184 |
- dev-libs/expat |
| 185 |
- sys-libs/zlib |
| 186 |
- mysql? ( virtual/mysql ) |
| 187 |
- odbc? ( iodbc? ( dev-db/libiodbc ) |
| 188 |
- !iodbc? ( dev-db/unixODBC ) ) |
| 189 |
- ssl? ( dev-libs/openssl:0= ) |
| 190 |
- sqlite? ( dev-db/sqlite:3 )" |
| 191 |
-RDEPEND="${DEPEND}" |
| 192 |
- |
| 193 |
-S="${WORKDIR}/${MY_P}-all" |
| 194 |
- |
| 195 |
-src_prepare() { |
| 196 |
- epatch \ |
| 197 |
- "${FILESDIR}"/${PV}-gentoo.patch \ |
| 198 |
- "${FILESDIR}"/poco-1.4.4-patch-for-libpcre-8.32.patch |
| 199 |
-} |
| 200 |
- |
| 201 |
-src_configure() { |
| 202 |
- targets="libexecs" |
| 203 |
- odbc="unixodbc" |
| 204 |
- |
| 205 |
- if use ssl; then |
| 206 |
- targets="${targets} NetSSL_OpenSSL-libexec Crypto-libexec" |
| 207 |
- echo NetSSL_OpenSSL >> components |
| 208 |
- echo Crypto >> components |
| 209 |
- fi |
| 210 |
- if use odbc; then |
| 211 |
- targets="${targets} Data/ODBC-libexec" |
| 212 |
- echo Data/ODBC >> components |
| 213 |
- if use iodbc; then |
| 214 |
- append-flags "-I/usr/include/iodbc" |
| 215 |
- odbc="iodbc" |
| 216 |
- fi |
| 217 |
- fi |
| 218 |
- if use sqlite; then |
| 219 |
- targets="${targets} Data/SQLite-libexec" |
| 220 |
- echo Data/SQLite >> components |
| 221 |
- fi |
| 222 |
- if use mysql; then |
| 223 |
- targets="${targets} Data/MySQL-libexec" |
| 224 |
- echo Data/MySQL >> components |
| 225 |
- fi |
| 226 |
- |
| 227 |
- if use test; then |
| 228 |
- targets="${targets} cppunit tests" |
| 229 |
- echo CppUnit >> components |
| 230 |
- use ssl && targets="${targets} NetSSL_OpenSSL-tests Crypto-tests" |
| 231 |
- use odbc && targets="${targets} Data/ODBC-tests" |
| 232 |
- use sqlite && targets="${targets} Data/SQLite-tests" |
| 233 |
- use mysql && targets="${targets} Data/MySQL-tests" |
| 234 |
- fi |
| 235 |
- |
| 236 |
- local myconf |
| 237 |
- use test || myconf="--no-tests" |
| 238 |
- # not autoconf |
| 239 |
- ./configure \ |
| 240 |
- --no-samples ${myconf} \ |
| 241 |
- --prefix=/usr \ |
| 242 |
- --unbundled \ |
| 243 |
- || die "configure failed" |
| 244 |
- |
| 245 |
- sed -i \ |
| 246 |
- -e 's|-O2||g' \ |
| 247 |
- -e "s|CC = .*|CC = $(tc-getCC)|" \ |
| 248 |
- -e "s|CXX = .*|CXX = $(tc-getCXX)|" \ |
| 249 |
- -e "s|RANLIB = .*|RANLIB = $(tc-getRANLIB)|" \ |
| 250 |
- -e "s|LIB = ar|LIB = $(tc-getAR)|" \ |
| 251 |
- -e "s|STRIP = .*|STRIP = /bin/true|" \ |
| 252 |
- -e "s|CFLAGS = |CFLAGS = ${CFLAGS}|" \ |
| 253 |
- -e "s|CXXFLAGS = |CXXFLAGS = ${CXXFLAGS} |" \ |
| 254 |
- -e "s|LINKFLAGS =|LINKFLAGS = ${LDFLAGS} |" \ |
| 255 |
- -e "s|SHAREDOPT_LINK = -Wl,-rpath,\$(LIBPATH)|SHAREDOPT_LINK =|" \ |
| 256 |
- build/config/Linux build/config/FreeBSD || die "sed failed" |
| 257 |
- sed -i -e "s|SHLIBFLAGS)|SHLIBFLAGS) ${LDFLAGS}|" build/rules/lib || die |
| 258 |
-} |
| 259 |
- |
| 260 |
-src_compile() { |
| 261 |
- emake POCO_PREFIX=/usr GENTOO_ODBC="${odbc}" LIBDIR="$(get_libdir)" ${targets} || die "emake failed" |
| 262 |
-} |
| 263 |
- |
| 264 |
-src_install() { |
| 265 |
- emake POCO_PREFIX=/usr LIBDIR="$(get_libdir)" DESTDIR="${D}" install || die "emake install failed" |
| 266 |
- |
| 267 |
- dodoc CHANGELOG CONTRIBUTORS NEWS README |
| 268 |
- |
| 269 |
- use doc && dohtml -r "${WORKDIR}/${MY_DOCP}"/* |
| 270 |
- |
| 271 |
- if use examples ; then |
| 272 |
- for d in Net XML Data Util NetSSL_OpenSSL Foundation ; do |
| 273 |
- insinto /usr/share/doc/${PF}/examples/${d} |
| 274 |
- doins -r ${d}/samples |
| 275 |
- done |
| 276 |
- find "${D}/usr/share/doc/${PF}/examples" \ |
| 277 |
- -iname "*.sln" -or -iname "*.vcproj" -or \ |
| 278 |
- -iname "*.vmsbuild" -or -iname "*.properties" \ |
| 279 |
- | xargs rm |
| 280 |
- fi |
| 281 |
-} |
Archives