Added patches for 2.0 and 2.1.1 to use boost::regex_error if >=boost-1.33.0 is installed.

(Portage version: 2.0.51.22-r2)

6 files changed, 190 insertions, 19 deletions

diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog
index 6e550081ace1..e1023b85533b 100644
--- a/dev-util/source-highlight/ChangeLog
+++ b/dev-util/source-highlight/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-util/source-highlight
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.16 2005/08/06 04:05:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.17 2005/08/18 18:36:37 ka0ttic Exp $
+
+  18 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
+  +files/source-highlight-2.0-boost_regex_error.diff,
+  +files/source-highlight-2.1.1-boost_regex_error.diff,
+  source-highlight-2.0.ebuild, source-highlight-2.1.1.ebuild:
+  Added patches for 2.0 and 2.1.1 to use boost::regex_error if >=boost-1.33.0
+  is installed.
 
 *source-highlight-2.1.1 (05 Aug 2005)
 
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 46760ed90f5c..56d5598863e5 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4d357167d687bacbe1baa2825fbc6d34 ChangeLog 3211
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
+MD5 3ff02b7977cca1d12d1947ba4bbec119 source-highlight-2.0.ebuild 1306
 MD5 a14c15abad083ecd2d10a02282b53e71 source-highlight-1.11-r2.ebuild 1015
-MD5 736e63a1b8e538eb2f125ed88a4e608f source-highlight-2.0.ebuild 1173
-MD5 161a783395fb2da23a584e48b6a9dca7 source-highlight-2.1.1.ebuild 1104
+MD5 148cabe13e7b9b293334735f1c131c1e source-highlight-2.1.1.ebuild 1237
+MD5 7e86a9e9a94682835919a54d22fac965 ChangeLog 3527
+MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
 MD5 ec136e3bf2efb4bdb6934e287a23cd6a files/digest-source-highlight-1.11-r2 73
-MD5 8983d7886a00affa478eb51c53f99f97 files/digest-source-highlight-2.0 72
-MD5 8010d26caf8fbdd5b9c6ab34da1e492b files/source-highlight.bash-completion 1383
+MD5 f68966cb769d770115b9255f45a5373f files/source-highlight-2.0-boost_regex_error.diff 3077
 MD5 cc08e1b9735c8388eae6fddf9904efd7 files/digest-source-highlight-2.1.1 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC9GXJEZCkKN40op4RAq5NAJsE3VEiyjjQeZ1APmJrZDqOAIA0dgCgtAWV
-+P4I5qtC/9XnswYONao/wdo=
-=SVf4
------END PGP SIGNATURE-----
+MD5 8010d26caf8fbdd5b9c6ab34da1e492b files/source-highlight.bash-completion 1383
+MD5 8983d7886a00affa478eb51c53f99f97 files/digest-source-highlight-2.0 72
+MD5 0199dcd1d7fe3a480c402cecc8b819ef files/source-highlight-2.1.1-boost_regex_error.diff 3145
diff --git a/dev-util/source-highlight/files/source-highlight-2.0-boost_regex_error.diff b/dev-util/source-highlight/files/source-highlight-2.0-boost_regex_error.diff
new file mode 100644
index 000000000000..759e7cb2d1b7
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-2.0-boost_regex_error.diff
@@ -0,0 +1,79 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.0.orig/src/lib/regexpstatebuilder.cpp source-highlight-2.0/src/lib/regexpstatebuilder.cpp
+--- source-highlight-2.0.orig/src/lib/regexpstatebuilder.cpp	2005-08-18 11:38:37.000000000 -0400
++++ source-highlight-2.0/src/lib/regexpstatebuilder.cpp	2005-08-18 11:49:38.000000000 -0400
+@@ -33,7 +33,7 @@
+ {
+   try {
+     state->add_exp(exp, f);
+-  } catch (boost::bad_expression &e) {
++  } catch (boost::regex_error &e) {
+     printError("wrong original expression: " + orig);
+     throw e;
+   }
+@@ -44,7 +44,7 @@
+   bool ok = true;
+   try {
+     state->freeze();
+-  } catch (boost::bad_expression &e) {
++  } catch (boost::regex_error &e) {
+     ok = false;
+   }
+ 
+@@ -91,13 +91,13 @@
+       build(*it, temp_state);
+       try {
+         temp_state->freeze();
+-      } catch (boost::bad_expression &e) {
++      } catch (boost::regex_error &e) {
+         printError("problem in this expression: " + (*it)->toString());
+         throw e;
+       }
+     }
+   } else
+-    throw boost::bad_expression("internal error");
++    throw boost::regex_error(boost::regex_constants::error_bad_pattern);
+ }
+ 
+ void
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.0.orig/src/lib/test_langdefparser_main.cpp source-highlight-2.0/src/lib/test_langdefparser_main.cpp
+--- source-highlight-2.0.orig/src/lib/test_langdefparser_main.cpp	2005-08-18 11:38:37.000000000 -0400
++++ source-highlight-2.0/src/lib/test_langdefparser_main.cpp	2005-08-18 11:47:56.000000000 -0400
+@@ -31,7 +31,7 @@
+       
+     try {
+       boost::regex ex(ex_string);
+-    } catch (boost::bad_expression &e) {
++    } catch (boost::regex_error &e) {
+       cerr << "bad expression: " << ex_string << endl;
+     }
+   }
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.0.orig/src/regexpstate.cpp source-highlight-2.0/src/regexpstate.cpp
+--- source-highlight-2.0.orig/src/regexpstate.cpp	2005-08-18 11:38:37.000000000 -0400
++++ source-highlight-2.0/src/regexpstate.cpp	2005-08-18 11:47:20.000000000 -0400
+@@ -52,12 +52,12 @@
+ }
+ 
+ void
+-RegExpState::freeze() throw(boost::bad_expression)
++RegExpState::freeze() throw(boost::regex_error)
+ {
+   const string &buffered = buffer.str();
+   try {
+     reg_exp.assign(buffered);
+-  } catch (boost::bad_expression &e) {
++  } catch (boost::regex_error &e) {
+     printError("bad expression: " + buffered);
+     throw e;
+   }
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.0.orig/src/regexpstate.h source-highlight-2.0/src/regexpstate.h
+--- source-highlight-2.0.orig/src/regexpstate.h	2005-08-18 11:38:37.000000000 -0400
++++ source-highlight-2.0/src/regexpstate.h	2005-08-18 11:47:42.000000000 -0400
+@@ -55,7 +55,7 @@
+ 
+   const std::string &get_elem(int index = -1);
+   void add_exp(const std::string &s, RegExpFormatterPtr f);
+-  void freeze() throw(boost::bad_expression);
++  void freeze() throw(boost::regex_error);
+   void add_normal_formatter(RegExpFormatterPtr f);
+   RegExpFormatterPtr getLastFormatter() const { return formatters[formatters.size()-1];}
+ };
diff --git a/dev-util/source-highlight/files/source-highlight-2.1.1-boost_regex_error.diff b/dev-util/source-highlight/files/source-highlight-2.1.1-boost_regex_error.diff
new file mode 100644
index 000000000000..231744713d52
--- /dev/null
+++ b/dev-util/source-highlight/files/source-highlight-2.1.1-boost_regex_error.diff
@@ -0,0 +1,79 @@
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.1.1.orig/src/lib/regexpstatebuilder.cpp source-highlight-2.1.1/src/lib/regexpstatebuilder.cpp
+--- source-highlight-2.1.1.orig/src/lib/regexpstatebuilder.cpp	2005-08-18 11:53:18.000000000 -0400
++++ source-highlight-2.1.1/src/lib/regexpstatebuilder.cpp	2005-08-18 11:55:09.000000000 -0400
+@@ -33,7 +33,7 @@
+ {
+   try {
+     state->add_exp(exp, parserInfo, f);
+-  } catch (boost::bad_expression &e) {
++  } catch (boost::regex_error &e) {
+     printError("wrong original expression: " + orig);
+     throw e;
+   }
+@@ -44,7 +44,7 @@
+   bool ok = true;
+   try {
+     state->freeze();
+-  } catch (boost::bad_expression &e) {
++  } catch (boost::regex_error &e) {
+     ok = false;
+   }
+ 
+@@ -91,13 +91,13 @@
+       build(*it, temp_state);
+       try {
+         temp_state->freeze();
+-      } catch (boost::bad_expression &e) {
++      } catch (boost::regex_error &e) {
+         printError("problem in this expression: " + (*it)->toString());
+         throw e;
+       }
+     }
+   } else
+-    throw boost::bad_expression("internal error");
++    throw boost::regex_error(boost::regex_constants::error_bad_pattern);
+ }
+ 
+ void
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.1.1.orig/src/lib/test_langdefparser_main.cpp source-highlight-2.1.1/src/lib/test_langdefparser_main.cpp
+--- source-highlight-2.1.1.orig/src/lib/test_langdefparser_main.cpp	2005-08-18 11:53:18.000000000 -0400
++++ source-highlight-2.1.1/src/lib/test_langdefparser_main.cpp	2005-08-18 11:53:45.000000000 -0400
+@@ -31,7 +31,7 @@
+       
+     try {
+       boost::regex ex(ex_string);
+-    } catch (boost::bad_expression &e) {
++    } catch (boost::regex_error &e) {
+       cerr << "bad expression: " << ex_string << endl;
+     }
+   }
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.1.1.orig/src/regexpstate.cpp source-highlight-2.1.1/src/regexpstate.cpp
+--- source-highlight-2.1.1.orig/src/regexpstate.cpp	2005-08-18 11:53:18.000000000 -0400
++++ source-highlight-2.1.1/src/regexpstate.cpp	2005-08-18 11:53:45.000000000 -0400
+@@ -57,12 +57,12 @@
+ }
+ 
+ void
+-RegExpState::freeze() throw(boost::bad_expression)
++RegExpState::freeze() throw(boost::regex_error)
+ {
+   const string &buffered = buffer.str();
+   try {
+     reg_exp.assign(buffered);
+-  } catch (boost::bad_expression &e) {
++  } catch (boost::regex_error &e) {
+     printError("bad expression: " + buffered);
+     throw e;
+   }
+diff --exclude='*~' --exclude='.*' -I '$Id:' -urN source-highlight-2.1.1.orig/src/regexpstate.h source-highlight-2.1.1/src/regexpstate.h
+--- source-highlight-2.1.1.orig/src/regexpstate.h	2005-08-18 11:53:18.000000000 -0400
++++ source-highlight-2.1.1/src/regexpstate.h	2005-08-18 11:55:21.000000000 -0400
+@@ -69,7 +69,7 @@
+ 
+   const std::string &get_elem(int index = -1);
+   void add_exp(const std::string &s, ParserInfo *parserInfo, RegExpFormatterPtr f);
+-  void freeze() throw(boost::bad_expression);
++  void freeze() throw(boost::regex_error);
+   void add_normal_formatter(RegExpFormatterPtr f);
+   RegExpFormatterPtr getLastFormatter() const { return formatters[formatters.size()-1];}
+ };
diff --git a/dev-util/source-highlight/source-highlight-2.0.ebuild b/dev-util/source-highlight/source-highlight-2.0.ebuild
index 26eec518531a..7beea6efe839 100644
--- a/dev-util/source-highlight/source-highlight-2.0.ebuild
+++ b/dev-util/source-highlight/source-highlight-2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.0.ebuild,v 1.3 2005/08/06 04:05:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.0.ebuild,v 1.4 2005/08/18 18:36:37 ka0ttic Exp $
 
 inherit bash-completion versionator eutils
 
@@ -18,6 +18,13 @@ IUSE="doc"
 DEPEND="virtual/libc
 	dev-libs/boost"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	has_version '>=dev-libs/boost-1.33.0' && \
+		epatch ${FILESDIR}/${P}-boost_regex_error.diff
+}
+
 src_compile() {
 	local myconf
 
diff --git a/dev-util/source-highlight/source-highlight-2.1.1.ebuild b/dev-util/source-highlight/source-highlight-2.1.1.ebuild
index ce374b736971..c28517f272c8 100644
--- a/dev-util/source-highlight/source-highlight-2.1.1.ebuild
+++ b/dev-util/source-highlight/source-highlight-2.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.1.1.ebuild,v 1.1 2005/08/06 04:05:05 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.1.1.ebuild,v 1.2 2005/08/18 18:36:37 ka0ttic Exp $
 
 inherit bash-completion versionator eutils
 
@@ -16,6 +16,13 @@ IUSE="doc"
 DEPEND="virtual/libc
 	dev-libs/boost"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	has_version '>=dev-libs/boost-1.33.0' && \
+		epatch ${FILESDIR}/${P}-boost_regex_error.diff
+}
+
 src_compile() {
 	local myconf