Delete calls to deprecated python_version().

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

3 files changed, 14 insertions, 26 deletions

diff --git a/net-im/pyicq-t/ChangeLog b/net-im/pyicq-t/ChangeLog
index 62b8711a1061..000d2bc630d3 100644
--- a/net-im/pyicq-t/ChangeLog
+++ b/net-im/pyicq-t/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/pyicq-t
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.18 2010/01/10 10:25:27 griffon26 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/ChangeLog,v 1.19 2010/04/23 19:56:48 arfrever Exp $
+
+  23 Apr 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  pyicq-t-0.8.1.5.ebuild:
+  Delete calls to deprecated python_version().
 
   10 Jan 2010; Maurice van der Pot <griffon26@gentoo.org>
   -files/pyicq-t-0.8-twisted-2.5.patch, -pyicq-t-0.8.1.ebuild,
diff --git a/net-im/pyicq-t/Manifest b/net-im/pyicq-t/Manifest
index da804122b66b..428ac43b7177 100644
--- a/net-im/pyicq-t/Manifest
+++ b/net-im/pyicq-t/Manifest
@@ -1,19 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pyicq-t-0.8-initd 680 RMD160 0b8e2f2147615807abeb65a37c341b5c4035932f SHA1 0e78dcfde66fee25ff3a07040b16b478288f08ea SHA256 02f02bb3ed0aee4505a26e904d3fbef4e40f370f039a67289ec2dd1a194cef9c
-DIST pyicqt-0.8.1.3.tar.gz 184777 RMD160 7e219573b3361c7a8f9ec2c57be5389252f2f4bb SHA1 15fb7396e64ac558ee00f47dde1b5d222c83f4f6 SHA256 5770c3d810a14bd75bdd68704acdba83131b268cfd6821660e22456d0115b0a7
-DIST pyicqt-0.8.1.4.tar.gz 183338 RMD160 74f7db6cf28ebf295b1dc0b95eb5687c557b9790 SHA1 c707545cd7cceb80ac08c9389e5922d36953c5d6 SHA256 63843ce414d921330668264711adafd4abaf8037bf348e5745b880d6eb558451
 DIST pyicqt-0.8.1.5.tar.gz 183865 RMD160 205583d07d938a6d2d5b5af58d1a04682fd8318e SHA1 47606a4f84f6237c391a1c07139f8715913ea2ea SHA256 15ffa7b7d8f2d749492eec3b87bf64f8a429452282ca14e36ba5aee45b5322df
-EBUILD pyicq-t-0.8.1.3.ebuild 2196 RMD160 34cc7b23ba41db80c81eee68bca86fbcb68c8681 SHA1 d718343060a84f2f10a353a7cc21009fbf683237 SHA256 bb4142f5ef1407e7d1e94f741f08e000b171592d5448fcf051aa2534e27ead4e
-EBUILD pyicq-t-0.8.1.4.ebuild 2201 RMD160 01b6adf6fb104a9bf1971bf29907df058b3cdbb5 SHA1 ff2163f6bc70e923362c75a419e0e308029db22f SHA256 9e3baf37d8b1b9dadb2141e193c2e54221f75b03dc998abf3b72887dd68b402f
-EBUILD pyicq-t-0.8.1.5.ebuild 2196 RMD160 285cd80e3d4a2b5a2e9572d3879c2b53402adb99 SHA1 0769d133248d9b9038f6c548e1b615534e92e65f SHA256 dbad4ad7f1eabb913853679b3c75ad1d7fb8277d552282b7aea2e4a12cf104f0
-MISC ChangeLog 3163 RMD160 467ade3e31ef5812c88aa940fafe0509613f9d3f SHA1 256fadf97efa918e56e93a427ff02dd31340ee26 SHA256 b17da105f847a822ea9fb8395c51281dd5bbb19455d6978a3b44919ef026d5df
+EBUILD pyicq-t-0.8.1.5.ebuild 2060 RMD160 6f2c6220b7bb6965cb89f54978483232f5e358c9 SHA1 e4d57874304c2b7deae1e44b1fe384ca471a11fd SHA256 9007072d193835ae1066346d939bf96afe38e753bc693a0d148f3eb5dc3988e9
+MISC ChangeLog 3309 RMD160 3fa8ebe02229d2e616002419ec1503fd3d89fd41 SHA1 62e8ac11b1060b9eb1450fe472cd59eca75f2026 SHA256 7bd33d3b341a12dbe3e5798dc9ca20c41c256872455c38ba63edbe0e6f195723
 MISC metadata.xml 398 RMD160 b42612b4fd2e70718be7270c1480b5be983bae22 SHA1 41ebab25775cb93a76a2cb95ebd2f661d589433e SHA256 78a24c3297186e22d5b8204bc79d5ca613f5ef0836c4fb4fa312cabffa3aa026
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAktJqx8ACgkQMGnpIbeahxyZtwCeNw+2WCViqX1ukb3xur/urQk1
-WKsAoL/39dCiP1GaRMBgWzoGbAtqV4Nh
-=HWim
------END PGP SIGNATURE-----
diff --git a/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild b/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild
index 9a06a9a48608..f5901a87d228 100644
--- a/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild
+++ b/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild
@@ -1,10 +1,10 @@
-# 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/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild,v 1.2 2009/10/03 17:30:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/pyicq-t/pyicq-t-0.8.1.5.ebuild,v 1.3 2010/04/23 19:56:48 arfrever Exp $
 
 NEED_PYTHON=2.3
 
-inherit eutils multilib python
+inherit eutils python
 
 MY_P="${P/pyicq-t/pyicqt}"
 
@@ -29,8 +29,7 @@ RDEPEND="${DEPEND}
 src_install() {
 	local inspath
 
-	python_version
-	inspath=/usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	inspath=$(python_get_sitedir)/${PN}
 	insinto ${inspath}
 	doins -r data src tools
 	newins PyICQt.py ${PN}.py
@@ -51,8 +50,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}
+	python_mod_optimize $(python_get_sitedir)/${PN}
 
 	elog "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
 	elog "Please edit it and the configuration of your Jabber server to match."
@@ -60,12 +58,12 @@ pkg_postinst() {
 	ewarn "If you are storing user accounts in MySQL and are upgrading from a "
 	ewarn "version older than 0.8.1, then you will need to run the following "
 	ewarn "command to create some new tables:"
-	ewarn "	 mysql -u user_name -p pyicqt < /usr/$(get_libdir)/python${PYVER}/site-packages/${PN}/tools/db-setup.mysql"
+	ewarn "	 mysql -u user_name -p pyicqt < $(python_get_sitedir)/${PN}/tools/db-setup.mysql"
 
 	elog  "These instructions along with a list of new config variables are "
 	elog  "available at: http://code.google.com/p/pyicqt/wiki/Upgrade"
 }
 
 pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/python*/site-packages/${PN}
+	python_mod_cleanup $(python_get_sitedir)/${PN}
 }