Delete deprecation warnings.

(Portage version: HEAD/cvs/Linux x86_64)

4 files changed, 15 insertions, 12 deletions

diff --git a/sci-chemistry/pdb2pqr/ChangeLog b/sci-chemistry/pdb2pqr/ChangeLog
index 05bb006b8435..2136d23057e3 100644
--- a/sci-chemistry/pdb2pqr/ChangeLog
+++ b/sci-chemistry/pdb2pqr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-chemistry/pdb2pqr
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.22 2010/05/28 20:17:08 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/ChangeLog,v 1.23 2010/06/15 12:46:05 arfrever Exp $
+
+  15 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pdb2pqr-1.3.0.ebuild, pdb2pqr-1.4.0-r1.ebuild, pdb2pqr-1.5.0.ebuild:
+  Delete deprecation warnings.
 
   28 May 2010; Justin Lecher <jlec@gentoo.org> pdb2pqr-1.5.0-r1.ebuild:
   Removed broken test
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.3.0.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.3.0.ebuild
index 941c66d0bd8e..ec3de87292b1 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.3.0.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.3.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/sci-chemistry/pdb2pqr/pdb2pqr-1.3.0.ebuild,v 1.6 2009/05/24 07:50:41 je_fro Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.3.0.ebuild,v 1.7 2010/06/15 12:46:05 arfrever Exp $
 
 inherit eutils fortran multilib flag-o-matic distutils
 
@@ -36,8 +36,7 @@ src_compile() {
 }
 
 src_install() {
-	python_version
-	INPATH="/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}"
+	INPATH="$(python_get_sitedir)/${PN}"
 
 	insinto "${INPATH}"
 	doins __init__.py || \
@@ -67,7 +66,7 @@ src_install() {
 	# generate pdb2pqr wrapper
 	cat >> "${T}"/${PN} <<-EOF
 		#!/bin/sh
-		${python} ${INPATH}/${PN}.py \$*
+		$(PYTHON) ${INPATH}/${PN}.py \$*
 	EOF
 
 	exeinto /usr/bin
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.4.0-r1.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.4.0-r1.ebuild
index 0121e9bcee04..266708692675 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.4.0-r1.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.4.0-r1.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/pdb2pqr/pdb2pqr-1.4.0-r1.ebuild,v 1.3 2009/09/24 23:43:11 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.4.0-r1.ebuild,v 1.4 2010/06/15 12:46:05 arfrever Exp $
 
 inherit eutils fortran multilib flag-o-matic distutils python
 
@@ -73,7 +73,7 @@ src_install() {
 	# generate pdb2pqr wrapper
 	cat >> "${T}"/${PN} <<-EOF
 		#!/bin/sh
-		${python} ${INPATH}/${PN}.py \$*
+		$(PYTHON) ${INPATH}/${PN}.py \$*
 	EOF
 
 	exeinto /usr/bin
diff --git a/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0.ebuild b/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0.ebuild
index 898517a899cd..72ee264d493e 100644
--- a/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0.ebuild
+++ b/sci-chemistry/pdb2pqr/pdb2pqr-1.5.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/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0.ebuild,v 1.1 2009/11/03 05:40:25 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdb2pqr/pdb2pqr-1.5.0.ebuild,v 1.2 2010/06/15 12:46:05 arfrever Exp $
 
 inherit eutils fortran multilib flag-o-matic distutils python versionator
 
@@ -80,7 +80,7 @@ src_install() {
 	# generate pdb2pqr wrapper
 	cat >> "${T}"/${PN} <<-EOF
 		#!/bin/sh
-		${python} ${INPATH}/${PN}.py \$*
+		$(PYTHON) ${INPATH}/${PN}.py \$*
 	EOF
 
 	exeinto /usr/bin