Add as-is and X11 to LICENSE for oldXMenu und etc/rgb.txt, respectively.

(Portage version: 2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 i686)

6 files changed, 16 insertions, 11 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 1b00f8784760..f3bd98c38d96 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.284 2008/10/27 22:50:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.285 2008/11/07 08:43:11 ulm Exp $
+
+  07 Nov 2008; Ulrich Mueller <ulm@gentoo.org> emacs-18.59-r5.ebuild,
+  emacs-21.4-r15.ebuild, emacs-21.4-r17.ebuild, emacs-22.2-r3.ebuild,
+  emacs-22.3.ebuild:
+  Add as-is and X11 to LICENSE for oldXMenu und etc/rgb.txt, respectively.
 
   27 Oct 2008; Brent Baude <ranger@gentoo.org> emacs-22.3.ebuild:
   stable ppc64, bug 240300
diff --git a/app-editors/emacs/emacs-18.59-r5.ebuild b/app-editors/emacs/emacs-18.59-r5.ebuild
index 2a996f4a6672..6dfb75592fe5 100644
--- a/app-editors/emacs/emacs-18.59-r5.ebuild
+++ b/app-editors/emacs/emacs-18.59-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.4 2008/10/21 15:54:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-18.59-r5.ebuild,v 1.5 2008/11/07 08:43:11 ulm Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -10,7 +10,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-3.tar.bz2"
 
-LICENSE="GPL-1 GPL-2 BSD"
+LICENSE="GPL-1 GPL-2 BSD as-is"
 SLOT="18"
 KEYWORDS="x86"
 IUSE="X"
diff --git a/app-editors/emacs/emacs-21.4-r15.ebuild b/app-editors/emacs/emacs-21.4-r15.ebuild
index c264b1a00227..a5709626868a 100644
--- a/app-editors/emacs/emacs-21.4-r15.ebuild
+++ b/app-editors/emacs/emacs-21.4-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r15.ebuild,v 1.5 2008/09/23 20:21:48 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r15.ebuild,v 1.6 2008/11/07 08:43:11 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 	mirror://gentoo/${P}-patches-2.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
-LICENSE="GPL-2 FDL-1.1 BSD"
+LICENSE="GPL-2 FDL-1.1 BSD as-is X11"
 SLOT="21"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
 IUSE="X Xaw3d leim motif nls sendmail"
diff --git a/app-editors/emacs/emacs-21.4-r17.ebuild b/app-editors/emacs/emacs-21.4-r17.ebuild
index a55365098847..1af6382f1e2b 100644
--- a/app-editors/emacs/emacs-21.4-r17.ebuild
+++ b/app-editors/emacs/emacs-21.4-r17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.12 2008/10/21 15:54:59 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r17.ebuild,v 1.13 2008/11/07 08:43:11 ulm Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/emacs/${P}a.tar.gz
 	mirror://gentoo/${P}-patches-6.tar.bz2
 	leim? ( mirror://gnu/emacs/leim-${PV}.tar.gz )"
 
-LICENSE="GPL-2 FDL-1.1 BSD"
+LICENSE="GPL-2 FDL-1.1 BSD as-is X11"
 SLOT="21"
 KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
 IUSE="X Xaw3d leim motif nls sendmail"
diff --git a/app-editors/emacs/emacs-22.2-r3.ebuild b/app-editors/emacs/emacs-22.2-r3.ebuild
index 99a1a8a65f75..05379b9ab371 100644
--- a/app-editors/emacs/emacs-22.2-r3.ebuild
+++ b/app-editors/emacs/emacs-22.2-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2-r3.ebuild,v 1.10 2008/09/26 06:12:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.2-r3.ebuild,v 1.11 2008/11/07 08:43:11 ulm Exp $
 
 inherit autotools elisp-common eutils flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
 
-LICENSE="GPL-3 FDL-1.2 BSD"
+LICENSE="GPL-3 FDL-1.2 BSD as-is X11"
 SLOT="22"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"
diff --git a/app-editors/emacs/emacs-22.3.ebuild b/app-editors/emacs/emacs-22.3.ebuild
index 57fa6e65b203..7959c853f104 100644
--- a/app-editors/emacs/emacs-22.3.ebuild
+++ b/app-editors/emacs/emacs-22.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.11 2008/10/27 22:50:53 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3.ebuild,v 1.12 2008/11/07 08:43:11 ulm Exp $
 
 inherit autotools elisp-common eutils flag-o-matic
 
@@ -8,7 +8,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
 
-LICENSE="GPL-3 FDL-1.2 BSD"
+LICENSE="GPL-3 FDL-1.2 BSD as-is X11"
 SLOT="22"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
 IUSE="alsa gif gtk gzip-el hesiod jpeg kerberos motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xpm"