Delete calls to deprecated python_version(). Call python_mod_cleanup() with paths to Python modules.

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

4 files changed, 19 insertions, 16 deletions

diff --git a/net-mail/dbmail/ChangeLog b/net-mail/dbmail/ChangeLog
index b05c0e541809..d3472c1be3a1 100644
--- a/net-mail/dbmail/ChangeLog
+++ b/net-mail/dbmail/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/dbmail
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.38 2010/03/28 20:33:23 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/ChangeLog,v 1.39 2010/06/04 19:07:40 arfrever Exp $
+
+  04 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  dbmail-2.2.11.ebuild, dbmail-2.2.15.ebuild:
+  Delete calls to deprecated python_version(). Call python_mod_cleanup()
+  with paths to Python modules.
 
 *dbmail-2.2.15 (28 Mar 2010)
 
diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index c1c3c11ca165..4b5272fed487 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -5,8 +5,8 @@ AUX dbmail-timsieved.initd 716 RMD160 563e506fd21e97bc722aee4b0ccfe59846713440 S
 DIST dbmail-2.2.11.tar.gz 901705 RMD160 e8a506b850d1610b66059b685b7a2318ce5e37a9 SHA1 7b9c19de7ca14d849e8388377b8aa941f3f3538b SHA256 7d61ce32b5f1cbbc42fa39e3c1cc10659c524a7d3135555efe4b272064939148
 DIST dbmail-2.2.15.tar.gz 875592 RMD160 b0f2beb37566b9b2a650b90f5d8f011c93cd8be5 SHA1 d8b036edc6c39586d326cfa5b1c615e2edc71ff9 SHA256 ca88e4a3bc1360b3621ffd8567103668a896ecb22102d3886ab5e59e7747217b
 DIST dbmail-2.2.9.tar.gz 900072 RMD160 f4b2f29d6890556c85a2b801737e8a5aa0642490 SHA1 c7ea4bb1de94794493f2f157b292cb8fb6084354 SHA256 f6a222b142f4aa05f8b458acda50022ec85c6ec46b78658a414d6e7055b2bb84
-EBUILD dbmail-2.2.11.ebuild 5025 RMD160 886a85a25ee5dafa5fd65f755b3052d3de53a4f8 SHA1 14e460260fb0bed9eb39929377df6be96d5b58ad SHA256 8f3bf0a0fadd75b05c8de009cb1478718269d6bcbf4cc47cc57c7274087c5d2e
-EBUILD dbmail-2.2.15.ebuild 4845 RMD160 a37565345265e6f22937459b49957325ffdfd53a SHA1 851f6e8dd846470d3dacb058480e2955e424c9c3 SHA256 40c419be968bdacaf30f4419cc40c78fe17e3cea815b8c8f8ab28e6a037c5b2e
+EBUILD dbmail-2.2.11.ebuild 4861 RMD160 5d0000f381aabbe1b38babfe9b73cbfc06bd85fe SHA1 159811f976ad88a2bae8589601c1df65c474c401 SHA256 63121a723054a88e263f87c70b4e199d049afaf8adf992f735d5d11dbb217171
+EBUILD dbmail-2.2.15.ebuild 4875 RMD160 60ede58d9a2101b36bae401bf8b7fa62d257c2ba SHA1 66f116d11e0430c3225779553d92e2da4267aba9 SHA256 848fe39dd63c935ed35f0112761a19d6b7afb50458ffdd27c037cae19d1ec001
 EBUILD dbmail-2.2.9.ebuild 3568 RMD160 314c5a7b5fc8e58b9f65cecbabc75143cdac94ce SHA1 ef10dcdd0633f3139b8e1aecc82f772f29cad67c SHA256 0695e9a145bb4422af9165f8c7c3e65a04daf2029618630ec8d8d57cf778a6f1
-MISC ChangeLog 8023 RMD160 8fe81f733c1c3328ed3ff948be8a9b358426ff5d SHA1 26071b44fa833d5dcb55028e1dc37bdcdc8552ff SHA256 a1336d66bd1c7c7f0f01a959474bee2a7e2ed990a6b2c7c52ce51239736f3102
+MISC ChangeLog 8249 RMD160 30640fa1c82d735b2e882b7459c500e93503194a SHA1 16036a42f351f58eb6c7fd9b891ae5edd06d8b92 SHA256 84afe03a8aba37495d52b51d488e2a6a172ae4abf63b8799e00c3b7e6c820832
 MISC metadata.xml 580 RMD160 e824692f7f60c50f5afffb04e3ef2eb47c44efaf SHA1 96720e52cc8f2387b57f3db2e55e87a660aa1815 SHA256 8a14856cce888d8658e3ea9388e18a9b6892c6e00fd478c1afd4c5f496dccc14
diff --git a/net-mail/dbmail/dbmail-2.2.11.ebuild b/net-mail/dbmail/dbmail-2.2.11.ebuild
index 9b89111da393..da6476513840 100644
--- a/net-mail/dbmail/dbmail-2.2.11.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.11.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/net-mail/dbmail/dbmail-2.2.11.ebuild,v 1.5 2010/03/28 20:33:23 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.11.ebuild,v 1.6 2010/06/04 19:07:39 arfrever Exp $
 
 inherit eutils multilib python
 
@@ -96,16 +96,15 @@ src_install() {
 	fi
 
 	if use python; then
-	   python_version
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail
+	   insinto $(python_get_sitedir)/dbmail
 	   doins python/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/app
+	   insinto $(python_get_sitedir)/dbmail/app
 	   doins python/app/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/bin
+	   insinto $(python_get_sitedir)/dbmail/bin
 	   doins python/bin/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/lib
+	   insinto $(python_get_sitedir)/dbmail/lib
 	   doins python/lib/*.py
-	   insinto /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail/tests
+	   insinto $(python_get_sitedir)/dbmail/tests
 	   doins python/tests/*.py
 	fi
 
@@ -116,8 +115,7 @@ src_install() {
 
 pkg_postinst() {
 	if use python; then
-	   python_version
-	   python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/dbmail
+	   python_mod_optimize $(python_get_sitedir)/dbmail
 	fi
 	elog "Please read the INSTALL file in /usr/share/doc/${PF}/"
 	elog "for remaining instructions on setting up dbmail users and "
@@ -151,5 +149,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	     python_mod_cleanup
+	     python_mod_cleanup $(python_get_sitedir)/dbmail
 }
diff --git a/net-mail/dbmail/dbmail-2.2.15.ebuild b/net-mail/dbmail/dbmail-2.2.15.ebuild
index c1cf62b0728e..777bc696e193 100644
--- a/net-mail/dbmail/dbmail-2.2.15.ebuild
+++ b/net-mail/dbmail/dbmail-2.2.15.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/net-mail/dbmail/dbmail-2.2.15.ebuild,v 1.1 2010/03/28 20:33:23 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/dbmail/dbmail-2.2.15.ebuild,v 1.2 2010/06/04 19:07:40 arfrever Exp $
 
 EAPI="1"
 inherit eutils multilib python
@@ -150,5 +150,5 @@ pkg_postinst() {
 }
 
 pkg_postrm() {
-	     python_mod_cleanup
+	     python_mod_cleanup $(python_get_sitedir)/dbmail
 }