revision bump (direct stable), to fix ABI breakage reported in bug 209697 by jakub

Package-Manager: portage-2.1.3.19
RepoMan-Options: --force

4 files changed, 35 insertions, 8 deletions

diff --git a/dev-libs/libpcre/ChangeLog b/dev-libs/libpcre/ChangeLog
index 4cb3a366cd2a..48f2e5e1989e 100644
--- a/dev-libs/libpcre/ChangeLog
+++ b/dev-libs/libpcre/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libpcre
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.135 2008/02/10 21:54:48 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/ChangeLog,v 1.136 2008/02/13 08:12:01 opfer Exp $
+
+*libpcre-7.6-r1 (13 Feb 2008)
+
+  13 Feb 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/libpcre-7.6-ABI_correction.patch, -libpcre-7.6.ebuild,
+  +libpcre-7.6-r1.ebuild:
+  revision bump (direct stable), to fix ABI breakage reported in bug 209697 by
+  jakub
 
   10 Feb 2008; Olivier Crête <tester@gentoo.org> libpcre-7.6.ebuild:
   Stable on amd64, security bug #209067
diff --git a/dev-libs/libpcre/Manifest b/dev-libs/libpcre/Manifest
index d05e821d0bc8..ac89a3ec587d 100644
--- a/dev-libs/libpcre/Manifest
+++ b/dev-libs/libpcre/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libpcre-7.6-ABI_correction.patch 701 RMD160 48c03a1c481ac8f2234cd30abd6148efe7beebe8 SHA1 10fe3f6874f94227bbfee451a945642f60e115e5 SHA256 93ce2941cc8ebce1dd552620a14321e4ba20a4e9b99656a76db2cef1f31b6892
 DIST pcre-7.4.tar.bz2 783044 RMD160 42bc33e5592c23c7eb337f8fcfab77fb290aed61 SHA1 2092ff639da7694b47056f3f9abed285d4a840b3 SHA256 a5fb383fcc6d35e694950d203f9d7ef525165854dd4ac2c269e20e57a0d0b3e5
 DIST pcre-7.6.tar.bz2 802829 RMD160 d62ebef7828bbf135a80e55a5d69d12f02953506 SHA1 e1ed4d3c90d0657bb1967123e90a525744fd12f9 SHA256 362e4b4473f2f7a3bfa28ea73e80ec00a2fe525a1aceb5f66e1c528a900bd735
 EBUILD libpcre-7.4-r1.ebuild 1287 RMD160 fc6f34a4f242d67bf8594c199c03c02990219b06 SHA1 b1044334ea4bdada723411f64f6154c4f25fa36c SHA256 492451e8f0dabbbe7a68f6c9166d85e483fd5702d0bbf4d50cb4e68c6fcdb24b
 EBUILD libpcre-7.4.ebuild 1154 RMD160 a1a5aa464f280ab3ed1fb16ff020e3ff321b2fa6 SHA1 f8aa2be344aa1645743ed6e4d94f4c4dfdf1e409 SHA256 3b661cd4d5facfb765e1529e01cfa248f3f8b0e63dfb1c0dfcf0b7a147d06997
-EBUILD libpcre-7.6.ebuild 1336 RMD160 f664508255a4514276f4f30d547ed77e0252e9b8 SHA1 b72e557058d83ff6b8ae1b913994ce0e98101f95 SHA256 2e756d0de384eebf7aba1620d84bb25f4ef15c964bcd2bf52b01e3c157538c09
-MISC ChangeLog 16798 RMD160 f1439064eb0a4c57f807b89e8b3a9a18558d5a84 SHA1 c370fc092b57d38ddddee397553ace3aff7c3b85 SHA256 286fc5a595e634ed6daae4d959325bcc1ec979378a680532269ee1360be33962
+EBUILD libpcre-7.6-r1.ebuild 1386 RMD160 e5f3ec88ff89ce21ff1471712c8ce18ab906139e SHA1 c6570171a8709b36b223bfe968fb7cd3cef94f80 SHA256 411a99a966cc593306a74acd5f91edc8e0939ba3e0f4310601e25364ae8d525b
+MISC ChangeLog 17061 RMD160 d03954b1396c16c90a88ccc0231ee942521cdbff SHA1 c903c8c4f8e08202cc8c02fe3f16521f73ce4b78 SHA256 6b5452f5bd5a76f2e6a17f70388d5c6cad5a0c9d0f519125b5cac4635c6c046d
 MISC metadata.xml 160 RMD160 d86217bb48cf4283e08e43bcaabbc919101ad795 SHA1 d6147d00f16e8cfeef893d0764b0675a93d62849 SHA256 56fca1e06f6dcbe3bc12e7d3962998c7cb79d74f218ce8a17b07771b3e06f49e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHr3KtmOfEJZHYOKcRAgZJAJ94xGELnYAqZTGzfUFSCl+M0zxmcgCgsM1O
-/LbQfsL9Qhrrzi86l628ugY=
-=r2u6
+iD8DBQFHsqapNQqtfCuFneMRAiVAAJ4k8Pg/dT4AzJY05AiMG4TwpHTpwwCgmI3K
+YK508sSNbMh4BKjzKXs2qJA=
+=s5Bg
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch b/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch
new file mode 100644
index 000000000000..99da95c7458a
--- /dev/null
+++ b/dev-libs/libpcre/files/libpcre-7.6-ABI_correction.patch
@@ -0,0 +1,17 @@
+--- pcrecpp.cc.orig	2008-02-13 09:04:56.000000000 +0100
++++ pcrecpp.cc	2008-02-13 09:05:28.000000000 +0100
+@@ -57,6 +57,14 @@
+ // Special object that stands-in for no argument
+ Arg RE::no_arg((void*)NULL);
+ 
++// This is for ABI compatibility with old versions of pcre (pre-7.6),
++// which defined a global no_arg variable instead of putting it in the
++// RE class.  This works on GCC >= 3, at least.  We could probably have
++// a more inclusive test if we ever needed it.
++#if defined(__GNUC__) && __GNUC__ >= 3
++  extern Arg no_arg __attribute__((alias("_ZN7pcrecpp2RE6no_argE")));
++#endif
++
+ // If a regular expression has no error, its error_ field points here
+ static const string empty_string;
+ 
diff --git a/dev-libs/libpcre/libpcre-7.6.ebuild b/dev-libs/libpcre/libpcre-7.6-r1.ebuild
index e59ece15df95..737d83aa62a5 100644
--- a/dev-libs/libpcre/libpcre-7.6.ebuild
+++ b/dev-libs/libpcre/libpcre-7.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.6.ebuild,v 1.8 2008/02/10 21:54:48 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libpcre/libpcre-7.6-r1.ebuild,v 1.1 2008/02/13 08:12:01 opfer Exp $
 
 EAPI=1
 
@@ -25,6 +25,7 @@ S=${WORKDIR}/${MY_P}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
+	epatch "${FILESDIR}"/${P}-ABI_correction.patch
 	elibtoolize
 }