commit: 4b44a3fa3f014e76d930321b829d417b2dff3011
Author: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 13 19:15:38 2015 +0000
Commit: Ole Reifschneider <tranquility <AT> gentoo <DOT> org>
CommitDate: Sun Sep 13 19:15:38 2015 +0000
URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=4b44a3fa
gnome-extra/evolution-data-server: Bump version to 3.17.91
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 7E8B4D42
...ebuild => evolution-data-server-3.17.91.ebuild} | 30 ++++++++--------------
.../evolution-data-server-9999.ebuild | 10 ++++----
2 files changed, 15 insertions(+), 25 deletions(-)
diff --git
a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
b/gnome-extra/evolution-data-server/evolution-data-server-3.17.91.ebuild
similarity index 82%
copy from gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
copy to gnome-extra/evolution-data-server/evolution-data-server-3.17.91.ebuild
index 9012670..1a2c0b5 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.17.91.ebuild
@@ -10,33 +10,24 @@ VALA_MIN_API_VERSION="0.22"
VALA_USE_DEPEND="vapigen"
inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Evolution groupware backend"
HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/52" # subslot = libcamel-1.2 soname + optional revision if needed
+SLOT="0/54" # subslot = libcamel-1.2 soname version
IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap
kerberos vala +weather"
REQUIRED_USE="vala? ( introspection )"
-if [[ ${PV} = 9999 ]]; then
- IUSE="${IUSE} doc"
- REQUIRED_USE="${REQUIRED_USE} api-doc-extras? ( doc )"
- KEYWORDS=""
-else
- KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-fi
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
# sys-libs/db is only required for migrating from <3.13 versions
# gdata-0.15.1 is required for google tasks
RDEPEND="
>=app-crypt/gcr-3.4
>=app-crypt/libsecret-0.5[crypt]
- >=dev-db/sqlite-3.5:=
+ >=dev-db/sqlite-3.7.17:=
>=dev-libs/glib-2.40:2
>=dev-libs/libgdata-0.10:=
>=dev-libs/libical-0.43:=
@@ -52,13 +43,13 @@ RDEPEND="
gtk? (
>=app-crypt/gcr-3.4[gtk]
- >=x11-libs/gtk+-3.6:3
+ >=x11-libs/gtk+-3.10:3
)
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
kerberos? ( virtual/krb5:= )
ldap? ( >=net-nds/openldap-2:= )
- weather? ( >=dev-libs/libgweather-3.8:2= )
+ weather? ( >=dev-libs/libgweather-3.10:2= )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -74,11 +65,10 @@ DEPEND="${RDEPEND}
# eautoreconf needs:
# >=gnome-base/gnome-common-2
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- doc? ( >=dev-util/gtk-doc-1.14 )
- "
-fi
+# Some tests fail due to missings locales.
+# Also, dbus tests are flacky, bugs #397975 #501834
+# It looks like a nightmare to disable those for now.
+RESTRICT="test"
pkg_setup() {
python-any-r1_pkg_setup
diff --git
a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index 9012670..7e02d86 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -19,7 +19,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/52" # subslot = libcamel-1.2 soname + optional revision if needed
+SLOT="0/54" # subslot = libcamel-1.2 soname + optional revision if needed
IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap
kerberos vala +weather"
REQUIRED_USE="vala? ( introspection )"
@@ -36,7 +36,7 @@ fi
RDEPEND="
>=app-crypt/gcr-3.4
>=app-crypt/libsecret-0.5[crypt]
- >=dev-db/sqlite-3.5:=
+ >=dev-db/sqlite-3.7.17:=
>=dev-libs/glib-2.40:2
>=dev-libs/libgdata-0.10:=
>=dev-libs/libical-0.43:=
@@ -52,13 +52,13 @@ RDEPEND="
gtk? (
>=app-crypt/gcr-3.4[gtk]
- >=x11-libs/gtk+-3.6:3
+ >=x11-libs/gtk+-3.10:3
)
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
kerberos? ( virtual/krb5:= )
ldap? ( >=net-nds/openldap-2:= )
- weather? ( >=dev-libs/libgweather-3.8:2= )
+ weather? ( >=dev-libs/libgweather-3.10:2= )
"
DEPEND="${RDEPEND}
${PYTHON_DEPS}