Don't call deprecated python_version() (bug #312291).

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

diff --git a/dev-python/pygobject/ChangeLog b/dev-python/pygobject/ChangeLog
index a6ff20012956503e7d1dd668d255e2636c5805fd..0dc652841a916397207ccd026e2e0cdfafe8755e 100644 (file)
--- a/dev-python/pygobject/ChangeLog
+++ b/dev-python/pygobject/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/pygobject
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.89 2010/03/19 17:04:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/ChangeLog,v 1.90 2010/04/02 21:29:10 arfrever Exp $
+
+  02 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pygobject-2.18.0.ebuild:
+  Don't call deprecated python_version() (bug #312291).
 
   19 Mar 2010; Pacho Ramos <pacho@gentoo.org> pygobject-2.20.0.ebuild,
   +files/pygobject-2.20.0-tmpdir-makefile.patch:

diff --git a/dev-python/pygobject/Manifest b/dev-python/pygobject/Manifest
index be2a404c49b4070ddcdee01f25adbe9084f75615..eedbf67ed55ee5711d99c35c29fdfaed1243fd35 100644 (file)
--- a/dev-python/pygobject/Manifest
+++ b/dev-python/pygobject/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pygobject-2.15.4-fix-codegen-location.patch 1519 RMD160 e4721ae2d9a2d05e3b129627c762acf177521974 SHA1 02e9446db952de3b934a264ce77648d2cd5c6d97 SHA256 6ab22def2c57a4dd44dedc787cb660dc326a62b518c3dc747fbe600ca2c20b8c
 AUX pygobject-2.18.0-automake111.patch 323 RMD160 182ea96cbb8fe28a93add0ef3dfd7710777615d8 SHA1 96c22e5bb8f07ea117248f4c8ca580474938c7af SHA256 4a94e9ca2a421a923c522ad4132c8988f22e74949f0361e231b6ba0ca813bc57
 AUX pygobject-2.18.0-make_check.patch 1589 RMD160 a2657fb299055620a745cb704ea3de289cdf8d63 SHA1 64ada13e6ac91845353855ed694ed951f63f583b SHA256 df43cef258567f824753caa0ba3a8d2820f729dac5ecba0d9fbf39a6f4861c4a
@@ -9,14 +6,7 @@ AUX pygobject-2.20.0-tmpdir-makefile.patch 1817 RMD160 6e2032012f65a74ed140f777e
 DIST pygobject-2.18.0.tar.bz2 639205 RMD160 db454107949b0e797c6c151aa426368ef0f59317 SHA1 f800eda7978fe9813600cfdda973da15c3178bb0 SHA256 b11b840ae31e6e644986806ee3400f4528b803d07b6cee26add45e0f2e5e622b
 DIST pygobject-2.20.0.tar.bz2 666287 RMD160 5e3a8c976b3047b0dd9c492c8344ccd0ca77d3fd SHA1 a5954262051f376983bef6cc0e3fd1b0ca1824f7 SHA256 41e923a3f4426a3e19f6d154c424e3dac6f39defca77af602ac6272ce270fa81
 EBUILD pygobject-2.18.0-r2.ebuild 3145 RMD160 7bb41c69b2e7162a6d59f05616c59056af137ea3 SHA1 1620b8b3f448eea09bdfdd52ed6651b16f376e40 SHA256 f14ff14b98379823ee21b4b1b7f477bbbd082684dc9b999110b07d5721b0e710
-EBUILD pygobject-2.18.0.ebuild 2470 RMD160 c353299d365aea86d15b93ff849ac5cba7633929 SHA1 2f5493ddfd678a84c34897625b8e1127fb11728a SHA256 aae65791cd99ac96a76e7310705d603fb50e615f5b75ad5c6c3bc54ea72ebb1b
+EBUILD pygobject-2.18.0.ebuild 2206 RMD160 9d2814fce1e8af71ce481d85bb099df8a22f2943 SHA1 f97790b65cec5cb8646e78d023252ef6e2e102d0 SHA256 590709921497cb0a9805c0cd17894bf4e14a4cbdf5a07e87d74a373d198668e9
 EBUILD pygobject-2.20.0.ebuild 3204 RMD160 30f656d7b28f2afb431d84ebfa67bfd997702c0e SHA1 7aac445b9150ac5a95cfac48a79e2bb286577bf5 SHA256 78e368f199b4e0763b016b8e3a588cf672e9e7774e1583449af693e3332cb25b
-MISC ChangeLog 12794 RMD160 f6f3bba6797664e892fa793c797862759fc7a7a4 SHA1 cc61501ef3fca236fab5d4eb2708b553bd260aff SHA256 0600ab012eb47b8041e2457619ccfb96a2004b7f3e40a6733f9ebc1f013480e4
+MISC ChangeLog 12954 RMD160 e4d65bf1a10e1305894863df1211d87f6d694611 SHA1 bf126988954827befda0c8ea0276b151e75b1c27 SHA256 7f1574011e04c876f42023c8c3dc270d6946f917366b478d40d0935495afbee5
 MISC metadata.xml 282 RMD160 32fd779b50e24af15b5d30862d362cef786e2930 SHA1 6603342ce4d848c26dd1a585eeebc1b84198f2fa SHA256 116a6827697ff69c8f1971077502e9fa2b0d2fd23e57c97d4b54b3d1495597ca
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkujrrAACgkQCaWpQKGI+9S/rgCeMo54j2WRawIms9D3vUGUyvef
-Qv4AnRpGvHtEqN7IlCVf7zEq+kkPicVW
-=0wI4
------END PGP SIGNATURE-----

diff --git a/dev-python/pygobject/pygobject-2.18.0.ebuild b/dev-python/pygobject/pygobject-2.18.0.ebuild
index 540963cd1a058fc46789c458b163db722d91cea9..75abcbebb53c8508af66f626b93f816cc5a07436 100644 (file)
--- a/dev-python/pygobject/pygobject-2.18.0.ebuild
+++ b/dev-python/pygobject/pygobject-2.18.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 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/pygobject/pygobject-2.18.0.ebuild,v 1.14 2009/12/29 21:50:57 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pygobject/pygobject-2.18.0.ebuild,v 1.15 2010/04/02 21:29:10 arfrever Exp $
 
 inherit alternatives autotools gnome2 python virtualx
 
@@ -65,23 +65,18 @@ src_install() {
                doins -r examples
        fi
 
-       python_version
-       mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py \
-               "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py-2.0
-       mv "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth \
-               "${D}"/usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth-2.0
+       mv "${D}"$(python_get_sitedir)/pygtk.py "${D}"$(python_get_sitedir)/pygtk.py-2.0
+       mv "${D}"$(python_get_sitedir)/pygtk.pth "${D}"$(python_get_sitedir)/pygtk.pth-2.0
 }
 
 pkg_postinst() {
-       python_version
-       python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/gtk-2.0
-       alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py pygtk.py-[0-9].[0-9]
-       alternatives_auto_makesym /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.pth pygtk.pth-[0-9].[0-9]
-       python_mod_compile /usr/$(get_libdir)/python${PYVER}/site-packages/pygtk.py
+       python_mod_optimize $(python_get_sitedir)/gtk-2.0
+       alternatives_auto_makesym $(python_get_sitedir)/pygtk.py pygtk.py-[0-9].[0-9]
+       alternatives_auto_makesym $(python_get_sitedir)/pygtk.pth pygtk.pth-[0-9].[0-9]
+       python_mod_compile $(python_get_sitedir)/pygtk.py
        python_need_rebuild
 }
 
 pkg_postrm() {
-       python_version
        python_mod_cleanup
 }