Use Python 2 and remove deprecation warning (bug #324193).

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

diff --git a/games-action/xpilot-ng/ChangeLog b/games-action/xpilot-ng/ChangeLog
index 8619fc27d616623fd9c48f3ac975d22e19d7f771..c50c65033071058baa7edf941c6e0cc321ed8482 100644 (file)
--- a/games-action/xpilot-ng/ChangeLog
+++ b/games-action/xpilot-ng/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for games-action/xpilot-ng
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.13 2010/01/22 20:05:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/ChangeLog,v 1.14 2010/06/16 02:02:46 arfrever Exp $
+
+  16 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  xpilot-ng-4.7.2-r1.ebuild:
+  Use Python 2 and remove deprecation warning (bug #324193).
 
   22 Jan 2010; Brent Baude <ranger@gentoo.org> xpilot-ng-4.7.2-r1.ebuild:
   stable ppc, bug 294019

diff --git a/games-action/xpilot-ng/Manifest b/games-action/xpilot-ng/Manifest
index bf4dfb6a5d9c3e372a0418cb550963a41c974ed7..3c41b34f732942eb5661a463d018b4c9475c77b4 100644 (file)
--- a/games-action/xpilot-ng/Manifest
+++ b/games-action/xpilot-ng/Manifest
@@ -2,6 +2,6 @@ AUX xpilot-ng-4.7.2-glibc210.patch 2583 RMD160 cb4e486551c6726e792fa79453be82d28
 AUX xpilot-ng-4.7.2-xpngcc.patch 648 RMD160 f5bae034c80cb972ee6235ca2bf8d23c1b5df3bb SHA1 76dcaeed120b7f95daa6ac50806fbd250922ba49 SHA256 12973a163663e6a5f560737742dc51b0f0ba258ac01ea255184a8c70eda3d870
 DIST xpilot-ng-4.7.2.tar.gz 2807988 RMD160 acc4266fd14467168cf3412ed747c5377b34ed41 SHA1 b61f05c9041866bcb58d7808dfd1dba09a6e930e SHA256 31ef0f6b40779dd0ac5eb1bd17dd0908174e52991413fe25d623b6336d480fc0
 DIST xpilot-ng.png 3898 RMD160 a68fe7ffb0b2d4225b95233be950d65dc527c3ad SHA1 3461e7cccd99d006542bfa97d8f1dd63abd8967d SHA256 6c9ba1bb1d0bf20428df32453cc66b2fa93b28bebcb75237ccb3052e8e8c8dde
-EBUILD xpilot-ng-4.7.2-r1.ebuild 1780 RMD160 a7751de66908d8853f35f1ec916cd1d8abf4f3a5 SHA1 7d7a2541c4a9c7ebfc6da264847c5286da33ffce SHA256 31f647e96ba5b7ca25d4367d94f3ebf7d1f1a2df24d49c557087e9b9775204ad
-MISC ChangeLog 2022 RMD160 79c51dba866e5f69e065ade7dbfaaa406d60a1e7 SHA1 199c06e69b30b8a17e6bf4b25bc8f6f96c2493e9 SHA256 9ace1b5fbc8b65d1efec34a25ff07aac46ebe03ef050c9659f470bfe4e778aba
+EBUILD xpilot-ng-4.7.2-r1.ebuild 1796 RMD160 36865852b26f87c96d21fcc7e35af682e3f1b4ff SHA1 af7689305c327fdd0660bbd8db68c9e64416cbc7 SHA256 81c5573b8ff805049d3ce0850691eca7a0cbc6e7b216fa50ea063299b32072a4
+MISC ChangeLog 2188 RMD160 ec9ed23b3ce98ccc154421dc083b4481166e81d5 SHA1 8f69f975682647fef81dc501202ba3eeed5c1fb1 SHA256 b5f6a6d3ecabc7270ee4918ac80d7b944c2e99aa4f3d01eec94fdd7626033aee
 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3

diff --git a/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
index d3aaee40cbc1e7aa20ede97f74ab3080524a67d7..187d23c35aa0532e26bcdcb4d24fc9aed54679af 100644 (file)
--- a/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
+++ b/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild,v 1.9 2010/01/22 20:05:05 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/xpilot-ng/xpilot-ng-4.7.2-r1.ebuild,v 1.10 2010/06/16 02:02:46 arfrever Exp $
 
 EAPI=2
+PYTHON_DEPEND="2"
 inherit python eutils multilib games
 
 DESCRIPTION="Improvement of the multiplayer space game XPilot"
@@ -31,6 +32,11 @@ DEPEND="${RDEPEND}
        x11-proto/xextproto
        x11-proto/xproto"
 
+pkg_setup() {
+       python_set_active_version 2
+       games_pkg_setup
+}
+
 src_prepare() {
        epatch "${FILESDIR}/${P}"-xpngcc.patch \
                "${FILESDIR}"/${P}-glibc210.patch
@@ -52,13 +58,12 @@ src_configure() {
 src_install() {
        emake DESTDIR="${D}" install || die "emake install failed"
        dodoc AUTHORS ChangeLog README
-       python_version
        insinto "${GAMES_DATADIR}"/${PN}/xpngcc
        doins contrib/xpngcc/*.py contrib/xpngcc/*.png
        exeinto "${GAMES_DATADIR}"/${PN}/xpngcc
        doexe contrib/xpngcc/xpngcc.py
-       dodir /usr/$(get_libdir)/python${PYVER}/site-packages
-       dosym "${GAMES_DATADIR}"/${PN}/xpngcc /usr/$(get_libdir)/python${PYVER}/site-packages/xpngcc
+       dodir $(python_get_sitedir)
+       dosym "${GAMES_DATADIR}"/${PN}/xpngcc $(python_get_sitedir)/xpngcc
        dosym "${GAMES_DATADIR}"/${PN}/xpngcc/xpngcc.py "${GAMES_BINDIR}"/xpilot-ng
        doicon "${DISTDIR}"/${PN}.png
        make_desktop_entry ${PN} "XPilot NG"