Partial sync of emacs and emacs-cvs ebuilds.

Package-Manager: portage-2.1.3.16

3 files changed, 32 insertions, 18 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index a1c888ca5bd5..84a0676216f0 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-editors/emacs
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.196 2007/11/01 12:35:19 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/ChangeLog,v 1.197 2007/11/02 09:37:33 ulm Exp $
+
+  02 Nov 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r1.ebuild:
+  Partial sync of emacs and emacs-cvs ebuilds.
 
   01 Nov 2007; Raúl Porcel <armin76@gentoo.org> emacs-21.4-r13.ebuild:
   alpha/ia64 stable wrt #197313
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 8f1956f33408..7955c71c31af 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
 MD5 8a440640bcaf8056c90863ec16dd1c93 files/emacs-22.1-Xaw3d-headers.patch 4736
 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 files/emacs-22.1-Xaw3d-headers.patch 4736
@@ -47,14 +50,14 @@ EBUILD emacs-21.4-r8.ebuild 5760 RMD160 3b46f4b43fa8c7f4c9ca1bab954803dc7753568e
 MD5 3a3e7463c54cf97632b5cd1ae7c93d02 emacs-21.4-r8.ebuild 5760
 RMD160 3b46f4b43fa8c7f4c9ca1bab954803dc7753568e emacs-21.4-r8.ebuild 5760
 SHA256 3effad0fa79294bf0d597159991c3bd1112689674e06f0c27e6b96f112a655c5 emacs-21.4-r8.ebuild 5760
-EBUILD emacs-22.1-r1.ebuild 7631 RMD160 fe687598bba13e4a2b933de012a10b8fc226d71a SHA1 f22d050ef458d25ab3095b038f62716ab0f5cf23 SHA256 838a400f077a841c733568b22a0e30577c6685996faa5763665966f7991aea53
-MD5 fc425f1bc7a314983d9dbd2884702dff emacs-22.1-r1.ebuild 7631
-RMD160 fe687598bba13e4a2b933de012a10b8fc226d71a emacs-22.1-r1.ebuild 7631
-SHA256 838a400f077a841c733568b22a0e30577c6685996faa5763665966f7991aea53 emacs-22.1-r1.ebuild 7631
-MISC ChangeLog 29372 RMD160 ad1baf7fbe9d3c15f6a89351fe1612864d573a80 SHA1 19e29172fda372c7073c9739479a618df539d45a SHA256 dd292429420d2ed0f6de904123ff9955360a143a597a433809de4d7d6c854af5
-MD5 bc942baebe341121c320b2c36ce199b9 ChangeLog 29372
-RMD160 ad1baf7fbe9d3c15f6a89351fe1612864d573a80 ChangeLog 29372
-SHA256 dd292429420d2ed0f6de904123ff9955360a143a597a433809de4d7d6c854af5 ChangeLog 29372
+EBUILD emacs-22.1-r1.ebuild 7626 RMD160 8438f6f79d8e53c8a4409e2bbbc9075d5cb8194b SHA1 63b7ccc9b7de6d34729f64117017b85c2ee42b0e SHA256 9247a96147b0cab056b80707ff501bb5f793952cbef6d9c0a5e33ad878a46d84
+MD5 2e2b60f2fb5e241a5da2a8bbe4dcd2ad emacs-22.1-r1.ebuild 7626
+RMD160 8438f6f79d8e53c8a4409e2bbbc9075d5cb8194b emacs-22.1-r1.ebuild 7626
+SHA256 9247a96147b0cab056b80707ff501bb5f793952cbef6d9c0a5e33ad878a46d84 emacs-22.1-r1.ebuild 7626
+MISC ChangeLog 29485 RMD160 d0aadc6752f5c295b5659a8abc832a6d237d5f74 SHA1 c3f657d069f96defc6ff77b9505dc6c285f4500e SHA256 94ee1a4fa7033eaad5acac1e66d7cefbbe394bb891c614fbadf1f03787ca8479
+MD5 425c17e4a7e89f51cd8e711ff8e91c41 ChangeLog 29485
+RMD160 d0aadc6752f5c295b5659a8abc832a6d237d5f74 ChangeLog 29485
+SHA256 94ee1a4fa7033eaad5acac1e66d7cefbbe394bb891c614fbadf1f03787ca8479 ChangeLog 29485
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
@@ -77,3 +80,10 @@ SHA256 f982f9350410ec80f097275982dc87df4f0d4bec244378e9fd9be5c5c69bf5bc files/di
 MD5 8c64069c07b5fdaf75a4679bad002334 files/digest-emacs-22.1-r1 238
 RMD160 503cb2e6877f461b2adf972a8bbef02e81eb79ef files/digest-emacs-22.1-r1 238
 SHA256 fade317ca7642c607422c8f3a829728969542fe5996e6ec5015fdea0bccf64e4 files/digest-emacs-22.1-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFHKu/3Oeoy/oIi7uwRAtD7AKC5jqZ5aY75lyh+1bofkl1LprZ0KgCfa0Cl
+aypAQC5qBol5N6pYmlIJSiE=
+=QGSR
+-----END PGP SIGNATURE-----
diff --git a/app-editors/emacs/emacs-22.1-r1.ebuild b/app-editors/emacs/emacs-22.1-r1.ebuild
index 59b3238f6ac2..2c811ca44ca0 100644
--- a/app-editors/emacs/emacs-22.1-r1.ebuild
+++ b/app-editors/emacs/emacs-22.1-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/emacs-22.1-r1.ebuild,v 1.15 2007/10/24 09:29:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs/emacs-22.1-r1.ebuild,v 1.16 2007/11/02 09:37:33 ulm Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="latest"
@@ -97,14 +97,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"
@@ -175,7 +176,7 @@ src_install () {
 		doins src/*.[ch]
 		sed 's/^X//' >00${PN}-${SLOT}-gentoo.el <<-EOF
 
-		;;; emacs-${SLOT} site-lisp configuration
+		;;; ${PN}-${SLOT} site-lisp configuration
 
 		(if (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version)
 		X    (setq find-function-C-source-directory
@@ -231,9 +232,9 @@ pkg_postinst() {
 
 	echo
 	elog "You can set the version to be started by /usr/bin/emacs through"
-	elog "the Emacs eselect module. Man and info pages are automatically"
-	elog "redirected, so you may have several installed Emacs versions at the"
-	elog "same time. \"man emacs.eselect\" for details."
+	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."
 }
 
 pkg_postrm() {