* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2012-05-26 8:10 Alexandre Restovtsev
0 siblings, 0 replies; 7+ messages in thread
From: Alexandre Restovtsev @ 2012-05-26 8:10 UTC (permalink / raw
To: gentoo-commits
commit: 3685687379f40316a9d3eacdf4d53d2259d756d9
Author: Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat May 26 08:09:44 2012 +0000
Commit: Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat May 26 08:09:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=36856873
gnome-extra/evolution-data-server: sync with gx86
fix-la-relink-command is now a package in portage.
---
.../evolution-data-server-9999.ebuild | 4 +-
.../files/fix_relink_command.pl | 108 --------------------
2 files changed, 2 insertions(+), 110 deletions(-)
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 fcdf1c8..9921c8d 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -50,6 +50,7 @@ RDEPEND=">=dev-libs/glib-2.30:2
"
DEPEND="${RDEPEND}
dev-lang/perl
+ dev-util/fix-la-relink-command
dev-util/gperf
>=dev-util/intltool-0.35.5
sys-devel/bison
@@ -116,8 +117,7 @@ src_install() {
# every .la file's relink_command field, forcing libtool to look there
# first during relinking. This will mangle the .la files installed by
# make install, but we don't care because we will be punting them anyway.
- perl "${FILESDIR}/fix_relink_command.pl" . ||
- die "fix_relink_command.pl failed"
+ fix-la-relink-command . || die "fix-la-relink-command failed"
gnome2_src_install
if use ldap; then
diff --git a/gnome-extra/evolution-data-server/files/fix_relink_command.pl b/gnome-extra/evolution-data-server/files/fix_relink_command.pl
deleted file mode 100755
index 12106c3..0000000
--- a/gnome-extra/evolution-data-server/files/fix_relink_command.pl
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/usr/bin/perl
-# Fix the relink_command field of .la files in the specified directory tree
-# to add "-L$dir/.libs" for every .la file that is specified in a relative
-# $dir; place these new -L directives before the first relative .la file.
-#
-# E.g. :
-# relink_command="(cd /tmp/foo/libfoo; /bin/sh /tmp/foo/libtool --silent --tag CC --mode=relink gcc -O2 foo.lo bar/libbar.la ../baz/libbaz.la /usr/lib/libfrob.la -lm)"
-# will become
-# relink_command="(cd /tmp/foo/libfoo; /bin/sh /tmp/foo/libtool --silent --tag CC --mode=relink gcc -O2 foo.lo -Lbar/.libs -L../baz/.libs bar/libbar.la ../baz/libbaz.la /usr/lib/libfrob.la -lm)"
-#
-# Such a procedure should ensure that during relinking, libraries in the
-# local build tree will be looked at before libraries installed systemwide.
-#
-# Limitations: it is assumed that relink_command is one line. It is assumed
-# that any spaces in paths are escaped using '\'.
-#
-# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com>
-#
-# This program is free software; you can redistribute it and/or modify it
-# under the same terms as Perl itself.
-use strict;
-use warnings;
-
-use Cwd qw(realpath);
-use File::Basename;
-use File::Find;
-
-my %processed = ();
-sub process_la_file {
- my $filename = $_; # relative to cwd
- my $pretty_filename = $File::Find::name; # relative to initial cwd
- if (-d $filename) { return; }
-
- # don't process a single .la file multiple times (e.g. if symlinked)
- my $realpath = realpath($filename);
- if ($processed{$realpath}) {
- print "$pretty_filename ($realpath) was already processed\n";
- return;
- } else {
- $processed{$realpath}++;
- }
-
- # preserve the .la file's mtime in order to avoid triggering make rules
- my $mtime = (stat $filename)[9];
- open(my $fh, '<', $filename) or die $!;
- my $text;
- my $changes; # whether the file has been changed
- while (<$fh>) {
- if (/relink_command=/) {
- my ($start, $added, $end);
- my $ignore = 0; # number of words to not check for similariy to
- # an .la filename, following and including the
- # current word
- # split by unescaped spaces
- for my $word (split /(?<!\\) /) {
- if ($word =~ /^-/) {
- # ignore command-line options; ignore filename after -o
- $ignore++;
- $ignore++ if $word eq '-o' ;
- }
- if ($word =~ m:^[^/].*\.la\W*$: and not $ignore) {
- $added .= "-L" . dirname($word) . "/.libs ";
- $end .= "$word ";
- $changes++;
- } else {
- if ($end) {
- $end .= "$word ";
- } else {
- $start .= "$word ";
- }
- }
- $ignore-- if $ignore > 0;
- }
- $_ = "$start$added$end";
- print "Added '$added' to relink_command in $pretty_filename\n" if $changes;
- }
- $text .= $_;
- }
- close $fh;
- if ($changes) {
- open($fh, '>', $filename) or die $!;
- print $fh $text;
- close $fh;
- # Perl's utime does not support sub-second time :/
- # And Time::HiRes doesn't help. As a workaround, round up the number of
- # seconds in order to avoid triggering make rules.
- utime $mtime + 1, $mtime + 1, $filename;
- }
-}
-
-if (not @ARGV or $ARGV[0] eq '-h' or $ARGV[0] eq '--help') {
- warn <<endhelp;
-Usage: fix_relink_command.pl [LAFILENAMES or DIRECTORIES]
-
-Adds extra -L\$dir/.libs arguments to the relink_command field of .la files
-in order to ensure that during relinking, libraries in the local build tree
-will be looked at before ones installed systemwide.
-
-If a filename is given, will process that .la file. If a directory is given,
-will recursively process all .la files in it (but will not recurse into
-symlinked or hidden directories).
-endhelp
- exit;
-}
-
-find({ wanted => \&process_la_file,
- preprocess => sub {grep { if (-d $_) { /^[^.]/ } else { /\.la$/ } } sort @_}
- }, @ARGV);
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2012-08-10 13:17 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2012-08-10 13:17 UTC (permalink / raw
To: gentoo-commits
commit: 4bc393013b26554b9103ce029a90cb1d1457bcc9
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 10 13:15:28 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 10 13:15:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4bc39301
gnome-extra/evolution-data-server: Fix build with gcc-4.5.x
---
.../evolution-data-server-3.5.5.ebuild | 2 +
.../evolution-data-server-3.5.5-gcc-compat.patch | 54 ++++++++++++++++++++
2 files changed, 56 insertions(+), 0 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
index 9e4dfcc..83561c5 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
@@ -91,6 +91,8 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
+ epatch "${FILESDIR}/${P}-gcc-compat.patch"
+
# /usr/include/db.h is always db-1 on FreeBSD
# so include the right dir in CPPFLAGS
append-cppflags "-I$(db_includedir)"
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch
new file mode 100644
index 0000000..24f591e
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch
@@ -0,0 +1,54 @@
+From 5e6aadd88030702c002d8f1c32806f2eccbefb60 Mon Sep 17 00:00:00 2001
+From: Matthew Barnes <mbarnes@redhat.com>
+Date: Fri, 10 Aug 2012 12:31:01 +0000
+Subject: e-book-backend-db-cache.h: Avoid DB typedef.
+
+Some distros use compiler settings that choke on duplicate typedefs.
+Gentoo seems to be one of them.
+
+Replace the DB typedef with a forward declaration of "struct __db"
+and fix up all the function arguments that take a DB pointer.
+---
+diff --git a/addressbook/libedata-book/e-book-backend-db-cache.h b/addressbook/libedata-book/e-book-backend-db-cache.h
+index b0742ca..4b17bbd 100644
+--- a/addressbook/libedata-book/e-book-backend-db-cache.h
++++ b/addressbook/libedata-book/e-book-backend-db-cache.h
+@@ -31,23 +31,23 @@
+ G_BEGIN_DECLS
+
+ /* Avoid including <db.h> in a public header file. */
+-typedef struct __db DB;
++struct __db;
+
+-EContact * e_book_backend_db_cache_get_contact (DB *db, const gchar *uid);
+-gchar *e_book_backend_db_cache_get_filename (DB *db);
+-void e_book_backend_db_cache_set_filename (DB *db, const gchar *filename);
+-gboolean e_book_backend_db_cache_add_contact (DB *db,
++EContact * e_book_backend_db_cache_get_contact (struct __db *db, const gchar *uid);
++gchar *e_book_backend_db_cache_get_filename (struct __db *db);
++void e_book_backend_db_cache_set_filename (struct __db *db, const gchar *filename);
++gboolean e_book_backend_db_cache_add_contact (struct __db *db,
+ EContact *contact);
+-gboolean e_book_backend_db_cache_remove_contact (DB *db,
++gboolean e_book_backend_db_cache_remove_contact (struct __db *db,
+ const gchar *uid);
+-gboolean e_book_backend_db_cache_check_contact (DB *db, const gchar *uid);
+-GList * e_book_backend_db_cache_get_contacts (DB *db, const gchar *query);
++gboolean e_book_backend_db_cache_check_contact (struct __db *db, const gchar *uid);
++GList * e_book_backend_db_cache_get_contacts (struct __db *db, const gchar *query);
+ gboolean e_book_backend_db_cache_exists (const gchar *uri);
+-void e_book_backend_db_cache_set_populated (DB *db);
+-gboolean e_book_backend_db_cache_is_populated (DB *db);
+-GPtrArray * e_book_backend_db_cache_search (DB *db, const gchar *query);
+-void e_book_backend_db_cache_set_time (DB *db, const gchar *t);
+-gchar * e_book_backend_db_cache_get_time (DB *db);
++void e_book_backend_db_cache_set_populated (struct __db *db);
++gboolean e_book_backend_db_cache_is_populated (struct __db *db);
++GPtrArray * e_book_backend_db_cache_search (struct __db *db, const gchar *query);
++void e_book_backend_db_cache_set_time (struct __db *db, const gchar *t);
++gchar * e_book_backend_db_cache_get_time (struct __db *db);
+
+ G_END_DECLS
+
+--
+cgit v0.9.0.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2012-08-24 17:08 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2012-08-24 17:08 UTC (permalink / raw
To: gentoo-commits
commit: d9aa2719c248888f621b06cea4abc8077ad8321c
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Fri Aug 24 17:07:23 2012 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Fri Aug 24 17:07:23 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=d9aa2719
gnome-extra/evolution-data-server: 3.5.5 → 3.5.90
---
....ebuild => evolution-data-server-3.5.90.ebuild} | 2 -
.../evolution-data-server-3.5.5-gcc-compat.patch | 54 --------------------
2 files changed, 0 insertions(+), 56 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.5.90.ebuild
similarity index 98%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.5.90.ebuild
index 784ad84..9666e95 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.5.5.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.5.90.ebuild
@@ -92,8 +92,6 @@ pkg_setup() {
src_prepare() {
gnome2_src_prepare
- epatch "${FILESDIR}/${P}-gcc-compat.patch"
-
# /usr/include/db.h is always db-1 on FreeBSD
# so include the right dir in CPPFLAGS
append-cppflags "-I$(db_includedir)"
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch
deleted file mode 100644
index 24f591e..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.5.5-gcc-compat.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 5e6aadd88030702c002d8f1c32806f2eccbefb60 Mon Sep 17 00:00:00 2001
-From: Matthew Barnes <mbarnes@redhat.com>
-Date: Fri, 10 Aug 2012 12:31:01 +0000
-Subject: e-book-backend-db-cache.h: Avoid DB typedef.
-
-Some distros use compiler settings that choke on duplicate typedefs.
-Gentoo seems to be one of them.
-
-Replace the DB typedef with a forward declaration of "struct __db"
-and fix up all the function arguments that take a DB pointer.
----
-diff --git a/addressbook/libedata-book/e-book-backend-db-cache.h b/addressbook/libedata-book/e-book-backend-db-cache.h
-index b0742ca..4b17bbd 100644
---- a/addressbook/libedata-book/e-book-backend-db-cache.h
-+++ b/addressbook/libedata-book/e-book-backend-db-cache.h
-@@ -31,23 +31,23 @@
- G_BEGIN_DECLS
-
- /* Avoid including <db.h> in a public header file. */
--typedef struct __db DB;
-+struct __db;
-
--EContact * e_book_backend_db_cache_get_contact (DB *db, const gchar *uid);
--gchar *e_book_backend_db_cache_get_filename (DB *db);
--void e_book_backend_db_cache_set_filename (DB *db, const gchar *filename);
--gboolean e_book_backend_db_cache_add_contact (DB *db,
-+EContact * e_book_backend_db_cache_get_contact (struct __db *db, const gchar *uid);
-+gchar *e_book_backend_db_cache_get_filename (struct __db *db);
-+void e_book_backend_db_cache_set_filename (struct __db *db, const gchar *filename);
-+gboolean e_book_backend_db_cache_add_contact (struct __db *db,
- EContact *contact);
--gboolean e_book_backend_db_cache_remove_contact (DB *db,
-+gboolean e_book_backend_db_cache_remove_contact (struct __db *db,
- const gchar *uid);
--gboolean e_book_backend_db_cache_check_contact (DB *db, const gchar *uid);
--GList * e_book_backend_db_cache_get_contacts (DB *db, const gchar *query);
-+gboolean e_book_backend_db_cache_check_contact (struct __db *db, const gchar *uid);
-+GList * e_book_backend_db_cache_get_contacts (struct __db *db, const gchar *query);
- gboolean e_book_backend_db_cache_exists (const gchar *uri);
--void e_book_backend_db_cache_set_populated (DB *db);
--gboolean e_book_backend_db_cache_is_populated (DB *db);
--GPtrArray * e_book_backend_db_cache_search (DB *db, const gchar *query);
--void e_book_backend_db_cache_set_time (DB *db, const gchar *t);
--gchar * e_book_backend_db_cache_get_time (DB *db);
-+void e_book_backend_db_cache_set_populated (struct __db *db);
-+gboolean e_book_backend_db_cache_is_populated (struct __db *db);
-+GPtrArray * e_book_backend_db_cache_search (struct __db *db, const gchar *query);
-+void e_book_backend_db_cache_set_time (struct __db *db, const gchar *t);
-+gchar * e_book_backend_db_cache_get_time (struct __db *db);
-
- G_END_DECLS
-
---
-cgit v0.9.0.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2013-03-03 12:50 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2013-03-03 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 52c98f9e7ca96ce670330e2bb67b1b622a6d45b4
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Mar 3 10:17:55 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Mar 3 12:49:44 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=52c98f9e
gnome-extra/evolution-data-server: Add 3.7.90 to overlay
---
....ebuild => evolution-data-server-3.7.90.ebuild} | 30 +++++++++++--------
.../evolution-data-server-9999.ebuild | 28 ++++++++++--------
...n-data-server-3.7.90-libebook-splitup-fix.patch | 25 ++++++++++++++++
3 files changed, 57 insertions(+), 26 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild
similarity index 84%
copy from gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
copy to gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild
index 847fb4c..12eb80e 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild
@@ -19,8 +19,9 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/40" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
+SLOT="0/43" # subslot = libcamel-1.2 soname version
+# TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib )
+IUSE="api-doc-extras +gnome-online-accounts +google +gtk +introspection ipv6 ldap kerberos vala +weather"
REQUIRED_USE="vala? ( introspection )"
if [[ ${PV} = 9999 ]]; then
@@ -31,25 +32,24 @@ else
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
fi
-RDEPEND=">=dev-libs/glib-2.32:2
- >=x11-libs/gtk+-3.2:3
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5
>=dev-db/sqlite-3.5:=
- >=dev-libs/libgdata-0.10:=
- >=gnome-base/gnome-keyring-2.20.1
+ >=dev-libs/glib-2.34:2
>=dev-libs/libical-0.43:=
- >=net-libs/libsoup-2.38.1:2.4
+ >=net-libs/libsoup-2.40.3:2.4
>=dev-libs/libxml2-2
>=sys-libs/db-4:=
>=dev-libs/nspr-4.4:=
>=dev-libs/nss-3.9:=
- >=app-crypt/gcr-3.4
sys-libs/zlib:=
virtual/libiconv
- gnome-online-accounts? (
- >=net-libs/gnome-online-accounts-3.2
- >=net-libs/liboauth-0.9.4 )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+ google? ( >=dev-libs/libgdata-0.10:= )
+ gtk? ( >=x11-libs/gtk+-3.2:3 )
introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
kerberos? ( virtual/krb5:= )
ldap? ( >=net-nds/openldap-2:= )
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
dev-util/gperf
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35.5
- >=gnome-base/gnome-common-2
+ >=gnome-base/gnome-common-3.5.5
>=sys-devel/gettext-0.17
virtual/pkgconfig
vala? ( $(vala_depend) )"
@@ -81,18 +81,20 @@ pkg_setup() {
src_prepare() {
DOCS="ChangeLog MAINTAINERS NEWS TODO"
- # Uh, what to do about dbus-call-timeout ?
+ # TODO: ubuntu-online-accounts uoa
G2CONF="${G2CONF}
--disable-schemas-compile
$(use_enable api-doc-extras gtk-doc)
$(use_with api-doc-extras private-docs)
$(use_enable gnome-online-accounts goa)
+ $(use_enable google)
$(use_enable introspection)
$(use_enable ipv6)
$(use_with kerberos krb5 ${EPREFIX}/usr)
$(use_with ldap openldap)
$(use_enable vala vala-bindings)
$(use_enable weather)
+ --disable-uoa
--enable-nntp
--enable-largefile
--enable-smime
@@ -101,6 +103,8 @@ src_prepare() {
gnome2_src_prepare
use vala && vala_src_prepare
+ epatch "${FILESDIR}/${P}-libebook-splitup-fix.patch"
+
# /usr/include/db.h is always db-1 on FreeBSD
# so include the right dir in CPPFLAGS
append-cppflags "-I$(db_includedir)"
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 847fb4c..bcbfb50 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -19,8 +19,9 @@ HOMEPAGE="http://projects.gnome.org/evolution/"
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/40" # subslot = libcamel-1.2 soname version
-IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
+SLOT="0/43" # subslot = libcamel-1.2 soname version
+# TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib )
+IUSE="api-doc-extras +gnome-online-accounts +google +gtk +introspection ipv6 ldap kerberos vala +weather"
REQUIRED_USE="vala? ( introspection )"
if [[ ${PV} = 9999 ]]; then
@@ -31,25 +32,24 @@ else
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
fi
-RDEPEND=">=dev-libs/glib-2.32:2
- >=x11-libs/gtk+-3.2:3
+RDEPEND="
+ >=app-crypt/gcr-3.4
+ >=app-crypt/libsecret-0.5
>=dev-db/sqlite-3.5:=
- >=dev-libs/libgdata-0.10:=
- >=gnome-base/gnome-keyring-2.20.1
+ >=dev-libs/glib-2.34:2
>=dev-libs/libical-0.43:=
- >=net-libs/libsoup-2.38.1:2.4
+ >=net-libs/libsoup-2.40.3:2.4
>=dev-libs/libxml2-2
>=sys-libs/db-4:=
>=dev-libs/nspr-4.4:=
>=dev-libs/nss-3.9:=
- >=app-crypt/gcr-3.4
sys-libs/zlib:=
virtual/libiconv
- gnome-online-accounts? (
- >=net-libs/gnome-online-accounts-3.2
- >=net-libs/liboauth-0.9.4 )
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 )
+ google? ( >=dev-libs/libgdata-0.10:= )
+ gtk? ( >=x11-libs/gtk+-3.2:3 )
introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
kerberos? ( virtual/krb5:= )
ldap? ( >=net-nds/openldap-2:= )
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND}
dev-util/gperf
>=dev-util/gtk-doc-am-1.9
>=dev-util/intltool-0.35.5
- >=gnome-base/gnome-common-2
+ >=gnome-base/gnome-common-3.5.5
>=sys-devel/gettext-0.17
virtual/pkgconfig
vala? ( $(vala_depend) )"
@@ -81,18 +81,20 @@ pkg_setup() {
src_prepare() {
DOCS="ChangeLog MAINTAINERS NEWS TODO"
- # Uh, what to do about dbus-call-timeout ?
+ # TODO: ubuntu-online-accounts uoa
G2CONF="${G2CONF}
--disable-schemas-compile
$(use_enable api-doc-extras gtk-doc)
$(use_with api-doc-extras private-docs)
$(use_enable gnome-online-accounts goa)
+ $(use_enable google)
$(use_enable introspection)
$(use_enable ipv6)
$(use_with kerberos krb5 ${EPREFIX}/usr)
$(use_with ldap openldap)
$(use_enable vala vala-bindings)
$(use_enable weather)
+ --disable-uoa
--enable-nntp
--enable-largefile
--enable-smime
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch
new file mode 100644
index 0000000..3241de2
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch
@@ -0,0 +1,25 @@
+From 794f538befedadaded6f19004738cf3babd5e9c5 Mon Sep 17 00:00:00 2001
+From: Tristan Van Berkom <tristanvb@openismus.com>
+Date: Mon, 18 Feb 2013 12:05:22 +0000
+Subject: Fixing pkg-config files for libebook & libedata-book
+
+This part was missed while the libebook / libebook-contacts library
+splitup was done manually.
+---
+(limited to 'addressbook/libebook')
+
+diff --git a/addressbook/libebook/libebook.pc.in b/addressbook/libebook/libebook.pc.in
+index 993870b..293cdc0 100644
+--- a/addressbook/libebook/libebook.pc.in
++++ b/addressbook/libebook/libebook.pc.in
+@@ -10,7 +10,7 @@ privincludedir=@privincludedir@
+ Name: libebook
+ Description: Client library for evolution address books
+ Version: @VERSION@
+-Requires: libedataserver-1.2
++Requires: libedataserver-1.2 libebook-contacts-1.2 libedata-book-1.2
+ Requires.private: camel-1.2
+ Libs: -L${libdir} -lebook-1.2
+ Cflags: -I${privincludedir}
+--
+cgit v0.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2013-03-03 15:07 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2013-03-03 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 3350a654e03b3b9d343bf6b86e42832d3ad1dab0
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Mar 3 15:04:40 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Mar 3 15:04:40 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3350a654
gnome-extra/evolution-data-server: 3.7.90 → 3.7.91
---
....ebuild => evolution-data-server-3.7.91.ebuild} | 4 +--
.../evolution-data-server-9999.ebuild | 2 +-
...n-data-server-3.7.90-libebook-splitup-fix.patch | 25 --------------------
3 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
similarity index 97%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
index 12eb80e..bc3ebf4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -103,8 +103,6 @@ src_prepare() {
gnome2_src_prepare
use vala && vala_src_prepare
- epatch "${FILESDIR}/${P}-libebook-splitup-fix.patch"
-
# /usr/include/db.h is always db-1 on FreeBSD
# so include the right dir in CPPFLAGS
append-cppflags "-I$(db_includedir)"
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 bcbfb50..bc3ebf4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch
deleted file mode 100644
index 3241de2..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 794f538befedadaded6f19004738cf3babd5e9c5 Mon Sep 17 00:00:00 2001
-From: Tristan Van Berkom <tristanvb@openismus.com>
-Date: Mon, 18 Feb 2013 12:05:22 +0000
-Subject: Fixing pkg-config files for libebook & libedata-book
-
-This part was missed while the libebook / libebook-contacts library
-splitup was done manually.
----
-(limited to 'addressbook/libebook')
-
-diff --git a/addressbook/libebook/libebook.pc.in b/addressbook/libebook/libebook.pc.in
-index 993870b..293cdc0 100644
---- a/addressbook/libebook/libebook.pc.in
-+++ b/addressbook/libebook/libebook.pc.in
-@@ -10,7 +10,7 @@ privincludedir=@privincludedir@
- Name: libebook
- Description: Client library for evolution address books
- Version: @VERSION@
--Requires: libedataserver-1.2
-+Requires: libedataserver-1.2 libebook-contacts-1.2 libedata-book-1.2
- Requires.private: camel-1.2
- Libs: -L${libdir} -lebook-1.2
- Cflags: -I${privincludedir}
---
-cgit v0.9.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2013-03-25 13:19 Nirbheek Chauhan
0 siblings, 0 replies; 7+ messages in thread
From: Nirbheek Chauhan @ 2013-03-25 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 2c1336ff29072752c349e5f53d7427a8d3c103c6
Author: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 25 13:19:24 2013 +0000
Commit: Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Mon Mar 25 13:19:24 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=2c1336ff
gnome-extra/evolution-data-server: Fix critical bug
All users of Evolution should upgrade.
https://bugzilla.gnome.org/show_bug.cgi?id=693101
---
...uild => evolution-data-server-3.7.92-r1.ebuild} | 3 ++
...n-data-server-3.7.92-fix-imapx-redownload.patch | 39 ++++++++++++++++++++
2 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.7.92.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild
similarity index 97%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.7.92.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild
index 9b27f80..cee2bb1 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.7.92.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.92-r1.ebuild
@@ -82,6 +82,9 @@ pkg_setup() {
src_prepare() {
DOCS="ChangeLog MAINTAINERS NEWS TODO"
+ # https://bugzilla.gnome.org/show_bug.cgi?id=693101
+ epatch "${FILESDIR}/${P}-fix-imapx-redownload.patch"
+
gnome2_src_prepare
use vala && vala_src_prepare
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch
new file mode 100644
index 0000000..f6e17f0
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch
@@ -0,0 +1,39 @@
+https://bugzilla.gnome.org/show_bug.cgi?id=693101
+
+diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
+index 33ee30e..0161536 100644
+--- a/camel/camel-imapx-store.c
++++ b/camel/camel-imapx-store.c
+@@ -1132,11 +1132,30 @@ sync_folders (CamelIMAPXStore *istore,
+ GHashTable *folders_from_server;
+ gboolean notify_all;
+ gint i, total;
++ GError *local_error = NULL;
+
+ folders_from_server = fetch_folders_for_namespaces (
+- istore, pattern, sync, cancellable, error);
+- if (folders_from_server == NULL)
++ istore, pattern, sync, cancellable, &local_error);
++ if (folders_from_server == NULL) {
++ if (local_error)
++ g_propagate_error (error, local_error);
+ return FALSE;
++ }
++
++ /* In certain situations can happen that the function returns data,
++ even either the operation was cancelled or an error was set,
++ thus check for this and do not update local list of folders
++ with incomplete data
++ */
++ if (g_cancellable_is_cancelled (cancellable) || local_error) {
++ g_hash_table_foreach (folders_from_server, imapx_get_folders_free, NULL);
++ g_hash_table_destroy (folders_from_server);
++
++ if (local_error)
++ g_propagate_error (error, local_error);
++
++ return FALSE;
++ }
+
+ settings = camel_service_ref_settings (CAMEL_SERVICE (istore));
+ notify_all = !camel_imapx_settings_get_use_subscriptions (CAMEL_IMAPX_SETTINGS (settings));
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
@ 2013-11-13 13:15 Priit Laes
0 siblings, 0 replies; 7+ messages in thread
From: Priit Laes @ 2013-11-13 13:15 UTC (permalink / raw
To: gentoo-commits
commit: 26b664145f1e55802757508564c028ef91240ea9
Author: Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Wed Nov 13 10:24:49 2013 +0000
Commit: Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Wed Nov 13 10:24:49 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=26b66414
gnome-extra/evolution-data-server: 3.9.92 → 3.10.2
-9999 has been also updated to reflect current deps, but is untested.
---
....ebuild => evolution-data-server-3.10.2.ebuild} | 0
.../evolution-data-server-9999.ebuild | 15 +++++----
...n-data-server-3.7.92-fix-imapx-redownload.patch | 39 ----------------------
3 files changed, 9 insertions(+), 45 deletions(-)
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.9.92.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.10.2.ebuild
similarity index 100%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.9.92.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.10.2.ebuild
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 d95f0f0..8f350b7 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="http://projects.gnome.org/evolution/arch.shtml"
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/45" # subslot = libcamel-1.2 soname version
+SLOT="0/47" # subslot = libcamel-1.2 soname version
# TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib )
IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather"
REQUIRED_USE="vala? ( introspection )"
@@ -33,22 +33,24 @@ else
fi
RDEPEND="
- >=dev-libs/glib-2.34:2
+ dev-libs/icu
+ >=dev-libs/glib-2.36:2
>=dev-db/sqlite-3.5:=
>=dev-libs/libgdata-0.10:=
>=app-crypt/libsecret-0.5
>=dev-libs/libical-0.43:=
- >=net-libs/libsoup-2.40.3:2.4
+ >=net-libs/libsoup-2.42:2.4
>=dev-libs/libxml2-2
>=sys-libs/db-4:=
>=dev-libs/nspr-4.4:=
>=dev-libs/nss-3.9:=
- >=app-crypt/gcr-3.4
-
sys-libs/zlib:=
virtual/libiconv
- gtk? ( >=x11-libs/gtk+-3.2:3 )
+ gtk? (
+ >=app-crypt/gcr-3.4[gtk]
+ >=x11-libs/gtk+-3.2:3
+ )
gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 )
introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
kerberos? ( virtual/krb5:= )
@@ -86,6 +88,7 @@ src_prepare() {
src_configure() {
gnome2_src_configure \
--disable-schemas-compile \
+ --disable-examples \
--disable-uoa \
$(use_enable api-doc-extras gtk-doc) \
$(use_with api-doc-extras private-docs) \
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch
deleted file mode 100644
index f6e17f0..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.92-fix-imapx-redownload.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-https://bugzilla.gnome.org/show_bug.cgi?id=693101
-
-diff --git a/camel/camel-imapx-store.c b/camel/camel-imapx-store.c
-index 33ee30e..0161536 100644
---- a/camel/camel-imapx-store.c
-+++ b/camel/camel-imapx-store.c
-@@ -1132,11 +1132,30 @@ sync_folders (CamelIMAPXStore *istore,
- GHashTable *folders_from_server;
- gboolean notify_all;
- gint i, total;
-+ GError *local_error = NULL;
-
- folders_from_server = fetch_folders_for_namespaces (
-- istore, pattern, sync, cancellable, error);
-- if (folders_from_server == NULL)
-+ istore, pattern, sync, cancellable, &local_error);
-+ if (folders_from_server == NULL) {
-+ if (local_error)
-+ g_propagate_error (error, local_error);
- return FALSE;
-+ }
-+
-+ /* In certain situations can happen that the function returns data,
-+ even either the operation was cancelled or an error was set,
-+ thus check for this and do not update local list of folders
-+ with incomplete data
-+ */
-+ if (g_cancellable_is_cancelled (cancellable) || local_error) {
-+ g_hash_table_foreach (folders_from_server, imapx_get_folders_free, NULL);
-+ g_hash_table_destroy (folders_from_server);
-+
-+ if (local_error)
-+ g_propagate_error (error, local_error);
-+
-+ return FALSE;
-+ }
-
- settings = camel_service_ref_settings (CAMEL_SERVICE (istore));
- notify_all = !camel_imapx_settings_get_use_subscriptions (CAMEL_IMAPX_SETTINGS (settings));
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-11-13 13:15 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-26 8:10 [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/ Alexandre Restovtsev
-- strict thread matches above, loose matches on Subject: below --
2012-08-10 13:17 Priit Laes
2012-08-24 17:08 Priit Laes
2013-03-03 12:50 Priit Laes
2013-03-03 15:07 Priit Laes
2013-03-25 13:19 Nirbheek Chauhan
2013-11-13 13:15 Priit Laes
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox