Add Emacs-23-CEDET-grammars to LICENSE. Replace remaining echo commands by einfo...

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

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 5d9db7374e1ddc50e29f3ea187e0559ff69c59e3..ea0b663d4659162ef932bc36e4fd875f75831c55 100644 (file)
--- 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.441 2011/12/03 15:16:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.442 2011/12/06 13:44:27 ulm Exp $
+
+  06 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-22.3-r8.ebuild,
+  emacs-23.3-r1.ebuild, emacs-23.3-r2.ebuild:
+  Add Emacs-23-CEDET-grammars to LICENSE. Replace remaining echo commands by
+  einfo/elog. Remove obsolete blocker.
 
   03 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-23.3-r2.ebuild:
   New patchset, fixes dumping on macos, bug 388817. Call epatch_user to allow

diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 55b631f6befcc2d5317f411f147d5e4be5758a1c..40976af976af095730d7aee240cfa29e9b01c9ee 100644 (file)
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -13,16 +13,16 @@ DIST emacs-23.3-patches-2.tar.bz2 1936 RMD160 c1cbe26f05e68efe0768445a3918892e99
 DIST emacs-23.3a.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 5017 RMD160 bb3c54bfb53827aa857b465d7fff42a11a92b2ad SHA1 a1dade7a5da5d9ed39995c30df31923e0d3c1f47 SHA256 9dd3e8baaeaea97db9c2046e6ea94278c70e1f4d188579d231c4034489c825a4
-EBUILD emacs-22.3-r8.ebuild 7882 RMD160 9acdd2299199e277ac287583d4fb007b2aa1335e SHA1 d58b682f8437146b3ef87bc692c1825bad794a39 SHA256 12d897f4247cbaf59eda3946fa5c38671086ba9de5d24289638aa7de56ab5ed2
-EBUILD emacs-23.3-r1.ebuild 10277 RMD160 8f902be9fb6a328517507099243e76a2a667fa0a SHA1 ee8568fe4c1ffb509c812a3e80a5b22469c29aae SHA256 f022fbe2be9d8378945a69741336513863b80c7670e24f8c07a949189ed417b8
-EBUILD emacs-23.3-r2.ebuild 10652 RMD160 931702ab00bc7c62041b5e415f30e889534b8aab SHA1 897bbb0663682aa8148b26dbcf089a455988c2dc SHA256 c418222a96b263332db8712ff316f9448414b962682267e0a77b0f261ecb1378
-MISC ChangeLog 62906 RMD160 4ac1dc78bd430e20199c0cdfc622057f9c53ff75 SHA1 6f2e1741251a8ee479e589f1e2b20d538950d7f7 SHA256 240b041fdc67a27b518375126d1a083d14ea75d34f707347a5b0461dc043625e
+EBUILD emacs-21.4-r23.ebuild 5010 RMD160 2b7019a59d7ba82a320c8464c3c2b6c098410b5a SHA1 04e1932afc02456234eb46ffc0baa35681162a7e SHA256 263a626ed20b87ae8f19b136ce75f90d9f188e4a69d8bcfdbef540b419f9b693
+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
+MISC ChangeLog 63138 RMD160 69ce473157f18ce90e2073d85cde1a5ffe0a35f7 SHA1 7df2fa47d87626ab0e9395d3b931ade82c69ab39 SHA256 0b8e6079c7d84265cd96ea855876e3be15b3de8a4ed6aabd48b0849e1611048f
 MISC metadata.xml 1644 RMD160 911d63b0a921d248984f3c5efeb1922f05aa5111 SHA1 7281388d7c274016274e888d97821fda9e5c958c SHA256 7c703ad3af721dfa1d9737f78cd848b7c69a7b906ead5c5fe8fd1db23a1d3166
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7aP4sACgkQOeoy/oIi7uxrigCghQdNURgj/kf6DvlCjW3kbVss
-tucAnA4DrY4WczkRA6M2s0IMZGUWZate
-=M1wj
+iEYEARECAAYFAk7eHoEACgkQOeoy/oIi7uxUIACgpEeXDNt9jJ30LGUL7kRbHJfE
+6DAAnjHRBfDSE0HRZCoB/ja3dYM7sqsC
+=1lAt
 -----END PGP SIGNATURE-----

diff --git a/app-editors/emacs/emacs-21.4-r23.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild
index 9f43dcbd3f75a110d0cebdc2fe8fbb3eeb9db09c..1cdfcf49dfdaa74425ed0f9a98aa59a8ce27e2b5 100644 (file)
--- a/app-editors/emacs/emacs-21.4-r23.ebuild
+++ b/app-editors/emacs/emacs-21.4-r23.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-21.4-r23.ebuild,v 1.4 2011/09/28 05:35:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-21.4-r23.ebuild,v 1.5 2011/12/06 13:44:27 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -171,7 +171,6 @@ pkg_postinst() {
        fi
 
        if use X; then
-               echo
                elog "You need to install some fonts for Emacs."
                elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
                elog "machine would satisfy basic Emacs requirements under X11."

diff --git a/app-editors/emacs/emacs-22.3-r8.ebuild b/app-editors/emacs/emacs-22.3-r8.ebuild
index 7337bd70143b94ec194f6300877c11b8ec71b7e3..49c42f76502de14d3fff301a93df14d3b9c87c12 100644 (file)
--- a/app-editors/emacs/emacs-22.3-r8.ebuild
+++ b/app-editors/emacs/emacs-22.3-r8.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-22.3-r8.ebuild,v 1.3 2011/09/28 05:35:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.3-r8.ebuild,v 1.4 2011/12/06 13:44:27 ulm Exp $
 
 EAPI=4
 WANT_AUTOMAKE="none"
@@ -45,7 +45,6 @@ DEPEND="${RDEPEND}
        gzip-el? ( app-arch/gzip )"
 
 RDEPEND="${RDEPEND}
-       !<app-editors/emacs-vcs-22.1
        >=app-emacs/emacs-common-gentoo-1[X?]"
 
 # FULL_VERSION keeps the full version number, which is needed in order to
@@ -89,10 +88,8 @@ src_configure() {
        local myconf
 
        if use alsa && ! use sound; then
-               echo
                einfo "Although sound USE flag is disabled you chose to have alsa,"
                einfo "so sound is switched on anyway."
-               echo
                myconf="${myconf} --with-sound"
        else
                myconf="${myconf} $(use_with sound)"
@@ -238,13 +235,12 @@ pkg_postinst() {
        eselect emacs update ifunset
 
        if use X; then
-               echo
                elog "You need to install some fonts for Emacs."
                elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
                elog "machine would satisfy basic Emacs requirements under X11."
+               elog
        fi
 
-       echo
        elog "You can set the version to be started by /usr/bin/emacs through"
        elog "the Emacs eselect module, which also redirects man and info pages."
        elog "Therefore, several Emacs versions can be installed at the same time."

diff --git a/app-editors/emacs/emacs-23.3-r1.ebuild b/app-editors/emacs/emacs-23.3-r1.ebuild
index 3c95d3c46019bdcc7de54beb2988cb90646a0445..aa5041e6121f163db0373d8ec395e3c78d1fe8ee 100644 (file)
--- a/app-editors/emacs/emacs-23.3-r1.ebuild
+++ b/app-editors/emacs/emacs-23.3-r1.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-r1.ebuild,v 1.3 2011/09/28 05:35:45 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r1.ebuild,v 1.4 2011/12/06 13:44:27 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-1.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 Emacs-23-CEDET-grammars"
 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 livecd m17n-lib motif png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"

diff --git a/app-editors/emacs/emacs-23.3-r2.ebuild b/app-editors/emacs/emacs-23.3-r2.ebuild
index ff357290c1b910d3dfeba6eb2bfd51e47b37dbe3..86d67b6168049e26f3aab91236d49e8ca9bb7ddd 100644 (file)
--- a/app-editors/emacs/emacs-23.3-r2.ebuild
+++ b/app-editors/emacs/emacs-23.3-r2.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-r2.ebuild,v 1.13 2011/12/03 15:16:24 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-23.3-r2.ebuild,v 1.14 2011/12/06 13:44:27 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-2.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 Emacs-23-CEDET-grammars"
 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"
@@ -115,10 +115,8 @@ src_configure() {
        local myconf
 
        if use alsa && ! use sound; then
-               echo
                einfo "Although sound USE flag is disabled you chose to have alsa,"
                einfo "so sound is switched on anyway."
-               echo
                myconf="${myconf} --with-sound"
        else
                myconf="${myconf} $(use_with sound)"
@@ -308,20 +306,19 @@ pkg_postinst() {
        fi
 
        if use X; then
-               echo
                elog "You need to install some fonts for Emacs."
                elog "Installing media-fonts/font-adobe-{75,100}dpi on the X server's"
                elog "machine would satisfy basic Emacs requirements under X11."
                elog "See also http://www.gentoo.org/proj/en/lisp/emacs/xft.xml"
                elog "for how to enable anti-aliased fonts."
+               elog
        fi
 
-       echo
        elog "You can set the version to be started by /usr/bin/emacs through"
        elog "the Emacs eselect module, which also redirects man and info pages."
        elog "Therefore, several Emacs versions can be installed at the same time."
        elog "\"man emacs.eselect\" for details."
-       echo
+       elog
        elog "If you upgrade from a previous major version of Emacs, then it is"
        elog "strongly recommended that you use app-admin/emacs-updater to rebuild"
        elog "all byte-compiled elisp files of the installed Emacs packages."