Delete calls to deprecated python_version().

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

4 files changed, 19 insertions, 25 deletions

diff --git a/dev-python/pyorbit/ChangeLog b/dev-python/pyorbit/ChangeLog
index f8abef2e3893..4751bc876f72 100644
--- a/dev-python/pyorbit/ChangeLog
+++ b/dev-python/pyorbit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pyorbit
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.69 2010/01/17 23:43:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/ChangeLog,v 1.70 2010/06/08 17:40:45 arfrever Exp $
+
+  08 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pyorbit-2.14.3.ebuild, pyorbit-2.24.0.ebuild:
+  Delete calls to deprecated python_version().
 
   17 Jan 2010; Jeroen Roovers <jer@gentoo.org> pyorbit-2.24.0.ebuild:
   Stable for HPPA (bug #281427).
diff --git a/dev-python/pyorbit/Manifest b/dev-python/pyorbit/Manifest
index dd1ff0b4367d..a9be6e8ad713 100644
--- a/dev-python/pyorbit/Manifest
+++ b/dev-python/pyorbit/Manifest
@@ -1,6 +1,6 @@
 DIST pyorbit-2.14.3.tar.bz2 284374 RMD160 a25c396815c17449030d289e8e3d20ec8e1e21bb SHA1 b0863aba35beddaf44722b0d7a3d1f65081e424a SHA256 a3517e0ddaf23508f99e7489a23e3462f86c528ea24bce432e832a78ee4149db
 DIST pyorbit-2.24.0.tar.bz2 293054 RMD160 55aa1c3ac0739d398d8e9bbda93ef36f7c659360 SHA1 f9877ce9672ed3c3d001b86924f1b6514a79efc9 SHA256 8754669b8220aa1f151b920360029d5ea28c42bec55769059676725fe28397b8
-EBUILD pyorbit-2.14.3.ebuild 1261 RMD160 83ff11af7c2d3e1413ec605f513bbca264342a75 SHA1 8a0d741887997b8a453376220411754900c4eeb0 SHA256 ac38514c7be65caf165a50970de4b18f0944e87a612fbfc5b5095fcf1724e673
-EBUILD pyorbit-2.24.0.ebuild 1336 RMD160 8794f04596c16dd9dc373a339f656afe95278866 SHA1 1c987622993834fec3bb79dc21dd45f58450b98e SHA256 92edc73d516e913aeb4155b87f6d34327cc4e8ed4fb52d498df68a9a369b4536
-MISC ChangeLog 7617 RMD160 520ee0e61c4aad45703995166f969382b6038e8e SHA1 9e13d6c55eaca1c2a6e4184a3c0278eb3fb272e4 SHA256 dba9888f22fae7d8dffcb3362f30021975ff46ab2bc31e9a54f70c3f81c9899a
+EBUILD pyorbit-2.14.3.ebuild 1151 RMD160 74338b0df4ea59494397564e8b67d012817ec1dd SHA1 a2301a066c43b06950969a0dda1e1f294157fafa SHA256 84d633e66d2bee62cfaf5f1fb872ea6dc955ed023d5599edad23ca8ab9dcd10f
+EBUILD pyorbit-2.24.0.ebuild 1228 RMD160 f472f547ff213d1feeccac28146738973474b8b1 SHA1 4dcd24448fc5d7eba79e10792e9ade091a2aba48 SHA256 73023b2525be989647c721069cacb52f02d0156b1199c4a32a86fb33ff5b8525
+MISC ChangeLog 7791 RMD160 7330e6b7642eb31274d51c6efbf695faadc3e359 SHA1 0a13b158e2d0fa63a71ecc2adafa0d816709a16a SHA256 1cf480af8b256388d8bf79c60f6c1604aa0ddbb263464e5edc04a3d5dbbf4c8a
 MISC metadata.xml 178 RMD160 52828e1ca616ad731f2ab1ed2890d6d3a7cc8043 SHA1 a42d68a6c263ea8d8cbb678548e209aa9642a74e SHA256 aeea09173ed30175422e4f951e369e1882919be3d56e655468e5d4bffea0fc3c
diff --git a/dev-python/pyorbit/pyorbit-2.14.3.ebuild b/dev-python/pyorbit/pyorbit-2.14.3.ebuild
index e6d74c2b72f0..51e38938ee6d 100644
--- a/dev-python/pyorbit/pyorbit-2.14.3.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.14.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.14.3.ebuild,v 1.12 2008/10/27 10:29:01 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.14.3.ebuild,v 1.13 2010/06/08 17:40:45 arfrever Exp $
 
 inherit python gnome2 multilib
 
@@ -30,19 +30,14 @@ src_install() {
 	python_need_rebuild
 	gnome2_src_install
 
-	python_version
-	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/CORBA.py \
-		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_CORBA.py
-
-	mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/PortableServer.py \
-		"${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_PortableServer.py
+	mv "${D}"$(python_get_sitedir)/{CORBA.py,pyorbit_CORBA.py}
+	mv "${D}"$(python_get_sitedir)/{PortableServer.py,pyorbit_PortableServer.py}
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize $(python_get_sitedir)/{pyorbit_CORBA.py,pyorbit_PortableServer.py}
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/{pyorbit_CORBA.py,pyorbit_PortableServer.py}
 }
diff --git a/dev-python/pyorbit/pyorbit-2.24.0.ebuild b/dev-python/pyorbit/pyorbit-2.24.0.ebuild
index aeb825eea711..1864f16cf1ab 100644
--- a/dev-python/pyorbit/pyorbit-2.24.0.ebuild
+++ b/dev-python/pyorbit/pyorbit-2.24.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0.ebuild,v 1.11 2010/01/17 23:43:06 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyorbit/pyorbit-2.24.0.ebuild,v 1.12 2010/06/08 17:40:45 arfrever Exp $
 
 inherit python gnome2 multilib
 
@@ -30,19 +30,14 @@ src_install() {
 	[[ -z ${ED} ]] && local ED=${D}
 	gnome2_src_install
 
-	python_version
-	mv "${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/CORBA.py \
-		"${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_CORBA.py
-
-	mv "${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/PortableServer.py \
-		"${ED}"/usr/$(get_libdir)/python${PYVER}/site-packages/pyorbit_PortableServer.py
+	mv "${ED}"$(python_get_sitedir)/{CORBA.py,pyorbit_CORBA.py}
+	mv "${ED}"$(python_get_sitedir)/{PortableServer.py,pyorbit_PortableServer.py}
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages
+	python_mod_optimize $(python_get_sitedir)/{pyorbit_CORBA.py,pyorbit_PortableServer.py}
 }
 
 pkg_postrm() {
-	python_mod_cleanup
+	python_mod_cleanup $(python_get_sitedir)/{pyorbit_CORBA.py,pyorbit_PortableServer.py}
 }