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

["Priit Laes" <plaes@plaes.org>]

commit:     5b5560e2b095dbf872c3aff068fe64626a1d0fc1
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Mon Dec 22 20:21:50 2014 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Tue Dec 23 05:23:06 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5b5560e2

mail-client/evolution: 3.13.8 → 3.13.9, sync with gx86

---
 .../evolution/{evolution-3.13.8.ebuild => evolution-3.13.9.ebuild} | 7 ++-----
 mail-client/evolution/evolution-9999.ebuild                        | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/mail-client/evolution/evolution-3.13.8.ebuild b/mail-client/evolution/evolution-3.13.9.ebuild
similarity index 96%
rename from mail-client/evolution/evolution-3.13.8.ebuild
rename to mail-client/evolution/evolution-3.13.9.ebuild
index e41a459..104ade2 100644
--- a/mail-client/evolution/evolution-3.13.8.ebuild
+++ b/mail-client/evolution/evolution-3.13.9.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
+inherit eutils flag-o-matic readme.gentoo gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=app-crypt/gcr-3.4
 	>=app-text/enchant-1.1.7
 	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/glib-2.36:2
+	>=dev-libs/glib-2.40:2
 	>=dev-libs/libgdata-0.10:=
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
@@ -114,8 +114,6 @@ src_prepare() {
 	# Fix relink issues in src_install
 	ELTCONF="--reverse-deps"
 
-	#eautoreconf # See https://bugzilla.gnome.org/701904
-
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness, upstream bug #653157
@@ -163,7 +161,6 @@ src_install() {
 	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
 	doenvd "${T}"/99${PN}
 
-	gnome2_src_install
 	readme.gentoo_create_doc
 }
 

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index e41a459..104ade2 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
+inherit eutils flag-o-matic readme.gentoo gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -38,7 +38,7 @@ COMMON_DEPEND="
 	>=app-crypt/gcr-3.4
 	>=app-text/enchant-1.1.7
 	>=dev-libs/dbus-glib-0.6
-	>=dev-libs/glib-2.36:2
+	>=dev-libs/glib-2.40:2
 	>=dev-libs/libgdata-0.10:=
 	>=dev-libs/libxml2-2.7.3:2
 	>=gnome-base/gnome-desktop-2.91.3:3=
@@ -114,8 +114,6 @@ src_prepare() {
 	# Fix relink issues in src_install
 	ELTCONF="--reverse-deps"
 
-	#eautoreconf # See https://bugzilla.gnome.org/701904
-
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness, upstream bug #653157
@@ -163,7 +161,6 @@ src_install() {
 	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
 	doenvd "${T}"/99${PN}
 
-	gnome2_src_install
 	readme.gentoo_create_doc
 }