summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-10-17 05:09:30 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-10-17 05:09:30 +0000
commitbdbe8c59cb0c31d32eb0cf3877376b2f74b071ce (patch)
tree81e58261c355af39528e9885eb449b9aa77b82a6 /dev-lang
parentSmall updates. (diff)
downloadgentoo-2-bdbe8c59cb0c31d32eb0cf3877376b2f74b071ce.tar.gz
gentoo-2-bdbe8c59cb0c31d32eb0cf3877376b2f74b071ce.tar.bz2
gentoo-2-bdbe8c59cb0c31d32eb0cf3877376b2f74b071ce.zip
Fix paths passed to python_mod_optimize() and python_mod_cleanup() (bug #288354).
(Portage version: 14615-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/ChangeLog7
-rw-r--r--dev-lang/python/python-2.5.4-r3.ebuild8
-rw-r--r--dev-lang/python/python-2.6.3.ebuild8
-rw-r--r--dev-lang/python/python-3.1.1-r1.ebuild8
4 files changed, 15 insertions, 16 deletions
diff --git a/dev-lang/python/ChangeLog b/dev-lang/python/ChangeLog
index c275bbec8f38..9c1a9f589343 100644
--- a/dev-lang/python/ChangeLog
+++ b/dev-lang/python/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-lang/python
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.426 2009/10/14 09:27:58 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/ChangeLog,v 1.427 2009/10/17 05:09:30 arfrever Exp $
+
+ 17 Oct 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ python-2.5.4-r3.ebuild, python-2.6.3.ebuild, python-3.1.1-r1.ebuild:
+ Fix paths passed to python_mod_optimize() and python_mod_cleanup() (bug
+ #288354).
14 Oct 2009; Samuli Suominen <ssuominen@gentoo.org>
python-3.1.1-r1.ebuild:
diff --git a/dev-lang/python/python-2.5.4-r3.ebuild b/dev-lang/python/python-2.5.4-r3.ebuild
index bc709e341e0b..02e70fdd13ab 100644
--- a/dev-lang/python/python-2.5.4-r3.ebuild
+++ b/dev-lang/python/python-2.5.4-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.24 2009/10/17 05:03:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.5.4-r3.ebuild,v 1.25 2009/10/17 05:09:30 arfrever Exp $
EAPI="1"
@@ -285,8 +285,7 @@ eselect_python_update() {
pkg_postinst() {
eselect_python_update
- python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER}
- [[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
+ python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
if [[ "${python_updater_warning}" == "1" ]]; then
ewarn
@@ -304,6 +303,5 @@ pkg_postinst() {
pkg_postrm() {
eselect_python_update
- python_mod_cleanup /usr/lib/python${PYVER}
- [[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+ python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
}
diff --git a/dev-lang/python/python-2.6.3.ebuild b/dev-lang/python/python-2.6.3.ebuild
index 9f1569193fd9..f21d43eb5268 100644
--- a/dev-lang/python/python-2.6.3.ebuild
+++ b/dev-lang/python/python-2.6.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.3.ebuild,v 1.5 2009/10/17 05:03:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-2.6.3.ebuild,v 1.6 2009/10/17 05:09:30 arfrever Exp $
EAPI="2"
@@ -290,8 +290,7 @@ eselect_python_update() {
pkg_postinst() {
eselect_python_update
- python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER}
- [[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
+ python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
if [[ "${python_updater_warning}" == "1" ]]; then
ewarn
@@ -309,6 +308,5 @@ pkg_postinst() {
pkg_postrm() {
eselect_python_update
- python_mod_cleanup /usr/lib/python${PYVER}
- [[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+ python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
}
diff --git a/dev-lang/python/python-3.1.1-r1.ebuild b/dev-lang/python/python-3.1.1-r1.ebuild
index cda8869d4c2d..c81020b5f071 100644
--- a/dev-lang/python/python-3.1.1-r1.ebuild
+++ b/dev-lang/python/python-3.1.1-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.13 2009/10/17 05:03:53 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.1-r1.ebuild,v 1.14 2009/10/17 05:09:30 arfrever Exp $
EAPI="2"
@@ -270,8 +270,7 @@ eselect_python_update() {
pkg_postinst() {
eselect_python_update
- python_mod_optimize -x "(site-packages|test)" /usr/lib/python${PYVER}
- [[ "$(get_libdir)" != "lib" ]] && python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
+ python_mod_optimize -x "(site-packages|test)" /usr/$(get_libdir)/python${PYVER}
if [[ "$(eselect python show)" == "python2."* ]]; then
ewarn
@@ -301,6 +300,5 @@ pkg_postinst() {
pkg_postrm() {
eselect_python_update
- python_mod_cleanup /usr/lib/python${PYVER}
- [[ "$(get_libdir)" != "lib" ]] && python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
+ python_mod_cleanup /usr/$(get_libdir)/python${PYVER}
}