1 |
eva 07/12/10 00:13:37 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: evolution-data-server-1.12.2-r1.ebuild |
5 |
Removed: evolution-data-server-1.12.2.ebuild |
6 |
Log: |
7 |
revdump with the actual patch size != 0 |
8 |
(Portage version: 2.1.4_rc9) |
9 |
|
10 |
Revision Changes Path |
11 |
1.163 gnome-extra/evolution-data-server/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?rev=1.163&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?rev=1.163&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog?r1=1.162&r2=1.163 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v |
20 |
retrieving revision 1.162 |
21 |
retrieving revision 1.163 |
22 |
diff -u -r1.162 -r1.163 |
23 |
--- ChangeLog 8 Dec 2007 17:46:25 -0000 1.162 |
24 |
+++ ChangeLog 10 Dec 2007 00:13:36 -0000 1.163 |
25 |
@@ -1,6 +1,14 @@ |
26 |
# ChangeLog for gnome-extra/evolution-data-server |
27 |
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.162 2007/12/08 17:46:25 eva Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.163 2007/12/10 00:13:36 eva Exp $ |
30 |
+ |
31 |
+*evolution-data-server-1.12.2-r1 (09 Dec 2007) |
32 |
+ |
33 |
+ 09 Dec 2007; Gilles Dartiguelongue <eva@g.o> |
34 |
+ files/evolution-data-server-1.12.2-local-delivery.patch, |
35 |
+ -evolution-data-server-1.12.2.ebuild, |
36 |
+ +evolution-data-server-1.12.2-r1.ebuild: |
37 |
+ revbump with the actual fix |
38 |
|
39 |
08 Dec 2007; Gilles Dartiguelongue <eva@g.o> |
40 |
+files/evolution-data-server-1.12.2-local-delivery.patch, |
41 |
|
42 |
|
43 |
|
44 |
1.1 gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: evolution-data-server-1.12.2-r1.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2007 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.12.2-r1.ebuild,v 1.1 2007/12/10 00:13:36 eva Exp $ |
54 |
|
55 |
inherit db-use eutils flag-o-matic gnome2 autotools |
56 |
|
57 |
DESCRIPTION="Evolution groupware backend" |
58 |
HOMEPAGE="http://www.gnome.org/projects/evolution/" |
59 |
|
60 |
LICENSE="LGPL-2 Sleepycat" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" |
63 |
IUSE="doc ipv6 kerberos keyring krb4 ldap ssl" |
64 |
|
65 |
RDEPEND=">=x11-libs/gtk+-2.10 |
66 |
>=gnome-base/orbit-2.9.8 |
67 |
>=gnome-base/gnome-vfs-2.4 |
68 |
>=gnome-base/libbonobo-2.4.2 |
69 |
>=gnome-base/gconf-2 |
70 |
>=gnome-base/libglade-2 |
71 |
>=gnome-base/libgnome-2 |
72 |
>=dev-libs/libxml2-2 |
73 |
keyring? ( gnome-base/gnome-keyring ) |
74 |
ssl? ( |
75 |
>=dev-libs/nspr-4.4 |
76 |
>=dev-libs/nss-3.9 ) |
77 |
>=gnome-base/libgnomeui-2 |
78 |
>=net-libs/libsoup-2.2.91 |
79 |
>=gnome-base/gnome-common-2 |
80 |
sys-libs/zlib |
81 |
=sys-libs/db-4* |
82 |
ldap? ( >=net-nds/openldap-2.0 ) |
83 |
kerberos? ( virtual/krb5 ) |
84 |
krb4? ( virtual/krb5 )" |
85 |
|
86 |
DEPEND="${RDEPEND} |
87 |
>=dev-util/pkgconfig-0.9 |
88 |
>=dev-util/intltool-0.35.5 |
89 |
doc? ( >=dev-util/gtk-doc-1.4 )" |
90 |
|
91 |
DOCS="ChangeLog MAINTAINERS NEWS TODO" |
92 |
|
93 |
pkg_setup() { |
94 |
G2CONF="$(use_with ldap openldap) \ |
95 |
$(use_with kerberos krb5 /usr) \ |
96 |
$(use_enable ssl nss) \ |
97 |
$(use_enable ssl smime) \ |
98 |
$(use_enable ipv6) \ |
99 |
$(use_enable keyring gnome-keyring) \ |
100 |
--with-libdb=/usr/$(get_libdir)" |
101 |
|
102 |
if use krb4 && ! built_with_use virtual/krb5 krb4; then |
103 |
ewarn |
104 |
ewarn "In order to add kerberos 4 support, you have to emerge" |
105 |
ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well." |
106 |
ewarn |
107 |
ewarn "Skipping for now." |
108 |
ewarn |
109 |
G2CONF="${G2CONF} --without-krb4" |
110 |
else |
111 |
G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)" |
112 |
fi |
113 |
} |
114 |
|
115 |
src_unpack() { |
116 |
gnome2_src_unpack |
117 |
|
118 |
# Fix what ? |
119 |
epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch |
120 |
|
121 |
# Fix broken libdb build |
122 |
epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch |
123 |
|
124 |
# Resolve symbols at execution time for setgid binaries |
125 |
epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch |
126 |
|
127 |
# Rewind in camel-disco-diary to fix a crash |
128 |
epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch |
129 |
|
130 |
# Don't assume that endian.h and byteswap.h exist on all non sun os's |
131 |
epatch "${FILESDIR}"/${PN}-1.12.1-icaltz-util.patch |
132 |
|
133 |
# Fix selection of mbox for local delivery (bug #201504) |
134 |
epatch "${FILESDIR}"/${PN}-1.12.2-local-delivery.patch |
135 |
|
136 |
#-------------Upstream GNOME look here -----------------# |
137 |
|
138 |
# --as-needed fixes |
139 |
epatch "${FILESDIR}"/${PN}-1.11.3-as-needed.patch |
140 |
|
141 |
# fix for dep ordering so we can add libedataserverui to libexchange-storage |
142 |
# we need to do this or: undefined reference to `e_passwords_get_password' |
143 |
# are the kinds of errors you will get. |
144 |
|
145 |
# move the groupwise backend and provider for addressbook, camel, and |
146 |
# calendar to its own folder called server.deps. |
147 |
mkdir server.deps || die "mkdir server.deps failed" |
148 |
mv addressbook/backends/groupwise server.deps/addressbook || die "mv address/groupwise failed" |
149 |
mv camel/providers/groupwise server.deps/camel || die "mv camel/groupwise failed" |
150 |
mv calendar/backends/groupwise server.deps/calendar || die "mv calendar/groupwise failed" |
151 |
|
152 |
# now fix the autotools foo for the new directory and the removed ones |
153 |
echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am || die "echo failed" |
154 |
|
155 |
# remove groupwise folder from Makefile's since they are in a diff location |
156 |
sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am || die "sed 1 failed" |
157 |
|
158 |
# fix configure.in location of the Makefile's |
159 |
sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in || die "sed 2 failed" |
160 |
sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in || die "sed 3 failed" |
161 |
# tack on the server.deps Makefile on our last edit |
162 |
sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in || die "sed 4 failed" |
163 |
|
164 |
# fix file includes |
165 |
sed -i -e 's:<backends/groupwise/e-book-backend-groupwise.h>:"server.deps/addressbook/e-book-backend-groupwise.h":' addressbook/libedata-book/e-data-book-factory.c || die "sed 5 failed" |
166 |
|
167 |
# Fix db version for FreeBSD users where -ldb is always db-1 |
168 |
sed -i -e "s:-ldb:-l$(db_libname):" configure.in || die "sed 6 failed" |
169 |
|
170 |
#---------------Upstream GNOME stop here--------------- |
171 |
eautoreconf |
172 |
} |
173 |
|
174 |
src_compile() { |
175 |
# Use NSS/NSPR only if 'ssl' is enabled. |
176 |
if use ssl ; then |
177 |
sed -i -e "s|mozilla-nss|nss| |
178 |
s|mozilla-nspr|nspr|" "${S}"/configure |
179 |
G2CONF="${G2CONF} --enable-nss=yes" |
180 |
else |
181 |
G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ |
182 |
--without-nss-libs --without-nss-includes" |
183 |
fi |
184 |
|
185 |
# /usr/include/db.h is always db-1 on FreeBSD |
186 |
# so include the right dir in CPPFLAGS |
187 |
append-cppflags "-I$(db_includedir)" |
188 |
|
189 |
cd "${S}" |
190 |
gnome2_src_compile |
191 |
} |
192 |
|
193 |
|
194 |
|
195 |
-- |
196 |
gentoo-commits@g.o mailing list |