Update Manifest file; upstream tarballs have been replaced without version bump. Add PSF-2 to LICENSE for CEDET grammars.

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

4 files changed, 18 insertions, 15 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 1849656cc12f..0381b33fcb38 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.422 2011/07/15 16:09:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.423 2011/08/01 06:33:39 ulm Exp $
+
+  01 Aug 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.2-r2.ebuild,
+  emacs-23.3.ebuild:
+  Update Manifest file; upstream tarballs have been replaced without version
+  bump. Add PSF-2 to LICENSE for CEDET grammars.
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org> emacs-23.3.ebuild:
   ppc64 stable wrt #363633
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 761da5dd08bc..a323a1ff96e5 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -11,21 +11,19 @@ DIST emacs-22.3.tar.gz 39587396 RMD160 a7eed5099d0cab25f34152f1b18b5c1b4e2e0746
 DIST emacs-23.2-patches-2.tar.bz2 2248 RMD160 e8e6d8ac11b9d9f61edca4046381f93deec24d17 SHA1 261f32cde33890d77efde5448c6aedf72377f1f1 SHA256 5a5c257847ec952d4ca8e9c1c296ae906043b9fb989c40042d25cdb27a81768c
 DIST emacs-23.2.tar.bz2 38376047 RMD160 b7441be0a32e78e02f108dcb3b09b531c6849d95 SHA1 b46e6b33e1f5e24ede0ecd0d8703b64847c83946 SHA256 ffd466fa5b06c0451612210190d2feb14b2d7ca9dd41893357d2201dd28526c5
 DIST emacs-23.3-patches-1.tar.bz2 1675 RMD160 f167c15e8d1c6a9629967aa3f910cc476e22315e SHA1 51522c8af1c0991ef189f8537e6636f7e1b30553 SHA256 caec6e052a564e75de2873e2d0e4ffb8169bde3c4f786e1a04b8781df31456fe
-DIST emacs-23.3.tar.bz2 38689490 RMD160 bddaba77f543b41a91d133c6700078a9b41b0bf8 SHA1 de2c924655f0f4e012cc119840cd341a1d40e32c SHA256 6adc96efd794513b25c7c93fcc2e2918353c427c94bd24269f2d82880d29ca4d
+DIST emacs-23.3.tar.bz2 38748283 RMD160 21f201714bca420c3a8fed8c92058cec786e724e SHA1 795bdfa372e42b9589a80f6dcb2ad8fed65b90e4 SHA256 9f4beee3bf4987914d57851c0aac017cb92a1410c2b31ba313265c64a38cc6ba
 DIST leim-21.4.tar.gz 3291433 RMD160 89e1108bfe06425a0d6b4d941f9c297551bafcca SHA1 dd63f9aca1a58d40d9d426dd410fb627230974f7 SHA256 db24946985dd644bfed18815d6e991dad27f8ab1fd5823dd6dc4eb8dcd04333b
 EBUILD emacs-18.59-r6.ebuild 2736 RMD160 23d2b7c5cbf0deb8d76035a77fe803206581a810 SHA1 997a0271b8b4114867b308843180a59ab03fcf63 SHA256 bcc584e1ee5a50c6a6539458acf0ce229f79981430fe624e4f0301c63ddaf14a
 EBUILD emacs-21.4-r23.ebuild 5014 RMD160 b598a01d292f0652d3d580705970c626a3e84b32 SHA1 5fad050c4fbfcaf69faae74aaf55c7206cf284a4 SHA256 0e3b454a5e326ecd6dae5e363a644fa3b5dcf6373c8dcbc9d8e3288646826d61
 EBUILD emacs-22.3-r7.ebuild 7888 RMD160 d25cde5f1d2b177d39e42f0232f8b08825cfb7bb SHA1 a368eae3bccd5c069b070c545a70175e703b561d SHA256 7126cae4361a78acd7b01b85da689f60544916abf274d3aaef3a25919668ca83
-EBUILD emacs-23.2-r2.ebuild 10008 RMD160 47d6ab99e7483fe18a7fece0a31f1f0ad19fdfef SHA1 57367184d44c8e170f3186cf84c007a4d9be7fd3 SHA256 44fd93a28deb705d0cdbf741bb3ce65ae0c6bdc1b06d147b76abf085cd1cc4f9
-EBUILD emacs-23.3.ebuild 10080 RMD160 2f60911139ede66835d76d063b38a332054f8a3c SHA1 237149125c05c3b4602503ad8b0a81a10b949141 SHA256 09e357ce2c820af4db3b9a8ede31edf083cea01bb5b95ee425e86e5f67b393f5
-MISC ChangeLog 59918 RMD160 ecb705d70a4c54b13f8c0155c8ef376dd11eb5c8 SHA1 1d04eac0bf13d1d501840b199fe2a4fc6fb17849 SHA256 d52bc2457c268ca10c797d12033269c921489025a93b719ed99f0549be3cde96
+EBUILD emacs-23.2-r2.ebuild 10014 RMD160 8e7e4cef00bc8ddd5e4fb0c6c123058228e7839d SHA1 a6b3ef99db2d4e71dc1553dfe57bdd3b73416559 SHA256 c151b6ceddfc3225b8c9993a8416075941d6354adc05fc8d8fee2cadc2dc8c2e
+EBUILD emacs-23.3.ebuild 10079 RMD160 fa47d01aaaca2e912677e397e382ad23b2f0267c SHA1 0b9c5d28e247e80598afb6b8a85edf95fa5d3554 SHA256 04c48706ed5e2161e01ed71a06f97cb6e349144e8b676b0138c4cd983b072a2d
+MISC ChangeLog 60128 RMD160 31c965af838b447012a7dde0e645469361286f58 SHA1 4c9b54f36a38d4cf34c21447ed666a054a0f84ad SHA256 de193f09ffe77f831f44507ee0090c8169fb01945570fc33b6d25ea939f63c4b
 MISC metadata.xml 1704 RMD160 efbac0e266304bf11ffb64c3cdfecac81e7ff177 SHA1 d12430143adab307f896d1c72c02ed40a8f62822 SHA256 22b564149011a32c17256ac39c2d6d49be01b52f9ddddeb82795ff9b66a46ed1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4gZjwACgkQIiMqcbOVdxR8OwP+I7pILP34/Zb/WehhUbLxzxeO
-SWvm1YjPSNJjf9LI5INsW5IFfc8ekvONa7iZe6/R2gKqPARWBLbErb8uR+/f8v1p
-ttCZonXrpRj1eCeHd2uyf8kR00A9WSy+dLtp0Sd1CLiBlAoji+7XuThBZHhZV9yl
-qZH1zrtEQcv3mvyQF6w=
-=NkmG
+iEYEARECAAYFAk42SfgACgkQOeoy/oIi7uyoAwCgg2ykJSqrlGrstlwgE4bIL1l9
+o/EAmgJNdvbMqNVgLf8SyelysaUloffb
+=Zr5S
 -----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-23.2-r2.ebuild b/app-editors/emacs/emacs-23.2-r2.ebuild
index 4a3a869e4336..b6ff308f05af 100644
--- a/app-editors/emacs/emacs-23.2-r2.ebuild
+++ b/app-editors/emacs/emacs-23.2-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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.2-r2.ebuild,v 1.12 2010/12/29 13:09:01 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.2-r2.ebuild,v 1.13 2011/08/01 06:33:39 ulm Exp $
 
 EAPI=2
 
@@ -25,7 +25,7 @@ fi
 DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
+LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode PSF-2"
 SLOT="23"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="alsa dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
diff --git a/app-editors/emacs/emacs-23.3.ebuild b/app-editors/emacs/emacs-23.3.ebuild
index e9acb54a2941..512de159ca4f 100644
--- a/app-editors/emacs/emacs-23.3.ebuild
+++ b/app-editors/emacs/emacs-23.3.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.ebuild,v 1.10 2011/07/15 16:09:26 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3.ebuild,v 1.11 2011/08/01 06:33:39 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-1.tar.bz2"
 
-LICENSE="GPL-3 FDL-1.3 BSD as-is MIT W3C unicode"
+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 dbus gconf gif gpm gtk gzip-el hesiod jpeg kerberos m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"