aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-29 18:06:08 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-29 18:06:08 +0000
commita87e65c033bf425cd4644838ffee21ea64cbf677 (patch)
tree7e210fbb02c967dbb48673453b8e4e1e6702b34a
parentde4bdd8833ae530818bce39db997fd78f027f26a (diff)
downloadpaludis-a87e65c033bf425cd4644838ffee21ea64cbf677.tar.gz
paludis-a87e65c033bf425cd4644838ffee21ea64cbf677.tar.xz
Normalise GPL headers
-rw-r--r--ebuild/ebuild.bash5
-rw-r--r--paludis/config_file.cc3
-rw-r--r--paludis/config_file.hh3
-rw-r--r--paludis/config_file_TEST.cc3
-rw-r--r--paludis/create_insert_iterator.cc3
-rw-r--r--paludis/create_insert_iterator.hh3
-rw-r--r--paludis/create_insert_iterator_TEST.cc3
-rw-r--r--paludis/default_config.cc3
-rw-r--r--paludis/default_config.hh3
-rw-r--r--paludis/dep_atom_flattener.cc3
-rw-r--r--paludis/dep_atom_flattener.hh3
-rw-r--r--paludis/destringify.cc3
-rw-r--r--paludis/destringify.hh3
-rw-r--r--paludis/destringify_TEST.cc3
-rw-r--r--paludis/exception_to_debug_string.cc3
-rw-r--r--paludis/exception_to_debug_string.hh3
-rw-r--r--paludis/filter_insert_iterator.cc4
-rw-r--r--paludis/filter_insert_iterator.hh3
-rw-r--r--paludis/filter_insert_iterator_TEST.cc3
-rw-r--r--paludis/getenv.cc3
-rw-r--r--paludis/getenv.hh3
-rw-r--r--paludis/getenv_TEST.cc3
-rw-r--r--paludis/is_file_with_extension.cc3
-rw-r--r--paludis/is_file_with_extension.hh3
-rw-r--r--paludis/is_file_with_extension_TEST.cc3
-rw-r--r--paludis/iterator_utilities.cc3
-rw-r--r--paludis/iterator_utilities.hh3
-rw-r--r--paludis/key_value_config_file.cc3
-rw-r--r--paludis/key_value_config_file.hh3
-rw-r--r--paludis/key_value_config_file_TEST.cc3
-rw-r--r--paludis/keyword_name.cc3
-rw-r--r--paludis/line_config_file.cc3
-rw-r--r--paludis/line_config_file.hh3
-rw-r--r--paludis/line_config_file_TEST.cc3
-rw-r--r--paludis/mask_reasons.cc4
-rw-r--r--paludis/mask_reasons.hh3
-rw-r--r--paludis/pstream.cc3
-rw-r--r--paludis/pstream.hh3
-rw-r--r--paludis/pstream_TEST.cc3
-rw-r--r--paludis/strip.cc3
-rw-r--r--paludis/strip.hh3
-rw-r--r--paludis/tokeniser.cc3
-rw-r--r--paludis/tokeniser.hh3
-rw-r--r--paludis/tokeniser_TEST.cc3
-rw-r--r--paludis/transform_insert_iterator.cc3
-rw-r--r--paludis/transform_insert_iterator.hh3
-rw-r--r--paludis/transform_insert_iterator_TEST.cc3
-rw-r--r--paludis/use_flag_state.cc3
-rw-r--r--paludis/use_flag_state.hh3
-rw-r--r--paludis/virtual_constructor.cc3
-rw-r--r--paludis/virtual_constructor.hh3
-rw-r--r--paludis/visitor.cc3
-rw-r--r--paludis/visitor.hh3
-rw-r--r--paludis/visitor_TEST.cc3
-rw-r--r--src/colour.cc3
-rw-r--r--src/colour.hh3
-rw-r--r--src/command_line.cc3
-rw-r--r--src/command_line.hh3
-rw-r--r--src/install.cc3
-rw-r--r--src/install.hh3
-rw-r--r--src/list.cc3
-rw-r--r--src/list.hh3
-rw-r--r--src/query.cc3
-rw-r--r--src/query.hh3
-rw-r--r--test/test_fail_TEST.cc3
-rw-r--r--test/test_framework.cc3
-rw-r--r--test/test_framework.hh3
-rw-r--r--test/test_pass_TEST.cc3
-rw-r--r--test/test_runner.cc3
-rw-r--r--test/test_runner.hh3
70 files changed, 76 insertions, 138 deletions
diff --git a/ebuild/ebuild.bash b/ebuild/ebuild.bash
index 379f71e90..df64d2c82 100644
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -30,6 +30,7 @@ shopt -s expand_aliases
EBUILD_KILL_PID=$$
alias die='diefunc "$FUNCNAME" "$LINENO" "$@"'
alias assert='_pipestatus="${PIPESTATUS[*]}"; [[ -z "${_pipestatus//[ 0]/}" ]] || diefunc "$FUNCNAME" "$LINENO" "$_pipestatus"'
+trap 'echo "exiting." ; exit 250' 15
diefunc()
{
@@ -40,6 +41,9 @@ diefunc()
echo "!!! $funcname at $lineno gave exit code $exitcode" 1>&2
echo "!!! ${@:-(no message provided)}" 1>&2
echo 1>&2
+
+ kill ${ESELECT_KILL_TARGET}
+ exit 249
}
umask 022
@@ -58,3 +62,4 @@ source portage_stubs.bash
source list_functions.bash
source echo_functions.bash
source install_functions.bash
+source build_functions.bash
diff --git a/paludis/config_file.cc b/paludis/config_file.cc
index 997e9b006..a7d240f28 100644
--- a/paludis/config_file.cc
+++ b/paludis/config_file.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/config_file.hh b/paludis/config_file.hh
index 98ce37339..0b34f3e2e 100644
--- a/paludis/config_file.hh
+++ b/paludis/config_file.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/config_file_TEST.cc b/paludis/config_file_TEST.cc
index e89aeeda6..e368d0a11 100644
--- a/paludis/config_file_TEST.cc
+++ b/paludis/config_file_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/create_insert_iterator.cc b/paludis/create_insert_iterator.cc
index 675496010..370609eeb 100644
--- a/paludis/create_insert_iterator.cc
+++ b/paludis/create_insert_iterator.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/create_insert_iterator.hh b/paludis/create_insert_iterator.hh
index 562fcf63a..2e5fd0567 100644
--- a/paludis/create_insert_iterator.hh
+++ b/paludis/create_insert_iterator.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/create_insert_iterator_TEST.cc b/paludis/create_insert_iterator_TEST.cc
index a7f4560ff..e64d24495 100644
--- a/paludis/create_insert_iterator_TEST.cc
+++ b/paludis/create_insert_iterator_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/default_config.cc b/paludis/default_config.cc
index cd1ab1b15..a17e6d2d9 100644
--- a/paludis/default_config.cc
+++ b/paludis/default_config.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/default_config.hh b/paludis/default_config.hh
index 93e6f897b..5adb841ff 100644
--- a/paludis/default_config.hh
+++ b/paludis/default_config.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/dep_atom_flattener.cc b/paludis/dep_atom_flattener.cc
index 175345493..c2f32acbf 100644
--- a/paludis/dep_atom_flattener.cc
+++ b/paludis/dep_atom_flattener.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/dep_atom_flattener.hh b/paludis/dep_atom_flattener.hh
index eb3c24bbb..adedceb7a 100644
--- a/paludis/dep_atom_flattener.hh
+++ b/paludis/dep_atom_flattener.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/destringify.cc b/paludis/destringify.cc
index 0b497ef7c..27399ff27 100644
--- a/paludis/destringify.cc
+++ b/paludis/destringify.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/destringify.hh b/paludis/destringify.hh
index a8df9cde4..0db27a434 100644
--- a/paludis/destringify.hh
+++ b/paludis/destringify.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/destringify_TEST.cc b/paludis/destringify_TEST.cc
index ec1e936bd..51e2e0a0a 100644
--- a/paludis/destringify_TEST.cc
+++ b/paludis/destringify_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/exception_to_debug_string.cc b/paludis/exception_to_debug_string.cc
index 05a76c679..178e04535 100644
--- a/paludis/exception_to_debug_string.cc
+++ b/paludis/exception_to_debug_string.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/exception_to_debug_string.hh b/paludis/exception_to_debug_string.hh
index de13e6fd7..cfae673d8 100644
--- a/paludis/exception_to_debug_string.hh
+++ b/paludis/exception_to_debug_string.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/filter_insert_iterator.cc b/paludis/filter_insert_iterator.cc
index e20036fb1..63c6671b0 100644
--- a/paludis/filter_insert_iterator.cc
+++ b/paludis/filter_insert_iterator.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -18,5 +17,6 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "filter_insert_iterator.hh"
diff --git a/paludis/filter_insert_iterator.hh b/paludis/filter_insert_iterator.hh
index 5c42bd4a1..bf3a64bda 100644
--- a/paludis/filter_insert_iterator.hh
+++ b/paludis/filter_insert_iterator.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/filter_insert_iterator_TEST.cc b/paludis/filter_insert_iterator_TEST.cc
index 19c9f7f74..50c421a36 100644
--- a/paludis/filter_insert_iterator_TEST.cc
+++ b/paludis/filter_insert_iterator_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/getenv.cc b/paludis/getenv.cc
index c428b13ff..0d9ef3652 100644
--- a/paludis/getenv.cc
+++ b/paludis/getenv.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/getenv.hh b/paludis/getenv.hh
index 3366ae7fa..6d4dae8c5 100644
--- a/paludis/getenv.hh
+++ b/paludis/getenv.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/getenv_TEST.cc b/paludis/getenv_TEST.cc
index fc9c03403..880b62d02 100644
--- a/paludis/getenv_TEST.cc
+++ b/paludis/getenv_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/is_file_with_extension.cc b/paludis/is_file_with_extension.cc
index 6f7b140a3..1635108ce 100644
--- a/paludis/is_file_with_extension.cc
+++ b/paludis/is_file_with_extension.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/is_file_with_extension.hh b/paludis/is_file_with_extension.hh
index c74668aa6..d387225a8 100644
--- a/paludis/is_file_with_extension.hh
+++ b/paludis/is_file_with_extension.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/is_file_with_extension_TEST.cc b/paludis/is_file_with_extension_TEST.cc
index bee8559fb..0ef879ed9 100644
--- a/paludis/is_file_with_extension_TEST.cc
+++ b/paludis/is_file_with_extension_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/iterator_utilities.cc b/paludis/iterator_utilities.cc
index 10ab96ab7..787e3de0f 100644
--- a/paludis/iterator_utilities.cc
+++ b/paludis/iterator_utilities.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/iterator_utilities.hh b/paludis/iterator_utilities.hh
index fbff17301..b24447e92 100644
--- a/paludis/iterator_utilities.hh
+++ b/paludis/iterator_utilities.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/key_value_config_file.cc b/paludis/key_value_config_file.cc
index c3e1d7a67..dd49fefc6 100644
--- a/paludis/key_value_config_file.cc
+++ b/paludis/key_value_config_file.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/key_value_config_file.hh b/paludis/key_value_config_file.hh
index 93ab8187c..a5127505f 100644
--- a/paludis/key_value_config_file.hh
+++ b/paludis/key_value_config_file.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/key_value_config_file_TEST.cc b/paludis/key_value_config_file_TEST.cc
index 2cab299c6..f190c9734 100644
--- a/paludis/key_value_config_file_TEST.cc
+++ b/paludis/key_value_config_file_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/keyword_name.cc b/paludis/keyword_name.cc
index 7e1041f15..2ea2694c6 100644
--- a/paludis/keyword_name.cc
+++ b/paludis/keyword_name.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/line_config_file.cc b/paludis/line_config_file.cc
index e66807ceb..fc6248b87 100644
--- a/paludis/line_config_file.cc
+++ b/paludis/line_config_file.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/line_config_file.hh b/paludis/line_config_file.hh
index b2b4361d6..dffdc9e3b 100644
--- a/paludis/line_config_file.hh
+++ b/paludis/line_config_file.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/line_config_file_TEST.cc b/paludis/line_config_file_TEST.cc
index 1c9fee666..885919ec6 100644
--- a/paludis/line_config_file_TEST.cc
+++ b/paludis/line_config_file_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/mask_reasons.cc b/paludis/mask_reasons.cc
index ba41ab6cc..0e53a31cc 100644
--- a/paludis/mask_reasons.cc
+++ b/paludis/mask_reasons.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
@@ -18,5 +17,6 @@
* Place, Suite 330, Boston, MA 02111-1307 USA
*/
+
#include "mask_reasons.hh"
diff --git a/paludis/mask_reasons.hh b/paludis/mask_reasons.hh
index 61da2d042..6c781f952 100644
--- a/paludis/mask_reasons.hh
+++ b/paludis/mask_reasons.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/pstream.cc b/paludis/pstream.cc
index 43ee47b40..25bef9ace 100644
--- a/paludis/pstream.cc
+++ b/paludis/pstream.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/pstream.hh b/paludis/pstream.hh
index a48ea5f33..bb429aa98 100644
--- a/paludis/pstream.hh
+++ b/paludis/pstream.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/pstream_TEST.cc b/paludis/pstream_TEST.cc
index 13cef2d6c..7abda78c5 100644
--- a/paludis/pstream_TEST.cc
+++ b/paludis/pstream_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/strip.cc b/paludis/strip.cc
index 2cfafd173..d7aa8b465 100644
--- a/paludis/strip.cc
+++ b/paludis/strip.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/strip.hh b/paludis/strip.hh
index 7fc8d0746..0ebfaf1d2 100644
--- a/paludis/strip.hh
+++ b/paludis/strip.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/tokeniser.cc b/paludis/tokeniser.cc
index aff286bf3..68985f9f9 100644
--- a/paludis/tokeniser.cc
+++ b/paludis/tokeniser.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/tokeniser.hh b/paludis/tokeniser.hh
index 9e2e3a455..28082e57d 100644
--- a/paludis/tokeniser.hh
+++ b/paludis/tokeniser.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/tokeniser_TEST.cc b/paludis/tokeniser_TEST.cc
index 6d6ceb5d1..c674e00e4 100644
--- a/paludis/tokeniser_TEST.cc
+++ b/paludis/tokeniser_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/transform_insert_iterator.cc b/paludis/transform_insert_iterator.cc
index db03accc3..67942509e 100644
--- a/paludis/transform_insert_iterator.cc
+++ b/paludis/transform_insert_iterator.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/transform_insert_iterator.hh b/paludis/transform_insert_iterator.hh
index 035093075..3d8cd2e5d 100644
--- a/paludis/transform_insert_iterator.hh
+++ b/paludis/transform_insert_iterator.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/transform_insert_iterator_TEST.cc b/paludis/transform_insert_iterator_TEST.cc
index 4816f2287..bff6def58 100644
--- a/paludis/transform_insert_iterator_TEST.cc
+++ b/paludis/transform_insert_iterator_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/use_flag_state.cc b/paludis/use_flag_state.cc
index ea7fe0fec..aafd50cb8 100644
--- a/paludis/use_flag_state.cc
+++ b/paludis/use_flag_state.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/use_flag_state.hh b/paludis/use_flag_state.hh
index b4c775faa..0cf17efc5 100644
--- a/paludis/use_flag_state.hh
+++ b/paludis/use_flag_state.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/virtual_constructor.cc b/paludis/virtual_constructor.cc
index acbe0c0da..aacdb1092 100644
--- a/paludis/virtual_constructor.cc
+++ b/paludis/virtual_constructor.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/virtual_constructor.hh b/paludis/virtual_constructor.hh
index a897abc9a..eaf7cb107 100644
--- a/paludis/virtual_constructor.hh
+++ b/paludis/virtual_constructor.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/visitor.cc b/paludis/visitor.cc
index 792fb5105..efa0c30f1 100644
--- a/paludis/visitor.cc
+++ b/paludis/visitor.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/visitor.hh b/paludis/visitor.hh
index 63e4e1b05..efb84fc99 100644
--- a/paludis/visitor.hh
+++ b/paludis/visitor.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/paludis/visitor_TEST.cc b/paludis/visitor_TEST.cc
index d0c65ab59..66aef029e 100644
--- a/paludis/visitor_TEST.cc
+++ b/paludis/visitor_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/colour.cc b/src/colour.cc
index 0df7d41e0..deeeb6e39 100644
--- a/src/colour.cc
+++ b/src/colour.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/colour.hh b/src/colour.hh
index e66d6ff27..d3430c576 100644
--- a/src/colour.hh
+++ b/src/colour.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/command_line.cc b/src/command_line.cc
index 3feb9459a..646f365c4 100644
--- a/src/command_line.cc
+++ b/src/command_line.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/command_line.hh b/src/command_line.hh
index e43ad529f..909ee0e80 100644
--- a/src/command_line.hh
+++ b/src/command_line.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/install.cc b/src/install.cc
index 46ca93525..6d98678e4 100644
--- a/src/install.cc
+++ b/src/install.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/install.hh b/src/install.hh
index 719bf6f3e..5cfdc4e99 100644
--- a/src/install.hh
+++ b/src/install.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/list.cc b/src/list.cc
index c3c62307f..5b30a6e18 100644
--- a/src/list.cc
+++ b/src/list.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/list.hh b/src/list.hh
index 4888c31e8..08bfe6184 100644
--- a/src/list.hh
+++ b/src/list.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/query.cc b/src/query.cc
index 7dfcf45ba..ced3ce94f 100644
--- a/src/query.cc
+++ b/src/query.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/src/query.hh b/src/query.hh
index e74760757..c4229ba9c 100644
--- a/src/query.hh
+++ b/src/query.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/test/test_fail_TEST.cc b/test/test_fail_TEST.cc
index 516a1c50b..8c27e1298 100644
--- a/test/test_fail_TEST.cc
+++ b/test/test_fail_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/test/test_framework.cc b/test/test_framework.cc
index 045813902..c7e143a23 100644
--- a/test/test_framework.cc
+++ b/test/test_framework.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/test/test_framework.hh b/test/test_framework.hh
index 781f1dc3d..710ff8d86 100644
--- a/test/test_framework.hh
+++ b/test/test_framework.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/test/test_pass_TEST.cc b/test/test_pass_TEST.cc
index ab88dacf6..38b156e62 100644
--- a/test/test_pass_TEST.cc
+++ b/test/test_pass_TEST.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/test/test_runner.cc b/test/test_runner.cc
index 523f9505c..6eba9c20e 100644
--- a/test/test_runner.cc
+++ b/test/test_runner.cc
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
diff --git a/test/test_runner.hh b/test/test_runner.hh
index ba0ff019f..b6f98d7ac 100644
--- a/test/test_runner.hh
+++ b/test/test_runner.hh
@@ -5,8 +5,7 @@
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
- * Public License as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
+ * Public License version 2, as published by the Free Software Foundation.
*
* Paludis is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS