Delete deprecation warnings.

(Portage version: HEAD/cvs/Linux x86_64)

3 files changed, 12 insertions, 14 deletions

diff --git a/sci-chemistry/pymol/ChangeLog b/sci-chemistry/pymol/ChangeLog
index 4ed37e366017..7bf8caa61f5c 100644
--- a/sci-chemistry/pymol/ChangeLog
+++ b/sci-chemistry/pymol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/pymol
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.64 2010/06/09 07:04:48 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/ChangeLog,v 1.65 2010/06/15 12:54:07 arfrever Exp $
+
+  15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pymol-0.99_rc10.ebuild, pymol-1.2.1.ebuild:
+  Delete deprecation warnings.
 
 *pymol-1.3.0 (09 Jun 2010)
 
diff --git a/sci-chemistry/pymol/pymol-0.99_rc10.ebuild b/sci-chemistry/pymol/pymol-0.99_rc10.ebuild
index 2fbe43a7b397..720a4ba4c939 100644
--- a/sci-chemistry/pymol/pymol-0.99_rc10.ebuild
+++ b/sci-chemistry/pymol/pymol-0.99_rc10.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/sci-chemistry/pymol/pymol-0.99_rc10.ebuild,v 1.9 2009/08/02 14:58:31 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-0.99_rc10.ebuild,v 1.10 2010/06/15 12:54:07 arfrever Exp $
 
 inherit distutils eutils multilib subversion
 
@@ -38,19 +38,17 @@ src_unpack() {
 }
 
 src_install() {
-	python_version
-
 	distutils_src_install
 	cd "${S}"
 
 #The following three lines probably do not do their jobs and should be
 #changed
-	PYTHONPATH="${D}/usr/$(get_libdir)/site-packages" ${python} setup2.py
+	PYTHONPATH="${D}/usr/$(get_libdir)/site-packages" $(PYTHON) setup2.py
 
 # These environment variables should not go in the wrapper script, or else
 # it will be impossible to use the PyMOL libraries from Python.
 		cat >> "${T}"/20pymol << EOF
-		PYMOL_PATH=/usr/$(get_libdir)/python${PYVER}/site-packages/pymol
+		PYMOL_PATH=$(python_get_sitedir)/pymol
 		PYMOL_DATA="/usr/share/pymol/data"
 		PYMOL_SCRIPTS="/usr/share/pymol/scripts"
 EOF
@@ -60,7 +58,7 @@ EOF
 # Make our own wrapper
 		cat >> "${T}"/pymol << EOF
 #!/bin/sh
-		${python} \${PYMOL_PATH}/__init__.py \$*
+		$(PYTHON) \${PYMOL_PATH}/__init__.py \$*
 EOF
 
 		exeinto /usr/bin
diff --git a/sci-chemistry/pymol/pymol-1.2.1.ebuild b/sci-chemistry/pymol/pymol-1.2.1.ebuild
index 68da5aaec576..0c97ee31cfbf 100644
--- a/sci-chemistry/pymol/pymol-1.2.1.ebuild
+++ b/sci-chemistry/pymol/pymol-1.2.1.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/sci-chemistry/pymol/pymol-1.2.1.ebuild,v 1.8 2010/02/06 15:26:35 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol/pymol-1.2.1.ebuild,v 1.9 2010/06/15 12:54:07 arfrever Exp $
 
 EAPI="2"
 
@@ -36,10 +36,6 @@ RDEPEND="${DEPEND}"
 
 S="${WORKDIR}"/${PN}
 
-pkg_setup(){
-	python_version
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/${PV}/${P}-data-path.patch \
 		|| die "Failed to apply data-path.patch"
@@ -88,7 +84,7 @@ src_install() {
 
 	cat >> "${T}"/pymol <<- EOF
 	#!/bin/sh
-	${python} -O \${PYMOL_PATH}/__init__.py \$*
+	$(PYTHON) -O \${PYMOL_PATH}/__init__.py \$*
 	EOF
 
 	dobin "${T}"/pymol || die "Failed to install wrapper."