Add Emacs-23-CEDET-grammars to LICENSE. Replace remaining echo commands by einfo/elog. Remove obsolete blocker.

(Portage version: 2.1.10.39/cvs/Linux x86_64)

5 files changed, 15 insertions, 18 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 5d9db7374e1d..ea0b663d4659 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.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/emacs-21.4-r23.ebuild b/app-editors/emacs/emacs-21.4-r23.ebuild
index 9f43dcbd3f75..1cdfcf49dfda 100644
--- 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 7337bd70143b..49c42f76502d 100644
--- 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 3c95d3c46019..aa5041e6121f 100644
--- 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 ff357290c1b9..86d67b616804 100644
--- 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."