Fixed for pcre-8.30, thanks Rainer 'Siju' Sigl for his initial work

Package-Manager: portage-2.1.10.41/cvs/Linux x86_64

4 files changed, 47 insertions, 8 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 697676736a50..26bb4c17c11c 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.193 2012/02/06 21:19:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.194 2012/02/09 17:35:24 bicatali Exp $
+
+  09 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.14.1.ebuild,
+  +files/R-2.14.1-pcre830.patch:
+  Fixed for pcre-8.30, thanks Rainer 'Siju' Sigl for his initial work
 
   06 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.14.1.ebuild,
   files/R-2.14.1-tiff.patch:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index d804cd4d1a36..3765e96341e1 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -4,19 +4,20 @@ Hash: SHA1
 AUX R-2.11.1-parallel.patch 633 RMD160 e2ba77a67870123faac6c62e454492d4ee70ad92 SHA1 6fec3a4dce03a64daf4f59ca1bbfe828adc83ae2 SHA256 4ad6f007ffb390584de0c8a5935e98f98106f32394aac45c30c3fdfe77c00c70
 AUX R-2.12.1-ldflags.patch 639 RMD160 ce9052b344ca706608495c54e5d338b627060b83 SHA1 cada00c963e75458c9d145b07a3378a20e221f82 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933
 AUX R-2.13.1-zlib_header_fix.patch 464 RMD160 908fd31070ac6e3311ad4105763a7b89f5d1d446 SHA1 a261faef7bd39de543952d0d9676319bf310a0b5 SHA256 161f0fff63db5cb2cb4894321759997e75463d784d5a7ba5105f74fe2ed73c40
+AUX R-2.14.1-pcre830.patch 949 RMD160 45dfda7325392d88c7b3b382db3cd29a188c3d7c SHA1 1a7fbcd00f145f22659cda568ff42bbd0d4b1187 SHA256 720ed76bdbb47169fd354d861b86b8443c3e6f923a5b220b47d46634b9c45bb2
 AUX R-2.14.1-rmath-shared.patch 986 RMD160 ec0adb2b8c8d8932eedebda776cf204e3c7ea01e SHA1 a837510d2f154cf33ba1f70272a0bb10266c9b3f SHA256 c05463dbf9ec5bba34cc987df4f6878154a738e57aaeaac46cc4f728c0c837a7
 AUX R-2.14.1-tiff.patch 1711 RMD160 cb6b5b2c160011c7dfebabc0f4bcae5a5ab03a90 SHA1 0b2b5cbd3cfef9eee1968ff7dab2c8fca051e9d4 SHA256 ff77e062a80eeb403dc98ffb0b6fedce28859f18082981891ae6e2a95cf61142
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
 DIST R-2.14.1.tar.gz 23697861 RMD160 9dcd1d135701e3c682585346e7c48ac2c62012fd SHA1 5803a213480a749e36bccc155aecb13070ade096 SHA256 d8a18914005975f40ed8fb37e3532422f769fb454651a9ed75f73c2bee9c0c4c
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
 EBUILD R-2.10.1.ebuild 4514 RMD160 7f170bfc025de21298d01f6b44ac3714605146fd SHA1 2a4d80e1e2ab22e2b3bfa2e910770185b81ee584 SHA256 86e6ab59bf58155d0dc313ecc3a07281b471074b3a178058c96fa8e4e3e3dea8
-EBUILD R-2.14.1.ebuild 4220 RMD160 891dd4f0a9ef84e2a454a50c7e00252d7751ef20 SHA1 a47c67bd81dfc30d3f3729dd2b677526061b6d19 SHA256 16439dd556494da6b11461e19908eacb1e8877eef110fe7572534561881aaddb
-MISC ChangeLog 29053 RMD160 46338e3f70597aed26b66d7f7e45bcceb58cc35a SHA1 7003be58fd14b1ad4f99b1bbf91f943b257ad390 SHA256 7cfad6d1ea978926eed3e5c0f388b68127492cf50935d90bf907ef0d7ce5e909
+EBUILD R-2.14.1.ebuild 4265 RMD160 bdaead15c1b3895a491632ce61586db12831e332 SHA1 cdcc86fc1b333c95b79a63ccfa3da6bde2b4a294 SHA256 4bd99cdec6c3cde1745d0f5e02d38a70807d2136c5922a2ae6845fc7e3e84f3c
+MISC ChangeLog 29229 RMD160 8b00924d48b96a19458025f9fc605e77019330f0 SHA1 de94e9d9a52a093bc798f86b5833302835633863 SHA256 900b7b680a11906ee9a2186b31479214c3ded2aeca87710c8c4de59ebed5d24b
 MISC metadata.xml 1033 RMD160 d200586401de4f212758a5632040059b86cebe79 SHA1 7e6e9da0f5fe1f39a440ecdb298775685f14bb31 SHA256 c0e2a21f7e4e5eeadfd2502b7d035633b81a8f0228e4986758fb0f45990ec016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk8wRAYACgkQ1ycZbhPLE2B1aACfUs5T9h7fIxNaAtNTXvP09hzu
-9mUAni4lsZsNMRid4RmwxNR0jzFm3cm9
-=vUDb
+iEYEARECAAYFAk80BCAACgkQ1ycZbhPLE2AZQgCdFia90yGWYPWgVLIU8iU+kWqC
+ToAAni6Xsdhe6yyO9kM/Oqb9i0b/7Vs6
+=3QSo
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.14.1.ebuild b/dev-lang/R/R-2.14.1.ebuild
index e5b1b68c7941..1c03e404734f 100644
--- a/dev-lang/R/R-2.14.1.ebuild
+++ b/dev-lang/R/R-2.14.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.2 2012/02/06 21:19:57 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.14.1.ebuild,v 1.3 2012/02/09 17:35:24 bicatali Exp $
 
 EAPI=4
 
@@ -64,7 +64,8 @@ src_prepare() {
 		"${FILESDIR}"/${PN}-2.12.1-ldflags.patch \
 		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
 		"${FILESDIR}"/${PN}-2.14.1-tiff.patch \
-		"${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch
+		"${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch \
+		"${FILESDIR}"/${PN}-2.14.1-pcre830.patch
 
 	# fix packages.html for doc (bug #205103)
 	sed -i \
diff --git a/dev-lang/R/files/R-2.14.1-pcre830.patch b/dev-lang/R/files/R-2.14.1-pcre830.patch
new file mode 100644
index 000000000000..54036d6e01c7
--- /dev/null
+++ b/dev-lang/R/files/R-2.14.1-pcre830.patch
@@ -0,0 +1,33 @@
+Fix for pcre-8.30 and above
+
+--- src/main/util.c.orig	2012-02-09 17:15:08.000000000 +0000
++++ src/main/util.c	2012-02-09 17:20:31.000000000 +0000
+@@ -1257,8 +1257,18 @@
+ }
+ 
+ #include "pcre.h"
++
++/* This changed at 8.30 */
++#if  PCRE_MAJOR > 8 || PCRE_MINOR >= 30
++extern int _pcre_valid_utf(const char *string, int length, int *erroroffset);
++
++Rboolean utf8Valid(const char *str)
++{
++    int errp;
++    return  (_pcre_valid_utf(str, (int) strlen(str), &errp) == 0);
++}
+ /* This changed at 8.13: we don't allow < 8.0 */
+-#if  PCRE_MAJOR > 8 || PCRE_MINOR >= 13
++#elif  PCRE_MAJOR > 8 || PCRE_MINOR >= 13
+ extern int _pcre_valid_utf8(const char *string, int length, int *erroroffset);
+ 
+ Rboolean utf8Valid(const char *str)
+@@ -1266,7 +1276,7 @@
+     int errp;
+     return  (_pcre_valid_utf8(str, (int) strlen(str), &errp) == 0);
+ }
+-#else
++#else 
+ extern int _pcre_valid_utf8(const char *string, int length);
+ 
+ Rboolean utf8Valid(const char *str)