summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Bronder <jsbronder@gentoo.org>2010-07-03 04:41:26 +0000
committerJustin Bronder <jsbronder@gentoo.org>2010-07-03 04:41:26 +0000
commit96bbab93f0449a11f8a1605d2bd8877a5108f350 (patch)
tree88f83fbc34f366be5af301c187ae19c24a30026d /sys-cluster
parentRespect LDFLAGS (diff)
downloadgentoo-2-96bbab93f0449a11f8a1605d2bd8877a5108f350.tar.gz
gentoo-2-96bbab93f0449a11f8a1605d2bd8877a5108f350.tar.bz2
gentoo-2-96bbab93f0449a11f8a1605d2bd8877a5108f350.zip
Isolate mpich2 specific python files in /usr/bin, simplify python deps. Thanks to Arfrever, #316937.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/mpich2/ChangeLog6
-rw-r--r--sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild20
2 files changed, 20 insertions, 6 deletions
diff --git a/sys-cluster/mpich2/ChangeLog b/sys-cluster/mpich2/ChangeLog
index 25035a4f0617..f13fae383dc0 100644
--- a/sys-cluster/mpich2/ChangeLog
+++ b/sys-cluster/mpich2/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-cluster/mpich2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.54 2010/07/03 01:38:53 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/ChangeLog,v 1.55 2010/07/03 04:41:26 jsbronder Exp $
+
+ 03 Jul 2010; Justin Bronder <jsbronder@gentoo.org> mpich2-1.2.1_p1.ebuild:
+ Isolate mpich2 specific python files in /usr/bin, simplify python deps.
+ Thanks to Arfrever, #316937.
03 Jul 2010; Justin Bronder <jsbronder@gentoo.org>
-mpich2-1.1.1_p1.ebuild, -mpich2-1.2.ebuild, -mpich2-1.2.1.ebuild:
diff --git a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild b/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild
index 871f4a1f7b22..6d60ed43324d 100644
--- a/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild
+++ b/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild
@@ -1,10 +1,9 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v 1.3 2010/07/03 01:35:41 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/mpich2/mpich2-1.2.1_p1.ebuild,v 1.4 2010/07/03 04:41:26 jsbronder Exp $
EAPI=2
-PYTHON_DEPEND="*:2.4"
-RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_DEPEND="2"
inherit eutils fortran python
@@ -152,6 +151,7 @@ src_test() {
}
src_install() {
+ local f
emake DESTDIR="${D}" install || die
dodir ${MPD_CONF_FILE_DIR}
@@ -171,6 +171,12 @@ src_install() {
dodir /usr/share/doc/${PF}/www
mv "${D}"/usr/share/doc/www*/* "${D}"/usr/share/doc/${PF}/www/
fi
+
+ # See #316937
+ MPD_PYTHON_MODULES=""
+ for f in "${D}"/usr/bin/*.py; do
+ MPD_PYTHON_MODULES="${MPD_PYTHON_MODULES} ${f##${D}}"
+ done
}
pkg_postinst() {
@@ -183,9 +189,13 @@ pkg_postinst() {
elog "as sys-cluster/mpe2."
elog ""
- python_mod_optimize /usr/bin/
+ for f in ${MPD_PYTHON_MODULES}; do
+ python_mod_optimize ${f}
+ done
}
pkg_postrm() {
- python_mod_cleanup /usr/bin/
+ for f in ${MPD_PYTHON_MODULES}; do
+ python_mod_cleanup ${f}
+ done
}