Fix usage of python_set_active_version(), call python_pkg_setup(), simplify src_confi...

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

diff --git a/games-kids/gcompris/ChangeLog b/games-kids/gcompris/ChangeLog
index 73ed6f16de4e8ed15e6c6256a753778b45ab01a2..0a1e0ef7cbbee9fa1750c0fedc8c4b0a2a74796c 100644 (file)
--- a/games-kids/gcompris/ChangeLog
+++ b/games-kids/gcompris/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-kids/gcompris
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.52 2010/06/16 02:08:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/ChangeLog,v 1.53 2010/06/16 02:10:37 arfrever Exp $
+
+  16 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  gcompris-9.2.2.ebuild:
+  Fix usage of python_set_active_version(), call python_pkg_setup(),
+  simplify src_configure() (bug #324195).
 
   16 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   gcompris-8.4.12.ebuild:

diff --git a/games-kids/gcompris/Manifest b/games-kids/gcompris/Manifest
index 5c3db1257f6ef3521e455558fbee3f4588bc2785..407f766d3d450cc5a9af1462a4396de8fa3824d9 100644 (file)
--- a/games-kids/gcompris/Manifest
+++ b/games-kids/gcompris/Manifest
@@ -3,6 +3,6 @@ AUX gcompris-9.2.2-build.patch 5001 RMD160 0e8f39b8f6ff277fbebf556c8bc8a3225e915
 DIST gcompris-8.4.12.tar.gz 104355638 RMD160 f5d8129d4c37c97c1f15d0b7fb6865d3477b745e SHA1 55b6619d7e05fcfa0934c8564d8085d5aa880bbe SHA256 55025808dcb4afb3fa9ea8e232684e651da3ac2c673cb36592d6583ebec2d4c7
 DIST gcompris-9.2-2.tar.gz 123861044 RMD160 2c1571a7ad18f31f54f80b574e66d0e9dbe77ba4 SHA1 584b7b65de0278ebabf5ccebe3644c0575150337 SHA256 6390b56ad3f7394b81818ad2194c5e65bbd9626cb0c0d0e0838c15beb5c1bfc9
 EBUILD gcompris-8.4.12.ebuild 1859 RMD160 8ed7322a421d59b959ff10bbe3480eeaf678ae1c SHA1 21ad4dcec376068b79169a8c0f9e0dc6fee7e3d1 SHA256 529d0c6caeb0989fdf20ff3a25ed1bd716826722645e6dcfeb82160b20d47a7a
-EBUILD gcompris-9.2.2.ebuild 2036 RMD160 d41fdcf8393714c20b32dbf9f816caf8e2616c4f SHA1 f5cc3a5f4a2e29ccaa1bf09946b57879b5668ea9 SHA256 6bcd6d6084afff8fae1f9907a6af23b3775004ef936c013d58e167c455e3f5d1
-MISC ChangeLog 7741 RMD160 d40394fa0aa742a0f636018061e494eedb67dc85 SHA1 944b828685ec2d4f75cc782184f4a76c44b2f13d SHA256 19854f5651d0ef251daf6616aa0ed7e3405bd35bf971e0a872e87a8c2077acf2
+EBUILD gcompris-9.2.2.ebuild 2040 RMD160 2951ef1ad184a3a48c2b2519319918972bd1e561 SHA1 efa2c0e6b19d4ec70152b0930880dfd9fb5140df SHA256 233ab63b2461cb8de64c1380882fa569274ec66cb5fd0a02efd2bea0cbe23b1b
+MISC ChangeLog 7951 RMD160 e9e66caf7b706cd4d57b391299c07e09e79d3218 SHA1 87c86901bdf5e4a588d5efc18e5a0c9b006a3ef9 SHA256 a93e6f03e3e3d81a1e7dc0dbc16e033f55cd69c74138f439807773e12a6c4afd
 MISC metadata.xml 256 RMD160 570feef44e7d62ff41eb94fd83a54d9adcfe9a1d SHA1 2719c80bf2b8c87e73d7cd147cd617d8bb85c4d8 SHA256 4d42cbbf92befa58671d7062d6b3be70d9e72f5e24745f94b93f59bd74ae6254

diff --git a/games-kids/gcompris/gcompris-9.2.2.ebuild b/games-kids/gcompris/gcompris-9.2.2.ebuild
index 865fb40d879b5c3c15e24af55c04207c6b0e3e5d..ad3370c8b4a6987ad8b5a97cf83842cf10da2dab 100644 (file)
--- a/games-kids/gcompris/gcompris-9.2.2.ebuild
+++ b/games-kids/gcompris/gcompris-9.2.2.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/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.4 2010/05/31 19:24:19 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-kids/gcompris/gcompris-9.2.2.ebuild,v 1.5 2010/06/16 02:10:37 arfrever Exp $
 
 EAPI=2
 
@@ -47,7 +47,10 @@ RDEPEND="${RDEPEND}
 S=${WORKDIR}/${PN}-$(get_version_component_range 1-2)
 
 pkg_setup() {
-       python_set_active_version 2
+       if use python; then
+               python_set_active_version 2
+               python_pkg_setup
+       fi
        games_pkg_setup
 }
 
@@ -58,8 +61,6 @@ src_prepare() {
 }
 
 src_configure() {
-       local python_version="$(PYTHON -a)"
-
        GNUCHESS="${GAMES_BINDIR}"/gnuchess \
        egamesconf \
                --disable-dependency-tracking \
@@ -67,7 +68,7 @@ src_configure() {
                --datadir="${GAMES_DATADIR}" \
                --localedir=/usr/share/locale \
                --infodir=/usr/share/info \
-               $(use_with python python "${python_version}") \
+               $(use_with python python "$(PYTHON -a)") \
                $(use_enable debug) \
                $(use_enable gnet) \
                --enable-sqlite \