Fix emacs integration on newer emacs versions

Package-Manager: portage-2.1.2-r12

diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index c49915c76d65e5574dc1e8678b1edd982f800226..ed13bdfd76e06d0bbaa4211067bb0dfd4bb87c4e 100644 (file)
--- 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/Manifest b/dev-util/subversion/Manifest
index 6ee4876258154368f56c34cf110f047a901b9a2e..1b2bb684ee9f9236645ee68cec11d756b80e2df1 100644 (file)
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,7 +1,7 @@
-AUX 70svn-gentoo.el 136 RMD160 d130792953a0b14b78b9a54a982f0812428f0d5e SHA1 65dfcabc7cbfe89b2feeabf388422ff865f52dab SHA256 85dc5461709d3cd28be3fbdaf0f02778f98bc9c970b50bcb00ca7658e88f3274
-MD5 4fd39b311d09602c93a9ff0aceaf8596 files/70svn-gentoo.el 136
-RMD160 d130792953a0b14b78b9a54a982f0812428f0d5e files/70svn-gentoo.el 136
-SHA256 85dc5461709d3cd28be3fbdaf0f02778f98bc9c970b50bcb00ca7658e88f3274 files/70svn-gentoo.el 136
+AUX 70svn-gentoo.el 210 RMD160 3c25e6d04b6ac431e030fc0d76080f8a0bb3ba08 SHA1 47b4e7758086439390a23cc0eb76e5038392a08b SHA256 5828272d4c5c97351b31b487ba563b64451e3ec402f18623acbca5fadc9d29d2
+MD5 9af6c8e0c660d202b70b82b2049bdf4a files/70svn-gentoo.el 210
+RMD160 3c25e6d04b6ac431e030fc0d76080f8a0bb3ba08 files/70svn-gentoo.el 210
+SHA256 5828272d4c5c97351b31b487ba563b64451e3ec402f18623acbca5fadc9d29d2 files/70svn-gentoo.el 210
 AUX subversion-1.1.1-perl-vendor.patch 713 RMD160 fdc54d38c44c3e1273b654b3d1a2f4a76f91aec3 SHA1 8c9a2fb00c4cb17dd477937701587a5da3fe1800 SHA256 d7c5994fa66d77ec956b2e1ca1020fadcf1200bdd2acce974033e9839bb8f7c3
 MD5 b8146e2661f55257aef6d41e79897b63 files/subversion-1.1.1-perl-vendor.patch 713
 RMD160 fdc54d38c44c3e1273b654b3d1a2f4a76f91aec3 files/subversion-1.1.1-perl-vendor.patch 713
@@ -82,14 +82,14 @@ EBUILD subversion-1.3.2-r3.ebuild 11762 RMD160 dcecf56e615d3cdd43b20b479d93f9a8a
 MD5 d83f004e921251c1be1165e2bfa2ded1 subversion-1.3.2-r3.ebuild 11762
 RMD160 dcecf56e615d3cdd43b20b479d93f9a8a047b0cf subversion-1.3.2-r3.ebuild 11762
 SHA256 532444d16391deda81769dbc526305159a91ae013c83d26e63e49094b30fbc39 subversion-1.3.2-r3.ebuild 11762
-EBUILD subversion-1.4.3.ebuild 11667 RMD160 d7b856b676c76a198ef0dc8996435fa8e528f812 SHA1 28a0e5483b3b51a8f38b378dd86ab707f3b8d33f SHA256 9a5cf67e17bd2146cfef9db9b5c74df89399ee06901a5c59a0ef55195943209c
-MD5 5b8332562234f4c54d349a1f07c0f886 subversion-1.4.3.ebuild 11667
-RMD160 d7b856b676c76a198ef0dc8996435fa8e528f812 subversion-1.4.3.ebuild 11667
-SHA256 9a5cf67e17bd2146cfef9db9b5c74df89399ee06901a5c59a0ef55195943209c subversion-1.4.3.ebuild 11667
-MISC ChangeLog 42245 RMD160 21ff8408b7dbc55179531f6c75a23e9ba8ec25f0 SHA1 c105e6d709429c290145a06ebec0010690008241 SHA256 55bc0d3f90b3883e0ae0263aa40a6ef4042b7a2bcbde9253173d2bb76f1934ca
-MD5 735fb2bcb8e130476aba66951f03ffe2 ChangeLog 42245
-RMD160 21ff8408b7dbc55179531f6c75a23e9ba8ec25f0 ChangeLog 42245
-SHA256 55bc0d3f90b3883e0ae0263aa40a6ef4042b7a2bcbde9253173d2bb76f1934ca ChangeLog 42245
+EBUILD subversion-1.4.3.ebuild 11703 RMD160 23a08b610fbd6fc7d637f178db0f0ef16317b70f SHA1 18bc560e7861a06a503a5b7fcfe37b2af0754daa SHA256 5a2e80b54506af8a6eebac9929b1c78750a409c14b0f6d21cf790508f7ffd595
+MD5 35d7070d5fa5af86c8169dd764c3fc7b subversion-1.4.3.ebuild 11703
+RMD160 23a08b610fbd6fc7d637f178db0f0ef16317b70f subversion-1.4.3.ebuild 11703
+SHA256 5a2e80b54506af8a6eebac9929b1c78750a409c14b0f6d21cf790508f7ffd595 subversion-1.4.3.ebuild 11703
+MISC ChangeLog 42594 RMD160 9d317984f4478b03908e6e685a17871f6f5ce49f SHA1 aaba11f9af8ea2f2371c316441b0ef651ca71142 SHA256 c4eb1a50be2ce811ca5cb16efd45cdcacb2981b4a5a263db0f2303d81a4c7afd
+MD5 1bcb964b2c62d2a55c6a37dd66ad0275 ChangeLog 42594
+RMD160 9d317984f4478b03908e6e685a17871f6f5ce49f ChangeLog 42594
+SHA256 c4eb1a50be2ce811ca5cb16efd45cdcacb2981b4a5a263db0f2303d81a4c7afd ChangeLog 42594
 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152
 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222
 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222

diff --git a/dev-util/subversion/files/70svn-gentoo.el b/dev-util/subversion/files/70svn-gentoo.el
index f2e92cc378ea78c72f077cc82b6467c1d2a6a81f..be6ed7dcbb5427164e13eaf26a049bd9de8e0823 100644 (file)
--- 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 67ad3ee0752973d6a6c28f1e4eb7cb091b28e8ac..ad7b99c4534244d2fc89b80adc76dee82997ee36 100644 (file)
--- 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