python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.

(Portage version: 2.1.5.2)

4 files changed, 19 insertions, 13 deletions

diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index a762f01f0c9b..35d3c3070d1e 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eric
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.60 2008/05/24 22:54:13 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.61 2008/05/29 16:46:16 hawking Exp $
+
+  29 May 2008; Ali Polatel <hawking@gentoo.org> eric-3.9.5.ebuild,
+  eric-4.1.1.ebuild, eric-4.1.4.ebuild:
+  python_mod_optimize is ROOT aware. Fixed python_mod_cleanup.
 
 *eric-4.1.4 (24 May 2008)
 
diff --git a/dev-util/eric/eric-3.9.5.ebuild b/dev-util/eric/eric-3.9.5.ebuild
index f7ee80e00357..07e9f74def84 100644
--- a/dev-util/eric/eric-3.9.5.ebuild
+++ b/dev-util/eric/eric-3.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.5.ebuild,v 1.5 2007/11/20 05:42:49 hawking Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-3.9.5.ebuild,v 1.6 2008/05/29 16:46:16 hawking Exp $
 
 NEED_PYTHON=2.3
 
@@ -80,10 +80,10 @@ pkg_postinst() {
 	elog "  \"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric3/patch_modpython.py\"."
 
 	python_version
-	python_mod_optimize "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric3
 }
 
 pkg_postrm() {
 	python_version
-	python_mod_cleanup "/usr/$(get_libdir)/python${PYVER}/site-packages/eric3"
+	python_mod_cleanup /usr/$(get_libdir)/python${PYVER}/site-packages/eric3
 }
diff --git a/dev-util/eric/eric-4.1.1.ebuild b/dev-util/eric/eric-4.1.1.ebuild
index 500536792f04..6ec8a1a1a93e 100644
--- a/dev-util/eric/eric-4.1.1.ebuild
+++ b/dev-util/eric/eric-4.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.1.1.ebuild,v 1.2 2008/04/14 11:40:58 ingmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.1.1.ebuild,v 1.3 2008/05/29 16:46:16 hawking Exp $
 
 NEED_PYTHON=2.4
 
@@ -62,7 +62,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
 	elog "If you want to use eric4 with mod_python, have a look at"
 	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
 	elog
@@ -75,6 +76,6 @@ pkg_postinst() {
 	elog "the App itself. You may want to check those as well"
 }
 
-pkg_posrm() {
-	python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
+pkg_postrm() {
+	python_mod_cleanup
 }
diff --git a/dev-util/eric/eric-4.1.4.ebuild b/dev-util/eric/eric-4.1.4.ebuild
index 77bc20d99482..d10ce4a5214f 100644
--- a/dev-util/eric/eric-4.1.4.ebuild
+++ b/dev-util/eric/eric-4.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.1.4.ebuild,v 1.1 2008/05/24 22:54:13 yngwin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.1.4.ebuild,v 1.2 2008/05/29 16:46:16 hawking Exp $
 
 NEED_PYTHON=2.4
 
@@ -61,7 +61,8 @@ src_install() {
 }
 
 pkg_postinst() {
-	python_mod_optimize "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
+	python_version
+	python_mod_optimize /usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
 	elog "If you want to use eric4 with mod_python, have a look at"
 	elog "\"${ROOT}usr/$(get_libdir)/python${PYVER}/site-packages/eric4/patch_modpython.py\"."
 	elog
@@ -74,6 +75,6 @@ pkg_postinst() {
 	elog "the App itself. You may want to check those as well"
 }
 
-pkg_posrm() {
-	python_mod_cleanup "${ROOT}"usr/$(get_libdir)/python${PYVER}/site-packages/eric4{,plugins}
+pkg_postrm() {
+	python_mod_cleanup
 }