Fix LICENSE.

(Portage version: 2.1.11.16/cvs/Linux x86_64)

9 files changed, 23 insertions, 17 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 40842c5c6864..5cb66cc8cd4a 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.526 2012/09/07 17:09:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.527 2012/09/18 06:52:43 ulm Exp $
+
+  18 Sep 2012; Ulrich Müller <ulm@gentoo.org> emacs-18.59-r8.ebuild,
+  emacs-21.4-r24.ebuild, emacs-22.3-r10.ebuild, emacs-23.4-r3.ebuild,
+  emacs-23.4-r4.ebuild, emacs-24.1.ebuild, emacs-24.1-r1.ebuild,
+  emacs-24.2.ebuild:
+  Fix LICENSE.
 
   07 Sep 2012; Ulrich Müller <ulm@gentoo.org> metadata.xml:
   Add description for source USE flag.
diff --git a/app-editors/emacs/emacs-18.59-r8.ebuild b/app-editors/emacs/emacs-18.59-r8.ebuild
index 7feda40be41b..649d6cfeb1ca 100644
--- a/app-editors/emacs/emacs-18.59-r8.ebuild
+++ b/app-editors/emacs/emacs-18.59-r8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.6 2012/08/24 08:16:38 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r8.ebuild,v 1.7 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/old-gnu/emacs/${P}.tar.gz
 	ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz
 	mirror://gentoo/${P}-patches-8.tar.bz2"
 
-LICENSE="GPL-1 GPL-2 BSD" #as-is
+LICENSE="GPL-1+ GPL-2+ BSD" #as-is
 SLOT="18"
 KEYWORDS="amd64 x86"
 IUSE=""
diff --git a/app-editors/emacs/emacs-21.4-r24.ebuild b/app-editors/emacs/emacs-21.4-r24.ebuild
index 1c4fc650f4fb..c90fbea8062b 100644
--- a/app-editors/emacs/emacs-21.4-r24.ebuild
+++ b/app-editors/emacs/emacs-21.4-r24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r24.ebuild,v 1.5 2012/06/11 22:01:52 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r24.ebuild,v 1.6 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 	mirror://gentoo/${P}-patches-13.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
-LICENSE="GPL-2 FDL-1.1 BSD as-is MIT"
+LICENSE="GPL-2+ FDL-1.1+ BSD as-is MIT"
 SLOT="21"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="X Xaw3d leim motif sendmail"
diff --git a/app-editors/emacs/emacs-22.3-r10.ebuild b/app-editors/emacs/emacs-22.3-r10.ebuild
index 1654544c12f2..3b767e1ac0d5 100644
--- a/app-editors/emacs/emacs-22.3-r10.ebuild
+++ b/app-editors/emacs/emacs-22.3-r10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r10.ebuild,v 1.2 2012/06/29 07:58:35 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r10.ebuild,v 1.3 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz
 	mirror://gentoo/${P}-patches-8.tar.bz2"
 
-LICENSE="GPL-3 FDL-1.2 BSD as-is MIT"
+LICENSE="GPL-3+ FDL-1.2+ BSD as-is MIT"
 SLOT="22"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="alsa games gif gtk gzip-el hesiod jpeg kerberos motif png sound source tiff toolkit-scroll-bars X Xaw3d +xpm"
diff --git a/app-editors/emacs/emacs-23.4-r3.ebuild b/app-editors/emacs/emacs-23.4-r3.ebuild
index 4925c1cbd035..d2b46239d5a1 100644
--- a/app-editors/emacs/emacs-23.4-r3.ebuild
+++ b/app-editors/emacs/emacs-23.4-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.12 2012/08/07 19:29:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r3.ebuild,v 1.13 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-6.tar.bz2"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
diff --git a/app-editors/emacs/emacs-23.4-r4.ebuild b/app-editors/emacs/emacs-23.4-r4.ebuild
index 4b3d4792c447..d6e7d5447788 100644
--- a/app-editors/emacs/emacs-23.4-r4.ebuild
+++ b/app-editors/emacs/emacs-23.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.6 2012/09/02 17:56:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.4-r4.ebuild,v 1.7 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-7.tar.bz2"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
diff --git a/app-editors/emacs/emacs-24.1-r1.ebuild b/app-editors/emacs/emacs-24.1-r1.ebuild
index 19df44268272..713cdfb0fd7d 100644
--- a/app-editors/emacs/emacs-24.1-r1.ebuild
+++ b/app-editors/emacs/emacs-24.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.6 2012/09/02 17:56:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1-r1.ebuild,v 1.7 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-5.tar.bz2"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
diff --git a/app-editors/emacs/emacs-24.1.ebuild b/app-editors/emacs/emacs-24.1.ebuild
index faffec706f3f..757fbe7690e9 100644
--- a/app-editors/emacs/emacs-24.1.ebuild
+++ b/app-editors/emacs/emacs-24.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.12 2012/08/11 12:56:30 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.1.ebuild,v 1.13 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
 	mirror://gentoo/${P}-patches-4.tar.bz2"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"
diff --git a/app-editors/emacs/emacs-24.2.ebuild b/app-editors/emacs/emacs-24.2.ebuild
index b7f1ef6fcde4..e725c2b9f84a 100644
--- a/app-editors/emacs/emacs-24.2.ebuild
+++ b/app-editors/emacs/emacs-24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.2.ebuild,v 1.1 2012/08/27 16:36:11 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-24.2.ebuild,v 1.2 2012/09/18 06:52:43 ulm Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.xz
 	mirror://gentoo/${P}-patches-1.tar.xz"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
+LICENSE="GPL-3+ FDL-1.3+ BSD as-is MIT W3C unicode PSF-2"
 SLOT="24"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus games gconf gif gnutls gpm gsettings gtk gtk3 gzip-el hesiod imagemagick jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm"