diff options
| -rw-r--r-- | dev-libs/poco/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-libs/poco/Manifest | 22 | ||||
| -rw-r--r-- | dev-libs/poco/files/1.3.2-gentoo.patch | 71 | ||||
| -rw-r--r-- | dev-libs/poco/files/1.3.2-missing_includes.patch | 57 | ||||
| -rw-r--r-- | dev-libs/poco/files/1.3.3_p1-gentoo.patch | 80 | ||||
| -rw-r--r-- | dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch | 197 | ||||
| -rw-r--r-- | dev-libs/poco/poco-1.3.3_p1.ebuild (renamed from dev-libs/poco/poco-1.3.2.ebuild) | 55 |
7 files changed, 324 insertions, 168 deletions
diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog index ca6439ec6384..9c682f83a458 100644 --- a/dev-libs/poco/ChangeLog +++ b/dev-libs/poco/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/poco # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.4 2008/08/25 17:07:33 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.5 2008/11/23 10:27:19 dev-zero Exp $ + +*poco-1.3.3_p1 (23 Nov 2008) + + 23 Nov 2008; Tiziano Müller <dev-zero@gentoo.org> + -files/1.3.2-gentoo.patch, +files/1.3.3_p1-gentoo.patch, + -files/1.3.2-missing_includes.patch, +files/1.3.3_p1-unbundle_libs.patch, + -poco-1.3.2.ebuild, +poco-1.3.3_p1.ebuild: + Version bump, unbundled libs (bug #247242). Dropped old version. 25 Aug 2008; Markus Meier <maekke@gentoo.org> poco-1.3.2.ebuild: add ~x86, bug #235675 diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest index 1542ef96e376..3520f3b4df88 100644 --- a/dev-libs/poco/Manifest +++ b/dev-libs/poco/Manifest @@ -1,17 +1,7 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX 1.3.2-gentoo.patch 2922 RMD160 b9c35edb408f399fdb92c5d19026b8916bd8b679 SHA1 19485d5462cf65b5facae005bfdbf958c4bf3e09 SHA256 1f772c61bb2ae956c8a0b2f20dd73b2c8fb08534a7cb2ba943abbf43cb09af4d -AUX 1.3.2-missing_includes.patch 2230 RMD160 83088a2083862d6d1c864c8a08a031886a04b46a SHA1 6e525719f39a20adb92754a22f1c1d16f667839d SHA256 32e7694a2b2d937b402f84ba6336575796326078665d670137ef442d38bb032f -DIST poco-1.3.2-data.tar.bz2 1737200 RMD160 73112ddd532b093bd55bb611759ce96c39395e52 SHA1 b8d884beab455b63c9edc0c60bf4c11b504ccf7a SHA256 f078b5f88b0cd29bcbb77f5d903240025f6c35e225a1e707df1c62ac281b2951 -DIST poco-1.3.2-doc.tar.gz 800076 RMD160 813f8b0ce8cb18269c5fcbf1c577375bca7db0c4 SHA1 cbf72f9cfbb624f28978f3d752cba7d4dc471ce6 SHA256 256c4c1becb1119ee0207360c8c0013b69744c0c4765ea2bd29b1695122196b9 -EBUILD poco-1.3.2.ebuild 3073 RMD160 aaa5168000b5cb2dfae664bbd37c28e42b17b9cc SHA1 715f462d283cd0aeb17e21d8448e6a6ec0479cac SHA256 d38a30c53efab08625c28e355c674cdb7effc0e491604f99a040b66d899bf482 -MISC ChangeLog 759 RMD160 be3f2e6f281b14c21fa3403ca7a0c1cff234a8ff SHA1 37e78d9a29abf4fafb2b1a7925fdaa7fc86fd83b SHA256 7e72fe7ea91460e015d6eee6d251a5d1aaa0d41ce06ad469129f1782fe033937 +AUX 1.3.3_p1-gentoo.patch 3357 RMD160 0b4f1e17a5c7c1963d0342b7aff00f2db2a3fe59 SHA1 10301073e1b2cd77d35b5ab2b965e03d0de1176d SHA256 2590e03757c8eab863cbdd5db1ff10a6f7734f18925415b430f4bdddadbe4040 +AUX 1.3.3_p1-unbundle_libs.patch 8075 RMD160 690b95724a05d9a3c64fcb907d6b4322bc5a2f71 SHA1 dbd2250d3650c144de1794058d3eec15a815ccba SHA256 63ae188d12bdef000eeb33ce79b045f01d6ab5d2c112079877d1735861f3496f +DIST poco-1.3.3-doc.tar.gz 924194 RMD160 0a9a5ba3117076bc163a0674ca47630d4346dc9e SHA1 cfdea5d3b4c3b15dcc300a7e5c2a60525e9bed8a SHA256 5edcc2216807c05ba236d4d8423c05c1f4645438196816db33380a4a2f543167 +DIST poco-1.3.3p1-all.tar.bz2 2011910 RMD160 bcdf37b0dc1d8cae84c020a34dcf2c838f92053a SHA1 59f3af74b105e6357af9e5d41c7d7579d2300a3c SHA256 9b011301f9111b21c37684fc3c2f8a85356300f003b1f827ae2de196e2c11909 +EBUILD poco-1.3.3_p1.ebuild 3320 RMD160 cd081dae680cd5103e416dbb6f6d53183412978f SHA1 ecb2c3cb205c6a4b459cf43bee6e78b02c820e9d SHA256 6dcff4e487f82645d5dc191ca56acc16b3eab693286101b0293e8c14738bad0f +MISC ChangeLog 1092 RMD160 73d2460cbc17784d630e15ada4535d33bf0aefef SHA1 dfe3c0882af702e256709d82c068f7a4d41fcffd SHA256 8dd4b730f41f7fc26cf7bcb3b50fda0596b4df8554c91ed7e506c7c218fa8c14 MISC metadata.xml 1214 RMD160 ad53912d3b0bfe957afb93f48a14acb8a63065ac SHA1 0540a52d1fb89cb295e74a76ff82b5a9aa9e17d2 SHA256 db4e1800aef5727137536db629841d0fe719018f9c5cb7fd8dd332fbe8c78e1c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkiy5yoACgkQkKaRLQcq0GKo+wCfdCYNOI8KuuRQQf3+BqYMttM2 -vL0AnibLtjOFbYZdmScaC8BmUW1QQYSD -=g55M ------END PGP SIGNATURE----- diff --git a/dev-libs/poco/files/1.3.2-gentoo.patch b/dev-libs/poco/files/1.3.2-gentoo.patch deleted file mode 100644 index bed364c524fa..000000000000 --- a/dev-libs/poco/files/1.3.2-gentoo.patch +++ /dev/null @@ -1,71 +0,0 @@ -diff -Naur poco-1.3.2-data.orig/components poco-1.3.2-data/components ---- poco-1.3.2-data.orig/components 2008-05-29 16:54:08.000000000 +0200 -+++ poco-1.3.2-data/components 2008-05-29 16:58:26.000000000 +0200 -@@ -2,8 +2,4 @@ - XML - Util - Net --NetSSL_OpenSSL - Data --Data/SQLite --Data/ODBC --CppUnit -diff -Naur poco-1.3.2-data.orig/Data/ODBC/Makefile poco-1.3.2-data/Data/ODBC/Makefile ---- poco-1.3.2-data.orig/Data/ODBC/Makefile 2008-05-29 16:54:08.000000000 +0200 -+++ poco-1.3.2-data/Data/ODBC/Makefile 2008-05-29 16:56:05.000000000 +0200 -@@ -8,11 +8,11 @@ - - include $(POCO_BASE)/build/rules/global - --ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?)) -+ifeq (unixodbc, $(GENTOO_ODBC)) - SYSLIBS += -lodbc -lodbcinst - COMMONFLAGS += -DPOCO_UNIXODBC - else --ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) -+ifeq (iodbc, $(GENTOO_ODBC)) - SYSLIBS += -liodbc -liodbcinst - COMMONFLAGS += -DPOCO_IODBC - else -diff -Naur poco-1.3.2-data.orig/Makefile poco-1.3.2-data/Makefile ---- poco-1.3.2-data.orig/Makefile 2008-05-29 16:54:08.000000000 +0200 -+++ poco-1.3.2-data/Makefile 2008-05-29 20:32:35.000000000 +0200 -@@ -17,17 +17,17 @@ - - .PHONY: all libexecs cppunit tests samples install - --all: libexecs tests samples -+all: libexecs - - INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) --COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC -+COMPONENTS = Foundation XML Util Net Data - - cppunit: - $(MAKE) -C $(POCO_BASE)/CppUnit - - 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 \ -@@ -37,14 +37,14 @@ - find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -Rf {} $(INSTALLDIR)/bin \; ; \ - fi ; \ - done -- find $(POCO_BUILD)/lib -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/lib \; -+ find $(POCO_BUILD)/$(LIBDIR) -name "libPoco*" -exec cp -Rf {} $(INSTALLDIR)/$(LIBDIR) \; - - .PHONY: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec - .PHONY: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests - .PHONY: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples - --libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec --tests: Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests -+libexecs: Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec -+tests: Foundation-tests XML-tests Util-tests Net-tests Data-tests - samples: Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples - - Foundation-libexec: diff --git a/dev-libs/poco/files/1.3.2-missing_includes.patch b/dev-libs/poco/files/1.3.2-missing_includes.patch deleted file mode 100644 index afcbe57560ff..000000000000 --- a/dev-libs/poco/files/1.3.2-missing_includes.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur poco-1.3.2-data.orig/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h poco-1.3.2-data/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h ---- poco-1.3.2-data.orig/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h 2008-05-29 20:47:39.000000000 +0200 -+++ poco-1.3.2-data/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h 2008-05-29 20:49:09.000000000 +0200 -@@ -42,6 +42,7 @@ - - #include "Poco/Data/ODBC/ODBC.h" - #include <vector> -+#include <cstring> - #ifdef POCO_OS_FAMILY_WINDOWS - #include <windows.h> - #endif -diff -Naur poco-1.3.2-data.orig/Foundation/include/Poco/FIFOStrategy.h poco-1.3.2-data/Foundation/include/Poco/FIFOStrategy.h ---- poco-1.3.2-data.orig/Foundation/include/Poco/FIFOStrategy.h 2008-05-29 20:47:40.000000000 +0200 -+++ poco-1.3.2-data/Foundation/include/Poco/FIFOStrategy.h 2008-05-29 22:01:36.000000000 +0200 -@@ -42,7 +42,7 @@ - #include "Poco/NotificationStrategy.h" - #include <map> - #include <list> -- -+#include <memory> - - namespace Poco { - -diff -Naur poco-1.3.2-data.orig/Foundation/include/Poco/HashTable.h poco-1.3.2-data/Foundation/include/Poco/HashTable.h ---- poco-1.3.2-data.orig/Foundation/include/Poco/HashTable.h 2008-05-29 20:47:40.000000000 +0200 -+++ poco-1.3.2-data/Foundation/include/Poco/HashTable.h 2008-05-29 22:08:33.000000000 +0200 -@@ -47,7 +47,7 @@ - #include <vector> - #include <map> - #include <cstddef> -- -+#include <cstring> - - namespace Poco { - -diff -Naur poco-1.3.2-data.orig/Foundation/src/BinaryWriter.cpp poco-1.3.2-data/Foundation/src/BinaryWriter.cpp ---- poco-1.3.2-data.orig/Foundation/src/BinaryWriter.cpp 2008-05-29 20:47:40.000000000 +0200 -+++ poco-1.3.2-data/Foundation/src/BinaryWriter.cpp 2008-05-29 20:48:05.000000000 +0200 -@@ -33,6 +33,7 @@ - // DEALINGS IN THE SOFTWARE. - // - -+#include <cstring> - - #include "Poco/BinaryWriter.h" - #include "Poco/ByteOrder.h" -diff -Naur poco-1.3.2-data.orig/Foundation/src/File_UNIX.cpp poco-1.3.2-data/Foundation/src/File_UNIX.cpp ---- poco-1.3.2-data.orig/Foundation/src/File_UNIX.cpp 2008-05-29 20:47:40.000000000 +0200 -+++ poco-1.3.2-data/Foundation/src/File_UNIX.cpp 2008-05-29 20:48:05.000000000 +0200 -@@ -33,6 +33,7 @@ - // DEALINGS IN THE SOFTWARE. - // - -+#include <cstring> - - #include "Poco/File_UNIX.h" - #include "Poco/Buffer.h" diff --git a/dev-libs/poco/files/1.3.3_p1-gentoo.patch b/dev-libs/poco/files/1.3.3_p1-gentoo.patch new file mode 100644 index 000000000000..f162cd1d222e --- /dev/null +++ b/dev-libs/poco/files/1.3.3_p1-gentoo.patch @@ -0,0 +1,80 @@ +diff -Naur poco-1.3.3p1-all.orig/components poco-1.3.3p1-all/components +--- poco-1.3.3p1-all.orig/components 2008-10-20 19:40:05.000000000 +0200 ++++ poco-1.3.3p1-all/components 2008-10-20 20:11:19.000000000 +0200 +@@ -1,12 +1,6 @@ +-CppUnit + Foundation + XML + Util + Net +-NetSSL_OpenSSL + Data +-Data/SQLite +-Data/ODBC +-Data/MySQL +-Crypto + Zip +diff -Naur poco-1.3.3p1-all.orig/Data/ODBC/Makefile poco-1.3.3p1-all/Data/ODBC/Makefile +--- poco-1.3.3p1-all.orig/Data/ODBC/Makefile 2008-10-20 19:40:05.000000000 +0200 ++++ poco-1.3.3p1-all/Data/ODBC/Makefile 2008-10-20 19:54:07.000000000 +0200 +@@ -11,19 +11,19 @@ + ifeq ($(POCO_CONFIG),MinGW) + # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib + else +-ifeq (0, $(shell test -e /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?)) ++ifeq (unixodbc, $(GENTOO_ODBC)) + SYSLIBS += -lodbc -lodbcinst + COMMONFLAGS += -DPOCO_UNIXODBC + else +-ifeq (0, $(shell test -h /usr/lib/libodbc$(SHAREDLIBLINKEXT); echo $$?)) ++ifeq (unixodbc, $(GENTOO_ODBC)) + SYSLIBS += -lodbc -lodbcinst + COMMONFLAGS += -DPOCO_UNIXODBC + else +-ifeq (0, $(shell test -e /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) ++ifeq (iodbc, $(GENTOO_ODBC)) + SYSLIBS += -liodbc -liodbcinst + COMMONFLAGS += -DPOCO_IODBC + else +-ifeq (0, $(shell test -h /usr/lib/libiodbc$(SHAREDLIBLINKEXT); echo $$?)) ++ifeq (iodbc, $(GENTOO_ODBC)) + SYSLIBS += -liodbc -liodbcinst + COMMONFLAGS += -DPOCO_IODBC + else +diff -Naur poco-1.3.3p1-all.orig/Makefile poco-1.3.3p1-all/Makefile +--- poco-1.3.3p1-all.orig/Makefile 2008-10-20 19:40:05.000000000 +0200 ++++ poco-1.3.3p1-all/Makefile 2008-10-20 20:12:09.000000000 +0200 +@@ -21,7 +21,7 @@ + + .PHONY: all libexecs cppunit tests samples clean distclean install + +-all: libexecs tests samples ++all: libexecs + + INSTALLDIR = $(DESTDIR)$(POCO_PREFIX) + COMPONENTS = Foundation XML Util Net NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Crypto Zip +@@ -31,7 +31,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 \ +@@ -41,11 +41,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 NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Crypto-libexec Zip-libexec +-tests = Foundation-tests XML-tests Util-tests Net-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Crypto-tests Zip-tests ++libexecs = Foundation-libexec XML-libexec Util-libexec Net-libexec Data-libexec Zip-libexec ++tests = Foundation-tests XML-tests Util-tests Net-tests Data-tests Zip-tests + samples = Foundation-samples XML-samples Util-samples Net-samples NetSSL_OpenSSL-samples Data-samples Crypto-samples Zip-samples + + .PHONY: $(libexecs) diff --git a/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch b/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch new file mode 100644 index 000000000000..2ec2067b318a --- /dev/null +++ b/dev-libs/poco/files/1.3.3_p1-unbundle_libs.patch @@ -0,0 +1,197 @@ +diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/Makefile poco-1.3.3p1-all/Data/SQLite/Makefile +--- poco-1.3.3p1-all.orig/Data/SQLite/Makefile 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Data/SQLite/Makefile 2008-11-23 10:27:53.000000000 +0100 +@@ -9,10 +9,10 @@ + include $(POCO_BASE)/build/rules/global + + SYSFLAGS += -DTHREADSAFE -DNO_TCL -DSQLITE_DISABLE_LFS ++SYSLIBS += -lsqlite3 + + objects = Binder Extractor SessionImpl Connector \ +- SQLiteException SQLiteStatementImpl Utility \ +- sqlite3 ++ SQLiteException SQLiteStatementImpl Utility + + target = PocoSQLite + target_version = $(LIBVERSION) +diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp +--- poco-1.3.3p1-all.orig/Data/SQLite/src/Binder.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Data/SQLite/src/Binder.cpp 2008-11-23 10:30:43.000000000 +0100 +@@ -38,7 +38,7 @@ + #include "Poco/Data/SQLite/Utility.h" + #include "Poco/Data/BLOB.h" + #include "Poco/Exception.h" +-#include "sqlite3.h" ++#include <sqlite3.h> + #include <cstdlib> + + +diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp +--- poco-1.3.3p1-all.orig/Data/SQLite/src/Connector.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Data/SQLite/src/Connector.cpp 2008-11-23 10:29:32.000000000 +0100 +@@ -37,7 +37,7 @@ + #include "Poco/Data/SQLite/Connector.h" + #include "Poco/Data/SQLite/SessionImpl.h" + #include "Poco/Data/SessionFactory.h" +-#include "sqlite3.h" ++#include <sqlite3.h> + + + namespace Poco { +diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp +--- poco-1.3.3p1-all.orig/Data/SQLite/src/Extractor.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Data/SQLite/src/Extractor.cpp 2008-11-23 10:29:44.000000000 +0100 +@@ -39,7 +39,7 @@ + #include "Poco/Data/BLOB.h" + #include "Poco/Data/DataException.h" + #include "Poco/Exception.h" +-#include "sqlite3.h" ++#include <sqlite3.h> + #include <cstdlib> + + +diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp +--- poco-1.3.3p1-all.orig/Data/SQLite/src/SessionImpl.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Data/SQLite/src/SessionImpl.cpp 2008-11-23 10:30:05.000000000 +0100 +@@ -37,7 +37,7 @@ + #include "Poco/Data/SQLite/SessionImpl.h" + #include "Poco/Data/SQLite/Utility.h" + #include "Poco/Data/SQLite/SQLiteStatementImpl.h" +-#include "sqlite3.h" ++#include <sqlite3.h> + #include <cstdlib> + + +diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp +--- poco-1.3.3p1-all.orig/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Data/SQLite/src/SQLiteStatementImpl.cpp 2008-11-23 10:30:34.000000000 +0100 +@@ -40,7 +40,7 @@ + #include "Poco/String.h" + #include <cstdlib> + #include <cstring> +-#include "sqlite3.h" ++#include <sqlite3.h> + + + namespace Poco { +diff -Naur poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp +--- poco-1.3.3p1-all.orig/Data/SQLite/src/Utility.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Data/SQLite/src/Utility.cpp 2008-11-23 10:29:22.000000000 +0100 +@@ -41,7 +41,7 @@ + #include "Poco/NumberFormatter.h" + #include "Poco/String.h" + #include "Poco/Exception.h" +-#include "sqlite3.h" ++#include <sqlite3.h> + + + namespace Poco { +diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h +--- poco-1.3.3p1-all.orig/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Foundation/include/Poco/DeflatingStream.h 2008-11-22 22:13:50.000000000 +0100 +@@ -44,7 +44,7 @@ + #include "Poco/BufferedStreamBuf.h" + #include <istream> + #include <ostream> +-#include "Poco/zlib.h" ++#include <zlib.h> + + + namespace Poco { +diff -Naur poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h +--- poco-1.3.3p1-all.orig/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Foundation/include/Poco/InflatingStream.h 2008-11-22 22:13:50.000000000 +0100 +@@ -44,7 +44,7 @@ + #include "Poco/BufferedStreamBuf.h" + #include <istream> + #include <ostream> +-#include "Poco/zlib.h" ++#include <zlib.h> + + + namespace Poco { +diff -Naur poco-1.3.3p1-all.orig/Foundation/Makefile poco-1.3.3p1-all/Foundation/Makefile +--- poco-1.3.3p1-all.orig/Foundation/Makefile 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Foundation/Makefile 2008-11-23 10:04:10.000000000 +0100 +@@ -8,6 +8,8 @@ + + include $(POCO_BASE)/build/rules/global + ++SYSLIBS += -lpcre -lz ++ + objects = ArchiveStrategy ASCIIEncoding AsyncChannel Base64Decoder Base64Encoder \ + BinaryReader BinaryWriter Bugcheck ByteOrder Channel Checksum Configurable ConsoleChannel \ + CountingStream DateTime LocalDateTime DateTimeFormat DateTimeFormatter DateTimeParser \ +@@ -30,12 +32,7 @@ + FileStreamFactory URIStreamFactory URIStreamOpener UTF16Encoding Windows1252Encoding \ + UTF8Encoding UnicodeConverter UUID UUIDGenerator Void Format \ + Pipe PipeImpl PipeStream DynamicAny DynamicAnyHolder SharedMemory \ +- FileStream Unicode UTF8String \ +- adler32 compress crc32 deflate gzio infback inffast inflate inftrees \ +- trees zutil \ +- pcre_chartables pcre_compile pcre_globals pcre_maketables pcre_study \ +- pcre_tables pcre_try_flipped pcre_ucd pcre_valid_utf8 \ +- pcre_exec pcre_ord2utf8 pcre_newline pcre_fullinfo pcre_xclass ++ FileStream Unicode UTF8String + + ifeq ($(POCO_CONFIG),MinGW) + objects += EventLogChannel WindowsConsoleChannel +diff -Naur poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp poco-1.3.3p1-all/Foundation/src/Checksum.cpp +--- poco-1.3.3p1-all.orig/Foundation/src/Checksum.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Foundation/src/Checksum.cpp 2008-11-22 22:13:50.000000000 +0100 +@@ -35,7 +35,7 @@ + + + #include "Poco/Checksum.h" +-#include "Poco/zlib.h" ++#include <zlib.h> + + + namespace Poco { +diff -Naur poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp +--- poco-1.3.3p1-all.orig/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/Foundation/src/RegularExpression.cpp 2008-11-22 22:13:50.000000000 +0100 +@@ -37,7 +37,7 @@ + #include "Poco/RegularExpression.h" + #include "Poco/Exception.h" + #include <sstream> +-#include "pcre.h" ++#include <pcre.h> + + + namespace Poco { +diff -Naur poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h +--- poco-1.3.3p1-all.orig/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/XML/include/Poco/XML/ParserEngine.h 2008-11-22 22:13:50.000000000 +0100 +@@ -40,7 +40,7 @@ + + + #include "Poco/XML/XML.h" +-#include "Poco/XML/expat.h" ++#include <expat.h> + #include "Poco/XML/XMLString.h" + #include "Poco/XML/XMLStream.h" + #include "Poco/SAX/Locator.h" +diff -Naur poco-1.3.3p1-all.orig/XML/Makefile poco-1.3.3p1-all/XML/Makefile +--- poco-1.3.3p1-all.orig/XML/Makefile 2008-11-22 22:13:34.000000000 +0100 ++++ poco-1.3.3p1-all/XML/Makefile 2008-11-23 10:04:25.000000000 +0100 +@@ -8,7 +8,9 @@ + + include $(POCO_BASE)/build/rules/global + +-COMMONFLAGS += -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H ++COMMONFLAGS += -DXML_NS -DXML_DTD ++ ++SYSLIBS += -lexpat + + objects = AbstractContainerNode AbstractNode Attr AttrMap Attributes \ + AttributesImpl CDATASection CharacterData ChildNodesList Comment \ +@@ -22,7 +24,7 @@ + NamespaceSupport Node NodeFilter NodeIterator NodeList Notation \ + ParserEngine ProcessingInstruction SAXException SAXParser Text \ + TreeWalker WhitespaceFilter XMLException XMLFilter XMLFilterImpl XMLReader \ +- XMLString XMLWriter NodeAppender xmlparse xmlrole xmltok ++ XMLString XMLWriter NodeAppender + + target = PocoXML + target_version = $(LIBVERSION) diff --git a/dev-libs/poco/poco-1.3.2.ebuild b/dev-libs/poco/poco-1.3.3_p1.ebuild index 0b0a787c61dc..d729d7511b49 100644 --- a/dev-libs/poco/poco-1.3.2.ebuild +++ b/dev-libs/poco/poco-1.3.3_p1.ebuild @@ -1,49 +1,49 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.3.2.ebuild,v 1.4 2008/08/25 17:07:33 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.3.3_p1.ebuild,v 1.1 2008/11/23 10:27:19 dev-zero Exp $ -EAPI="1" +EAPI="2" -inherit eutils toolchain-funcs flag-o-matic +inherit eutils toolchain-funcs flag-o-matic versionator + +MY_P="${P/_}" +MY_DOCP="${PN}-$(get_version_component_range 1-3)-doc" DESCRIPTION="C++ class libraries that simplify and accelerate the development of network-centric, portable applications." HOMEPAGE="http://pocoproject.org/" -SRC_URI="mirror://sourceforge/poco/${P}-data.tar.bz2 - doc? ( mirror://sourceforge/poco/${P}-doc.tar.gz )" +SRC_URI="mirror://sourceforge/poco/${MY_P}-all.tar.bz2 + doc? ( mirror://sourceforge/poco/${MY_DOCP}.tar.gz )" LICENSE="Boost-1.0" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="doc examples iodbc odbc sqlite ssl" +IUSE="doc examples iodbc mysql odbc sqlite ssl" DEPEND="dev-libs/libpcre dev-libs/expat + sys-libs/zlib + mysql? ( dev-db/mysql ) odbc? ( iodbc? ( dev-db/libiodbc ) !iodbc? ( dev-db/unixODBC ) ) ssl? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 )" RDEPEND="${DEPEND}" -# Upstream has three editions: "economic", "with NetSSL" and "with NetSSL and Data" -# We take the last one and provide useflags for ssl, odbc, sqlite -S="${WORKDIR}/${P}-data" - -src_unpack() { - unpack ${A} - cd "${S}" +S="${WORKDIR}/${MY_P}-all" +src_prepare() { epatch \ - "${FILESDIR}/${PV}-missing_includes.patch" \ - "${FILESDIR}/${PV}-gentoo.patch" - + "${FILESDIR}/${PV}-gentoo.patch" \ + "${FILESDIR}/${PV}-unbundle_libs.patch" } -src_compile() { - local targets="all" - local odbc="unixodbc" +src_configure() { + targets="all" + odbc="unixodbc" if use ssl; then - targets="${targets} NetSSL_OpenSSL-libexec" + targets="${targets} NetSSL_OpenSSL-libexec Crypto-libexec" echo NetSSL_OpenSSL >> components + echo Crypto >> components fi if use odbc; then targets="${targets} Data/ODBC-libexec" @@ -57,18 +57,25 @@ src_compile() { 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 has test ${FEATURES}; then targets="${targets} cppunit tests" echo CppUnit >> components - use ssl && targets="${targets} NetSSL_OpenSSL-tests" + 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 + has test ${FEATURES} || myconf="--no-tests" # not autoconf ./configure \ - --no-samples \ + --no-samples ${myconf} \ --prefix=/usr \ || die "configure failed" @@ -83,7 +90,9 @@ src_compile() { -e "s|LINKFLAGS = |LINKFLAGS = ${LDFLAG} |" \ -e 's|-O2||g' \ build/config/Linux build/config/FreeBSD || die "sed failed" +} +src_compile() { emake POCO_PREFIX=/usr GENTOO_ODBC="${odbc}" LIBDIR="$(get_libdir)" ${targets} || die "emake failed" } @@ -92,7 +101,7 @@ src_install() { dodoc CHANGELOG CONTRIBUTORS NEWS README - use doc && dohtml -r "${WORKDIR}/${P}-doc"/* + use doc && dohtml -r "${WORKDIR}/${MY_DOCP}"/* if use examples ; then for d in Net XML Data Util NetSSL_OpenSSL Foundation ; do |