Add fix from upstream for exported symbols in C++ lib.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)

3 files changed, 116 insertions, 1 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index dcd474b4ddd0..12d0cc113e37 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.242 2014/08/23 15:28:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.243 2014/09/04 06:49:22 vapier Exp $
+
+*libpcre-8.35-r1 (04 Sep 2014)
+
+  04 Sep 2014; Mike Frysinger <vapier@gentoo.org>
+  +files/libpcre-8.35-export-output.patch, +libpcre-8.35-r1.ebuild:
+  Add fix from upstream for exported symbols in C++ lib.
 
   23 Aug 2014; Agostino Sarubbo <ago@gentoo.org> libpcre-8.35.ebuild:
   Stable for ia64, wrt bug #512012
diff --git a/dev-libs/libpcre/files/libpcre-8.35-export-output.patch b/dev-libs/libpcre/files/libpcre-8.35-export-output.patch
new file mode 100644
index 000000000000..ba4288f6a807
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-8.35-export-output.patch
@@ -0,0 +1,12 @@
+fix from upstream to restore missing symbol
+
+--- pcre_stringpiece.h.in	(revision 1499)
++++ pcre_stringpiece.h.in	(revision 1500)
+@@ -174,6 +174,6 @@ template<> struct __type_traits<pcrecpp:
+ #endif
+ 
+ // allow StringPiece to be logged
+-std::ostream& operator<<(std::ostream& o, const pcrecpp::StringPiece& piece);
++PCRECPP_EXP_DECL std::ostream& operator<<(std::ostream& o, const pcrecpp::StringPiece& piece);
+ 
+ #endif /* _PCRE_STRINGPIECE_H */
diff --git a/dev-libs/libpcre/libpcre-8.35-r1.ebuild b/dev-libs/libpcre/libpcre-8.35-r1.ebuild
new file mode 100644
index 000000000000..83d692c4c235
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.35-r1.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.35-r1.ebuild,v 1.1 2014/09/04 06:49:22 vapier Exp $
+
+EAPI="4"
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="Perl-compatible regular expression library"
+HOMEPAGE="http://www.pcre.org/"
+MY_P="pcre-${PV/_rc/-RC}"
+if [[ ${PV} != *_rc* ]] ; then
+	# Only the final releases are available here.
+	SRC_URI="mirror://sourceforge/pcre/${MY_P}.tar.bz2
+		ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${MY_P}.tar.bz2"
+else
+	SRC_URI="ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/Testing/${MY_P}.tar.bz2"
+fi
+
+LICENSE="BSD"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 +cxx +jit libedit pcre16 pcre32 +readline +recursion-limit static-libs unicode zlib"
+REQUIRED_USE="readline? ( !libedit )
+	libedit? ( !readline )"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	zlib? ( sys-libs/zlib )
+	libedit? ( dev-libs/libedit )
+	readline? ( sys-libs/readline )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
+RDEPEND="${RDEPEND}
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r2
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+	)"
+
+S=${WORKDIR}/${MY_P}
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/pcre-config
+)
+
+src_prepare() {
+	local pc
+	for pc in *.pc.in ; do
+		echo "Libs.private: @PTHREAD_CFLAGS@" >> ${pc} #454478
+	done
+	sed -i -e "s:-lpcre ::" libpcrecpp.pc.in || die
+	epatch "${FILESDIR}"/${P}-export-output.patch
+	elibtoolize
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(multilib_native_use_enable bzip2 pcregrep-libbz2) \
+		$(use_enable cxx cpp) \
+		$(use_enable jit) $(use_enable jit pcregrep-jit) \
+		$(use_enable pcre16) \
+		$(use_enable pcre32) \
+		$(multilib_native_use_enable libedit pcretest-libedit) \
+		$(multilib_native_use_enable readline pcretest-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
+		$(multilib_native_use_enable zlib pcregrep-libz) \
+		--enable-pcre8 \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+multilib_src_compile() {
+	emake V=1 $(multilib_is_native_abi || echo "bin_PROGRAMS=")
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		$(multilib_is_native_abi || echo "bin_PROGRAMS= dist_html_DATA=") \
+		install
+	multilib_is_native_abi && gen_usr_ldscript -a pcre
+}
+
+multilib_src_install_all() {
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}