fix broken headers in a few random files

13 files changed, 19 insertions, 73 deletions

diff --git a/eclass/ant-tasks.eclass b/eclass/ant-tasks.eclass
index 0b7293fedf3a..91d3193a2f2d 100644
--- a/eclass/ant-tasks.eclass
+++ b/eclass/ant-tasks.eclass
@@ -1,8 +1,5 @@
-# Eclass for building dev-java/ant-* packages
-#
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Vlastimil Babka <caster@gentoo.org>
 # $Id$
 
 # @ECLASS: ant-tasks.eclass
diff --git a/eclass/gdesklets.eclass b/eclass/gdesklets.eclass
index 4b2bb888bfd9..378dd1386cd7 100644
--- a/eclass/gdesklets.eclass
+++ b/eclass/gdesklets.eclass
@@ -1,5 +1,5 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # @ECLASS: gdesklets.eclass
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index ea0f3e05fa90..64dca0af538f 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -1,19 +1,5 @@
-# eclass for ant based Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-# Changes:
-#   May 2007:
-#     Made bsfix make one pass for all things and add some glocal targets for
-#     setting up the whole thing. Contributed by  kiorky
-#     (kiorky@cryptelium.net).
-#   December 2006:
-#     I pretty much rewrote the logic of the bsfix functions
-#     and xml-rewrite.py because they were so slow
-#     Petteri Räty (betelgeuse@gentoo.org)
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # @ECLASS: java-ant-2.eclass
diff --git a/eclass/java-mvn-src.eclass b/eclass/java-mvn-src.eclass
index da60cf8ea8e0..c34034eb00d7 100644
--- a/eclass/java-mvn-src.eclass
+++ b/eclass/java-mvn-src.eclass
@@ -1,9 +1,5 @@
-# Eclass for Java packages from bare sources exported by Maven
-#
-# Copyright (c) 2004-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 inherit java-pkg-simple
diff --git a/eclass/java-osgi.eclass b/eclass/java-osgi.eclass
index 7e13ed2edd5f..46865fa8b1ce 100644
--- a/eclass/java-osgi.eclass
+++ b/eclass/java-osgi.eclass
@@ -1,10 +1,5 @@
-# Base eclass for Java packages that needs to be OSGi compliant
-#
-# Copyright (c) 2007, Jean-Noël Rivasseau <elvanor@gmail.com>
-# Copyright (c) 2007-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2007-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # -----------------------------------------------------------------------------
diff --git a/eclass/java-pkg-2.eclass b/eclass/java-pkg-2.eclass
index a0028c8200d7..6b770663cd2f 100644
--- a/eclass/java-pkg-2.eclass
+++ b/eclass/java-pkg-2.eclass
@@ -1,10 +1,5 @@
-# Eclass for Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # @ECLASS: java-pkg-2.eclass
diff --git a/eclass/java-pkg-opt-2.eclass b/eclass/java-pkg-opt-2.eclass
index 9902837017c2..20c4cbc471e8 100644
--- a/eclass/java-pkg-opt-2.eclass
+++ b/eclass/java-pkg-opt-2.eclass
@@ -1,15 +1,5 @@
-# Eclass for optional Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004-2011, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
-# Major changes:
-#    20070805:
-#       Removed phase hooks because Portage does proper env saving now.
-#       <betelgeuse@gentoo.org>
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # @ECLASS: java-pkg-opt-2.eclass
diff --git a/eclass/java-pkg-simple.eclass b/eclass/java-pkg-simple.eclass
index d5309bb105be..7abdb624de5e 100644
--- a/eclass/java-pkg-simple.eclass
+++ b/eclass/java-pkg-simple.eclass
@@ -1,9 +1,5 @@
-# Eclass for simple bare-source Java packages
-#
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 inherit java-utils-2
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index e0984f33f633..302a82ab86de 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -1,11 +1,5 @@
-# Base eclass for Java packages
-#
-# Copyright (c) 2004-2005, Thomas Matthijs <axxo@gentoo.org>
-# Copyright (c) 2004, Karl Trygve Kalleberg <karltk@gentoo.org>
-# Copyright (c) 2004-2015, Gentoo Foundation
-#
-# Licensed under the GNU General Public License, v2
-#
+# Copyright 2004-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # @ECLASS: java-utils-2.eclass
diff --git a/eclass/pam.eclass b/eclass/pam.eclass
index a690e00a1034..c5d9108625f5 100644
--- a/eclass/pam.eclass
+++ b/eclass/pam.eclass
@@ -1,7 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
-#
 
 # @ECLASS: pam.eclass
 # @MAINTAINER:
diff --git a/eclass/twisted-r1.eclass b/eclass/twisted-r1.eclass
index 2cb24e3f07a8..5b10491d25cf 100644
--- a/eclass/twisted-r1.eclass
+++ b/eclass/twisted-r1.eclass
@@ -1,5 +1,5 @@
 # Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
+# Distributed under the terms of the GNU General Public License v2
 # $Id$
 
 # @ECLASS: twisted-r1.eclass
diff --git a/www-apache/passenger/passenger-5.0.20-r1.ebuild b/www-apache/passenger/passenger-5.0.20-r1.ebuild
index 140bd12d6a1c..a9c600ab93b9 100644
--- a/www-apache/passenger/passenger-5.0.20-r1.ebuild
+++ b/www-apache/passenger/passenger-5.0.20-r1.ebuild
@@ -1,4 +1,3 @@
-
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
diff --git a/www-apache/passenger/passenger-5.0.20.ebuild b/www-apache/passenger/passenger-5.0.20.ebuild
index 989ba35136f3..b385fee2e1fa 100644
--- a/www-apache/passenger/passenger-5.0.20.ebuild
+++ b/www-apache/passenger/passenger-5.0.20.ebuild
@@ -1,4 +1,3 @@
-
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$