aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory M. Tuner <gmt@be-evil.net>2014-01-03 20:24:13 -0800
committerGregory M. Tuner <gmt@be-evil.net>2014-01-03 20:24:13 -0800
commit42e0873919f37b3e9857a457158d68638dfec8d5 (patch)
tree41d8009c7a4385a6abdee63d4e1c7f7315835715 /dev-lang
parenteclass/python-utils-multilib-r1 -> python-multilib-utils-r1 (diff)
downloadgmt-42e0873919f37b3e9857a457158d68638dfec8d5.tar.gz
gmt-42e0873919f37b3e9857a457158d68638dfec8d5.tar.bz2
gmt-42e0873919f37b3e9857a457158d68638dfec8d5.zip
eclass/python-multilib-utils-r1: some adminstrivia following rename
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
Diffstat (limited to 'dev-lang')
-rw-r--r--dev-lang/python/Manifest2
-rw-r--r--dev-lang/python/python-2.7.6-r1.ebuild13
2 files changed, 10 insertions, 5 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a0d0243..64b97fb 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -20,7 +20,7 @@ DIST Python-3.3.3.tar.xz 12057744 SHA256 339275b30a1a3fef1589016bf6302c14e870f7a
DIST python-gentoo-patches-2.7.6-0.tar.xz 13916 SHA256 01971f3cfe464d80a775d2838a519b16715be02fce0145a0c4fdc361fa57ef49 SHA512 32b0d3f49294d2f7935be459bbcf0892598fc856a266abea11f4cd109e174f4de8b8bef8b74737253e1820b6de23f5df070a0927dcc499adf607eb5ac11c3709 WHIRLPOOL fb9a448ebebc7b7c68ad4460c7ae51e1619224570540e15d6b6c05039ed09da52acd364374c9f85d8d36c299d86394a078e0fb10bfb359b83a91426f1a886066
DIST python-gentoo-patches-3.2.5-0.tar.xz 13892 SHA256 ebbfacc81486493ce4c16a697e53d77e9dc5c9d700e86cf92ae93b5e3e03abee SHA512 6d09ef5ed583dedd587d4247c7d0e99daf20d7cadb7afbcf4d951931e3a574a82f1b9dbc4e4f93d3dc55773808452284f50dee2fbfb6b68aff5f1f53c1665359 WHIRLPOOL 55b1ba0a25612b3987af93e252dd2dbd71ff0f4ff0bcadda9ba0b11e19278acdb3fa91166a854dcbe3d27bb570a104ee63a3976111d6f608614f7b3d9f734f67
DIST python-gentoo-patches-3.3.3-0.tar.xz 12992 SHA256 38b5c604416947fdd7d87ada2ccd3febf7407f00c1e67e6a99be8765f1b25c49 SHA512 d803b287c0f407c68dd766974296239419fb35441f1796081681f28d17b1f6c7e50e0aae807ad147469eb586db8fe486a013a166cb76e08f2b7a9ba39acb1760 WHIRLPOOL 09a9dbd1831c2e7022f4df27b57435dd1df7eace294e8fa069ce5fa5c1719f64ba9bcd8f27d614a8c13ee8605db37c7e75c13fa14885b76ce289667bf2871aaf
-EBUILD python-2.7.6-r1.ebuild 12576 SHA256 fc49b898e8a1a361035b8967444e33987b85ade13969e779cef7b379b0d1c6d3 SHA512 94327b2d914176208613f38d7243d9e448ff3219cea38c2453be62eefba28eb15975290d2c6667f17e270b8a49b375a4c0d460470715195d1ce50d846f69b873 WHIRLPOOL aacdfadd6f882f8d1158ce0f5bfd7ddf6dda08530f8bc70ece73ffcb24bba148bb9a401114ca12bddac11f0d14c74abd43495ab2591ae3b30ae35a28ff46baf2
+EBUILD python-2.7.6-r1.ebuild 12762 SHA256 b7e21ad67d8b4e767e8154bbdf2c6ce8063e730d63356ad0d6582f0df70db041 SHA512 9e633b51945da17608fdc461f6bf142c7e15554e30afe257251b2862090c2dab61898aa3242bbf248922c9439025c6b0b8c29e0edaac448d28a24402610164bd WHIRLPOOL ae0d8938de2030f0969b71759950da49189c37bb9cdde810ad38897c4f9c38c14ea76b6bb2ae766331721d74c9f24a0f086cd4c308541e17a458204db30aba46
EBUILD python-3.2.5-r4.ebuild 10625 SHA256 ec1ff663e5451d2e021b362d016238900e4153f7bac28e25b9a5901d3e1aa684 SHA512 8856676c5e120c1230e4f17dac4b14f6dcf647102e755ae3f769564255a98ded4a629240a33f93cd5d8c47fa951c25bc3f12aba74ce4cdf6927151ae11c27d16 WHIRLPOOL 68725726c33faab42be22c1bfdd7041e688f57154244db97932e524b62d578397c1fd3099c36cf957d0c62e286c7c0dfe1906b22fd74f2767bc2758b1cfbb513
EBUILD python-3.3.3-r1.ebuild 9072 SHA256 84f9ffa940b13349f1acba7573c767f79d319794d13cc789f2ead6dbb01812b4 SHA512 18a6cfd83df529c29ac82e8de652e058e4ad8ac67c62414339c5f4f869ba673b7d55d6c93911fbb32af9b8f0314be3b55598cf6ad6cb0a9a4560c30cbab019c7 WHIRLPOOL 1fbedf693cf990337958b6c58e885579f57b5d58735a11f3dab0a027803ebb1b9750cb01a872f27b89f01d0b382ee0639c4abc9fe3791402bbd5381cbb07c518
MISC ChangeLog 27576 SHA256 d9b6928b2234df665a3ce1868f4452b24d2cc7e012e6ac08c116d8b786ab4859 SHA512 c54030c7f02a0663eea1c2a0fb5b9d0377b9245bb1de7330e85d341a05c7c3c6db117df20ac121fa1e549da3e76470714c9e4b723499716f00ee8ae6d4a64d50 WHIRLPOOL 8a878d2be539d36d6fd4102df9d493c63b528cd46a7ee3b0c89429a2370bdab90c50925e73adaf4c5920cef23efd54993d5b0e0d2cd5d946648a97b2bbbb7405
diff --git a/dev-lang/python/python-2.7.6-r1.ebuild b/dev-lang/python/python-2.7.6-r1.ebuild
index 4e14c3f..da456f3 100644
--- a/dev-lang/python/python-2.7.6-r1.ebuild
+++ b/dev-lang/python/python-2.7.6-r1.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
WANT_AUTOMAKE="none"
WANT_LIBTOOL="none"
-inherit autotools eutils flag-o-matic multilib pax-utils python-utils-multilib-r1 toolchain-funcs multiprocessing multilib-minimal
+inherit autotools eutils flag-o-matic multilib pax-utils python-multilib-utils-r1 toolchain-funcs multiprocessing multilib-minimal
MY_P="Python-${PV}"
PATCHSET_REVISION="0"
@@ -62,7 +62,11 @@ RDEPEND="app-arch/bzip2[${MULTILIB_USEDEP}]
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/autoconf-2.65
- !sys-devel/gcc[libffi]"
+ !sys-devel/gcc[libffi]
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-baselibs-20131008-r8
+ !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
+ )"
RDEPEND+=" !build? ( app-misc/mime-types )
doc? ( dev-python/python-docs:${SLOT} )"
PDEPEND="app-admin/eselect-python
@@ -81,7 +85,7 @@ MULTILIB_WRAPPED_EXECUTABLES=(
/usr/bin/pydoc${SLOT}
/usr/bin/idle${SLOT}
)
-MULTILIB_PARALLEL_PHASES=( src_configure src_compile )
+MULTILIB_PARALLEL_PHASES=( src_configure src_compile src_test )
pkg_setup() {
if use berkdb; then
@@ -362,6 +366,7 @@ multilib_src_install_all() {
dodoc "${S}"/Misc/{ACKS,HISTORY,NEWS}
if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
insinto /usr/share/doc/${PF}/examples
doins -r "${S}"/Tools
fi
@@ -382,7 +387,7 @@ multilib_src_install_all() {
# the rest want shebang hacks
abifile="${ED}${file#/}-${abi}"
if [[ -f ${abifile} ]] ; then
- python_rewrite_shebang_multilib "python${SLOT}-${abi}" "${abifile}"
+ python_multilib_rewrite_shebang "python${SLOT}-${abi}" "${abifile}"
else
die "Couldn't find \"${abifile}\""
fi