From: Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
Date: Tue, 15 Jun 2010 12:54:07 +0000 (+0000)
Subject: Delete deprecation warnings.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=168a5aca339d73c90e6bab79e52ef157eb8c0d6e;p=gentoo.git

Delete deprecation warnings.
Package-Manager: portage-HEAD/cvs/Linux x86_64
---

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/Manifest b/sci-chemistry/pymol/Manifest
index c5c78d5cba9d..6d9d16cbb9dd 100644
--- a/sci-chemistry/pymol/Manifest
+++ b/sci-chemistry/pymol/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.2.1/nosplash-gentoo.patch 485 RMD160 3b3d85ffe14a253e54c4ff89b210cf35effe7aee SHA1 627affce7ee9763e308cf6dee70b831e09bd829d SHA256 acf8ef1d53719c1b4158b0f49250e8ed7c3aa4c870ef7ce4bdbc8ec97f591e27
 AUX 1.2.1/pymol-1.2.1-data-path.patch 1585 RMD160 e8d505a25869f0abd7b1ef77e1176c5fe7b2a312 SHA1 89464b3780fc48bd239c0e0662dbd1d61665984f SHA256 c89862e631b7bb0e05426ad0550be51501380d4522820a7600708d5290e5dfa8
 AUX 1.2.1/pymol-1.2.1-shaders.patch 442 RMD160 db5ee361cd1e253b9aa012098d08eb7873d95da3 SHA1 881d25514bc744d6f12b5f30bfa1709ed45dba05 SHA256 48042a9baf28c35a55204f646f14eddcf5093e17f518d7de2ffc50cbb7914dda
@@ -14,16 +11,9 @@ DIST apbs_tools.py.090618.bz2 21329 RMD160 80baed718524dfbaff2f0a3b7263fc75c55bf
 DIST pymol-1.2.1.tar.gz 8276264 RMD160 0b888ef9dfc91057077248bd388327dd9d3ff15b SHA1 2fb71dd69fbfffd2a6b2804766e410c6167be066 SHA256 f8b38fce8b56015c9e40f8af20fe69ae14b758fa2d3578a62ac9d26e97426e78
 DIST pymol-1.2.3.tar.gz 8281001 RMD160 125b4827b1ee5708ed28ac5bd8988a75b707ce4f SHA1 435dccba925298fa4865980a7139edcb8748accc SHA256 7d85e3e818ba357fa6df0db2248ef5555f84394559790e88e7003d602a20ab9f
 DIST pymol-1.3.0.tar.gz 8468105 RMD160 0681e0a2a565d4abfbf16d0d28bb2232eb9057b4 SHA1 a4f8f380e4af1e38b72f8b6e67eb0a48a6ad7131 SHA256 6810e2bc28c6fb949a10b22e1ef29851a570828b93b504d2bc4ac3eaa404b006
-EBUILD pymol-0.99_rc10.ebuild 2125 RMD160 92cb22b6566abc10a6d5f02d6b45be0316f2126d SHA1 4dfd6793fd7b1ee3bd90b12e0ed9c1ded007cb03 SHA256 3a9eb60ad0fff94a55d8614f5ade15225298a05d31efb4de0e1f0aa092d94b24
-EBUILD pymol-1.2.1.ebuild 2948 RMD160 e5894b3e057f178dec0ecebf7ae40301ab392239 SHA1 0658797816610b8de962cd7640db3e359f8579c0 SHA256 fe9f60d348ca7b1a4e04cb17235724ee1e614a77eafed3e53c8aeed868a5f296
+EBUILD pymol-0.99_rc10.ebuild 2085 RMD160 c47fd6362393165fc29c2e04e1c3154050d88a06 SHA1 7bdab939740b72037847ff1d21b31e4639514607 SHA256 4e3f3341f9a9213c589124b32ae643eed7ffd45f26053fb4c4c1d2b3b7e6e77b
+EBUILD pymol-1.2.1.ebuild 2921 RMD160 178234afc306ba8abbace7ac39f1b37daf84749f SHA1 20ac44ca697b96c09bae976533fdbfb54ef79929 SHA256 c977a8670364df99b8f5aa1861bca6ac5509a0b55faba9e4688edcb5c3f6322e
 EBUILD pymol-1.2.3-r1.ebuild 2634 RMD160 1c3fcad44b69e3df0b9f6e0dc5e0ff3d82822ee3 SHA1 77af289f50f30798227d4229ba175a4ec112a62f SHA256 306ab75001a6038b05f09f1cc7d285b050b6a6d9714a175aa12f0bd2665baebc
 EBUILD pymol-1.3.0.ebuild 2563 RMD160 34376677a524735b8a66e5708d101caec3b35a2b SHA1 4c997bd42c6ef68f912d0ffc8b021471b881aa1d SHA256 4e8134840493e05f89a53efc11a88a522e88f6e7871a55064598e40223bef098
-MISC ChangeLog 13246 RMD160 f9ae38568ec3e099d20560927917104566ee961a SHA1 b6f2babd90ef36d59f3147398376836163f30f81 SHA256 624ab781c75e6f6a4f8e1a9ce7072b3038a715414cc151a37381cee99fdc6ff0
+MISC ChangeLog 13401 RMD160 c1a01e87f5becedd61d9157121182b034defa8d0 SHA1 7b6f7b169665cf046c584b40de121e1d06b0ad8c SHA256 608c1bb78390f31eca10b45331cfac3683ac552cffd54c4e2d0df410cdb843a5
 MISC metadata.xml 494 RMD160 0aec5d84b0aaa7666af93962827613e9b4c7487b SHA1 84282f439939e0fbb2f7ec55c128a92442aa016e SHA256 22ac79b0f91926fe2e275ad46ec31994a0523fd196b3d82e8279d0f3d4250300
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.15 (GNU/Linux)
-
-iEYEARECAAYFAkwPPRYACgkQgAnW8HDreRbJ4QCgpW6NgvMmSWilPw8UUcHfEL7a
-51kAoKmpJorNWW/OGiEm2dS9YFM2eigQ
-=70Du
------END PGP SIGNATURE-----
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."