[gentoo-commits] proj/gnome:master commit in: mail-client/evolution/

[Priit Laes]

commit:     21be256e6ee9bf8c07e8ee48bb72f4ab103e4e99
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Thu Nov 13 12:52:52 2014 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Thu Nov 13 12:52:52 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=21be256e

mail-client/evolution: 3.13.6 → 3.13.7

---
 .../{evolution-3.13.6.ebuild => evolution-3.13.7.ebuild}   | 13 +++++++++++--
 mail-client/evolution/evolution-9999.ebuild                | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/mail-client/evolution/evolution-3.13.6.ebuild 
b/mail-client/evolution/evolution-3.13.7.ebuild
similarity index 92%
rename from mail-client/evolution/evolution-3.13.6.ebuild
rename to mail-client/evolution/evolution-3.13.7.ebuild
index e76eb8c..94c3e10 100644
--- a/mail-client/evolution/evolution-3.13.6.ebuild
+++ b/mail-client/evolution/evolution-3.13.7.ebuild
@@ -112,14 +112,14 @@ x-scheme-handler/https=firefox.desktop
 file from /usr/share/applications if you use a different browser)."
 
 src_prepare() {
-       # Reason?
+       # Fix relink issues in src_install
        ELTCONF="--reverse-deps"
 
        #eautoreconf # See https://bugzilla.gnome.org/701904
 
        gnome2_src_prepare
 
-       # Fix compilation flags crazyness
+       # Fix compilation flags crazyness, upstream bug #653157
        sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
                -i configure || die "CPPFLAGS sed failed"
 }
@@ -154,7 +154,16 @@ src_configure() {
 
 src_install() {
        DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
        gnome2_src_install
+
+       # Problems with prelink:
+       # https://bugzilla.gnome.org/show_bug.cgi?id=731680
+       # https://bugzilla.gnome.org/show_bug.cgi?id=732148
+       # https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+       echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+       doenvd "${T}"/99${PN}
+
        readme.gentoo_create_doc
 }
 

diff --git a/mail-client/evolution/evolution-9999.ebuild 
b/mail-client/evolution/evolution-9999.ebuild
index e76eb8c..49f98fa 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -112,14 +112,14 @@ x-scheme-handler/https=firefox.desktop
 file from /usr/share/applications if you use a different browser)."
 
 src_prepare() {
-       # Reason?
+       # Fix relink issues in src_install
        ELTCONF="--reverse-deps"
 
        #eautoreconf # See https://bugzilla.gnome.org/701904
 
        gnome2_src_prepare
 
-       # Fix compilation flags crazyness
+       # Fix compilation flags crazyness, upstream bug #653157
        sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
                -i configure || die "CPPFLAGS sed failed"
 }
@@ -154,6 +154,16 @@ src_configure() {
 
 src_install() {
        DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
+
+       gnome2_src_install
+
+       # Problems with prelink:
+       # https://bugzilla.gnome.org/show_bug.cgi?id=731680
+       # https://bugzilla.gnome.org/show_bug.cgi?id=732148
+       # https://bugzilla.redhat.com/show_bug.cgi?id=1114538
+       echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
+       doenvd "${T}"/99${PN}
+
        gnome2_src_install
        readme.gentoo_create_doc
 }