Remove non-existent file README.multi-tty from dodoc, fixes bug #190762.

(Portage version: 2.1.3.7)

4 files changed, 20 insertions, 13 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 9c8feb4a637a..d82f842706c1 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.151 2007/08/29 15:14:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.152 2007/08/30 12:38:26 ulm Exp $
+
+  30 Aug 2007; Ulrich Mueller <ulm@gentoo.org> emacs-cvs-22.1.50-r1.ebuild,
+  emacs-cvs-23.0.0-r7.ebuild, emacs-cvs-23.0.50.ebuild:
+  Remove non-existent file README.multi-tty from dodoc, fixes bug #190762.
+  Moved some comments.
 
 *emacs-cvs-22.1.50_p20070829 (29 Aug 2007)
 
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild
index a7428ab4f92a..a7a29c56dc8a 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild,v 1.1 2007/08/29 06:46:10 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.1.50-r1.ebuild,v 1.2 2007/08/30 12:38:26 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -115,14 +115,15 @@ src_compile() {
 	fi
 
 	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
 		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with xpm)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
 		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
 		myconf="${myconf} $(use_with gif) $(use_with png)"
+		myconf="${myconf} $(use_with xpm)"
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
 		if use gtk; then
 			echo
 			einfo "Configuring to build with GTK support, disabling all other toolkits"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild
index f7b49bffc215..c13c5700b57c 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild,v 1.2 2007/08/29 10:01:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0-r7.ebuild,v 1.3 2007/08/30 12:38:26 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -116,17 +116,18 @@ src_compile() {
 	fi
 
 	if use X; then
-		# GTK+ is the default toolkit if USE=gtk is chosen with other
-		# possibilities. Emacs upstream thinks this should be standard
-		# policy on all distributions
 		myconf="${myconf} --with-x"
-		myconf="${myconf} $(use_with xpm)"
 		myconf="${myconf} $(use_with toolkit-scroll-bars)"
 		myconf="${myconf} $(use_enable xft font-backend)"
 		myconf="${myconf} $(use_with xft freetype)"
 		myconf="${myconf} $(use_with xft)"
 		myconf="${myconf} $(use_with jpeg) $(use_with tiff)"
 		myconf="${myconf} $(use_with gif) $(use_with png)"
+		myconf="${myconf} $(use_with xpm)"
+
+		# GTK+ is the default toolkit if USE=gtk is chosen with other
+		# possibilities. Emacs upstream thinks this should be standard
+		# policy on all distributions
 		if use gtk; then
 			echo
 			einfo "Configuring to build with GTK support, disabling all other toolkits"
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild
index 1aba8a8a57c4..8b944d67c4cb 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild,v 1.2 2007/08/29 18:55:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.50.ebuild,v 1.3 2007/08/30 12:38:26 ulm Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -197,7 +197,7 @@ src_install () {
 		elisp-site-file-install 00${PN}-${SLOT}-gentoo.el
 	fi
 
-	dodoc AUTHORS BUGS CONTRIBUTE README README.multi-tty || die "dodoc failed"
+	dodoc AUTHORS BUGS CONTRIBUTE README || die "dodoc failed"
 }
 
 emacs-infodir-rebuild() {