aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-04 01:35:27 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2007-01-04 01:35:27 +0000
commit4810105b214db010c06cb4b4ec988408deeed381 (patch)
treebad13f889677cf1d81df4d1b02f69fa0a56d4351
parent3894d3a08745816f84c0466519e4a502aeb23173 (diff)
downloadpaludis-4810105b214db010c06cb4b4ec988408deeed381.tar.gz
paludis-4810105b214db010c06cb4b4ec988408deeed381.tar.xz
Fix copyright headers
-rw-r--r--cran/cran.bash3
-rw-r--r--ebuild/build_functions.bash3
-rw-r--r--ebuild/builtin_fetch.bash3
-rw-r--r--ebuild/builtin_fetch_bin.bash3
-rw-r--r--ebuild/builtin_init.bash3
-rw-r--r--ebuild/builtin_init_bin.bash5
-rw-r--r--ebuild/builtin_merge.bash3
-rw-r--r--ebuild/builtin_metadata.bash3
-rw-r--r--ebuild/builtin_strip.bash3
-rw-r--r--ebuild/builtin_tidyup.bash3
-rw-r--r--ebuild/builtin_unmerge.bash3
-rw-r--r--ebuild/builtin_unpack_bin.bash3
-rw-r--r--ebuild/builtin_variable.bash3
-rwxr-xr-xebuild/ebuild.bash3
-rw-r--r--ebuild/echo_functions.bash.in3
-rw-r--r--ebuild/eclass_functions.bash3
-rw-r--r--ebuild/install_functions.bash3
-rw-r--r--ebuild/kernel_functions.bash3
-rw-r--r--ebuild/kernel_functions_TEST.bash3
-rw-r--r--ebuild/list_functions.bash3
-rw-r--r--ebuild/multilib_functions.bash3
-rw-r--r--ebuild/pkg_config.bash3
-rw-r--r--ebuild/pkg_nofetch.bash3
-rw-r--r--ebuild/pkg_postinst.bash3
-rw-r--r--ebuild/pkg_postrm.bash3
-rw-r--r--ebuild/pkg_preinst.bash3
-rw-r--r--ebuild/pkg_prerm.bash3
-rw-r--r--ebuild/pkg_setup.bash3
-rw-r--r--ebuild/portage_stubs.bash3
-rw-r--r--ebuild/sandbox.bash3
-rw-r--r--ebuild/src_compile.bash3
-rw-r--r--ebuild/src_install.bash3
-rw-r--r--ebuild/src_test.bash3
-rw-r--r--ebuild/src_unpack.bash3
-rw-r--r--ebuild/usage_error.bash3
-rw-r--r--ebuild/work_around_broken_utilities.bash.in3
-rwxr-xr-xhooks/eselect_env_update.bash3
-rwxr-xr-xhooks/find_config_updates.bash3
-rwxr-xr-xhooks/gnu_info_index.bash3
-rwxr-xr-xhooks/installable_cache_regen.bash3
-rwxr-xr-xhooks/installed_cache_regen.bash3
-rwxr-xr-xhooks/log.bash3
-rwxr-xr-xhooks/news.bash3
-rwxr-xr-xhooks/rewrite_broken_symlinks.bash3
-rw-r--r--paludis/args/args_dumper.cc3
-rw-r--r--paludis/args/args_dumper.hh3
-rw-r--r--paludis/dep_list/dep_list.cc2
-rw-r--r--paludis/dep_list/dep_list.hh2
-rw-r--r--paludis/selinux/security_context.cc3
-rw-r--r--paludis/selinux/security_context.hh3
50 files changed, 51 insertions, 99 deletions
diff --git a/cran/cran.bash b/cran/cran.bash
index 7a2e18b..3baf2e1 100644
--- a/cran/cran.bash
+++ b/cran/cran.bash
@@ -9,8 +9,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/ebuild/build_functions.bash b/ebuild/build_functions.bash
index aa0daf2..6e7aa11 100644
--- a/ebuild/build_functions.bash
+++ b/ebuild/build_functions.bash
@@ -9,8 +9,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/ebuild/builtin_fetch.bash b/ebuild/builtin_fetch.bash
index 58454ea..c3f6402 100644
--- a/ebuild/builtin_fetch.bash
+++ b/ebuild/builtin_fetch.bash
@@ -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/ebuild/builtin_fetch_bin.bash b/ebuild/builtin_fetch_bin.bash
index f6e777e..0c3360a 100644
--- a/ebuild/builtin_fetch_bin.bash
+++ b/ebuild/builtin_fetch_bin.bash
@@ -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/ebuild/builtin_init.bash b/ebuild/builtin_init.bash
index 07e9290..d7c5042 100644
--- a/ebuild/builtin_init.bash
+++ b/ebuild/builtin_init.bash
@@ -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/ebuild/builtin_init_bin.bash b/ebuild/builtin_init_bin.bash
index 9d1efe5..115eccc 100644
--- a/ebuild/builtin_init_bin.bash
+++ b/ebuild/builtin_init_bin.bash
@@ -2,11 +2,10 @@
# vim: set sw=4 sts=4 et :
# Copyright (c) 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
-#
+
# 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/ebuild/builtin_merge.bash b/ebuild/builtin_merge.bash
index 78220b3..f12f702 100644
--- a/ebuild/builtin_merge.bash
+++ b/ebuild/builtin_merge.bash
@@ -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/ebuild/builtin_metadata.bash b/ebuild/builtin_metadata.bash
index 3668c40..dbc951f 100644
--- a/ebuild/builtin_metadata.bash
+++ b/ebuild/builtin_metadata.bash
@@ -9,8 +9,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/ebuild/builtin_strip.bash b/ebuild/builtin_strip.bash
index cd22079..9a4168e 100644
--- a/ebuild/builtin_strip.bash
+++ b/ebuild/builtin_strip.bash
@@ -6,8 +6,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/ebuild/builtin_tidyup.bash b/ebuild/builtin_tidyup.bash
index 145f426..8927d23 100644
--- a/ebuild/builtin_tidyup.bash
+++ b/ebuild/builtin_tidyup.bash
@@ -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/ebuild/builtin_unmerge.bash b/ebuild/builtin_unmerge.bash
index a49dae3..8b106fd 100644
--- a/ebuild/builtin_unmerge.bash
+++ b/ebuild/builtin_unmerge.bash
@@ -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/ebuild/builtin_unpack_bin.bash b/ebuild/builtin_unpack_bin.bash
index 6964d63..eaf1e30 100644
--- a/ebuild/builtin_unpack_bin.bash
+++ b/ebuild/builtin_unpack_bin.bash
@@ -9,8 +9,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/ebuild/builtin_variable.bash b/ebuild/builtin_variable.bash
index 7bdcc48..e140188 100644
--- a/ebuild/builtin_variable.bash
+++ b/ebuild/builtin_variable.bash
@@ -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/ebuild/ebuild.bash b/ebuild/ebuild.bash
index b8d7368..e244637 100755
--- a/ebuild/ebuild.bash
+++ b/ebuild/ebuild.bash
@@ -9,8 +9,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/ebuild/echo_functions.bash.in b/ebuild/echo_functions.bash.in
index d36bca2..279121c 100644
--- a/ebuild/echo_functions.bash.in
+++ b/ebuild/echo_functions.bash.in
@@ -11,8 +11,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/ebuild/eclass_functions.bash b/ebuild/eclass_functions.bash
index d6b32db..2220c34 100644
--- a/ebuild/eclass_functions.bash
+++ b/ebuild/eclass_functions.bash
@@ -9,8 +9,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/ebuild/install_functions.bash b/ebuild/install_functions.bash
index 4b8ab3b..e23628c 100644
--- a/ebuild/install_functions.bash
+++ b/ebuild/install_functions.bash
@@ -9,8 +9,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/ebuild/kernel_functions.bash b/ebuild/kernel_functions.bash
index 554df65..9126376 100644
--- a/ebuild/kernel_functions.bash
+++ b/ebuild/kernel_functions.bash
@@ -9,8 +9,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/ebuild/kernel_functions_TEST.bash b/ebuild/kernel_functions_TEST.bash
index de3a74f..4b3271d 100644
--- a/ebuild/kernel_functions_TEST.bash
+++ b/ebuild/kernel_functions_TEST.bash
@@ -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/ebuild/list_functions.bash b/ebuild/list_functions.bash
index 643cab6..d34ba64 100644
--- a/ebuild/list_functions.bash
+++ b/ebuild/list_functions.bash
@@ -9,8 +9,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/ebuild/multilib_functions.bash b/ebuild/multilib_functions.bash
index 1813396..f656933 100644
--- a/ebuild/multilib_functions.bash
+++ b/ebuild/multilib_functions.bash
@@ -9,8 +9,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/ebuild/pkg_config.bash b/ebuild/pkg_config.bash
index d88570a..6666e99 100644
--- a/ebuild/pkg_config.bash
+++ b/ebuild/pkg_config.bash
@@ -9,8 +9,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/ebuild/pkg_nofetch.bash b/ebuild/pkg_nofetch.bash
index 3bc6c51..09c1791 100644
--- a/ebuild/pkg_nofetch.bash
+++ b/ebuild/pkg_nofetch.bash
@@ -9,8 +9,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/ebuild/pkg_postinst.bash b/ebuild/pkg_postinst.bash
index 84c5e18..c998529 100644
--- a/ebuild/pkg_postinst.bash
+++ b/ebuild/pkg_postinst.bash
@@ -9,8 +9,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/ebuild/pkg_postrm.bash b/ebuild/pkg_postrm.bash
index 5bb6b9e..c5b741d 100644
--- a/ebuild/pkg_postrm.bash
+++ b/ebuild/pkg_postrm.bash
@@ -9,8 +9,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/ebuild/pkg_preinst.bash b/ebuild/pkg_preinst.bash
index 5e3b62b..0636600 100644
--- a/ebuild/pkg_preinst.bash
+++ b/ebuild/pkg_preinst.bash
@@ -9,8 +9,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/ebuild/pkg_prerm.bash b/ebuild/pkg_prerm.bash
index 4a3b8b6..d515414 100644
--- a/ebuild/pkg_prerm.bash
+++ b/ebuild/pkg_prerm.bash
@@ -9,8 +9,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/ebuild/pkg_setup.bash b/ebuild/pkg_setup.bash
index 3da75de..307d8f8 100644
--- a/ebuild/pkg_setup.bash
+++ b/ebuild/pkg_setup.bash
@@ -9,8 +9,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/ebuild/portage_stubs.bash b/ebuild/portage_stubs.bash
index a5fa2b1..5fc6840 100644
--- a/ebuild/portage_stubs.bash
+++ b/ebuild/portage_stubs.bash
@@ -9,8 +9,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/ebuild/sandbox.bash b/ebuild/sandbox.bash
index 2b03dec..cd504ae 100644
--- a/ebuild/sandbox.bash
+++ b/ebuild/sandbox.bash
@@ -9,8 +9,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/ebuild/src_compile.bash b/ebuild/src_compile.bash
index 4147c6d..563e970 100644
--- a/ebuild/src_compile.bash
+++ b/ebuild/src_compile.bash
@@ -9,8 +9,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/ebuild/src_install.bash b/ebuild/src_install.bash
index 02ff2fb..ff33802 100644
--- a/ebuild/src_install.bash
+++ b/ebuild/src_install.bash
@@ -9,8 +9,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/ebuild/src_test.bash b/ebuild/src_test.bash
index 5a53732..ced06e7 100644
--- a/ebuild/src_test.bash
+++ b/ebuild/src_test.bash
@@ -9,8 +9,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/ebuild/src_unpack.bash b/ebuild/src_unpack.bash
index 9dae9ce..ec837f8 100644
--- a/ebuild/src_unpack.bash
+++ b/ebuild/src_unpack.bash
@@ -9,8 +9,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/ebuild/usage_error.bash b/ebuild/usage_error.bash
index 41c7247..0af5b2d 100644
--- a/ebuild/usage_error.bash
+++ b/ebuild/usage_error.bash
@@ -9,8 +9,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/ebuild/work_around_broken_utilities.bash.in b/ebuild/work_around_broken_utilities.bash.in
index 246f387..cb97656 100644
--- a/ebuild/work_around_broken_utilities.bash.in
+++ b/ebuild/work_around_broken_utilities.bash.in
@@ -9,8 +9,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/hooks/eselect_env_update.bash b/hooks/eselect_env_update.bash
index c75bf8e..eb31850 100755
--- a/hooks/eselect_env_update.bash
+++ b/hooks/eselect_env_update.bash
@@ -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/hooks/find_config_updates.bash b/hooks/find_config_updates.bash
index 43d32d1..983684b 100755
--- a/hooks/find_config_updates.bash
+++ b/hooks/find_config_updates.bash
@@ -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/hooks/gnu_info_index.bash b/hooks/gnu_info_index.bash
index 055aa0b..f96c690 100755
--- a/hooks/gnu_info_index.bash
+++ b/hooks/gnu_info_index.bash
@@ -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/hooks/installable_cache_regen.bash b/hooks/installable_cache_regen.bash
index 64829a0..4caf9ef 100755
--- a/hooks/installable_cache_regen.bash
+++ b/hooks/installable_cache_regen.bash
@@ -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/hooks/installed_cache_regen.bash b/hooks/installed_cache_regen.bash
index f34cc9c..f134872 100755
--- a/hooks/installed_cache_regen.bash
+++ b/hooks/installed_cache_regen.bash
@@ -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/hooks/log.bash b/hooks/log.bash
index f73ba20..43e042e 100755
--- a/hooks/log.bash
+++ b/hooks/log.bash
@@ -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/hooks/news.bash b/hooks/news.bash
index 4f61180..8e656ef 100755
--- a/hooks/news.bash
+++ b/hooks/news.bash
@@ -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/hooks/rewrite_broken_symlinks.bash b/hooks/rewrite_broken_symlinks.bash
index 3d6f7cf..7e83d88 100755
--- a/hooks/rewrite_broken_symlinks.bash
+++ b/hooks/rewrite_broken_symlinks.bash
@@ -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/args/args_dumper.cc b/paludis/args/args_dumper.cc
index afdc747..425ca04 100644
--- a/paludis/args/args_dumper.cc
+++ b/paludis/args/args_dumper.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/args/args_dumper.hh b/paludis/args/args_dumper.hh
index c53a3b3..c1cd9c1 100644
--- a/paludis/args/args_dumper.hh
+++ b/paludis/args/args_dumper.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_list/dep_list.cc b/paludis/dep_list/dep_list.cc
index 00dcd65..6d2bedc 100644
--- a/paludis/dep_list/dep_list.cc
+++ b/paludis/dep_list/dep_list.cc
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* 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
diff --git a/paludis/dep_list/dep_list.hh b/paludis/dep_list/dep_list.hh
index 3601bdf..55eb0a4 100644
--- a/paludis/dep_list/dep_list.hh
+++ b/paludis/dep_list/dep_list.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2005, 2006 Ciaran McCreesh <ciaranm@ciaranm.org>
+ * Copyright (c) 2005, 2006, 2007 Ciaran McCreesh <ciaranm@ciaranm.org>
*
* 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
diff --git a/paludis/selinux/security_context.cc b/paludis/selinux/security_context.cc
index 2a6dd3b..a11c3fc 100644
--- a/paludis/selinux/security_context.cc
+++ b/paludis/selinux/security_context.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/selinux/security_context.hh b/paludis/selinux/security_context.hh
index 1388faa..f3170a2 100644
--- a/paludis/selinux/security_context.hh
+++ b/paludis/selinux/security_context.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