Gentoo Archives: gentoo-commits

From: Priit Laes <plaes@×××××.org>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/
Date: Tue, 05 Mar 2013 13:35:44
Message-Id: 1362490425.e96c6dd5584db84ae9a6bc4514d047124d9a4926.plaes@gentoo
1 commit: e96c6dd5584db84ae9a6bc4514d047124d9a4926
2 Author: Priit Laes <plaes <AT> plaes <DOT> org>
3 AuthorDate: Tue Mar 5 13:33:45 2013 +0000
4 Commit: Priit Laes <plaes <AT> plaes <DOT> org>
5 CommitDate: Tue Mar 5 13:33:45 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=e96c6dd5
7
8 gnome-extra/evolution-data-server: Adapt to GNOME Team policies
9
10 ---
11 .../evolution-data-server-3.7.91.ebuild | 39 +++++++++++---------
12 .../evolution-data-server-9999.ebuild | 39 +++++++++++---------
13 2 files changed, 42 insertions(+), 36 deletions(-)
14
15 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
16 index bc3ebf4..ac3a4ca 100644
17 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
18 +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
19 @@ -81,24 +81,6 @@ pkg_setup() {
20
21 src_prepare() {
22 DOCS="ChangeLog MAINTAINERS NEWS TODO"
23 - # TODO: ubuntu-online-accounts uoa
24 - G2CONF="${G2CONF}
25 - --disable-schemas-compile
26 - $(use_enable api-doc-extras gtk-doc)
27 - $(use_with api-doc-extras private-docs)
28 - $(use_enable gnome-online-accounts goa)
29 - $(use_enable google)
30 - $(use_enable introspection)
31 - $(use_enable ipv6)
32 - $(use_with kerberos krb5 ${EPREFIX}/usr)
33 - $(use_with ldap openldap)
34 - $(use_enable vala vala-bindings)
35 - $(use_enable weather)
36 - --disable-uoa
37 - --enable-nntp
38 - --enable-largefile
39 - --enable-smime
40 - --with-libdb=${EPREFIX}/usr"
41
42 gnome2_src_prepare
43 use vala && vala_src_prepare
44 @@ -113,6 +95,27 @@ src_prepare() {
45 -i configure || die "sed failed"
46 }
47
48 +src_configure() {
49 +
50 + gnome2_src_configure \
51 + --disable-schemas-compile \
52 + --disable-uoa \
53 + $(use_enable api-doc-extras gtk-doc) \
54 + $(use_with api-doc-extras private-docs) \
55 + $(use_enable gnome-online-accounts goa) \
56 + $(use_enable google) \
57 + $(use_enable introspection) \
58 + $(use_enable ipv6) \
59 + $(use_with kerberos krb5 "${EPREFIX}"/usr) \
60 + $(use_with ldap openldap) \
61 + $(use_enable vala vala-bindings) \
62 + $(use_enable weather) \
63 + --enable-nntp \
64 + --enable-largefile \
65 + --enable-smime \
66 + --with-libdb="${EPREFIX}"/usr
67 +}
68 +
69 src_install() {
70 # Prevent this evolution-data-server from linking to libs in the installed
71 # evolution-data-server libraries by adding -L arguments for build dirs to
72
73 diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
74 index bc3ebf4..ac3a4ca 100644
75 --- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
76 +++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
77 @@ -81,24 +81,6 @@ pkg_setup() {
78
79 src_prepare() {
80 DOCS="ChangeLog MAINTAINERS NEWS TODO"
81 - # TODO: ubuntu-online-accounts uoa
82 - G2CONF="${G2CONF}
83 - --disable-schemas-compile
84 - $(use_enable api-doc-extras gtk-doc)
85 - $(use_with api-doc-extras private-docs)
86 - $(use_enable gnome-online-accounts goa)
87 - $(use_enable google)
88 - $(use_enable introspection)
89 - $(use_enable ipv6)
90 - $(use_with kerberos krb5 ${EPREFIX}/usr)
91 - $(use_with ldap openldap)
92 - $(use_enable vala vala-bindings)
93 - $(use_enable weather)
94 - --disable-uoa
95 - --enable-nntp
96 - --enable-largefile
97 - --enable-smime
98 - --with-libdb=${EPREFIX}/usr"
99
100 gnome2_src_prepare
101 use vala && vala_src_prepare
102 @@ -113,6 +95,27 @@ src_prepare() {
103 -i configure || die "sed failed"
104 }
105
106 +src_configure() {
107 +
108 + gnome2_src_configure \
109 + --disable-schemas-compile \
110 + --disable-uoa \
111 + $(use_enable api-doc-extras gtk-doc) \
112 + $(use_with api-doc-extras private-docs) \
113 + $(use_enable gnome-online-accounts goa) \
114 + $(use_enable google) \
115 + $(use_enable introspection) \
116 + $(use_enable ipv6) \
117 + $(use_with kerberos krb5 "${EPREFIX}"/usr) \
118 + $(use_with ldap openldap) \
119 + $(use_enable vala vala-bindings) \
120 + $(use_enable weather) \
121 + --enable-nntp \
122 + --enable-largefile \
123 + --enable-smime \
124 + --with-libdb="${EPREFIX}"/usr
125 +}
126 +
127 src_install() {
128 # Prevent this evolution-data-server from linking to libs in the installed
129 # evolution-data-server libraries by adding -L arguments for build dirs to