diff options
| author |   Paul de Vrieze <pauldv@gentoo.org> | 2007-03-03 16:35:37 +0000 |
|---|---|---|
| committer | Paul de Vrieze <pauldv@gentoo.org> | 2007-03-03 16:35:37 +0000 |
| commit | 1b6d660bd04295d0dd780ef50df4a14bb206e5c4 (patch) | |
| tree | d53aac0f69d5a01d16c7391506b8711af9105fe7 /dev-util/subversion | |
| parent | Install ChangeLog in the appropriate location, and put the checksum index in ... (diff) | |
| download | gentoo-2-1b6d660bd04295d0dd780ef50df4a14bb206e5c4.tar.gz gentoo-2-1b6d660bd04295d0dd780ef50df4a14bb206e5c4.tar.bz2 gentoo-2-1b6d660bd04295d0dd780ef50df4a14bb206e5c4.zip | |
Fix emacs integration on newer emacs versions
(Portage version: 2.1.2-r12)
Diffstat (limited to 'dev-util/subversion')
| -rw-r--r-- | dev-util/subversion/ChangeLog | 9 | ||||
| -rw-r--r-- | dev-util/subversion/files/70svn-gentoo.el | 4 | ||||
| -rw-r--r-- | dev-util/subversion/subversion-1.4.3.ebuild | 8 |
3 files changed, 15 insertions, 6 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index c49915c76d65..ed13bdfd76e0 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-util/subversion # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.247 2007/03/02 20:56:46 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.248 2007/03/03 16:35:37 pauldv Exp $ + + 03 Mar 2007; Paul de Vrieze <pauldv@gentoo.org> files/70svn-gentoo.el, + subversion-1.4.3.ebuild: + Fix the emacs binding to work with newer emacs versions that don't need the + packed vc-svn library, but use their own (newer) one instead. This fixes bug + #158891. Thanks to Ulrich Mueller <ulm@kph.uni-mainz.de> for providing this + solution. 02 Mar 2007; Paul de Vrieze <pauldv@gentoo.org> -subversion-1.2.3.ebuild, -subversion-1.2.3-r2.ebuild, -subversion-1.3.0.ebuild, diff --git a/dev-util/subversion/files/70svn-gentoo.el b/dev-util/subversion/files/70svn-gentoo.el index f2e92cc378ea..be6ed7dcbb54 100644 --- a/dev-util/subversion/files/70svn-gentoo.el +++ b/dev-util/subversion/files/70svn-gentoo.el @@ -1,5 +1,7 @@ ;;; svn site-lisp configuration -(setq load-path (cons "@SITELISP@" load-path)) +(add-to-list 'load-path "@SITELISP@") +(and (< emacs-major-version 22) + (add-to-list 'load-path "@SITELISP@/compat")) (add-to-list 'vc-handled-backends 'SVN) (require 'psvn) diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild index 67ad3ee07529..ad7b99c45342 100644 --- a/dev-util/subversion/subversion-1.4.3.ebuild +++ b/dev-util/subversion/subversion-1.4.3.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/dev-util/subversion/subversion-1.4.3.ebuild,v 1.3 2007/02/27 21:31:50 pauldv Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.4 2007/03/03 16:35:37 pauldv Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 @@ -251,9 +251,9 @@ EOF # Install emacs lisps if use emacs; then - insinto /usr/share/emacs/site-lisp/subversion - doins contrib/client-side/psvn/psvn.el* - doins contrib/client-side/vc-svn.el* + elisp-install ${PN} contrib/client-side/psvn/psvn.el* + elisp-install ${PN}/compat contrib/client-side/vc-svn.el* + touch "${D}${SITELISP}/${PN}/compat/.nosearch" elisp-site-file-install ${FILESDIR}/70svn-gentoo.el fi |