Restore mistakenly removed ~arch keywords; Resolves Bug #124158; Generate the /etc/env.d/50emacs-cvs-${SLOT} file from a here document rather than maintaining one in ${FILESDIR}; Initial work toward supporting find-function-C-source.

(Portage version: 2.1_pre5)

5 files changed, 37 insertions, 29 deletions

diff --git a/app-editors/emacs-cvs/ChangeLog b/app-editors/emacs-cvs/ChangeLog
index 68d462ee67bd..ea9fc43f2c18 100644
--- a/app-editors/emacs-cvs/ChangeLog
+++ b/app-editors/emacs-cvs/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/emacs-cvs
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.39 2006/02/25 22:54:55 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/ChangeLog,v 1.40 2006/02/26 21:48:47 mkennedy Exp $
+
+  26 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
+  -files/50emacs-22.0.50.envd, emacs-cvs-22.0.50-r1.ebuild,
+  emacs-cvs-23.0.0.ebuild:
+  Restore mistakenly removed ~arch keywords; Resolves Bug #124158; Generate
+  the /etc/env.d/50emacs-cvs-${SLOT} file from a here document rather than
+  maintaining one in ${FILESDIR}; Initial work toward supporting
+  find-function-C-source.
 
   25 Feb 2006; Matthew Kennedy <mkennedy@gentoo.org>
   -emacs-cvs-22.0.50.ebuild:
diff --git a/app-editors/emacs-cvs/Manifest b/app-editors/emacs-cvs/Manifest
index 9f0fae9acffa..e0d6a206a723 100644
--- a/app-editors/emacs-cvs/Manifest
+++ b/app-editors/emacs-cvs/Manifest
@@ -1,21 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 d082a9e73da0a556833f661f277e5825 ChangeLog 6560
 RMD160 8a7e3890d662752137305f9a00945f22403dc5b1 ChangeLog 6560
 SHA256 90612cdf94e3f1a422f3e59707249affe0a19782773b76d36ba87aaec3e39697 ChangeLog 6560
-MD5 4fdc4b38b90503d3accdb0d1a309431c emacs-cvs-22.0.50-r1.ebuild 5421
-RMD160 d4913573def6fdd504558a836a72311b64f7ebc3 emacs-cvs-22.0.50-r1.ebuild 5421
-SHA256 105d2068c588dac79b83c20b4f1e4a759bb8301af0cdbdd5c56951aca5d512b7 emacs-cvs-22.0.50-r1.ebuild 5421
-MD5 63bb16a2df85d465c00eaecbf3d69ac7 emacs-cvs-23.0.0.ebuild 4899
-RMD160 19de1b2d86d2c634745a595f2f9adeffcc9e80d4 emacs-cvs-23.0.0.ebuild 4899
-SHA256 ec967b1c001725926ba2bad9823b0155c402e63c7f4f21aff1fbe98f8fae14b1 emacs-cvs-23.0.0.ebuild 4899
+MD5 d9d408b62d870f62e7fb6bdab633a301 emacs-cvs-22.0.50-r1.ebuild 5902
+RMD160 5985d1d6c8f4b3379197146ee4c031c6efaa51ba emacs-cvs-22.0.50-r1.ebuild 5902
+SHA256 593212bffb349ffbcc0cee11d6fe057ad2a6a1c5987d3cd2ac73acbbf008d54e emacs-cvs-22.0.50-r1.ebuild 5902
+MD5 656cfacb709627252d553a8102c8c139 emacs-cvs-23.0.0.ebuild 4935
+RMD160 a8b1c4752652c78355eac869ce1902186ac09875 emacs-cvs-23.0.0.ebuild 4935
+SHA256 ed1b973bd4ccc238d46c84435304d5cc42a341aea2ef7e4ac21f5d338d8a3028 emacs-cvs-23.0.0.ebuild 4935
 MD5 04a64867694a98538309b433c80aaa62 files/40aspell-gentoo.el 80
 RMD160 f45303b3158136e3c5c4b6039fc893697900b9a4 files/40aspell-gentoo.el 80
 SHA256 b4d23344039e6d48efc893597295b3cacdad684c188a7fb2fada777e925f36b4 files/40aspell-gentoo.el 80
-MD5 0d61f19c0e6fcdb6657ae1d4d9e69801 files/50emacs-22.0.50.envd 39
-RMD160 6264f1faa5b99e98251be427fd8ef60b52ca1370 files/50emacs-22.0.50.envd 39
-SHA256 5501f5818b4b88a34e93440e5fc6e2a44d2a1c83080358849b811b1d17234f43 files/50emacs-22.0.50.envd 39
 MD5 0b379e4c82898cbd3b9929d752b7bfab files/50emacs-23.0.0.envd 38
 RMD160 78ada93c0a6e3019d225eaecac89a5554d5344b9 files/50emacs-23.0.0.envd 38
 SHA256 6179b1cbc85458d3cb49605ec095aa9ddfedcbd3b68dcbad01679717d5b86b1a files/50emacs-23.0.0.envd 38
@@ -49,10 +43,3 @@ SHA256 03643e029572a5bcbe6404d584537228c690df472426371b0585414b5d283966 files/xf
 MD5 fcd33d07e4ee719b01157946734f4fe8 metadata.xml 158
 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 metadata.xml 158
 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab metadata.xml 158
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFEAOCJyiNZaEAZA+ARAjeqAJ9xVdndMP1k/ZvnKcAWs1uo7ViBBwCdHCUi
-6CMptVQtrLdfLmgwt4ZLr2Q=
-=U91V
------END PGP SIGNATURE-----
diff --git a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild
index 6dfb4c0a4668..0416ff8a9f56 100644
--- a/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.0.50-r1.ebuild,v 1.1 2006/02/09 01:38:23 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-22.0.50-r1.ebuild,v 1.2 2006/02/26 21:48:47 mkennedy Exp $
 
 ECVS_AUTH="pserver"
 ECVS_SERVER="cvs.savannah.gnu.org:/sources/emacs"
@@ -10,7 +10,7 @@ ECVS_BRANCH="HEAD"
 inherit elisp-common cvs alternatives flag-o-matic eutils
 
 IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff"
-# IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff xft"
+# IUSE="X Xaw3d aqua gif gtk jpeg nls png spell tiff xft source"
 
 S=${WORKDIR}/emacs
 
@@ -41,8 +41,7 @@ PROVIDE="virtual/emacs virtual/editor"
 
 SLOT="22.0.50"
 LICENSE="GPL-2"
-# KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
-KEYWORDS="-*"					# until XFT support is finalized
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~ppc-macos"
 
 DFILE=emacs-${SLOT}.desktop
 
@@ -64,7 +63,7 @@ src_unpack() {
 #	if use xft; then
 #		ECVS_BRANCH=XFT_JHD_BRANCH
 #	else
-		ECVS_BRANCH=HEAD
+#		ECVS_BRANCH=HEAD
 #	fi
 	cvs_src_unpack
 	cd ${S};
@@ -163,13 +162,26 @@ src_install () {
 		# defaults to aspell if installed
 		elisp-site-file-install ${FILESDIR}/40aspell-gentoo.el
 	fi
-	newenvd ${FILESDIR}/50emacs-${SLOT}.envd 50emacs-${SLOT}
-
+	insinto /etc/env.d
+	cat >${D}/etc/env.d/50emacs-cvs-${SLOT} <<EOF
+INFOPATH=/usr/share/info/emacs-${SLOT}
+EOF
 	einfo "Fixing manpages..."
 	for m in  ${D}/usr/share/man/man1/* ; do
 		mv ${m} ${m/.1/.emacs-${SLOT}.1} || die "mv man failed"
 	done
 
+#	if use source; then
+#		insinto /usr/share/emacs/${SLOT}/src
+#		# This is not mean to install all the source -- just the
+#		# source you might find via find-function
+#		doins src/*.[ch]
+# #		cat >00emacs-cvs-${SLOT}-gentoo.el <<EOF
+# # (setq find-function-C-source-directory "/usr/share/emacs/${SLOT}/src")
+# # EOF
+# #		elisp-site-file-install 00emacs-cvs-${SLOT}-gentoo.el || die # need to move outside of NNfoo-gentoo.el for different versions (site-lisp is shared)
+#	fi
+
 	dodoc BUGS ChangeLog README
 
 	insinto /usr/share/applications
diff --git a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
index 59b9b46d7704..2aba2fd245dd 100644
--- a/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
+++ b/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.7 2006/02/09 01:38:23 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-cvs/emacs-cvs-23.0.0.ebuild,v 1.8 2006/02/26 21:48:47 mkennedy Exp $
 
 ECVS_AUTH="pserver"
 export CVS_RSH="ssh"
@@ -154,9 +154,11 @@ update-alternatives() {
 }
 
 pkg_postinst() {
+	elisp-site-regen
 	use ppc-macos || update-alternatives
 }
 
 pkg_postrm() {
+	elisp-site-regen
 	use ppc-macos || update-alternatives
 }
diff --git a/app-editors/emacs-cvs/files/50emacs-22.0.50.envd b/app-editors/emacs-cvs/files/50emacs-22.0.50.envd
deleted file mode 100644
index dfe7c9bcada1..000000000000
--- a/app-editors/emacs-cvs/files/50emacs-22.0.50.envd
+++ /dev/null
@@ -1 +0,0 @@
-INFOPATH=/usr/share/info/emacs-22.0.50