| 1 |
commit: 52c98f9e7ca96ce670330e2bb67b1b622a6d45b4 |
| 2 |
Author: Priit Laes <plaes <AT> plaes <DOT> org> |
| 3 |
AuthorDate: Sun Mar 3 10:17:55 2013 +0000 |
| 4 |
Commit: Priit Laes <plaes <AT> plaes <DOT> org> |
| 5 |
CommitDate: Sun Mar 3 12:49:44 2013 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=52c98f9e |
| 7 |
|
| 8 |
gnome-extra/evolution-data-server: Add 3.7.90 to overlay |
| 9 |
|
| 10 |
--- |
| 11 |
....ebuild => evolution-data-server-3.7.90.ebuild} | 30 +++++++++++-------- |
| 12 |
.../evolution-data-server-9999.ebuild | 28 ++++++++++-------- |
| 13 |
...n-data-server-3.7.90-libebook-splitup-fix.patch | 25 ++++++++++++++++ |
| 14 |
3 files changed, 57 insertions(+), 26 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
similarity index 84% |
| 18 |
copy from gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 19 |
copy to gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild |
| 20 |
index 847fb4c..12eb80e 100644 |
| 21 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 22 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild |
| 23 |
@@ -19,8 +19,9 @@ HOMEPAGE="http://projects.gnome.org/evolution/" |
| 24 |
|
| 25 |
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
| 26 |
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" |
| 27 |
-SLOT="0/40" # subslot = libcamel-1.2 soname version |
| 28 |
-IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather" |
| 29 |
+SLOT="0/43" # subslot = libcamel-1.2 soname version |
| 30 |
+# TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib ) |
| 31 |
+IUSE="api-doc-extras +gnome-online-accounts +google +gtk +introspection ipv6 ldap kerberos vala +weather" |
| 32 |
REQUIRED_USE="vala? ( introspection )" |
| 33 |
|
| 34 |
if [[ ${PV} = 9999 ]]; then |
| 35 |
@@ -31,25 +32,24 @@ else |
| 36 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" |
| 37 |
fi |
| 38 |
|
| 39 |
-RDEPEND=">=dev-libs/glib-2.32:2 |
| 40 |
- >=x11-libs/gtk+-3.2:3 |
| 41 |
+RDEPEND=" |
| 42 |
+ >=app-crypt/gcr-3.4 |
| 43 |
+ >=app-crypt/libsecret-0.5 |
| 44 |
>=dev-db/sqlite-3.5:= |
| 45 |
- >=dev-libs/libgdata-0.10:= |
| 46 |
- >=gnome-base/gnome-keyring-2.20.1 |
| 47 |
+ >=dev-libs/glib-2.34:2 |
| 48 |
>=dev-libs/libical-0.43:= |
| 49 |
- >=net-libs/libsoup-2.38.1:2.4 |
| 50 |
+ >=net-libs/libsoup-2.40.3:2.4 |
| 51 |
>=dev-libs/libxml2-2 |
| 52 |
>=sys-libs/db-4:= |
| 53 |
>=dev-libs/nspr-4.4:= |
| 54 |
>=dev-libs/nss-3.9:= |
| 55 |
- >=app-crypt/gcr-3.4 |
| 56 |
|
| 57 |
sys-libs/zlib:= |
| 58 |
virtual/libiconv |
| 59 |
|
| 60 |
- gnome-online-accounts? ( |
| 61 |
- >=net-libs/gnome-online-accounts-3.2 |
| 62 |
- >=net-libs/liboauth-0.9.4 ) |
| 63 |
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 ) |
| 64 |
+ google? ( >=dev-libs/libgdata-0.10:= ) |
| 65 |
+ gtk? ( >=x11-libs/gtk+-3.2:3 ) |
| 66 |
introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) |
| 67 |
kerberos? ( virtual/krb5:= ) |
| 68 |
ldap? ( >=net-nds/openldap-2:= ) |
| 69 |
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND} |
| 70 |
dev-util/gperf |
| 71 |
>=dev-util/gtk-doc-am-1.9 |
| 72 |
>=dev-util/intltool-0.35.5 |
| 73 |
- >=gnome-base/gnome-common-2 |
| 74 |
+ >=gnome-base/gnome-common-3.5.5 |
| 75 |
>=sys-devel/gettext-0.17 |
| 76 |
virtual/pkgconfig |
| 77 |
vala? ( $(vala_depend) )" |
| 78 |
@@ -81,18 +81,20 @@ pkg_setup() { |
| 79 |
|
| 80 |
src_prepare() { |
| 81 |
DOCS="ChangeLog MAINTAINERS NEWS TODO" |
| 82 |
- # Uh, what to do about dbus-call-timeout ? |
| 83 |
+ # TODO: ubuntu-online-accounts uoa |
| 84 |
G2CONF="${G2CONF} |
| 85 |
--disable-schemas-compile |
| 86 |
$(use_enable api-doc-extras gtk-doc) |
| 87 |
$(use_with api-doc-extras private-docs) |
| 88 |
$(use_enable gnome-online-accounts goa) |
| 89 |
+ $(use_enable google) |
| 90 |
$(use_enable introspection) |
| 91 |
$(use_enable ipv6) |
| 92 |
$(use_with kerberos krb5 ${EPREFIX}/usr) |
| 93 |
$(use_with ldap openldap) |
| 94 |
$(use_enable vala vala-bindings) |
| 95 |
$(use_enable weather) |
| 96 |
+ --disable-uoa |
| 97 |
--enable-nntp |
| 98 |
--enable-largefile |
| 99 |
--enable-smime |
| 100 |
@@ -101,6 +103,8 @@ src_prepare() { |
| 101 |
gnome2_src_prepare |
| 102 |
use vala && vala_src_prepare |
| 103 |
|
| 104 |
+ epatch "${FILESDIR}/${P}-libebook-splitup-fix.patch" |
| 105 |
+ |
| 106 |
# /usr/include/db.h is always db-1 on FreeBSD |
| 107 |
# so include the right dir in CPPFLAGS |
| 108 |
append-cppflags "-I$(db_includedir)" |
| 109 |
|
| 110 |
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 111 |
index 847fb4c..bcbfb50 100644 |
| 112 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 113 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild |
| 114 |
@@ -19,8 +19,9 @@ HOMEPAGE="http://projects.gnome.org/evolution/" |
| 115 |
|
| 116 |
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". |
| 117 |
LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" |
| 118 |
-SLOT="0/40" # subslot = libcamel-1.2 soname version |
| 119 |
-IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather" |
| 120 |
+SLOT="0/43" # subslot = libcamel-1.2 soname version |
| 121 |
+# TODO: Ubuntu online accounts (libaccounts-glib, rest, json-glib, libsignon-glib ) |
| 122 |
+IUSE="api-doc-extras +gnome-online-accounts +google +gtk +introspection ipv6 ldap kerberos vala +weather" |
| 123 |
REQUIRED_USE="vala? ( introspection )" |
| 124 |
|
| 125 |
if [[ ${PV} = 9999 ]]; then |
| 126 |
@@ -31,25 +32,24 @@ else |
| 127 |
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" |
| 128 |
fi |
| 129 |
|
| 130 |
-RDEPEND=">=dev-libs/glib-2.32:2 |
| 131 |
- >=x11-libs/gtk+-3.2:3 |
| 132 |
+RDEPEND=" |
| 133 |
+ >=app-crypt/gcr-3.4 |
| 134 |
+ >=app-crypt/libsecret-0.5 |
| 135 |
>=dev-db/sqlite-3.5:= |
| 136 |
- >=dev-libs/libgdata-0.10:= |
| 137 |
- >=gnome-base/gnome-keyring-2.20.1 |
| 138 |
+ >=dev-libs/glib-2.34:2 |
| 139 |
>=dev-libs/libical-0.43:= |
| 140 |
- >=net-libs/libsoup-2.38.1:2.4 |
| 141 |
+ >=net-libs/libsoup-2.40.3:2.4 |
| 142 |
>=dev-libs/libxml2-2 |
| 143 |
>=sys-libs/db-4:= |
| 144 |
>=dev-libs/nspr-4.4:= |
| 145 |
>=dev-libs/nss-3.9:= |
| 146 |
- >=app-crypt/gcr-3.4 |
| 147 |
|
| 148 |
sys-libs/zlib:= |
| 149 |
virtual/libiconv |
| 150 |
|
| 151 |
- gnome-online-accounts? ( |
| 152 |
- >=net-libs/gnome-online-accounts-3.2 |
| 153 |
- >=net-libs/liboauth-0.9.4 ) |
| 154 |
+ gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.2 ) |
| 155 |
+ google? ( >=dev-libs/libgdata-0.10:= ) |
| 156 |
+ gtk? ( >=x11-libs/gtk+-3.2:3 ) |
| 157 |
introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) |
| 158 |
kerberos? ( virtual/krb5:= ) |
| 159 |
ldap? ( >=net-nds/openldap-2:= ) |
| 160 |
@@ -61,7 +61,7 @@ DEPEND="${RDEPEND} |
| 161 |
dev-util/gperf |
| 162 |
>=dev-util/gtk-doc-am-1.9 |
| 163 |
>=dev-util/intltool-0.35.5 |
| 164 |
- >=gnome-base/gnome-common-2 |
| 165 |
+ >=gnome-base/gnome-common-3.5.5 |
| 166 |
>=sys-devel/gettext-0.17 |
| 167 |
virtual/pkgconfig |
| 168 |
vala? ( $(vala_depend) )" |
| 169 |
@@ -81,18 +81,20 @@ pkg_setup() { |
| 170 |
|
| 171 |
src_prepare() { |
| 172 |
DOCS="ChangeLog MAINTAINERS NEWS TODO" |
| 173 |
- # Uh, what to do about dbus-call-timeout ? |
| 174 |
+ # TODO: ubuntu-online-accounts uoa |
| 175 |
G2CONF="${G2CONF} |
| 176 |
--disable-schemas-compile |
| 177 |
$(use_enable api-doc-extras gtk-doc) |
| 178 |
$(use_with api-doc-extras private-docs) |
| 179 |
$(use_enable gnome-online-accounts goa) |
| 180 |
+ $(use_enable google) |
| 181 |
$(use_enable introspection) |
| 182 |
$(use_enable ipv6) |
| 183 |
$(use_with kerberos krb5 ${EPREFIX}/usr) |
| 184 |
$(use_with ldap openldap) |
| 185 |
$(use_enable vala vala-bindings) |
| 186 |
$(use_enable weather) |
| 187 |
+ --disable-uoa |
| 188 |
--enable-nntp |
| 189 |
--enable-largefile |
| 190 |
--enable-smime |
| 191 |
|
| 192 |
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 |
| 193 |
new file mode 100644 |
| 194 |
index 0000000..3241de2 |
| 195 |
--- /dev/null |
| 196 |
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch |
| 197 |
@@ -0,0 +1,25 @@ |
| 198 |
+From 794f538befedadaded6f19004738cf3babd5e9c5 Mon Sep 17 00:00:00 2001 |
| 199 |
+From: Tristan Van Berkom <tristanvb@×××××××××.com> |
| 200 |
+Date: Mon, 18 Feb 2013 12:05:22 +0000 |
| 201 |
+Subject: Fixing pkg-config files for libebook & libedata-book |
| 202 |
+ |
| 203 |
+This part was missed while the libebook / libebook-contacts library |
| 204 |
+splitup was done manually. |
| 205 |
+--- |
| 206 |
+(limited to 'addressbook/libebook') |
| 207 |
+ |
| 208 |
+diff --git a/addressbook/libebook/libebook.pc.in b/addressbook/libebook/libebook.pc.in |
| 209 |
+index 993870b..293cdc0 100644 |
| 210 |
+--- a/addressbook/libebook/libebook.pc.in |
| 211 |
++++ b/addressbook/libebook/libebook.pc.in |
| 212 |
+@@ -10,7 +10,7 @@ privincludedir=@privincludedir@ |
| 213 |
+ Name: libebook |
| 214 |
+ Description: Client library for evolution address books |
| 215 |
+ Version: @VERSION@ |
| 216 |
+-Requires: libedataserver-1.2 |
| 217 |
++Requires: libedataserver-1.2 libebook-contacts-1.2 libedata-book-1.2 |
| 218 |
+ Requires.private: camel-1.2 |
| 219 |
+ Libs: -L${libdir} -lebook-1.2 |
| 220 |
+ Cflags: -I${privincludedir} |
| 221 |
+-- |
| 222 |
+cgit v0.9.1 |
Archives