Version bump; removed previous 2.x versions and related patches.

(Portage version: 2.0.51.22-r2)

9 files changed, 19 insertions, 231 deletions

diff --git a/dev-util/source-highlight/ChangeLog b/dev-util/source-highlight/ChangeLog
index e1023b85533b..4c86a9be70f0 100644
--- a/dev-util/source-highlight/ChangeLog
+++ b/dev-util/source-highlight/ChangeLog
@@ -1,6 +1,15 @@
 # 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.17 2005/08/18 18:36:37 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/ChangeLog,v 1.18 2005/09/08 17:07:20 ka0ttic Exp $
+
+*source-highlight-2.1.2 (08 Sep 2005)
+
+  08 Sep 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,
+  +source-highlight-2.1.2.ebuild:
+  Version bump; removed previous 2.x versions and related patches.
 
   18 Aug 2005; Aaron Walker <ka0ttic@gentoo.org>
   +files/source-highlight-2.0-boost_regex_error.diff,
diff --git a/dev-util/source-highlight/Manifest b/dev-util/source-highlight/Manifest
index 6a3220443504..e90b59d788b6 100644
--- a/dev-util/source-highlight/Manifest
+++ b/dev-util/source-highlight/Manifest
@@ -1,11 +1,7 @@
-MD5 632fe6343e870f4aceda5eb73fef138b ChangeLog 3527
+MD5 d162b9d1afa58f43b73a6a64c5ce8983 source-highlight-2.1.2.ebuild 1088
+MD5 a14c15abad083ecd2d10a02282b53e71 source-highlight-1.11-r2.ebuild 1015
+MD5 d4c09a070134f32fbd72940d38eba617 ChangeLog 3891
+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 cc08e1b9735c8388eae6fddf9904efd7 files/digest-source-highlight-2.1.1 74
-MD5 f68966cb769d770115b9255f45a5373f files/source-highlight-2.0-boost_regex_error.diff 3077
-MD5 0199dcd1d7fe3a480c402cecc8b819ef files/source-highlight-2.1.1-boost_regex_error.diff 3145
+MD5 28242883659cebf7a8b81de6c906067d files/digest-source-highlight-2.1.2 74
 MD5 8010d26caf8fbdd5b9c6ab34da1e492b files/source-highlight.bash-completion 1383
-MD5 f8d10f350e91f30316ea4e1bd1e76470 metadata.xml 254
-MD5 a14c15abad083ecd2d10a02282b53e71 source-highlight-1.11-r2.ebuild 1015
-MD5 d96eb3a7329409516238968578802285 source-highlight-2.0.ebuild 1316
-MD5 691037920588b4dd02660dde9ad72820 source-highlight-2.1.1.ebuild 1247
diff --git a/dev-util/source-highlight/files/digest-source-highlight-2.0 b/dev-util/source-highlight/files/digest-source-highlight-2.0
deleted file mode 100644
index cc63117501fc..000000000000
--- a/dev-util/source-highlight/files/digest-source-highlight-2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7501da9ee6f5eba1c9bc9adac9baae18 source-highlight-2.0.tar.gz 482396
diff --git a/dev-util/source-highlight/files/digest-source-highlight-2.1.1 b/dev-util/source-highlight/files/digest-source-highlight-2.1.1
deleted file mode 100644
index 332f0ab5c313..000000000000
--- a/dev-util/source-highlight/files/digest-source-highlight-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b31e7a52a91a8fb8093934b54b4f317a source-highlight-2.1.1.tar.gz 557347
diff --git a/dev-util/source-highlight/files/digest-source-highlight-2.1.2 b/dev-util/source-highlight/files/digest-source-highlight-2.1.2
new file mode 100644
index 000000000000..3b66e5d082e3
--- /dev/null
+++ b/dev-util/source-highlight/files/digest-source-highlight-2.1.2
@@ -0,0 +1 @@
+MD5 ed2f292ea28ff3d84d51c69f25e15418 source-highlight-2.1.2.tar.gz 557143
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
deleted file mode 100644
index 759e7cb2d1b7..000000000000
--- a/dev-util/source-highlight/files/source-highlight-2.0-boost_regex_error.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index 231744713d52..000000000000
--- a/dev-util/source-highlight/files/source-highlight-2.1.1-boost_regex_error.diff
+++ /dev/null
@@ -1,79 +0,0 @@
-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
deleted file mode 100644
index c8f664c30176..000000000000
--- a/dev-util/source-highlight/source-highlight-2.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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.5 2005/08/22 16:35:44 swegener Exp $
-
-inherit bash-completion versionator eutils
-
-MY_P="${PN}-$(replace_version_separator 2 -)"
-S="${WORKDIR}/${MY_P}"
-DESCRIPTION="Generate highlighted source code as an (x)html document"
-HOMEPAGE="http://www.gnu.org/software/src-highlite/source-highlight.html"
-SRC_URI="ftp://ftp.gnu.org/gnu/src-highlite/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~mips ~ppc x86"
-SLOT="0"
-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
-
-	built_with_use dev-libs/boost threadsonly && \
-		myconf="--with-boost-regex=boost_regex-gcc-mt"
-
-	econf ${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	rm -fr ${D}/usr/share/doc
-
-	dodoc AUTHORS ChangeLog COPYING CREDITS INSTALL \
-		NEWS README THANKS TODO.txt || die
-	dobashcompletion ${FILESDIR}/${PN}.bash-completion ${PN}
-
-	if use doc ; then
-		cd ${S}/doc
-		dohtml *.html *.css *.java
-	fi
-}
diff --git a/dev-util/source-highlight/source-highlight-2.1.1.ebuild b/dev-util/source-highlight/source-highlight-2.1.2.ebuild
index 369b10340500..8171bca11c98 100644
--- a/dev-util/source-highlight/source-highlight-2.1.1.ebuild
+++ b/dev-util/source-highlight/source-highlight-2.1.2.ebuild
@@ -1,8 +1,8 @@
 # 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.3 2005/08/22 16:35:44 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/source-highlight/source-highlight-2.1.2.ebuild,v 1.1 2005/09/08 17:07:20 ka0ttic Exp $
 
-inherit bash-completion versionator eutils
+inherit bash-completion eutils
 
 DESCRIPTION="Generate highlighted source code as an (x)html document"
 HOMEPAGE="http://www.gnu.org/software/src-highlite/source-highlight.html"
@@ -13,15 +13,7 @@ KEYWORDS="~amd64 ~mips ~ppc ~x86"
 SLOT="0"
 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
-}
+DEPEND="dev-libs/boost"
 
 src_compile() {
 	local myconf