mail-client/evolution: Add 3.9.4, clean old, sync with gx86

3 files changed, 67 insertions, 45 deletions

diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index 404f8d0f..2080e1d1 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1 +1 @@
-DIST evolution-3.7.92.tar.xz 12312960 SHA256 2fe7eea1397b72d87a027676d9e5c015a0c3a25f51f775097e44a3c621906acb SHA512 a104fe5ccf5c8e73a32e52860b21051f3d6b4734e548314fed05ffdaf0e06d2b722046c2eba8cc1a6a420aaf384a9d0153148eb3c842f587df9b199d542d7409 WHIRLPOOL 58e0197d7db3db094ebcd7778b9785023f3ddcc100fa26ad3a5ff8c0bacc4004b64b3dc04714a2349ed2b55098dd180a19e63f4a07727687a7a30f6113b00479
+DIST evolution-3.9.4.tar.xz 12426676 SHA256 ff58b9a5183a972dbf1c15ca024ac56fefaaa04d0b5261d640c52d1e34936062 SHA512 58af6cfb6c02df0fabbec831e31c526bf792f79249144d2c1144689e15b8bfb679231cdcd6ef2f2717678b837529008fba6cc4ed700ef722585a4fd244d86962 WHIRLPOOL d2afde79b80c8470c8829f4c20d490005fe57fc4a41d7bb016b3031bb844da3d98083a0d383eaba70a023ceb2e7f65b187382fa9ee4db08e31f52b8fd665f341
diff --git a/mail-client/evolution/evolution-3.7.92.ebuild b/mail-client/evolution/evolution-3.9.4.ebuild
index 5eceecc3..e0b3bc60 100644
--- a/mail-client/evolution/evolution-3.7.92.ebuild
+++ b/mail-client/evolution/evolution-3.9.4.ebuild
@@ -6,19 +6,19 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 versionator
+inherit autotools eutils flag-o-matic readme.gentoo gnome2 versionator
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
+HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
-IUSE="bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
+IUSE="+bogofilter crypt gstreamer highlight kerberos ldap map spamassassin ssl +weather"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
@@ -32,20 +32,21 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.34:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
 	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gtk+-3.4.0:3
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
+	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
 	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.40.3:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 )
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=
@@ -64,7 +65,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.34:2
 		>=media-libs/clutter-gtk-0.90:1.0
 		>=sci-geosciences/geocode-glib-0.99.0
 		x11-libs/mx:1.0 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
 	gstreamer? ( || (
 		 ( media-libs/gstreamer:1.0
 		   media-libs/gst-plugins-base:1.0 )
@@ -76,12 +76,14 @@ COMMON_DEPEND=">=dev-libs/glib-2.34:2
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
 		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
+	weather? ( >=dev-libs/libgweather-3.5.0:2= )
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 # eautoreconf needs:
 #	app-text/yelp-tools
 #	>=gnome-base/gnome-common-2.12
@@ -89,7 +91,8 @@ RDEPEND="${COMMON_DEPEND}
 	bogofilter? ( mail-filter/bogofilter )
 	highlight? ( app-text/highlight )
 	spamassassin? ( mail-filter/spamassassin )
-	!<gnome-extra/evolution-exchange-2.32"
+	!<gnome-extra/evolution-exchange-2.32
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -97,10 +100,24 @@ if [[ ${PV} = 9999 ]]; then
 		doc? ( >=dev-util/gtk-doc-1.14 )"
 fi
 
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
 src_prepare() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 
+	eautoreconf # See https://bugzilla.gnome.org/701904
+
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness
@@ -120,7 +137,6 @@ src_configure() {
 		--disable-pst-import \
 		--enable-canberra \
 		$(use_enable bogofilter) \
-		$(use_enable gnome-online-accounts goa) \
 		$(use_enable gstreamer audio-inline) \
 		$(use_enable highlight text-highlight) \
 		$(use_enable map contact-maps) \
@@ -137,17 +153,12 @@ src_configure() {
 		${myconf}
 }
 
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, edit"
-	elog "~/.local/share/applications/mimeapps.list so it includes the"
-	elog "following content:"
-	elog ""
-	elog "[Default Applications]"
-	elog "x-scheme-handler/http=firefox.desktop"
-	elog "x-scheme-handler/https=firefox.desktop"
-	elog ""
-	elog "(replace firefox.desktop with the name of the appropriate .desktop"
-	elog "file from /usr/share/applications if you use a different browser)."
+	readme.gentoo_print_elog
 }
diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 5eceecc3..e0b3bc60 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -6,19 +6,19 @@ EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils flag-o-matic gnome2 versionator
+inherit autotools eutils flag-o-matic readme.gentoo gnome2 versionator
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
 MY_MAJORV=$(get_version_component_range 1-2)
 
 DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="http://projects.gnome.org/evolution/"
+HOMEPAGE="https://live.gnome.org/Evolution http://projects.gnome.org/evolution/"
 
 # Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
 LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
 SLOT="2.0"
-IUSE="bogofilter crypt +gnome-online-accounts gstreamer highlight kerberos ldap map spamassassin ssl +weather"
+IUSE="+bogofilter crypt gstreamer highlight kerberos ldap map spamassassin ssl +weather"
 if [[ ${PV} = 9999 ]]; then
 	IUSE="${IUSE} doc"
 	KEYWORDS=""
@@ -32,20 +32,21 @@ PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pi
 
 # glade-3 support is for maintainers only per configure.ac
 # pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.34:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.34:2
 	>=x11-libs/cairo-1.9.15:=[glib]
 	>=x11-libs/gtk+-3.4.0:3
 	>=gnome-base/gnome-desktop-2.91.3:3=
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7:=
-	>=gnome-extra/evolution-data-server-${PV}:=[gnome-online-accounts?,weather?]
+	>=gnome-extra/evolution-data-server-${PV}:=[weather?]
 	=gnome-extra/evolution-data-server-${MY_MAJORV}*
 	>=gnome-extra/gtkhtml-4.5.2:4.0
 	dev-libs/atk
 	>=dev-libs/dbus-glib-0.6
 	>=dev-libs/libxml2-2.7.3:2
-	>=net-libs/libsoup-gnome-2.40.3:2.4
+	|| ( >=net-libs/libsoup-2.42:2.4 >=net-libs/libsoup-gnome-2.40.3:2.4 )
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10:=
@@ -64,7 +65,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.34:2
 		>=media-libs/clutter-gtk-0.90:1.0
 		>=sci-geosciences/geocode-glib-0.99.0
 		x11-libs/mx:1.0 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
 	gstreamer? ( || (
 		 ( media-libs/gstreamer:1.0
 		   media-libs/gst-plugins-base:1.0 )
@@ -76,12 +76,14 @@ COMMON_DEPEND=">=dev-libs/glib-2.34:2
 	ssl? (
 		>=dev-libs/nspr-4.6.1:=
 		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.5.0:2= )"
+	weather? ( >=dev-libs/libgweather-3.5.0:2= )
+"
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 # eautoreconf needs:
 #	app-text/yelp-tools
 #	>=gnome-base/gnome-common-2.12
@@ -89,7 +91,8 @@ RDEPEND="${COMMON_DEPEND}
 	bogofilter? ( mail-filter/bogofilter )
 	highlight? ( app-text/highlight )
 	spamassassin? ( mail-filter/spamassassin )
-	!<gnome-extra/evolution-exchange-2.32"
+	!<gnome-extra/evolution-exchange-2.32
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -97,10 +100,24 @@ if [[ ${PV} = 9999 ]]; then
 		doc? ( >=dev-util/gtk-doc-1.14 )"
 fi
 
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
+~/.local/share/applications/mimeapps.list so it includes the
+following content:
+
+[Default Applications]
+x-scheme-handler/http=firefox.desktop
+x-scheme-handler/https=firefox.desktop
+
+(replace firefox.desktop with the name of the appropriate .desktop
+file from /usr/share/applications if you use a different browser)."
+
 src_prepare() {
 	ELTCONF="--reverse-deps"
 	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
 
+	eautoreconf # See https://bugzilla.gnome.org/701904
+
 	gnome2_src_prepare
 
 	# Fix compilation flags crazyness
@@ -120,7 +137,6 @@ src_configure() {
 		--disable-pst-import \
 		--enable-canberra \
 		$(use_enable bogofilter) \
-		$(use_enable gnome-online-accounts goa) \
 		$(use_enable gstreamer audio-inline) \
 		$(use_enable highlight text-highlight) \
 		$(use_enable map contact-maps) \
@@ -137,17 +153,12 @@ src_configure() {
 		${myconf}
 }
 
+src_install() {
+	gnome2_src_install
+	readme.gentoo_create_doc
+}
+
 pkg_postinst() {
 	gnome2_pkg_postinst
-
-	elog "To change the default browser if you are not using GNOME, edit"
-	elog "~/.local/share/applications/mimeapps.list so it includes the"
-	elog "following content:"
-	elog ""
-	elog "[Default Applications]"
-	elog "x-scheme-handler/http=firefox.desktop"
-	elog "x-scheme-handler/https=firefox.desktop"
-	elog ""
-	elog "(replace firefox.desktop with the name of the appropriate .desktop"
-	elog "file from /usr/share/applications if you use a different browser)."
+	readme.gentoo_print_elog
 }