From 94627de45ac0e95213778694386a701ac9938502 Mon Sep 17 00:00:00 2001 From: Eray Aslan Date: Sat, 20 Aug 2011 06:48:42 +0000 Subject: [PATCH] Use Python 2. Don't install *.pyc, *.pyo, *.a and *.la files in Python site-packages directories. Properly call python_mod_optimize() and python_mod_cleanup() (bug #377215). Patch by Arfrever. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- net-mail/mailutils/ChangeLog | 7 +++++- net-mail/mailutils/Manifest | 24 +++++++++++++------ net-mail/mailutils/mailutils-2.2.ebuild | 31 +++++++++++++++++++++---- 3 files changed, 50 insertions(+), 12 deletions(-) diff --git a/net-mail/mailutils/ChangeLog b/net-mail/mailutils/ChangeLog index d157f7f905f1..54a3f1de49ca 100644 --- a/net-mail/mailutils/ChangeLog +++ b/net-mail/mailutils/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-mail/mailutils # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.49 2011/07/29 18:50:17 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/ChangeLog,v 1.50 2011/08/20 06:48:42 eras Exp $ + + 20 Aug 2011; Eray Aslan mailutils-2.2.ebuild: + Use Python 2. Don't install *.pyc, *.pyo, *.a and *.la files in Python + site-packages directories. Properly call python_mod_optimize() and + python_mod_cleanup() (bug #377215). Patch by Arfrever. 29 Jul 2011; Fabian Groffen mailutils-2.2.ebuild: Marked ~*-macos diff --git a/net-mail/mailutils/Manifest b/net-mail/mailutils/Manifest index a6cbbfefa6f6..4921e9c4722d 100644 --- a/net-mail/mailutils/Manifest +++ b/net-mail/mailutils/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX mail.rc 271 RMD160 aed3edf9939427b4a9c602daa0851b829634e088 SHA1 25ed72daf07c3914491731532c2b7df597e55387 SHA256 b75b4e7770be8014baceb59a768697b72db9850fc07be8897a5ac851f169329c AUX mailutils-0.6-imap4d-format-string.patch 469 RMD160 86afa1767beccb5cc720d65b4745f44a31cb2e73 SHA1 b231625ee1580401c701ce6f08e20a55e10e0c2a SHA256 a339bd53d12d297681f86bf065c7e74ebef07fb0caa25207a28bcc0581f326ac @@ -14,13 +14,23 @@ AUX mailutils-getline.diff 667 RMD160 731f7e4af498ef0ab0d800fe5d7ab387061594b6 S DIST mailutils-0.6.tar.bz2 2025327 RMD160 a5f7df9e363ee461135f3c7336a5877f124284ec SHA1 dc9b50aa8e22a6c84e295499ff6ac2871ccf8fb7 SHA256 a76114866ddb705dbc6a841ef8b7f603ef34640bc8d9652ccac14bafddb95a8c DIST mailutils-2.2.tar.bz2 3092647 RMD160 5a54e53983d43789b21d9755906120aecb77c48e SHA1 e5ccb788f44aa241c97e4df4ff2a141b64fc4b62 SHA256 c5381591e12ed7ae5dcbebc481746c4a2839bac29d9ec43d6ef4e32f82c2eb6b EBUILD mailutils-0.6-r3.ebuild 2684 RMD160 c5a2f3ea35de8103908295b42860a1d1ce95abc7 SHA1 1d29d782a75e8a65c6973899e33b692640b2482e SHA256 94cd08059318d2a8e28b002931e7aa95b89e50bd841ac422d9bab070d6f58c0f -EBUILD mailutils-2.2.ebuild 1974 RMD160 cb55483c9f3cb87f90b3dc140e51eff31345ce0d SHA1 325bd60519c22f99ec3e6fcd2bf88e120dd02adb SHA256 b9d33b562b466070e71f6bacc4b65c957bf63fcb229e1607f32e4ee54ac27e77 -MISC ChangeLog 6787 RMD160 432fed69291031b5ab0a3114b25f84d4f4d50607 SHA1 97b66c6180c601d01d7466a8a9d3ef90e9083b19 SHA256 1456df4123fa22e5f1efd2f8d10edc410c53b0b239824b630159fdf74c55fa40 +EBUILD mailutils-2.2.ebuild 2324 RMD160 caaf25a30d22511432e75038f575da943db036ca SHA1 06b0d93e54324b287f1d9e4b3ebf19d5c7de1741 SHA256 fc65ec71e6f6badd0c745f26287b4eb68e14c9b7a79ecca17e2a940131f9d933 +MISC ChangeLog 7050 RMD160 26385f72f3038adda7c96c739acea7d7faa9e2fc SHA1 98ec2a7e580f96db7dcfa98429f8d244bd285498 SHA256 2170766cbdcc267baa922a70a7539e2e148ae4ad7a7cf361d940537f8cad56b8 MISC metadata.xml 243 RMD160 545912fd85c0b26af38d69924b14367a6824c87a SHA1 b03d8a5941c0b8f1278d7e8bba06d36733b564d1 SHA256 bdf9c126ac9b75f506cbd3ccd18a7dc88690947eda81edd2c948fc66addcce0a -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (Darwin) +Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk4zAOgACgkQX3X2B8XHTol7YwCfVw/gK5sa5/ePzW5A+6Y7f3vq -YlAAnA5mS4KV2uISREPD21VNnqL1+tAG -=Me9W +iQIcBAEBCAAGBQJOT1jYAAoJEHfx8XVYajsftbYP/RDTGas5lY7eLgoFPvt3bLy/ +ar8JQOtEIImEnMSrWeNCJf0gmcXiWHeQMmBz8tGugGXSufqnhSxmIqCHnSnHlor+ +12mvMEEgjebuPwKpTui1/b9gXOhcWWatrXI6iYCnYe5TeseyFUplISRnbxUMQFns +uPnPGhX6YT/gJAVRHtHZ+Jfa9BapYusi3d0UkqQPQPiHf6tl34ynU36IIAjxNSaN +9pxExBHiBnCB5s73wm0F57k/jqZzq67Of3/jVQNAhS0THE3tGC8F6JYRcGKOhCUR +Fyd6/aw8NzzDtggePwcpOH3TMpk1vh+6O+Wo2H8e7C7iRJUWS6EJk+6uvqRCXGW5 +uy7GkLyyRDo+zODaCKfPVg8RHZzTYkh91mn8Kzjp2D006Kx91It+0ti6LjIJvxfW +gqQIz06cHgJHM4roBZJCWrm6Qz+VrkGXQ7i8b040X9frHjeGfk8WOGwMhGeDhVKT +JAFBb17ASgtHceSUL/C4HRUcj2/DXIDtXVmvoVNafdCtsDXTNXrITJEF/cz2Cx/X +08Xtrztc/JpwIVExf53x85dbH3hL/OxJKsTsKFB0rxS9NmcQ0/GBuLUCruFL9HS6 +K4q7da3nG5vzpfwblTnCX2IgpC3GrGmo9ZO+mGcJfnx6/MLjgGDybwTKw/mYrLpj ++UPRH46xlhjtUZ+J3ijb +=+R5p -----END PGP SIGNATURE----- diff --git a/net-mail/mailutils/mailutils-2.2.ebuild b/net-mail/mailutils/mailutils-2.2.ebuild index 6ecc5c0881d0..7160d77475df 100644 --- a/net-mail/mailutils/mailutils-2.2.ebuild +++ b/net-mail/mailutils/mailutils-2.2.ebuild @@ -1,8 +1,9 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.2.ebuild,v 1.5 2011/07/29 18:50:17 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-mail/mailutils/mailutils-2.2.ebuild,v 1.6 2011/08/20 06:48:42 eras Exp $ EAPI="3" +PYTHON_DEPEND="python? 2" inherit eutils flag-o-matic libtool python @@ -32,9 +33,19 @@ RDEPEND="!mail-client/nmh DEPEND="${RDEPEND} test? ( dev-util/dejagnu )" +pkg_setup() { + if use python; then + python_set_active_version 2 + python_pkg_setup + fi +} + src_prepare() { epatch "${FILESDIR}"/${PN}-2.1-python.patch elibtoolize # for Darwin bundles + + # Disable bytecompilation of Python modules. + echo "#!/bin/sh" > build-aux/py-compile } src_configure() { @@ -57,8 +68,7 @@ src_configure() { $(use_enable pam) \ $(use_with postgres) \ $(use_with python) \ - $(use_with tokyocabinet) \ - || die "configure failed" + $(use_with tokyocabinet) } src_install() { @@ -66,8 +76,21 @@ src_install() { # mail.rc stolen from mailx, resolve bug #37302. insinto /etc doins "${FILESDIR}/mail.rc" + + if use python; then + python_clean_installation_image + rm -f "${ED}$(python_get_sitedir)/mailutils/c_api.a" + fi } pkg_postinst() { - python_mod_optimize "$(python_get_libdir)/site-packages/mailutils" + if use python; then + python_mod_optimize mailutils + fi +} + +pkg_postrm() { + if use python; then + python_mod_cleanup mailutils + fi } -- 2.26.2