Add -pthread to static pkg-config entries when appropriate #454478 by Till Heikamp.

Package-Manager: portage-2.2.0_alpha170/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

4 files changed, 106 insertions, 7 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index d40b16f0ef63..bc0ea6a05049 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.209 2013/02/21 05:15:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.210 2013/04/28 02:22:45 vapier Exp $
+
+*libpcre-8.32-r1 (28 Apr 2013)
+
+  28 Apr 2013; Mike Frysinger <vapier@gentoo.org> +libpcre-8.32-r1.ebuild,
+  libpcre-8.32.ebuild:
+  Add -pthread to static pkg-config entries when appropriate #454478 by Till
+  Heikamp.
 
   21 Feb 2013; Zac Medico <zmedico@gentoo.org> libpcre-8.32.ebuild:
   Add ~arm-linux keyword.
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index f960d50f5cc2..8e898350f8ce 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -24,13 +24,24 @@ EBUILD libpcre-8.20.ebuild 2097 SHA256 a41431c1092a99a2873657c1ca65144ed79d9e713
 EBUILD libpcre-8.21.ebuild 2279 SHA256 262bc5d1198bb2f7a5bdf64a9986a6c467c0529a7fb45bb081c4d8a49d80cc22 SHA512 89ef15f2a25853bf0ea6157b4d32d96b6063659cca66d7d5e01b647913e4d8d7115503c0aff6bf06a0bfbb5ff81e7732d5568ee5f3427da11eb2307b710e81aa WHIRLPOOL 54aeef652e6fe45526b12f4877d2e0f8a8f513dc1afcb1e335e466198eb32615345705d5ca166c0a77c1d6ffd5b87f4755d056717e4a39cd689aa40a69e6b4b6
 EBUILD libpcre-8.30-r2.ebuild 2345 SHA256 3697c4064533fe7f287c2c7350c1215d2ea2dce6f891e5f1b492ecbd68263d4b SHA512 466b070090c60c124347d4791c44209b6ced0e19785923899a3f0191d86a7abb12f4ac53e8310886adf0c7c33c59052123cbf379aed790ac131247fd5bc1442c WHIRLPOOL 406d202b6638bc999792cb7a1a41dcd2abda2cb6bacc85f72161b037fcca92693d5dd25f21687eb1b5764852aa38d944bc4b079169da1ed3e0abef5989b49038
 EBUILD libpcre-8.31.ebuild 2476 SHA256 e1fd01e9d5c13bcfd6c5f9d619c3e64859cda7851fcb4ac900a4c72e05d20a7c SHA512 227838120b616874a7dfb805c0c66822a5eb366008c9c61b6acf89ad61e457289e63b8a7f1db2ee707452d3a04495c35c3c26ba2100b60185298135eb3e64e11 WHIRLPOOL d78a22c79eb4df3ad15f3ed0b448f1ee4cebab858aa1794d4f2e0c4682a4a996f112d83760c9d9c4673380e10f06261061862e8b5ba9458f0e899101044a8373
-EBUILD libpcre-8.32.ebuild 2429 SHA256 7c7692725137d204046b40deb520acb56fd085777a78125b007eff6500a75532 SHA512 abc134e45316938d84be761b3453d1bb7e4a311b6d2b456e5a9beae41d44a2657705d5ab4924854cad21da48e87f3ed6394dcb6c23e7f499b35e0d7a599cbae1 WHIRLPOOL a6dbdc430243fb36f1917f44343023241c8c57e5c28d7880472031e4e3290ad431d3da0720e836ecfb1ebaff8aba58e74ba7481a4ef69cd8a419bdd76200dbda
-MISC ChangeLog 28212 SHA256 164b1e4294a67fa668535c38e4005f8d6b83b487545e58214bebdf67a4e1c440 SHA512 a75f44e71e67149336f130f9224bdf655aaccc73e65d0f6fdda325c3bfb657eb10296ee362646a9fddb0a8452e41856ec48606f788faa38a804a4546535b3357 WHIRLPOOL 8ace0827f0a1ac2220ef249c15b4bdbfd463f4b93412c40e8ea75b83d85639fd1da80f119c15a606e17e13e411e65d8577095247f0dde0e4ddb87a6d0fafbe79
+EBUILD libpcre-8.32-r1.ebuild 2528 SHA256 de749b66123bc6d95fd777056246e53276de070041a5b80fe449ec5cf4beb68e SHA512 638b38801fc718c260a7a71098f6eeae5f6cd0de8d1b1a6868e4bc4d33b8a7a7d4c23808c5e4cf459a719578a708154a568c7f5a73be8f50c1d1a9292613e6a2 WHIRLPOOL bee6cc716be6d70537b843db7a44d4a90ee727735486f17409f05e3a257233ff1c7f39f27c7acc2c4a4ad61e40a9997171347344971e718c78e20dc4d97d875a
+EBUILD libpcre-8.32.ebuild 2525 SHA256 df939966377ae4b75df4fbbb2aa10417b1aac6d166530fc7b119abb626abda07 SHA512 030c3904eaf1c1275a3f2b3b28d3897a7462fcd4ff252f49f3ad0362d9db413679487aefa1d7a954d6f70aa6da073097939a7cedf31cc69c0da349dff67012ba WHIRLPOOL 8a6eed071401a8054417d0f4a050bea92dedd6873fec8df20482a9addfd4d9549f05ac0aae2c8306b1d53843cfefb40244338aa4700ccc1b122d6f4c1c999b2e
+MISC ChangeLog 28430 SHA256 d16612b4b7ae79fc661b386d9c81fac9ca3d129d794a4d2c5baca65c73d8c44c SHA512 f6043b6a3114d39c9f6c79be7323dc34d3f8b23fc77442ed9d74e93ecc1f9c07c280673fd2a891662e8705e1b9eaea598c5747ec71382b925fced24336746e65 WHIRLPOOL c6c298a4952121c309c16e14686235176d69637f549241af3a57c34d267eba419cd7cf34dfc8bb421890a1990dd03e4397f05a167225720bbf2d17d20617be3b
 MISC metadata.xml 873 SHA256 23f40a4e5c46ece49e04940cb994be87112b0060a864b0e844b5b9faf2871459 SHA512 b4f9ab3b318f1e78e72613c097007108eac2c81c94908a18707363f032ef8185f73d1e5bb209299f42b87459a76c61d87404df43df0bb46c67d22ba6139c7364 WHIRLPOOL 8e15c996a1288697fd4b406fedcbd2f2d1e570b6f977b4dc4bc690a3e299e4a854aa1396685d2855551da128354994f303ddc04de362fbe2f25e2802fa4dc8a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlElrY0ACgkQ/ejvha5XGaNeXACcC8JUsB8H2IcetygOibR74Sl1
-bk0An22aua6th6kxzNfcYAaSCdcUx5L6
-=Fx7k
+iQIcBAEBCAAGBQJRfIf8AAoJELEHsLL7fEFWwxcP/i5sgnL9yjWL66LSWDFbZwG8
+3hXyOm/Ct44gFlGtIn7KjLE4zoC3umZuWFs2RF69xRH37bfro/QuWcNFd0hhRL4I
+WH/sSb76/E0JfTKW9KUmjjguH61HM5vWGa4sb/2MSO+xZdAvLywMhqQ9PeTR3e4v
+HAFPdyGsBrzdsazDO1s9KboROHCjiA5sEG3sV2gpTPvzKanqfNtJT1p/cgDQpYkK
+6Fec93b+bBanmVpLdQx9i1uQ5oKWFsu//vEgdR9Im1t/2i6YuWkWU1DpSDX92ky0
+NqlwJwOQ8mELMN6YCGQsWTN9Kb6Cq49oIAMgfSpA8dnupU+/ZXCF/gYBMVmGlef+
+N0MPBVH0M9BkSfQaXq2ZMeKkr8w23s4qBBSc7aLS3IJnS1cw8MfpFLdvHpqlzE8I
+xBmx+twxRRdy03cd5i3ye+AMjP53Gx/4BdwwT45yFegpHc4KPHgFmt1kK0WwmVSV
+Nw7tiggjjb+prk8/SR736NCNx2PGXfLslUMCBSaZiTLNPfrj9pDYTW9GdISStjH6
+RqiCBFTSo57jFFNckm7H+c2dFmfjX9QEJwoHacse6vqOt7izy1T81+aPzEaplOZ+
+MNW1ZczwLts5lhMuYkKZNkCWGnQ02Jcl4azCz95STSCH+MkKyif8/hduGtWCaFfD
+Cfhjxnpli3gzFkwLak2y
+=zvcw
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/libpcre-8.32-r1.ebuild b/dev-libs/libpcre/libpcre-8.32-r1.ebuild
new file mode 100644
index 000000000000..35100fdf9567
--- /dev/null
+++ b/dev-libs/libpcre/libpcre-8.32-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.32-r1.ebuild,v 1.1 2013/04/28 02:22:44 vapier Exp $
+
+EAPI="4"
+
+inherit eutils multilib libtool flag-o-matic toolchain-funcs
+
+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 ~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 +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 )"
+
+S=${WORKDIR}/${MY_P}
+
+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
+	elibtoolize
+}
+
+src_configure() {
+	[[ ${CHOST} == *-mint* ]] && append-cppflags -D_GNU_SOURCE
+	econf \
+		--with-match-limit-recursion=$(usex recursion-limit 8192 MATCH_LIMIT) \
+		$(use_enable bzip2 pcregrep-libbz2) \
+		$(use_enable cxx cpp) \
+		$(use_enable jit) $(use_enable jit pcregrep-jit) \
+		$(use_enable pcre16) \
+		$(use_enable libedit pcretest-libedit) \
+		$(use_enable readline pcretest-libreadline) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode utf) $(use_enable unicode unicode-properties) \
+		$(use_enable zlib pcregrep-libz) \
+		--enable-pcre8 \
+		--enable-shared \
+		--htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	gen_usr_ldscript -a pcre
+	prune_libtool_files
+}
+
+pkg_preinst() {
+	preserve_old_lib /$(get_libdir)/libpcre.so.0
+}
+
+pkg_postinst() {
+	preserve_old_lib_notify /$(get_libdir)/libpcre.so.0
+}
diff --git a/dev-libs/libpcre/libpcre-8.32.ebuild b/dev-libs/libpcre/libpcre-8.32.ebuild
index a04228f1edf6..90b8a85f7bdf 100644
--- a/dev-libs/libpcre/libpcre-8.32.ebuild
+++ b/dev-libs/libpcre/libpcre-8.32.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.32.ebuild,v 1.2 2013/02/21 05:15:55 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-8.32.ebuild,v 1.3 2013/04/28 02:22:45 vapier Exp $
 
 EAPI="4"
 
@@ -35,6 +35,10 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${MY_P}
 
 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
 	elibtoolize
 }