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

Package-Manager: portage-2.2_rc13/cvs/Linux 2.6.26-gentoo-r1 i686

7 files changed, 32 insertions, 17 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/Manifest b/app-editors/emacs/Manifest
index 30115ea64ca4..0d501ddc1ae2 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
 AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 AUX emacs-22.1-vcdiff-tmp-race.patch 831 RMD160 0ffb7c22f28982a0f199a177a5e21a6a62b5ef46 SHA1 9200da3d3825747ded3cba4c9e1c0a514131e9ae SHA256 a220e676cde0e84fb136328915a747cce1b0807c21373cfda7c93063997d616d
@@ -16,10 +19,17 @@ DIST emacs-21.4a.tar.gz 20403483 RMD160 c312e739935b56d08783bbfe97992297a363cb8a
 DIST emacs-22.2.tar.gz 38694318 RMD160 ec2da7cd7065cbd76773e544da1d1495f33d6ea1 SHA1 7a371332cb8400d44e8eb31f19e432bbc93523a0 SHA256 216839e1fb38ca4f2ed0a07689fb47ee80d90845f34e0a56fe781d6aa462e367
 DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746 SHA1 5e9b3e0205099a83be7198fd43ba1c9442a3feb0 SHA256 7bd9b719db8ee20c75ee0d256737f7fd2c0e2ea30a285a3afbfc32c856420d16
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
-EBUILD emacs-18.59-r5.ebuild 2496 RMD160 58c66752c0863567db003cbbdca9b535262bfb05 SHA1 51f6c2a67a4146a09c3913fe26311e0e2bfb97fb SHA256 b2472d594e49c2dd63b445a17b6785d0aea72d2aba8302fc0434a677f24b6388
-EBUILD emacs-21.4-r15.ebuild 5243 RMD160 435bce2284700a04837706304e093528fc4d07cd SHA1 bf2c5fc026a36efe7c60e39ad8bc79534af3060a SHA256 872d3926e1c2189c6635ded30b6fdebb0a70eae26a0f61717c176932e786b0da
-EBUILD emacs-21.4-r17.ebuild 5341 RMD160 60a1a5bc4b3859206dde0b44aa3155f09fc56c32 SHA1 56b07a794a39d392312a64b2b6f7d9868a023471 SHA256 eaab07bdc4869250b670d054894471e4b9a020d0c9e36d3cadf0bc3c2e4cf187
-EBUILD emacs-22.2-r3.ebuild 8190 RMD160 82e59ee0d7744c470f1b7d1c705528294b9c9efa SHA1 71574c10a21ceb8414b7f99d3587cd6ec718ac75 SHA256 58e5e2c0a4803cfdeb44a66dee84ed5aee4ad57f801a2a0960a9b075e35bda42
-EBUILD emacs-22.3.ebuild 7652 RMD160 1c73b325c2e140bdb1ec840d36aa8eed7c4f02bd SHA1 99e292679690b2447096b82d2249fc7af4f63f46 SHA256 e47c9ad1ad03e4954449488aa72a7f31dd47f3ae1ad89af217dd82250c6fc7a4
-MISC ChangeLog 40834 RMD160 d0a460de85913aa598539634de791975508b34cf SHA1 20cd4d8be371c9a6323b2fe5d68b8792247a1f37 SHA256 86167ea3488e429dbaa3c888685d005159a53d455d4bdda0e37e81f0ff3856db
+EBUILD emacs-18.59-r5.ebuild 2502 RMD160 de98522d649b54d0d0af837be6100537c19c0aa4 SHA1 430f0e0745d1c0f884603af031d06405825b8cbf SHA256 5e7ccfc443996279b62122680a190294952127e40a6aabf31f8e1eef771ac8af
+EBUILD emacs-21.4-r15.ebuild 5251 RMD160 6cb3de4ad357b8982fbc64dd2cad6bc1ee3bcbe4 SHA1 76a2ba348fd5ac93dd326a9fedf77550dbb51464 SHA256 00a75f9804a8df387aafa4380dd5855ba6991b69e1a68a5965fd69614b677d73
+EBUILD emacs-21.4-r17.ebuild 5351 RMD160 cc8778d9b1c08774c4f6241f5d4043ddfc2f12db SHA1 f6431c378a38e8c154cb39ed4f9b6c078f3aede8 SHA256 35ec8245a8ab1b3fcfdb09d5ee3ad36770f68998039cb66e2a62a986bf51584e
+EBUILD emacs-22.2-r3.ebuild 8196 RMD160 ecf047909794fd1ed3f26912de31febe6e5f600d SHA1 99a3dc7eae2347db5afe59159f427997509e15a5 SHA256 24ef32b3fd737117e814d46811796756d3cdfcc7ab7c075555b8c3796494e47f
+EBUILD emacs-22.3.ebuild 7659 RMD160 41632c4fc178d77d6a0f6924b95eb5a9e1b67e30 SHA1 e3618e0ef8e914999faf0e3067ec1bb4e22bac8b SHA256 86bef96bc528b9e3985bc4d224e7f0eb08c5eb95324e15aa97a36d87c7ab8898
+MISC ChangeLog 41068 RMD160 4dda3dc0aeba39a1a0aa237b89a593e5e0f5431a SHA1 d25d7c576ca80668e74e31f1ee6f383ea3c22fbd SHA256 ea3da8017a642b8ff409113ea5e084021debecb35703a1865475b145c147fa5c
 MISC metadata.xml 1652 RMD160 537bd66f869b6306694a2e30a05d15e48e324a54 SHA1 afe373a8a2d21971448fc2480f6f1b77e0bb1f23 SHA256 89dca1423f45221c7df249d7e96e162abd7c3188824b81c0f83c2d8f4fa7a1b5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEARECAAYFAkkT/8IACgkQOeoy/oIi7uxqbQCdGwlu+cJbUCDYRD+DHVc5gqcz
+O5AAoOno4QYXrITc7UABe1qafkJceDLT
+=xwWx
+-----END PGP SIGNATURE-----
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"