1 |
eva 10/08/22 19:45:23 |
2 |
|
3 |
Modified: ChangeLog evolution-data-server-2.30.2.ebuild |
4 |
Log: |
5 |
Reorder dependencies. Depend on gmime-2.4 as in 2.28. Removing nntp USE flag, it does not pull any dependency and is not properly depended upon in evolution. Drop deprecated gtk-doc fix. Add missing preserved-lib for libecal. |
6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.271 gnome-extra/evolution-data-server/ChangeLog |
10 |
|
11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?rev=1.271&view=markup |
12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?rev=1.271&content-type=text/plain |
13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?r1=1.270&r2=1.271 |
14 |
|
15 |
Index: ChangeLog |
16 |
=================================================================== |
17 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v |
18 |
retrieving revision 1.270 |
19 |
retrieving revision 1.271 |
20 |
diff -u -r1.270 -r1.271 |
21 |
--- ChangeLog 18 Aug 2010 22:09:59 -0000 1.270 |
22 |
+++ ChangeLog 22 Aug 2010 19:45:23 -0000 1.271 |
23 |
@@ -1,6 +1,13 @@ |
24 |
# ChangeLog for gnome-extra/evolution-data-server |
25 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
26 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.270 2010/08/18 22:09:59 maekke Exp $ |
27 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.271 2010/08/22 19:45:23 eva Exp $ |
28 |
+ |
29 |
+ 22 Aug 2010; Gilles Dartiguelongue <eva@g.o> |
30 |
+ evolution-data-server-2.30.2.ebuild: |
31 |
+ Reorder dependencies. Depend on gmime-2.4 as in 2.28. Removing nntp USE |
32 |
+ flag, it does not pull any dependency and is not properly depended upon in |
33 |
+ evolution. Drop deprecated gtk-doc fix. Add missing preserved-lib for |
34 |
+ libecal. |
35 |
|
36 |
18 Aug 2010; Markus Meier <maekke@g.o> |
37 |
evolution-data-server-2.28.3.1-r1.ebuild: |
38 |
|
39 |
|
40 |
|
41 |
1.6 gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild?rev=1.6&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild?rev=1.6&content-type=text/plain |
45 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild?r1=1.5&r2=1.6 |
46 |
|
47 |
Index: evolution-data-server-2.30.2.ebuild |
48 |
=================================================================== |
49 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild,v |
50 |
retrieving revision 1.5 |
51 |
retrieving revision 1.6 |
52 |
diff -u -r1.5 -r1.6 |
53 |
--- evolution-data-server-2.30.2.ebuild 1 Aug 2010 11:38:34 -0000 1.5 |
54 |
+++ evolution-data-server-2.30.2.ebuild 22 Aug 2010 19:45:23 -0000 1.6 |
55 |
@@ -1,6 +1,6 @@ |
56 |
# Copyright 1999-2010 Gentoo Foundation |
57 |
# Distributed under the terms of the GNU General Public License v2 |
58 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild,v 1.5 2010/08/01 11:38:34 fauli Exp $ |
59 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.30.2.ebuild,v 1.6 2010/08/22 19:45:23 eva Exp $ |
60 |
|
61 |
EAPI="2" |
62 |
|
63 |
@@ -13,25 +13,24 @@ |
64 |
SLOT="0" |
65 |
KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" |
66 |
|
67 |
-IUSE="doc ipv6 kerberos gnome-keyring ldap nntp ssl" |
68 |
+IUSE="doc ipv6 kerberos gnome-keyring ldap ssl" |
69 |
|
70 |
RDEPEND=">=dev-libs/glib-2.16.1 |
71 |
>=x11-libs/gtk+-2.18 |
72 |
>=gnome-base/gconf-2 |
73 |
>=dev-db/sqlite-3.5 |
74 |
>=dev-libs/libxml2-2 |
75 |
- >=net-libs/libsoup-2.3 |
76 |
+ >=net-libs/libsoup-2.4 |
77 |
>=dev-libs/libgweather-2.25.4 |
78 |
>=dev-libs/libical-0.43 |
79 |
>=dev-libs/dbus-glib-0.6 |
80 |
- gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) |
81 |
>=sys-libs/db-4 |
82 |
+ sys-libs/zlib |
83 |
virtual/libiconv |
84 |
+ gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) |
85 |
ssl? ( |
86 |
>=dev-libs/nspr-4.4 |
87 |
>=dev-libs/nss-3.9 ) |
88 |
- sys-libs/zlib |
89 |
- |
90 |
ldap? ( >=net-nds/openldap-2.0 ) |
91 |
kerberos? ( virtual/krb5 )" |
92 |
|
93 |
@@ -51,7 +50,6 @@ |
94 |
$(use_with ldap openldap) |
95 |
$(use_enable gnome-keyring) |
96 |
$(use_enable ipv6) |
97 |
- $(use_enable nntp) |
98 |
$(use_enable ssl ssl) |
99 |
$(use_enable ssl smime) |
100 |
--with-weather |
101 |
@@ -80,14 +78,6 @@ |
102 |
# Revert "Bug 619347 - Return formatted address in e_destination_get_address" |
103 |
epatch "${FILESDIR}/${P}-revert-addressbook.patch" |
104 |
|
105 |
- if use doc; then |
106 |
- sed "/^TARGET_DIR/i \GTKDOC_REBASE=/usr/bin/gtkdoc-rebase" \ |
107 |
- -i gtk-doc.make || die "sed 1 failed" |
108 |
- else |
109 |
- sed "/^TARGET_DIR/i \GTKDOC_REBASE=$(type -P true)" \ |
110 |
- -i gtk-doc.make || die "sed 2 failed" |
111 |
- fi |
112 |
- |
113 |
# /usr/include/db.h is always db-1 on FreeBSD |
114 |
# so include the right dir in CPPFLAGS |
115 |
append-cppflags "-I$(db_includedir)" |
116 |
@@ -96,10 +86,7 @@ |
117 |
sed 's/CFLAGS="$CFLAGS $WARNING_FLAGS"//' \ |
118 |
-i configure.ac configure || die "sed 3 failed" |
119 |
|
120 |
- # Fix intltoolize broken file, see upstream #577133 |
121 |
- sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ |
122 |
- || die "intltool rules fix failed" |
123 |
- |
124 |
+ intltoolize --force --copy --automake || die "intltoolize failed" |
125 |
eautoreconf |
126 |
} |
127 |
|
128 |
@@ -120,6 +107,7 @@ |
129 |
|
130 |
pkg_preinst() { |
131 |
gnome2_pkg_preinst |
132 |
+ preserve_old_lib /usr/$(get_libdir)/libedata-cal-1.2.so.6 |
133 |
preserve_old_lib /usr/$(get_libdir)/libedataserver-1.2.so.11 |
134 |
} |
135 |
|
136 |
@@ -131,5 +119,6 @@ |
137 |
elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema" |
138 |
fi |
139 |
|
140 |
+ preserve_old_lib_notify /usr/$(get_libdir)/libedata-cal-1.2.so.6 |
141 |
preserve_old_lib_notify /usr/$(get_libdir)/libedataserver-1.2.so.11 |
142 |
} |