Use correct python version for gnome-keyring script, reorganize for alphabetic orderi...

Package-Manager: portage-2.2.0_alpha67/cvs/Linux x86_64

diff --git a/mail-mta/msmtp/ChangeLog b/mail-mta/msmtp/ChangeLog
index e8dbc149233bed4195d411d79c478b59a818bb02..55e8e60e822277b98fe8364fb568d1a786c9a1a3 100644 (file)
--- a/mail-mta/msmtp/ChangeLog
+++ b/mail-mta/msmtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-mta/msmtp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.113 2011/10/17 05:41:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/ChangeLog,v 1.114 2011/10/17 19:10:29 radhermit Exp $
+
+  17 Oct 2011; Tim Harder <radhermit@gentoo.org> msmtp-1.4.25.ebuild:
+  Use correct python version for gnome-keyring script, reorganize for
+  alphabetic ordering, and remove excess quoting.
 
   17 Oct 2011; Tim Harder <radhermit@gentoo.org> msmtp-1.4.25.ebuild:
   Minor simplifications.

diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest
index e3008753fda36a8fa1312c99675a2b4c732298a5..610e219b03541bb7e106505953196de3171973a5 100644 (file)
--- a/mail-mta/msmtp/Manifest
+++ b/mail-mta/msmtp/Manifest
@@ -5,17 +5,17 @@ DIST msmtp-1.4.24.tar.bz2 299358 RMD160 5d342818bbbeee303c071a403fd86d40404ed5c2
 DIST msmtp-1.4.25.tar.bz2 302039 RMD160 4c74b9e939424015c4a474268273a264e9f3c1bd SHA1 ee3be4e250cbd6fef2fb14af4eadfc0ce58ef424 SHA256 65796adf60e1ebb4341f8415bd3cfa6647226bdba5fbaa5af7bc369808ab4e63
 EBUILD msmtp-1.4.24-r1.ebuild 2862 RMD160 de3cb68448e1adbe58d18b9dcf871dd45be87044 SHA1 a9216f5fccf6fdab1f692298cde97b04ae4a6243 SHA256 cdb4d510a0bde3e23e34d58f07c1ab1969bedf584416b9c9e5c2c3c00e423a83
 EBUILD msmtp-1.4.24.ebuild 2790 RMD160 9cf3aa6e8b758e522cdb76ef48872117dfaee709 SHA1 71c2470497b4f125b0c40555399fa33b089959af SHA256 d2933dd1ec4b6c30c448df29064c74552af1f9cc20e3d7bf941a06f208efb5d8
-EBUILD msmtp-1.4.25.ebuild 2761 RMD160 bee25a384dcf94d80d5a567094e68cc1eda36661 SHA1 7f77d55b765846ec126d5db968d4f1a9ca8d83e2 SHA256 f1db97a11667dc24dc41f010c061f0a569a7f4123b80e2b80fd91a14730c143a
-MISC ChangeLog 15423 RMD160 8dce87f9178030f13981667277fd985c87637633 SHA1 86382194d0014cf0c3a3d328c091a7bd72756e7e SHA256 fd513f81fc70bdd2105d2172801d97fb5b489e193eb707c87484b5ce45886fc8
+EBUILD msmtp-1.4.25.ebuild 2834 RMD160 d07b407819059356b117b723669b9f2981502461 SHA1 e8abb0a51f5e76a189d9d0aa3926ea3c47942306 SHA256 5d552bc3452dadd86cd5a1d9c1c21337802b587edaa629b49b6b57d21a95ab81
+MISC ChangeLog 15614 RMD160 7d43a2a7d3436a1b7b2782266b768cd2fa76560c SHA1 82d8beebb44a522ab27594b6513a20dd121bb0ff SHA256 04482561eeb6b955bfb9c81968f0c7de5a12512a6b7d3b1bab9644ad74b4faed
 MISC metadata.xml 241 RMD160 f3ecce2785b4dbd86fc2454197c5ea18bdceeb8e SHA1 0c8829739037990f3a2c342f959eb734eeabefc7 SHA256 26ee4bda381b79a28729c310bdd467e2d1bbf39f08e271c5845e969d95d0e889
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOm7/4AAoJEEqz6FtPBkyjnEEH/2/WIw23HKfQ/D/MXxlndr78
-5+mqz+F3GdfMYaq4+BubOMQul9/N6spbXEXngvHZtU/eL/IxgCfGS1I/43ai8geU
-Jxwe8AbzWXFt0INIQGcei8adCavUJVFB2cMdnn3DBU3P25VQb9V5I1jxnabuzQ4/
-IIztqZgV/GCemt1chTrtU/dXtiesA3XyX+WZfEo6tnPGuWADMIKltVpTxEsPXMY6
-hEPbR7yBJIlB7sDL/BN8KuHH5S//nOwNTrMO8ZucTWa+e6Z9YbxlKQkLWft186R2
-jmaMANDl6tRJwbFsRBu7zxjewIQdcgN01EsS6T9glgf8+O9pAO7Eoc64mXELv+4=
-=V8F7
+iQEcBAEBCgAGBQJOnH2rAAoJEEqz6FtPBkyjDQUH/0K6JzfzrD4hNE5QSOeoHXKz
+yZd9TlN/B6K1LiYMQb9h1wUeH8O374buXRdHB8SMyvo/ZZDTI0e8rfSBHwH+ytC3
+KgS25gb/F9OFCQekhmLH6qPbLZUDUxOuN968JG912OMld1X9Ur95miAzdxWK880T
+WrrHcVoUJ5NAKCbOJaTQ3cRmh28r/mr4Ux7m8ZqaMh6zBEzcYy9Sndd1wL51+dCK
+QHRKUssPb4/P61R2GELCzHhw4X9mgRz3Cg+INkNwxAJ8AxgCBdPByWE5iaIVGuxa
+14oAK67H+ZiXJZSwBEFqeb2AQN3gxsopZkMXfHRMcWWGC+kHETCqlbx6UQFwFqA=
+=yQCB
 -----END PGP SIGNATURE-----

diff --git a/mail-mta/msmtp/msmtp-1.4.25.ebuild b/mail-mta/msmtp/msmtp-1.4.25.ebuild
index 8030e92563b54d855438dafa434d9570f3fed2fb..6931e686f48ad56ecba40283d6388c0136c789f5 100644 (file)
--- a/mail-mta/msmtp/msmtp-1.4.25.ebuild
+++ b/mail-mta/msmtp/msmtp-1.4.25.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.25.ebuild,v 1.4 2011/10/17 05:41:06 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-mta/msmtp/msmtp-1.4.25.ebuild,v 1.5 2011/10/17 19:10:29 radhermit Exp $
 
 EAPI=4
-inherit multilib
+inherit multilib python
 
 DESCRIPTION="An SMTP client and SMTP plugin for mail user agents such as Mutt"
 HOMEPAGE="http://msmtp.sourceforge.net/"
@@ -14,17 +14,18 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="doc gnome-keyring gnutls idn +mta nls sasl ssl vim-syntax"
 
-CDEPEND="idn? ( net-dns/libidn )
-       nls? ( virtual/libintl )
+CDEPEND="
        gnome-keyring? (
-               gnome-base/gnome-keyring
                dev-python/gnome-keyring-python
+               gnome-base/libgnome-keyring
        )
+       idn? ( net-dns/libidn )
+       nls? ( virtual/libintl )
+       sasl? ( virtual/gsasl )
        ssl? (
                gnutls? ( net-libs/gnutls )
                !gnutls? ( dev-libs/openssl )
-       )
-       sasl? ( virtual/gsasl )"
+       )"
 
 RDEPEND="${CDEPEND}
        mta? (  !mail-mta/courier
@@ -50,19 +51,22 @@ REQUIRED_USE="gnutls? ( ssl )"
 src_prepare() {
        # Use default Gentoo location for mail aliases
        sed -i -e 's:/etc/aliases:/etc/mail/aliases:' scripts/find_alias/find_alias_for_msmtp.sh
+
+       python_convert_shebangs 2 scripts/msmtp-gnome-tool/msmtp-gnome-tool.py
 }
 
 src_configure() {
        econf \
-               $(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl")) \
+               $(use_with gnome-keyring ) \
                $(use_with idn libidn) \
+               $(use_enable nls) \
                $(use_with sasl libgsasl) \
-               $(use_with gnome-keyring ) \
-               $(use_enable nls)
+               $(use_with ssl ssl $(use gnutls && echo "gnutls" || echo "openssl"))
 }
 
 src_compile() {
        default
+
        if use doc ; then
                cd doc || die
                emake html pdf
@@ -71,13 +75,6 @@ src_compile() {
 
 src_install() {
        emake DESTDIR="${D}" install
-
-       if use mta ; then
-               dodir /usr/sbin
-               dosym /usr/bin/msmtp /usr/sbin/sendmail
-               dosym /usr/bin/msmtp /usr/$(get_libdir)/sendmail
-       fi
-
        dodoc AUTHORS ChangeLog NEWS README THANKS doc/{Mutt+msmtp.txt,msmtprc*}
 
        if use doc ; then
@@ -85,19 +82,25 @@ src_install() {
                dodoc doc/msmtp.pdf
        fi
 
+       if use gnome-keyring ; then
+               src_install_contrib msmtp-gnome-tool msmtp-gnome-tool.py README
+       fi
+
+       if use mta ; then
+               dodir /usr/sbin
+               dosym /usr/bin/msmtp /usr/sbin/sendmail
+               dosym /usr/bin/msmtp /usr/$(get_libdir)/sendmail
+       fi
+
        if use vim-syntax ; then
                insinto /usr/share/vim/vimfiles/syntax
                doins scripts/vim/msmtp.vim
        fi
 
-       if use gnome-keyring ; then
-               src_install_contrib msmtp-gnome-tool "msmtp-gnome-tool.py" "README"
-       fi
-
-       src_install_contrib find_alias "find_alias_for_msmtp.sh"
+       src_install_contrib find_alias find_alias_for_msmtp.sh
        src_install_contrib msmtpqueue "*.sh" "README ChangeLog"
-       src_install_contrib msmtpq "msmtpq msmtpQ" "README"
-       src_install_contrib set_sendmail "set_sendmail.sh" "set_sendmail.conf"
+       src_install_contrib msmtpq "msmtpq msmtpQ" README
+       src_install_contrib set_sendmail set_sendmail.sh set_sendmail.conf
 }
 
 src_install_contrib() {