From: "Priit Laes" <plaes@plaes.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/
Date: Sun, 3 Mar 2013 12:50:23 +0000 (UTC) [thread overview]
Message-ID: <1362314984.52c98f9e7ca96ce670330e2bb67b1b622a6d45b4.plaes@gentoo> (raw)
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
next reply other threads:[~2013-03-03 12:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-03 12:50 Priit Laes [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-11-13 13:15 [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/ Priit Laes
2013-03-25 13:19 Nirbheek Chauhan
2013-03-03 15:07 Priit Laes
2012-08-24 17:08 Priit Laes
2012-08-10 13:17 Priit Laes
2012-05-26 8:10 Alexandre Restovtsev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1362314984.52c98f9e7ca96ce670330e2bb67b1b622a6d45b4.plaes@gentoo \
--to=plaes@plaes.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox