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

(Portage version: HEAD/cvs/Linux x86_64)

3 files changed, 16 insertions, 13 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/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
 }