Version bump for bug 387805

Package-Manager: portage-2.2.0_alpha100-r1/cvs/Linux x86_64

5 files changed, 240 insertions, 3 deletions

diff --git a/dev-libs/poco/ChangeLog b/dev-libs/poco/ChangeLog
index f642dedbc40e..2c54e0a16383 100644
--- a/dev-libs/poco/ChangeLog
+++ b/dev-libs/poco/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/poco
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.11 2010/08/23 18:39:00 dev-zero Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/ChangeLog,v 1.12 2012/04/12 13:53:00 tommy Exp $
+
+*poco-1.4.3_p1 (12 Apr 2012)
+
+  12 Apr 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +files/1.4.3_p1-gentoo.patch, +poco-1.4.3_p1.ebuild,
+  +files/libpcre-8.13.patch:
+  Version bump, fixes bug 387805
 
   23 Aug 2010; Tiziano Müller <dev-zero@gentoo.org> poco-1.3.6_p2.ebuild:
   Changed order of -O2 replacement in sed call to avoid stripping an -O2 in
diff --git a/dev-libs/poco/Manifest b/dev-libs/poco/Manifest
index e47f77c9b350..4441dc472409 100644
--- a/dev-libs/poco/Manifest
+++ b/dev-libs/poco/Manifest
@@ -1,13 +1,30 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 1.3.3_p1-gcc44.patch 529 RMD160 03d16847116d6dbbc1feaddb68eada16622bc8d1 SHA1 d2bf6f1d85ad8dcd113df97297656f0195f9c04f SHA256 19bfb607bcc49e600950d4bca0f3d5bf1d33d547b148cbe42f97906130980822
 AUX 1.3.3_p1-gentoo.patch 3357 RMD160 0b4f1e17a5c7c1963d0342b7aff00f2db2a3fe59 SHA1 10301073e1b2cd77d35b5ab2b965e03d0de1176d SHA256 2590e03757c8eab863cbdd5db1ff10a6f7734f18925415b430f4bdddadbe4040
 AUX 1.3.3_p1-openssl-1.patch 402 RMD160 6b25f98e685b7bfc3281092fda22707051602e52 SHA1 3f239f9d28a68489aeb90c09cbd2f8647e36269e SHA256 076b0b024a225656989520b7d921e6e182f9cb7ff91d97205954a341081ecc2b
 AUX 1.3.3_p1-unbundle_libs.patch 8075 RMD160 690b95724a05d9a3c64fcb907d6b4322bc5a2f71 SHA1 dbd2250d3650c144de1794058d3eec15a815ccba SHA256 63ae188d12bdef000eeb33ce79b045f01d6ab5d2c112079877d1735861f3496f
 AUX 1.3.6_p2-gentoo.patch 3726 RMD160 823fe773bbc44019fd3af9e82b1e0ddb55232141 SHA1 8a8a9ce27c15cec50a65f0ae851f309b4e58da37 SHA256 1555ce072ac1e6ad37e1d570dfd2b0d9862aae4629425ad7443335952887e3e7
+AUX 1.4.3_p1-gentoo.patch 3778 RMD160 03a538c16c4d6235f12a55d09d50b01f6772db44 SHA1 7c263a6fa35962fd4b745b015183e9f16ab13772 SHA256 f856ef1329bc1ae5c40ef78bbc8798d1f0b0f6fbc71f2f52326954693e4d9e3e
+AUX libpcre-8.13.patch 339 RMD160 087e4540cf1ddc4cdcd7c91d10bdf2ab5f73a5e9 SHA1 561e5eb3f1015b2296ff86f8e04cc2bbc50cdc55 SHA256 cadb2f6099f7f23c1fd0c2a522de12ef2ad57e71effe209f951bc11ecb8f40e5
 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
 DIST poco-1.3.6-all-doc.zip 1911077 RMD160 471ad082126dbe0d40494a7b2bce1dbeaac83b78 SHA1 8356abfb11fc2694fa46d2c93e9b7dce75bd9371 SHA256 ccd0920cabfc61969f168b0fc63e3bd8a718f87b055f4da92c6b67539124208e
 DIST poco-1.3.6p2-all.tar.bz2 2321552 RMD160 effaff38aebca34af7dbbd3aae0798af95268790 SHA1 46c66620f7685e9ed9f7caffc8ff3a09454c06de SHA256 290c7f80827e509642f200b766e3709ef6ace0b6efadc832c9e879ac11830ae5
+DIST poco-1.4.3-all-doc.zip 2118165 RMD160 71982f0108134c8e1dccbd9f7130bc9742dd6e6e SHA1 8e8b20e429fab15f92a1bea527916777696d8541 SHA256 23d92cb042a603a9be5afc4225efe92063f4e295d2625c7d72bb3ed3ce392188
+DIST poco-1.4.3p1-all.tar.bz2 3005394 RMD160 3ec28ef3a78bb9850965eef29a81150b4ea7d4a3 SHA1 95fbf8f9cee1fd8ff05350d2925bbcb9fe089456 SHA256 8a3fd41234a8015e5c46470baa90140c7726cd7dc70d8300c655f08d71fdc35a
 EBUILD poco-1.3.3_p1.ebuild 3378 RMD160 e48e383c4ffb268338c88ea522d3343d214ff98a SHA1 a662d5faebf8283eb4388b381b26f24793968026 SHA256 20628a5cfc5462059a7bbed55fcc2ff3af1b2ffe129af499a762ca0c9cff91f8
 EBUILD poco-1.3.6_p2.ebuild 3424 RMD160 3426be712db86ead63814b45db581efaff1f7226 SHA1 e4b3eb28a0e1f8a3a0fb5b49877c6444e53f690a SHA256 c47c80eff6ea915b470d1b5084c089fc122b2798229bf01cd0816bc8473e9df4
-MISC ChangeLog 2192 RMD160 ccd015390e220f126dfbe8a6575604675edf96b7 SHA1 4ad093bb417c825f8648218db3efdca16b348588 SHA256 dbeea1d43ea5fbfdd07cedceabae092624a18112c0c1dce66648c62aae7c6216
+EBUILD poco-1.4.3_p1.ebuild 3454 RMD160 bd093289e4c33efa89493bbae06ef4ccf6d67d2d SHA1 5f50c208b9cc473fea4340c2ddf14f2496c47095 SHA256 5a147e7767e854ed0649553df2decdc0655e31f36d7855c9c40134a0ea5c44ad
+MISC ChangeLog 2396 RMD160 d64198b994202ec1be81391f35720535e9fcdb6e SHA1 bdcd03e2f960258bf13c381b6e19f01d213756d0 SHA256 11d3cdbec89cc48abde7588dba746c03b4e537a545c6804d808ad04543dcd696
 MISC metadata.xml 1119 RMD160 170170cee55fdee58830a0fc63235d405f4b2fa0 SHA1 f3e8757113d7e4364420c2be283f5980af24a085 SHA256 17ede60dfd2ca4f9343e7d80a9313220caf929ca6eb1d2266d0e8d8b15510f5b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iJwEAQECAAYFAk+G3hgACgkQG7kqcTWJkGfffQQAp/N4yDvGEu5sdAqYNqKS1yHF
+mypAyVKLzXqTVWZLHKOngFYdLUzhuNu5gEX2WIh0Tp3Q7oZO7jobzZajiMUpW5bC
+MS4QUEsrW8rB+uqK/A850KEp5+m1gJOzRZl4glmqm0VXk3liChUBufW5NjYaIcl1
+NkBsUY1mknWlBg/PhWs=
+=6b3B
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/poco/files/1.4.3_p1-gentoo.patch b/dev-libs/poco/files/1.4.3_p1-gentoo.patch
new file mode 100644
index 000000000000..727015ad5335
--- /dev/null
+++ b/dev-libs/poco/files/1.4.3_p1-gentoo.patch
@@ -0,0 +1,85 @@
+diff -ur poco-1.3.6p2-all.orig//components poco-1.3.6p2-all/components
+--- poco-1.3.6p2-all.orig//components	2010-07-19 13:52:31.936802078 +0200
++++ poco-1.3.6p2-all/components	2010-07-19 13:59:37.351927395 +0200
+@@ -1,13 +1,7 @@
+-CppUnit
+ Foundation
+ XML
+ Util
+ Net
+-Crypto
+-NetSSL_OpenSSL
+ Data
+-Data/SQLite
+-Data/ODBC
+-Data/MySQL
+ Zip
+ PageCompiler
+diff -ur poco-1.3.6p2-all.orig//Data/ODBC/Makefile poco-1.3.6p2-all/Data/ODBC/Makefile
+--- poco-1.3.6p2-all.orig//Data/ODBC/Makefile	2010-07-19 13:52:31.932802424 +0200
++++ poco-1.3.6p2-all/Data/ODBC/Makefile	2010-07-19 13:55:24.976677962 +0200
+@@ -9,10 +9,10 @@
+ include $(POCO_BASE)/build/rules/global
+ 
+ # adjust for the target system (usually '/usr/lib' or '/usr/local/lib')
+-ODBCLIBDIR = /usr/lib
++ODBCLIBDIR = /usr/$(LIBDIR)
+ 
+ INCLUDE += -I/usr/local/include -I/usr/include -I/usr/include/odbc -I/usr/local/include/odbc
+-SYSLIBS += -L/usr/local/lib/odbc -L/usr/lib/odbc -L/usr/lib -L/usr/local/lib
++SYSLIBS += -L/usr/local/$(LIBDIR)/odbc -L/usr/$(LIBDIR)/odbc -L/usr/$(LIBDIR) -L/usr/local/$(LIBDIR)
+ 
+ ifeq ($(POCO_CONFIG),MinGW)
+ # Lack of unixODBC or iODBC is not an error for MinGW platform since it uses Windows odbc32.lib
+@@ -24,19 +24,19 @@
+ # CYGWIN platform has its own ODBC library in /lib/w32api 
+ SYSLIBS += -L/lib/w32api -lodbc32 -lodbccp32
+ else
+-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (unixodbc, $(GENTOO_ODBC))
+ SYSLIBS += -lodbc -lodbcinst
+ COMMONFLAGS += -DPOCO_UNIXODBC
+ else
+-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (unixodbc, $(GENTOO_ODBC))
+ SYSLIBS += -lodbc -lodbcinst
+ COMMONFLAGS += -DPOCO_UNIXODBC
+ else
+-ifeq (0, $(shell test -e $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (iodbc, $(GENTOO_ODBC))
+ SYSLIBS += -liodbc -liodbcinst
+ COMMONFLAGS += -DPOCO_IODBC
+ else
+-ifeq (0, $(shell test -h $(ODBCLIBDIR)/libiodbc$(SHAREDLIBLINKEXT); echo $$?))
++ifeq (iodbc, $(GENTOO_ODBC))
+ SYSLIBS += -liodbc -liodbcinst
+ COMMONFLAGS += -DPOCO_IODBC
+ else
+diff -ur poco-1.3.6p2-all.orig//Makefile poco-1.3.6p2-all/Makefile
+--- poco-1.3.6p2-all.orig//Makefile	2010-07-19 13:52:31.908802377 +0200
++++ poco-1.3.6p2-all/Makefile	2010-07-19 14:00:03.814676950 +0200
+@@ -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 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/libpcre-8.13.patch b/dev-libs/poco/files/libpcre-8.13.patch
new file mode 100644
index 000000000000..e46dd5b16be4
--- /dev/null
+++ b/dev-libs/poco/files/libpcre-8.13.patch
@@ -0,0 +1,10 @@
+--- Foundation/Makefile	2012-01-23 15:12:27.000000000 +0100
++++ Foundation/Makefile.new	2012-04-11 14:58:14.000000000 +0200
+@@ -43,7 +43,6 @@
+ pcre_utf8_objects = pcre_ucd pcre_tables
+ 
+ ifdef POCO_UNBUNDLED
+-	objects += $(pcre_utf8_objects) 
+ 	SYSLIBS += -lpcre -lz
+ else
+ 	objects += $(zlib_objects) $(pcre_objects) $(pcre_utf8_objects)
diff --git a/dev-libs/poco/poco-1.4.3_p1.ebuild b/dev-libs/poco/poco-1.4.3_p1.ebuild
new file mode 100644
index 000000000000..d3ffc88083a8
--- /dev/null
+++ b/dev-libs/poco/poco-1.4.3_p1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/poco/poco-1.4.3_p1.ebuild,v 1.1 2012/04/12 13:53:00 tommy Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic versionator
+
+MY_P="${P/_}"
+MY_DOCP="${PN}-$(get_version_component_range 1-3)-all-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/${MY_P}-all.tar.bz2
+	doc? ( mirror://sourceforge/poco/${MY_DOCP}.zip )"
+LICENSE="Boost-1.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples iodbc mysql odbc sqlite ssl test"
+
+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}"
+
+S="${WORKDIR}/${MY_P}-all"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PV}-gentoo.patch \
+		"${FILESDIR}"/libpcre-8.13.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
+}