Further fixes from bug 457942 to work better with python eclasses.

Package-Manager: portage-2.1.11.58/cvs/Linux x86_64
Manifest-Sign-Key: 0x9433907D693FB5B8!

3 files changed, 30 insertions, 30 deletions

diff --git a/app-emacs/pymacs/ChangeLog b/app-emacs/pymacs/ChangeLog
index 3b2608e5c08b..25e6b6fd76bd 100644
--- a/app-emacs/pymacs/ChangeLog
+++ b/app-emacs/pymacs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emacs/pymacs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/ChangeLog,v 1.56 2013/02/17 13:54:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/ChangeLog,v 1.57 2013/03/30 13:45:35 ulm Exp $
+
+*pymacs-0.25-r1 (16 Mar 2013)
+
+  16 Mar 2013; Ulrich Müller <ulm@gentoo.org> -pymacs-0.25.ebuild,
+  +pymacs-0.25-r1.ebuild:
+  Further fixes from bug 457942 to work better with python eclasses.
 
 *pymacs-0.25 (17 Feb 2013)
 
diff --git a/app-emacs/pymacs/Manifest b/app-emacs/pymacs/Manifest
index 8596abc2dc8d..78dc2cdf3a98 100644
--- a/app-emacs/pymacs/Manifest
+++ b/app-emacs/pymacs/Manifest
@@ -7,23 +7,20 @@ DIST pymacs-0.24_beta2.tar.gz 116284 SHA256 126501a8fb24fdaeccea9bd4e24117620bf9
 DIST pymacs-0.25.tar.gz 120597 SHA256 51dc21b33316e6e244e78e5e88d8ae9a88afc0dcef34ba702ea9be589839bec2 SHA512 e17f7ee754413e21403d23894ee263fb0edae180a60c746b02cf101b2f0c782116e7bb61215bd0a8c689a991e211d780d220d4672b58f43108e7218a6f0c8dc0 WHIRLPOOL 90a211d1b62387e05deb759786fd82eeed23c1800307f1345e1c06c579c0455480433c24fda34a881f887595e169076a6ed56f6e8774933f0431aa96940e0152
 EBUILD pymacs-0.23-r1.ebuild 1326 SHA256 6b4971c90a8f5d22c397f973252bc941eb79a1e895b6269431c3f0af3ddf389d SHA512 9d5a1087a046e92503665a27554281d3f1f4fbd73c0bf4c1dff393c56f45bcad0af0e873f4c2c6f48579434a1445ccda947b71810565270c11b9e1b0e43646ae WHIRLPOOL 2b905936f68f02e005761341c1362a5654e4a4b3df771e921c4b4fa344437fede0aae4395a58de0af06d4860256f479213328606f3240976724ba19fd83d12cd
 EBUILD pymacs-0.24_beta2.ebuild 1160 SHA256 5d06b115af1817e971c149b21273d8bc070a20af7f48d56fa4bfcd0f66149539 SHA512 b82bb2cc3c46e3b8b02d685effb367e920d0e4497abf77da90cacd5cd883dff9ca3de30f8acc8fa8ca14fa5fd7b58cb9b4400fe3e0a764b163af3d963de3cf45 WHIRLPOOL 810acb86cb9c7e7bc9d77e4b2bd9279aa98dc3359800b1b43ce8bbcbe09b773ea4c4b1ec1911f9dc163e832ce20637b94d1c4226c3e779dafcdd24a6c169729f
-EBUILD pymacs-0.25.ebuild 1204 SHA256 2870c4375ea5fa0abfbaa7590561e9b1f7b64779dddd7142162d9a593dfdf5b9 SHA512 8be3538296da586f44bb1a1d071857865d5fc47beb081e0bd7a7e738a1554dca6de3bca99945bd03a8d5022414afad420be45892af1ea55e86b73a1d044d04cf WHIRLPOOL 64f984cdca4f7ed8b1cd6c005cd27d2faa731f50a53e888657be03465bfbb3fd3aee14dfe3f6a43d1c7608ecde3bece1abab69362eb34b0e6a03034178866ef9
-MISC ChangeLog 7104 SHA256 0db9fb0628330ce4d5a5573fc4a044960f4a17efcf045a96f30015fa9c4c10ae SHA512 3540cd2a2968339208665b2cbe784c5dc63f2446d26d0decb948ef48da0190c4483d24d82803d670ee2c74cec381f8101694bb484fe0e4ed7ec34ab3aa844819 WHIRLPOOL 0ced6be207e8fe6c5bbd6069f348f2672e782eb99a07a45bd75ecafc63bcbf05f2eca8e183dbd633b03ae1489829f4878e930653c9593745b53ab4dfaa2dec33
+EBUILD pymacs-0.25-r1.ebuild 1232 SHA256 d4823911a94c1fc88e2c474514a2ab9d2dd866b91ae1a0d55f17c211286eb742 SHA512 4de79511c3716af7b862d7ebf2a4dddf552fc3458d7f2ba6f46c2c5fe586f3abb298e4cf04782a9dd5a07bc5756f424e72fbcde6e5a4eaa8ea9d89028d94f6ab WHIRLPOOL afb34be916bdbef6d17bf67fc5e9186f6ec5a6485070c0c7345d318e78d383e7bbce6c8e936b62eec8e04b74c5e837677148944e718bdb1300ca074091a7538d
+MISC ChangeLog 7299 SHA256 a4c52996bf7e54061df4e1541da573cf8cd02c230d5966057ce92d356937c83d SHA512 60afcde4c4846fb21b7aa8643acc97ff7e12d89709a31e130e9fa8c375bb9b9df8b3fda68a8a729919015617b7b63002347fa70c58f56d916583401fa225252f WHIRLPOOL b20fcfcfcf4f863e876c8cf9c8f85891a482e02d1770a0505d4604187631780411fb648a5fbcc6cc1c4ad93b2a1d2aa160fecab57a34db26dbfc329f0f50b5a4
 MISC metadata.xml 178 SHA256 daafd22b77c8b0fd1457997b066b4915417db72b755712b4a3e65d3c91b884e3 SHA512 6a705222f8c6b6f78c244ac4b4d344a415bd9694ec29bf3d029737365fbdf199959e610f160e846b413deeaad49853394009b973c572b9948f87f55d0075507a WHIRLPOOL 84b156f2788965f73ba9073906058a6123ac7a3b3e1ebedcba7b5fe052d52a4fa204853d2957e2f1a9c632406f9435c4a907189b800a31cd2db0a9fff37db6b1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRIOIoAAoJEDxpGckxwJCBLDMP/R6rOT0hndugpSkELg2OfQ9R
-0AbTyhw3IFa3eGKmozI5mpiiOM0F70lzjwS8+agv8+zZQYNa7uVtFK6n+d+a/yL4
-+SFx5risJNGiUnMWeJK9b+NyScWVWkjdVcyHT7wi3w/OSy8IppsCW8NxITkaiUCJ
-lq78r2Z1rBdxyfo+4nkwjX+Ii65G09o/ORhMMixDH/5z+B5pabFIFxWCii0Jqy7T
-2O9d/OgjpKDbsRS2K00X9Sp4MwGTH2xK6g+ahAvA4Ubp9HvI+zRwc5gp9xu5nagA
-u+oTkDU6jzNUe2cWQORKplEm96OcKvSnL0c9tgNt6jyNv0emkmPoImD9GWf9jCEv
-NaKyPjgqJEjOfu6bDuyNwNQwpoBRsLmSevrkI3xx3GWk4FEiit2nUoTf+6Q99iGC
-vXBlCOcaVBQcJIJFVlVdxSJAd9e3UF7oV4iuYyxDqauY8AzhbwsZApgbWWlFmGkw
-PYcX3chpzJHO81rw/JnDzTJrMe7tkKFE130Na9iYMY9uTRe0ffpQ0yOJk/ooDYzY
-AJNzX8qsO1NKLqw0ESRyvAuUKGTGApvKzCbBFe8cMp6cdI4049VmMpU83AYqJVk9
-kh6cN6kUS+I3nOwWT6yIC9yPBZSBqxjQP+/Jha4HfwXi8Lnyzlqm6On4k0w8h7c/
-Upj+uLz4lj5CDbTcGnRN
-=FTw8
+iQGcBAEBCAAGBQJRVuygAAoJEJQzkH1pP7W4d9AL/inMbtayXnz8z7Mny/mJV3zz
+gi6ZBgmoC+CEW+tMeUktXyf8Ls92n7UePHfOns/bnoN8kiA0R9NMYlKx6Bs61vtD
+VNP0bzmH5dteTwOkbZgsIMTKp0ruAGRyK9IC27lQEIEZWqNtS6JHAvRiPvinMifT
+/T0zr3RB2keJeKrB4iuec5H9wXaLr3V9PBQwK8QJhFxcOniIXvuwbO2vDOaam98f
+6TR1nDKVbrWiMB7HkqpLswSu6lKhAuRQgBGlhPUl/I/Enup5/BNcBjTtjiEMasJ1
+P+EbxV77nyzUaw3xxugm8+5egAlD2QoFqj+32wWyPOPJQba1dsfhZKqZ0ii+ZYTX
+eBn+VT3wd3p0K4p68hcBeppxUueuSPEelXrP/ul7N0DYPBSZ5u2C4klSF5WIFaAv
+LQo/pWT95BRHSH8KhPNex+gLvqYrfB8QZf85XmKIpTUqLJuLREpTDlGO24dHCjsv
+/lmSQRZHwMus3/a9k7T/oc+5BXWAGdTpKhqtTzIi3Q==
+=bygI
 -----END PGP SIGNATURE-----
diff --git a/app-emacs/pymacs/pymacs-0.25.ebuild b/app-emacs/pymacs/pymacs-0.25-r1.ebuild
index 9843df3827c8..8ea15e0dc7ed 100644
--- a/app-emacs/pymacs/pymacs-0.25.ebuild
+++ b/app-emacs/pymacs/pymacs-0.25-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/pymacs-0.25.ebuild,v 1.1 2013/02/17 13:54:49 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emacs/pymacs/pymacs-0.25-r1.ebuild,v 1.1 2013/03/30 13:45:35 ulm Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
 
-inherit distutils-r1 elisp vcs-snapshot
+inherit elisp distutils-r1 vcs-snapshot
 
 DESCRIPTION="A tool that allows both-side communication beetween Python and Emacs Lisp"
 HOMEPAGE="http://pymacs.progiciels-bpi.ca/"
@@ -20,27 +20,24 @@ DEPEND="doc? ( >=dev-python/docutils-0.7
 			virtual/latex-base )"
 RDEPEND=""
 
+DISTUTILS_IN_SOURCE_BUILD=1
 SITEFILE="50${PN}-gentoo.el"
 
-python_configure_all() {
+# called by distutils-r1 for every python implementation
+python_configure() {
 	# pre-process the files but don't run distutils
-	emake PYSETUP=:
+	emake PYSETUP=: PYTHON=${EPYTHON}
 }
 
-src_configure() {
-	distutils-r1_src_configure
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	elisp-compile pymacs.el || die
+# called once
+python_compile_all() {
+	elisp_src_compile
 	if use doc; then
 		VARTEXFONTS="${T}"/fonts emake RST2LATEX=rst2latex.py pymacs.pdf
 	fi
 }
 
-src_install() {
-	distutils-r1_src_install
+python_install_all() {
 	elisp_src_install
 	dodoc pymacs.rst
 	use doc && dodoc pymacs.pdf