summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-11-07 14:32:07 +0000
committerUlrich Müller <ulm@gentoo.org>2007-11-07 14:32:07 +0000
commit936b2d5da85e5c15cf4c9992179089f5d6362553 (patch)
tree09768d9fa97d59c074ffbec146a52dd737e5dabe /app-editors
parentGroup compile functions together. (diff)
downloademacs-936b2d5da85e5c15cf4c9992179089f5d6362553.tar.gz
emacs-936b2d5da85e5c15cf4c9992179089f5d6362553.tar.bz2
emacs-936b2d5da85e5c15cf4c9992179089f5d6362553.zip
Sync with Portage, fixing bug #197958.
svn path=/emacs-overlay/; revision=735
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs/ChangeLog5
-rw-r--r--app-editors/emacs/Manifest5
-rw-r--r--app-editors/emacs/emacs-22.1-r2.ebuild (renamed from app-editors/emacs/emacs-22.1-r1.ebuild)18
-rw-r--r--app-editors/emacs/files/emacs-22.1-hack-local-variables.patch13
4 files changed, 31 insertions, 10 deletions
diff --git a/app-editors/emacs/ChangeLog b/app-editors/emacs/ChangeLog
index ce0d1ca..5ce3946 100644
--- a/app-editors/emacs/ChangeLog
+++ b/app-editors/emacs/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 07 Nov 2007; Ulrich Mueller <ulm@gentoo.org>
+ +files/emacs-22.1-hack-local-variables.patch, -emacs-22.1-r1.ebuild,
+ +emacs-22.1-r2.ebuild:
+ Sync with Portage, fixing bug #197958.
+
10 Oct 2007; Ulrich Mueller <ulm@gentoo.org> emacs-22.1-r1.ebuild:
Don't PROVIDE=virtual/editor as it is a new-style virtual now.
diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest
index 6627cd5..424cae3 100644
--- a/app-editors/emacs/Manifest
+++ b/app-editors/emacs/Manifest
@@ -2,9 +2,10 @@ AUX emacs-22.1-Xaw3d-headers.patch 4736 RMD160 d94da74ae2e8db00b5b98f35f3bbf11a1
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-hack-local-variables.patch 561 RMD160 248f09898369161dcd0e3148c7fcb4c9de5b3bc5 SHA1 02018dc2b66f829c83aeeadca240e282a695b9a1 SHA256 d3e2ec4d4b2788a5a6d91669bfc9dcb3dc7ff1f80195d42e5ae751fa4e26b9fb
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-r1.ebuild 7700 RMD160 9a55376d8edc7cf2adcb3bc1e29af8fd92eb1d60 SHA1 0ca7cfd8f6f7bce93c28c34bfcdf681605ea0f28 SHA256 703f26fc097c1e70719b74e6442ebf325dd9685f30060b0b3bb6d6c64170cfa6
-MISC ChangeLog 979 RMD160 452dfe298d0daf18a3e2fef3151a4a2ce4c74a4f SHA1 473865c4438cb4741311750a6385bfa664423fd1 SHA256 101f188fbc0a7b9674d06091d8460be88a0ba3b3a68f457fa5a7a1a3c3f97d57
+EBUILD emacs-22.1-r2.ebuild 7749 RMD160 7eec5e6508cf4204cbcb019adf906af285b3e96d SHA1 8c55330fba560078fb390b060548ba662ec9775f SHA256 c8bba1afba1103806d0298ac0ee1ccd06ebd917c9271deb0377d6eb8c954323e
+MISC ChangeLog 1164 RMD160 c6c0faa95574da47bbf9d0e2b33863b418e332e1 SHA1 87d0f58cb531c4dcd4074dd943e546ed0cb8bd40 SHA256 6f4c725c8d25d69369c558facc1df26a7a0fcad8a1f097da1be529f2d4fb1006
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-r2.ebuild
index 1abd780..f57839d 100644
--- a/app-editors/emacs/emacs-22.1-r1.ebuild
+++ b/app-editors/emacs/emacs-22.1-r2.ebuild
@@ -69,6 +69,7 @@ src_unpack() {
epatch "${FILESDIR}/${P}-freebsd-sparc.patch"
epatch "${FILESDIR}/${P}-oldxmenu-qa.patch"
epatch "${FILESDIR}/${P}-backup-buffer.patch"
+ epatch "${FILESDIR}/${P}-hack-local-variables.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"
@@ -99,14 +100,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"
@@ -180,7 +182,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
@@ -236,9 +238,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() {
diff --git a/app-editors/emacs/files/emacs-22.1-hack-local-variables.patch b/app-editors/emacs/files/emacs-22.1-hack-local-variables.patch
new file mode 100644
index 0000000..ed73505
--- /dev/null
+++ b/app-editors/emacs/files/emacs-22.1-hack-local-variables.patch
@@ -0,0 +1,13 @@
+--- lisp/files.el 13 Oct 2007 14:09:56 -0000 1.896.2.28
++++ lisp/files.el 2 Nov 2007 11:02:12 -0000 1.896.2.29
+@@ -2764,8 +2764,8 @@
+ ;; If caller wants only the safe variables,
+ ;; install only them.
+ (dolist (elt result)
+- (unless (or (memq (car elt) unsafe-vars)
+- (memq (car elt) risky-vars))
++ (unless (or (member elt unsafe-vars)
++ (member elt risky-vars))
+ (hack-one-local-variable (car elt) (cdr elt))))
+ ;; Query, except in the case where all are known safe
+ ;; if the user wants no quuery in that case.