Define obsolete variables properly, in order to prevent a crash with dev-python/ipython. Fixes bug 391403.

Package-Manager: portage-2.1.10.37/cvs/Linux x86_64

4 files changed, 38 insertions, 7 deletions

diff --git a/app-emacs/python-mode/ChangeLog b/app-emacs/python-mode/ChangeLog
index 4b3de490b7f5..f64533d7d4f8 100644
--- a/app-emacs/python-mode/ChangeLog
+++ b/app-emacs/python-mode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-emacs/python-mode
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/ChangeLog,v 1.51 2011/11/21 18:01:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/ChangeLog,v 1.52 2011/11/23 17:32:56 ulm Exp $
+
+*python-mode-6.0.3-r1 (23 Nov 2011)
+
+  23 Nov 2011; Ulrich Mueller <ulm@gentoo.org> -python-mode-6.0.3.ebuild,
+  +python-mode-6.0.3-r1.ebuild, +files/python-mode-6.0.3-obsolete-vars.patch:
+  Define obsolete variables properly, in order to prevent a crash with
+  dev-python/ipython. Fixes bug 391403.
 
 *python-mode-6.0.3 (21 Nov 2011)
 
diff --git a/app-emacs/python-mode/Manifest b/app-emacs/python-mode/Manifest
index 2399a81ce642..1fcad0201b69 100644
--- a/app-emacs/python-mode/Manifest
+++ b/app-emacs/python-mode/Manifest
@@ -3,18 +3,19 @@ Hash: SHA1
 
 AUX 50python-mode-gentoo.el 483 RMD160 c4ed69e8c54d136cccc519cc1532c9264d476e46 SHA1 b44dea97686898f486fb6ccc99b6daef18bc203a SHA256 9959f3c731aa326f4f75fcbd0bb503633de8d16abf809bb0c4bdad6385f5b448
 AUX 60python-mode-gentoo-5.1.el 450 RMD160 8b4c89d20e03ad9a3d9630aea7b2f593b56925d6 SHA1 1be88ae56e1ca6fbe32f57652c84d8727606653a SHA256 cadced96767ac51a6d3228eefbfcc53c7bc49d9579ff6e99338c2c91bd5aa3dc
+AUX python-mode-6.0.3-obsolete-vars.patch 798 RMD160 1b90f31c63de5b52c99f61caa9b66f9a07791b6c SHA1 7c13bde5bc8dc49d91c7c9b4209f8aafe9830c2f SHA256 6cf5a35392d40f0312cbbcf496b97334833693ff845fdb3cf48d07f73c735011
 DIST python-mode-5.1.0.el.bz2 37743 RMD160 df04f1ae210dc1eba4f43d80c4e1cabd930b53c5 SHA1 e58ed01bc7e63d6be76e9d65642e6245f15b27c1 SHA256 e9db2017996b6dbfb4fdb4fd725cd86a043990616bac981160c3118bd352633c
 DIST python-mode-5.2.0.tgz 73566 RMD160 fc6d649f4c85a275b714b2a1ba8fa5cfb13cea7a SHA1 f5a8e8ee5bcfef7df329a99f24106a77fe1e5b7b SHA256 84ee977fb7c639bc96cd4e8db0145c7a182489456e4d95a71c3612258b5013ac
 DIST python-mode.el-6.0.3.tar.gz 134816 RMD160 09a29896fd759ec1d928e4ce922b0a8cbd62a328 SHA1 2aac9464fe9690b00f94c2ea5debf3a5bb1b2884 SHA256 ea58b4aa944ee4c81041b5124cd552800a694b90bed9ba38f5dde673eaad06fa
 EBUILD python-mode-5.1.0.ebuild 806 RMD160 1bbdd57608c0eb850abf5af45e748c1114aedf16 SHA1 e78294debc30267b86a21778b6f0c9083ceabf93 SHA256 f988db73d4cba7d621c2af9ca66a83ad027210a6d7ad9f65c0a80dd9c9fac3d7
 EBUILD python-mode-5.2.0.ebuild 917 RMD160 26482f812d548ff5e82b2b77491a0ed50c6f4f2c SHA1 6d30ba1002d57afbb81ec98172a2735d4401780c SHA256 26abe53e610aca1f4ba1f3d908484c33c2dfed3e5319bacff1b1afbe4ee2f939
-EBUILD python-mode-6.0.3.ebuild 889 RMD160 e739a26a399eda83844e7bef11b5c0a4a55f89e6 SHA1 813a993766d84d5cd16b435975657bedf1ccc790 SHA256 b33d9473dad485687c55cbbaa4bc798ca34a8205b29a5e6e0ebc9cae9f40c3d7
-MISC ChangeLog 6395 RMD160 757a5741e7805c349a0078517c79fad4147740f3 SHA1 ebce92a0878bd8a997759b566699e86f1b3f557d SHA256 bdf399e7eaf959f065f40316e6a496961d27f82d28b299b3c8008fd190078d9e
+EBUILD python-mode-6.0.3-r1.ebuild 952 RMD160 b33d8305422f9a27efb2f03c9ca0bcb271182e18 SHA1 9f83c7303688484b54c956e1adb2c5dafd3de958 SHA256 9bd45238138947c1f73725b4ed5e47fa52df127cf96b78b0698337bf05a973ff
+MISC ChangeLog 6696 RMD160 099f113dc2d0b0c085c75938498d9ec5c597b2c7 SHA1 6954b85dae5daf97f6a468fcd11eb5ff63d740ac SHA256 0403b364cb934fe668899710dceebf6e15dcffcfd8ec6a7853be2a04fd9cdcbd
 MISC metadata.xml 158 RMD160 415d172437ca754d24fc5ab186ba8e77934d96e4 SHA1 61f6eff9729cd87a725c2a70c81aca4270a17fc4 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7KkhAACgkQOeoy/oIi7uwUjgCfTNlV31JBPyPkmUFVEgdzsjux
-8hQAn0b2Zr41j8N5OPfdVFJDwCKqf6LZ
-=/tHT
+iEYEARECAAYFAk7NLmoACgkQOeoy/oIi7uy1RQCg51xKwSZmyArqTXqhs2hC1cUi
+B34Anidg1dKZJSm4G5K0JNZqIM/rdvhO
+=xFSh
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/python-mode/files/python-mode-6.0.3-obsolete-vars.patch b/app-emacs/python-mode/files/python-mode-6.0.3-obsolete-vars.patch
new file mode 100644
index 000000000000..cd08f9720d9b
--- /dev/null
+++ b/app-emacs/python-mode/files/python-mode-6.0.3-obsolete-vars.patch
@@ -0,0 +1,21 @@
+https://bugs.gentoo.org/391403
+
+--- python-mode.el-6.0.3-orig/python-mode.el
++++ python-mode.el-6.0.3/python-mode.el
+@@ -163,11 +163,11 @@
+ ;; Execute stuff start
+ 
+ ;; backward compatibility
+-(defalias 'py-python-command 'py-shell-name)
+-(defalias 'py-jpython-command 'py-shell-name)
+-(defalias 'py-jython-command 'py-shell-name)
+-(defalias 'py-default-interpreter 'py-shell-name)
+-(defalias 'python-command 'py-shell-name)
++(defvaralias 'py-python-command 'py-shell-name)
++(defvaralias 'py-jpython-command 'py-shell-name)
++(defvaralias 'py-jython-command 'py-shell-name)
++(defvaralias 'py-default-interpreter 'py-shell-name)
++(defvaralias 'python-command 'py-shell-name)
+ 
+ (defcustom py-encoding-string " # -*- coding: utf-8 -*-"
+   "Default string specifying encoding in the heading of file. "
diff --git a/app-emacs/python-mode/python-mode-6.0.3.ebuild b/app-emacs/python-mode/python-mode-6.0.3-r1.ebuild
index 90da1a6150ff..ee9ff9782a64 100644
--- a/app-emacs/python-mode/python-mode-6.0.3.ebuild
+++ b/app-emacs/python-mode/python-mode-6.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.0.3.ebuild,v 1.1 2011/11/21 18:01:23 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/python-mode/python-mode-6.0.3-r1.ebuild,v 1.1 2011/11/23 17:32:56 ulm Exp $
 
 EAPI=4
 
@@ -17,10 +17,12 @@ KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~x86-free
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
+ELISP_PATCHES="${P}-obsolete-vars.patch"
 SITEFILE="50${PN}-gentoo.el"
 DOCS="NEWS"
 
 src_prepare() {
+	elisp_src_prepare
 	# remove XEmacs specific file
 	rm highlight-indentation.el || die
 }