Remove Emacs-23-CEDET-grammars from LICENSE because we distribute the grammar files...

Package-Manager: portage-2.1.10.40/cvs/Linux x86_64

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ec36a93c1d902146c189d634e7154c7fed51cedd..a179b034d6811b7a7fc743e8ffa9aa405efb7fb2 100644 (file)
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/emacs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.443 2011/12/13 22:20:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.444 2011/12/14 13:14:31 ulm Exp $
+
+  14 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r3.ebuild:
+  Remove Emacs-23-CEDET-grammars from LICENSE because we distribute the grammar
+  files in our patchball.
 
 *emacs-23.3-r3 (13 Dec 2011)
 

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 496b54a68aa9eec6ca2fe5bb3637c1147c8d9539..06e666616821db52658759133b3f0e91699fd718 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -18,13 +18,13 @@ EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5
 EBUILD emacs-22.3-r8.ebuild 7832 RMD160 d74e25b91dbe8783930d1647dec3cf8e44b49b17 SHA1 92e6d6b50578faf6f669e6b2389d7599712048e9 SHA256 b9a75b8b6f468f984441ab725779ff581c8ddbfa14ccff404cc11381d0db741b
 EBUILD emacs-23.3-r1.ebuild 10301 RMD160 885b752594822d1425e3afe95e997ea9fb5a2776 SHA1 90bcec933661eb0f5066a6ae679ecdb6b7ac42d0 SHA256 93cf3fe5516ed9b9f0e06ae9de0472e55c47d89d0c7824da5269e71d548e4d0c
 EBUILD emacs-23.3-r2.ebuild 10656 RMD160 015444a016093e78a11dec0ad71857e1fcc7ef61 SHA1 600b0741c75f0bc0ab246380ce1d105c83186cd3 SHA256 821938b07f1303e0b0a2a8751f1d98760c4623bb87817c722c9f8e60a9f6d106
-EBUILD emacs-23.3-r3.ebuild 10418 RMD160 5b2be564b91dc0bd58393a0aac212e5f8a64d544 SHA1 f2d471288c3241a24ab8f27f51da6bb5195276e9 SHA256 1df63f620c4fa6d9ba6b9a481b8e083864bbbeb8280428974475baed1f44531b
-MISC ChangeLog 63456 RMD160 13215fd7530c2ef0730f33ce81c1b41c1d4cb9a5 SHA1 189029e645a75d38a33dc89e4bb9b0567eedd6ee SHA256 60bc7438621cf026edb6e949a26784a8dd2714f57474ee01f27062973999355f
+EBUILD emacs-23.3-r3.ebuild 10394 RMD160 a663cd5f00d97188a412f3ede9da8a90a4043a2c SHA1 ae9437d9c40519ce84103f3410a0fdd64cc89aab SHA256 8d21bddda36ad67df6a1ce88f79dcf73d6a1615c408f7bc070f9ad40252f73f2
+MISC ChangeLog 63632 RMD160 ca5a4a36bbdb81c541b677eff451ec8214bcb484 SHA1 078b155c27b5b20852e07abfeff9ce9feecaedb8 SHA256 96e84086682aff35f00f9f4cca65dd9d44ece47a47f4985547b3bafff5caee24
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7n0hwACgkQOeoy/oIi7uzUGQCgmPiSk7L9BsFSkGT3Tb7SEapz
-AUUAn1sbdHYh/d0fSEVPQCi03d1bGY7c
-=7ld7
+iEYEARECAAYFAk7oo5MACgkQOeoy/oIi7ux8XQCdGq2GxXPpKcgxxt5+OwGphIJh
+hLEAoLfvbMsKqPwFXCTv8R6w+GLsFPcD
+=eB1E
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-23.3-r3.ebuild b/app-editors/emacs/emacs-23.3-r3.ebuild
index dbe983fb8107d3f191cacb2039d0bff7ba89168a..2c11eff13fa7b637e23c7511e98aa5e382957a42 100644 (file)
--- a/app-editors/emacs/emacs-23.3-r3.ebuild
+++ b/app-editors/emacs/emacs-23.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.1 2011/12/13 22:20:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r3.ebuild,v 1.2 2011/12/14 13:14:31 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}a.tar.bz2
        mirror://gentoo/${P}-patches-3.tar.bz2"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2 Emacs-23-CEDET-grammars"
+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 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="alsa aqua athena dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"