sync with Portage

svn path=/emacs-overlay/; revision=623

4 files changed, 33 insertions, 3 deletions

diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index 3d92f16..cb59594 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  25 Aug 2007; Christian Faulhammer <opfer@gentoo.org>
+  +files/emacs-22.1-backup-buffer.patch, emacs-22.1-r1.ebuild:
+  sync with Portage
+
   14 Jul 2007; Ulrich Mueller <ulm@gentoo.org>
   +files/emacs-22.1-Xaw3d-headers.patch,
   +files/emacs-22.1-disable_alsa_detection.patch,
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index e3f603e..83a8281 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -1,9 +1,10 @@
 AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1f38a188 SHA1 dd4eafe26a313334cc2c51f14b9ee7669428d02a SHA256 80228568be71952150c75adf562208913dcb15e51743480749729f9dc58816ea
+AUX emacs-22.1-backup-buffer.patch 481 RMD160 9ef0dfc7cb6a23eea18881dfa1d6d3a9b5873982 SHA1 0302df9678f2cc59c89da8bf47130810e08bfbbf SHA256 84b740a49cf201cd4e5f7384adeb3eff6b1a2c8af6b6b6d1fe849e32d50e0e8b
 AUX emacs-22.1-disable_alsa_detection.patch 1573 RMD160 e41972bc7c8c6ce80128046ee134acc7903fef2b SHA1 bdb460012bd526d336e97cb7f6b7e9c852da5be4 SHA256 afab81ebc4ac289c6f2ff4cd93f3f10a29bed3e55d463b337ab8711f6ff8cfcc
 AUX emacs-22.1-freebsd-sparc.patch 475 RMD160 a8e6e3f2bc014979fd269a027835a65520c12417 SHA1 71c6d9ee3b3e5149a33d440373a212b56fbd064c SHA256 43584ea923e6c7221e69d1d6a14d55d386565c5decd067a62acc58af522c803b
 AUX emacs-22.1-oldxmenu-qa.patch 448 RMD160 ac5b0e57569f0963862ded46953be899fb637590 SHA1 10887f5e0ccebde6715307fdc59faa8f826dd597 SHA256 3039fa8eedc22c638e706123bd1affb0f736a53bf0ebc68566678ead92a4c590
 AUX emacs-22.1-xembed.patch 12136 RMD160 96bf6095e8b6af78f7a5289820bde3a7043e74d8 SHA1 570faf7fa854624ea8f00df38a59c9b83f673f00 SHA256 ba41d8bf8830c657565c9ecc506d662f0eb45043e5aa2ea374031ba3185011f7
 DIST emacs-22.1.tar.gz 38172226 RMD160 da5360871db8b1d473ff7f0b0937ee6c278c0b19 SHA1 327664173eabe5db49d4e7e4a4b1794577af902e SHA256 1ec43bef7127e572f92d7c3a846951cf8e263e27445c62c867035f94681c3ed0
-EBUILD emacs-22.1.ebuild 7374 RMD160 8a1f2e15c61859e9e19bd8a19dd9c9241bdf6ee4 SHA1 1feb68169646524000eba0d417e8b726c1cdbb8d SHA256 f50eb71fd644b58cc3c4f59ec6afc94aac54ae3f4acd4dfdea9f64351c68cc97
-MISC ChangeLog 441 RMD160 5381181e28e7c603d3a20d7da51cb3ad35066f15 SHA1 1a85a3dab187f6f5e0b99f6300570c7ffcbcb80e SHA256 096a1e3ea38104319d72dd6c611afb02ba6479cba57bc8301274b07cc882a933
+EBUILD emacs-22.1-r1.ebuild 7714 RMD160 3318d70afb32c8457aa2c10d82bcd3e076a63102 SHA1 e6f311edf9f44d7046f6309be0d2a2dc67ed6e35 SHA256 4f73a558b1e818d905ba00175f4994456167c49e5e9860b44704a55b508ec7c3
+MISC ChangeLog 580 RMD160 e3590952597b29499477965c04450489588bd0ae SHA1 1576759e570072260660763591bc31d93188189c SHA256 5576107080e82d83577c33b53772df98da278f329b72a8481b4984ecf131c7a9
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
diff --git a/app-editors/emacs/emacs-22.1-r1.ebuild b/app-editors/emacs/emacs-22.1-r1.ebuild
index ed71f51..82db3ab 100644
--- a/app-editors/emacs/emacs-22.1-r1.ebuild
+++ b/app-editors/emacs/emacs-22.1-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="The extensible, customizable, self-documenting real-time display ed
 HOMEPAGE="http://www.gnu.org/software/emacs/"
 SRC_URI="mirror://gnu/emacs/${P}.tar.gz"
 
-LICENSE="GPL-2 FDL-1.2"
+LICENSE="GPL-2 FDL-1.2 BSD"
 SLOT="22"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
 IUSE="alsa gif gtk gzip-el hesiod jpeg motif png spell sound source tiff toolkit-scroll-bars X Xaw3d xembed xpm"
@@ -70,6 +70,7 @@ src_unpack() {
 	epatch "${FILESDIR}/${P}-Xaw3d-headers.patch"
 	epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
 	epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
+	epatch "${FILESDIR}/${P}-backup-buffer.patch"
 	# ALSA is detected and used even if not requested by the USE=alsa flag.
 	# So remove the automagic check
 	use alsa || epatch "${FILESDIR}/${P}-disable_alsa_detection.patch"
@@ -140,6 +141,11 @@ src_compile() {
 
 	emake CC="$(tc-getCC)" $(useq xembed && echo bootstrap) \
 		|| die "emake failed"
+
+	einfo "Recompiling patched lisp files..."
+	(cd lisp; emake recompile) || die "emake recompile failed"
+	(cd src; emake versionclean)
+	emake CC="$(tc-getCC)" || die "emake failed"
 }
 
 src_install () {
@@ -202,6 +208,11 @@ pkg_postinst() {
 	test -f ${ROOT}/usr/share/emacs/site-lisp/subdirs.el ||
 		cp ${ROOT}/usr/share/emacs{/${FULL_VERSION},}/site-lisp/subdirs.el
 
+	local f
+	for f in ${ROOT}/var/lib/games/emacs/{snake,tetris}-scores; do
+		test -e ${f} || touch ${f}
+	done
+
 	elisp-site-regen
 	emacs-infodir-rebuild
 
diff --git a/app-editors/emacs/files/emacs-22.1-backup-buffer.patch b/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
new file mode 100644
index 0000000..0e53cef
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-backup-buffer.patch
@@ -0,0 +1,14 @@
+--- emacs-22.1-orig/lisp/files.el	2007-05-25 14:43:31.000000000 +0200
++++ emacs-22.1/lisp/files.el	2007-08-21 08:26:36.000000000 +0200
+@@ -3119,9 +3119,8 @@
+ 	  (set-default-file-modes ?\700)
+ 	  (while (condition-case ()
+ 		     (progn
+-		       (condition-case nil
+-			   (delete-file to-name)
+-			 (file-error nil))
++		       (and (file-exists-p to-name)
++			    (delete-file to-name))
+ 		       (copy-file from-name to-name nil t)
+ 		       nil)
+ 		   (file-already-exists t))