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

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

commit:     3a8f25b80388ea2aad6d2a697d53d4132c8cdce0
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Aug  8 20:48:02 2012 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Aug  8 20:48:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3a8f25b8

mail-client/evolution: Added 3.5.5 to overlay

---
 ...volution-9999.ebuild => evolution-3.5.5.ebuild} |   38 +++++---------------
 mail-client/evolution/evolution-9999.ebuild        |   38 +++++---------------
 2 files changed, 18 insertions(+), 58 deletions(-)

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-3.5.5.ebuild
similarity index 78%
copy from mail-client/evolution/evolution-9999.ebuild
copy to mail-client/evolution/evolution-3.5.5.ebuild
index 70adbef..f7f5055 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-3.5.5.ebuild
@@ -5,9 +5,8 @@
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
 
-inherit eutils flag-o-matic gnome2 python
+inherit eutils flag-o-matic gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -22,33 +21,32 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 fi
-IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="clutter crypt doc +gnome-online-accounts gstreamer kerberos ldap map ssl"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
 PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
 
 # glade-3 support is for maintainers only per configure.ac
-# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
 # pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.30:2
+COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gtk+-3.2.0:3
 	>=gnome-base/gnome-desktop-2.91.3:3
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=dev-libs/libgweather-2.90.0:2
+	>=dev-libs/libgweather-3.5.0:2
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7
 	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
-	>=gnome-extra/gtkhtml-4.1.2:4.0
-	>=gnome-base/gconf-2:2
+	>=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.31.2:2.4
+	>=net-libs/libsoup-gnome-2.38.1:2.4
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10
+	>=net-libs/webkit-gtk-1.8.0
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -57,11 +55,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
 		x11-libs/mx:1.0 )
-	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
 		=app-crypt/gnupg-1.4* ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10:0.10
 		>=media-libs/gst-plugins-base-0.10:0.10 )
@@ -70,7 +67,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	map? (
 		>=app-misc/geoclue-0.12.0
 		>=media-libs/libchamplain-0.12:0.12 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
 		>=dev-libs/nss-3.11 )"
@@ -90,10 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
 # contact maps require clutter
-# NM and connman support cannot coexist
-REQUIRED_USE="map? ( clutter )
-	connman? ( !networkmanager )
-	networkmanager? ( !connman )"
+REQUIRED_USE="map? ( clutter )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
@@ -103,29 +96,19 @@ pkg_setup() {
 		--disable-schemas-compile
 		--without-glade-catalog
 		--without-kde-applnk-path
-		--enable-plugins=experimental
 		--disable-image-inline
-		--disable-mono
 		--disable-pst-import
 		--enable-canberra
 		--enable-weather
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		$(use_enable connman)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
 		$(use_enable map contact-maps)
-		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		G2CONF="${G2CONF} --enable-nss=yes"
@@ -136,9 +119,6 @@ pkg_setup() {
 			--without-nss-libs
 			--without-nss-includes"
 	fi
-
-	python_set_active_version 2
-	python_pkg_setup
 }
 
 src_prepare() {

diff --git a/mail-client/evolution/evolution-9999.ebuild b/mail-client/evolution/evolution-9999.ebuild
index 70adbef..f7f5055 100644
--- a/mail-client/evolution/evolution-9999.ebuild
+++ b/mail-client/evolution/evolution-9999.ebuild
@@ -5,9 +5,8 @@
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-PYTHON_DEPEND="python? 2:2.5"
 
-inherit eutils flag-o-matic gnome2 python
+inherit eutils flag-o-matic gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -22,33 +21,32 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86 ~x86-fbsd"
 fi
-IUSE="clutter connman crypt doc +gnome-online-accounts gstreamer kerberos ldap map networkmanager python ssl"
+IUSE="clutter crypt doc +gnome-online-accounts gstreamer kerberos ldap map ssl"
 
 # We need a graphical pinentry frontend to be able to ask for the GPG
 # password from inside evolution, bug 160302
 PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
 
 # glade-3 support is for maintainers only per configure.ac
-# mono plugin disabled as it's incompatible with 2.8 and lacks maintainance (see bgo#634571)
 # pst is not mature enough and changes API/ABI frequently
-COMMON_DEPEND=">=dev-libs/glib-2.30:2
+COMMON_DEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/cairo-1.9.15[glib]
 	>=x11-libs/gtk+-3.2.0:3
 	>=gnome-base/gnome-desktop-2.91.3:3
 	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=dev-libs/libgweather-2.90.0:2
+	>=dev-libs/libgweather-3.5.0:2
 	>=media-libs/libcanberra-0.25[gtk3]
 	>=x11-libs/libnotify-0.7
 	>=gnome-extra/evolution-data-server-${PV}[gnome-online-accounts?,weather]
-	>=gnome-extra/gtkhtml-4.1.2:4.0
-	>=gnome-base/gconf-2:2
+	>=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.31.2:2.4
+	>=net-libs/libsoup-gnome-2.38.1:2.4
 	>=x11-misc/shared-mime-info-0.22
 	>=x11-themes/gnome-icon-theme-2.30.2.1
 	>=dev-libs/libgdata-0.10
+	>=net-libs/webkit-gtk-1.8.0
 
 	x11-libs/libSM
 	x11-libs/libICE
@@ -57,11 +55,10 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 		>=media-libs/clutter-1.0.0:1.0
 		>=media-libs/clutter-gtk-0.90:1.0
 		x11-libs/mx:1.0 )
-	connman? ( net-misc/connman )
 	crypt? ( || (
 		( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
 		=app-crypt/gnupg-1.4* ) )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10:0.10
 		>=media-libs/gst-plugins-base-0.10:0.10 )
@@ -70,7 +67,6 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	map? (
 		>=app-misc/geoclue-0.12.0
 		>=media-libs/libchamplain-0.12:0.12 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
 		>=dev-libs/nss-3.11 )"
@@ -90,10 +86,7 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/evolution-exchange-2.32"
 
 # contact maps require clutter
-# NM and connman support cannot coexist
-REQUIRED_USE="map? ( clutter )
-	connman? ( !networkmanager )
-	networkmanager? ( !connman )"
+REQUIRED_USE="map? ( clutter )"
 
 pkg_setup() {
 	ELTCONF="--reverse-deps"
@@ -103,29 +96,19 @@ pkg_setup() {
 		--disable-schemas-compile
 		--without-glade-catalog
 		--without-kde-applnk-path
-		--enable-plugins=experimental
 		--disable-image-inline
-		--disable-mono
 		--disable-pst-import
 		--enable-canberra
 		--enable-weather
 		$(use_enable ssl nss)
 		$(use_enable ssl smime)
-		$(use_enable networkmanager nm)
-		$(use_enable connman)
 		$(use_enable gnome-online-accounts goa)
 		$(use_enable gstreamer audio-inline)
 		$(use_enable map contact-maps)
-		$(use_enable python)
 		$(use_with clutter)
 		$(use_with ldap openldap)
 		$(use_with kerberos krb5 ${EPREFIX}/usr)"
 
-	# dang - I've changed this to do --enable-plugins=experimental.  This will
-	# autodetect new-mail-notify and exchange, but that cannot be helped for the
-	# moment.  They should be changed to depend on a --enable-<foo> like mono
-	# is.  This cleans up a ton of crap from this ebuild.
-
 	# Use NSS/NSPR only if 'ssl' is enabled.
 	if use ssl ; then
 		G2CONF="${G2CONF} --enable-nss=yes"
@@ -136,9 +119,6 @@ pkg_setup() {
 			--without-nss-libs
 			--without-nss-includes"
 	fi
-
-	python_set_active_version 2
-	python_pkg_setup
 }
 
 src_prepare() {