diff options
Diffstat (limited to 'gnome-extra')
5 files changed, 191 insertions, 9 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index c5b0c10413d1..8d4c2085df22 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.109 2007/02/08 04:02:20 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.110 2007/03/01 18:38:55 dang Exp $ + +*evolution-data-server-1.8.3-r1 (01 Mar 2007) + + 01 Mar 2007; Daniel Gryniewicz <dang@gentoo.org> + +files/evolution-data-server-1.8.3-category.patch, + +evolution-data-server-1.8.3-r1.ebuild: + Bump to 1.8.3-r1 + + - Add patch from upstream to fix adding contacts to new mail in non-english + locales. *evolution-data-server-1.8.3 (08 Feb 2007) diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index 7c11186de086..7fb45cb178d6 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -25,6 +25,10 @@ AUX evolution-data-server-1.8.0-camel-rewind.patch 499 RMD160 90b94f0b20a52a4fdf MD5 884ee385ed5e2b858a6ce4030e7248a9 files/evolution-data-server-1.8.0-camel-rewind.patch 499 RMD160 90b94f0b20a52a4fdf476bcfa5fe0ad2a064d488 files/evolution-data-server-1.8.0-camel-rewind.patch 499 SHA256 1323e9dc957e3cc02fd1628fa21d448c8c985028e5b57d03596b6bde9ad66e0e files/evolution-data-server-1.8.0-camel-rewind.patch 499 +AUX evolution-data-server-1.8.3-category.patch 848 RMD160 996e6a7f6ea137762974d6ce74525d8075d19fb6 SHA1 06b942c068701d231f2e9259f56d061e03afaec1 SHA256 e0baf68b129f6be2858e35eff8738d3cd84e34db543e2a4545aefc151393d905 +MD5 f3fdb3801c172ac879df2259df79f9a6 files/evolution-data-server-1.8.3-category.patch 848 +RMD160 996e6a7f6ea137762974d6ce74525d8075d19fb6 files/evolution-data-server-1.8.3-category.patch 848 +SHA256 e0baf68b129f6be2858e35eff8738d3cd84e34db543e2a4545aefc151393d905 files/evolution-data-server-1.8.3-category.patch 848 AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 MD5 31de33250de9b6fe2dba0deae946db46 files/evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c files/evolution-data-server-no_lazy_bindings.patch 551 @@ -40,14 +44,18 @@ EBUILD evolution-data-server-1.8.2.ebuild 4451 RMD160 01d7b589b6acdd2e542e3915da MD5 be83ac24b8e2a92a92be39fc751c8a47 evolution-data-server-1.8.2.ebuild 4451 RMD160 01d7b589b6acdd2e542e3915da884ce1c25051a7 evolution-data-server-1.8.2.ebuild 4451 SHA256 4a96402ba329fa2c2c2e451ed21b52e96865c9ca05ed7f7e4fe3ffca1d1671b7 evolution-data-server-1.8.2.ebuild 4451 +EBUILD evolution-data-server-1.8.3-r1.ebuild 4607 RMD160 be75ed1f49e05b8e6bf06e1d62da9e8f6e5441c4 SHA1 d8ed52d50f558be7e7a1b83b83f6653010260623 SHA256 ba0a3f09b0fb50beb1ed9318bdce97776057c936f5815b376e1d961de1f528f3 +MD5 2cd00bc64642691734de9c19a22bb57b evolution-data-server-1.8.3-r1.ebuild 4607 +RMD160 be75ed1f49e05b8e6bf06e1d62da9e8f6e5441c4 evolution-data-server-1.8.3-r1.ebuild 4607 +SHA256 ba0a3f09b0fb50beb1ed9318bdce97776057c936f5815b376e1d961de1f528f3 evolution-data-server-1.8.3-r1.ebuild 4607 EBUILD evolution-data-server-1.8.3.ebuild 4456 RMD160 739ab21a5ee61efccd182835315f7cc0b076caf7 SHA1 46e9e396087b2a5166b50e7cde1fb3190314ba1a SHA256 90a7626fd78d05c351857c3c47b924380b91fa70412956eedce6b4f7b14c97d2 MD5 bab7c9bf45e596156ca9873fa460ed11 evolution-data-server-1.8.3.ebuild 4456 RMD160 739ab21a5ee61efccd182835315f7cc0b076caf7 evolution-data-server-1.8.3.ebuild 4456 SHA256 90a7626fd78d05c351857c3c47b924380b91fa70412956eedce6b4f7b14c97d2 evolution-data-server-1.8.3.ebuild 4456 -MISC ChangeLog 16232 RMD160 69cde6d1596a6a23f524242bf592dbc97b61f895 SHA1 9966ae60433d28c767c1fb118024d78c4a7185e5 SHA256 e0fcd03cd422598d96aaf8ab9a5de098ee2dfcb2800199a99820f7e4a99f9a8f -MD5 d5e7b61073642d425a2a13dc0d1beae4 ChangeLog 16232 -RMD160 69cde6d1596a6a23f524242bf592dbc97b61f895 ChangeLog 16232 -SHA256 e0fcd03cd422598d96aaf8ab9a5de098ee2dfcb2800199a99820f7e4a99f9a8f ChangeLog 16232 +MISC ChangeLog 16537 RMD160 bd2c6eae01e5387f131102da78b7f128974e10fa SHA1 e7a62a991dd6e66d18f7f416be6a0a0303ef57d9 SHA256 685f6222b385223a6241cd052b2b074c91fa8abcb33c80ebfc5c3c90d4567129 +MD5 c6f752d1670dbe6c589f2f45ac95fb3f ChangeLog 16537 +RMD160 bd2c6eae01e5387f131102da78b7f128974e10fa ChangeLog 16537 +SHA256 685f6222b385223a6241cd052b2b074c91fa8abcb33c80ebfc5c3c90d4567129 ChangeLog 16537 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -61,10 +69,13 @@ SHA256 0385bd5f744f65836836983a6ffa381ce6e536914986f9ab3c5dbf4ee1b058bd files/di MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3 289 RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3 289 SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3 289 +MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3-r1 289 +RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3-r1 289 +SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3-r1 289 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.6 (GNU/Linux) +Version: GnuPG v2.0.2 (GNU/Linux) -iD8DBQFFyqC9keYb6olFHJcRAu0dAKDCA+j3HlevKpwxXcshQeBqgpiF1wCfZm/Y -v2okcugACfB1C4gGWGxL9HI= -=80SJ +iD8DBQFF5x0GomPajV0RnrERArvDAJ9tiA15JZwG7ztyJkF+w8NOzMuV7ACfSNOL +Oq5z428OSeLY5o2CySY1pgg= +=phLx -----END PGP SIGNATURE----- diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r1.ebuild new file mode 100644 index 000000000000..492971d60b0c --- /dev/null +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r1.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r1.ebuild,v 1.1 2007/03/01 18:38:55 dang Exp $ + +WANT_AUTOMAKE="1.9" +WANT_AUTOCONF="latest" +inherit eutils gnome2 autotools + +DESCRIPTION="Evolution groupware backend" +HOMEPAGE="http://www.gnome.org/projects/evolution/" + +LICENSE="LGPL-2 Sleepycat" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="doc ipv6 kerberos keyring krb4 ldap nntp ssl" + +RDEPEND=">=dev-libs/glib-2.4 + >=gnome-base/libbonobo-2.4.2 + >=gnome-base/orbit-2.9.8 + >=gnome-base/libgnomeui-2 + >=gnome-base/gnome-vfs-2 + >=gnome-base/libgnome-2 + >=gnome-base/gnome-common-2 + keyring? ( gnome-base/gnome-keyring ) + >=dev-libs/libxml2-2 + >=gnome-base/gconf-2 + >=x11-libs/gtk+-2 + >=gnome-base/libglade-2 + >=net-libs/libsoup-2.2.90 + sys-libs/zlib + =sys-libs/db-4* + ldap? ( >=net-nds/openldap-2.0 ) + ssl? ( + >=dev-libs/nspr-4.4 + >=dev-libs/nss-3.9 ) + kerberos? ( virtual/krb5 ) + krb4? ( virtual/krb5 )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35 + doc? ( >=dev-util/gtk-doc-1.4 )" + +MAKEOPTS="${MAKEOPTS} -j1" +DOCS="ChangeLog MAINTAINERS NEWS TODO" + +RESTRICT="confcache" + +pkg_setup() { + G2CONF="$(use_with ldap openldap) \ + $(use_with kerberos krb5 /usr) \ + $(use_enable ssl nss) \ + $(use_enable ssl smime) \ + $(use_enable ipv6) \ + $(use_enable nntp) \ + $(use_enable keyring gnome-keyring) \ + --with-libdb=/usr/$(get_libdir)" + + if use krb4 && ! built_with_use virtual/krb5 krb4; then + ewarn + ewarn "In order to add kerberos 4 support, you have to emerge" + ewarn "virtual/krb5 with the 'krb4' USE flag enabled as well." + ewarn + ewarn "Skipping for now." + ewarn + G2CONF="${G2CONF} --without-krb4" + else + G2CONF="${G2CONF} $(use_with krb4 krb4 /usr)" + fi +} + +src_unpack() { + gnome2_src_unpack + + epatch ${FILESDIR}/${PN}-1.2.0-gentoo_etc_services.patch + + # Fix broken libdb build + epatch "${FILESDIR}"/${PN}-1.7.3-libdb.patch + + # Resolve symbols at execution time for setgid binaries + epatch "${FILESDIR}"/${PN}-no_lazy_bindings.patch + + # exchange-storage --as-needed fixes + epatch "${FILESDIR}"/${PN}-1.7.3-exchange-storage.patch + epatch "${FILESDIR}"/${PN}-1.7.4-move-subdirs.patch + + # Rewind in camel-disco-diary to fix a crash + epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch + + # Fix non-english contact insertion. Upstream bug: + # http://bugzilla.gnome.org/show_bug.cgi?id=405531 + epatch "${FILESDIR}"/${P}-category.patch + +#-------------Upstream GNOME look here -----------------# + + # fix for dep ordering so we can add libedataserverui to libexchange-storage + # we need to do this or: undefined reference to `e_passwords_get_password' + # are the kinds of errors you will get. + + # move the groupwise backend and provider for addressbook, camel, and + # calendar to its own folder called server.deps. + mkdir server.deps + mv addressbook/backends/groupwise server.deps/addressbook + mv camel/providers/groupwise server.deps/camel + mv calendar/backends/groupwise server.deps/calendar + + # now fix the autotools foo for the new directory and the removed ones + echo "SUBDIRS = addressbook camel calendar" > server.deps/Makefile.am + + # remove groupwise folder from Makefile's since they are in a diff location + sed -i -e 's: groupwise::' addressbook/backends/Makefile.am camel/providers/Makefile.am calendar/backends/Makefile.am + + # fix configure.in location of the Makefile's + sed -i -e 's:addressbook/backends/groupwise:server.deps/addressbook:' configure.in + sed -i -e 's:camel/providers/groupwise:server.deps/camel:' configure.in + # tack on the server.deps Makefile on our last edit + sed -i -e 's:calendar/backends/groupwise:server.deps/calendar/Makefile\nserver.deps:' configure.in + + # fix file includes + 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 + +#---------------Upstream GNOME stop here--------------- + eautoreconf +} + +src_compile() { + # Use NSS/NSPR only if 'ssl' is enabled. + if use ssl ; then + NSS_LIB=/usr/$(get_libdir)/nss + NSS_INC=/usr/include/nss + NSPR_LIB=/usr/$(get_libdir)/nspr + NSPR_INC=/usr/include/nspr + + G2CONF="${G2CONF} \ + --with-nspr-includes=${NSPR_INC} \ + --with-nspr-libs=${NSPR_LIB} \ + --with-nss-includes=${NSS_INC} \ + --with-nss-libs=${NSS_LIB}" + else + G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ + --without-nss-libs --without-nss-includes" + fi + + cd "${S}" + gnome2_src_compile +} diff --git a/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r1 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r1 new file mode 100644 index 000000000000..0defb70b07af --- /dev/null +++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r1 @@ -0,0 +1,3 @@ +MD5 f6a824f2553fd97555b8785a452fb6ab evolution-data-server-1.8.3.tar.bz2 7024111 +RMD160 8051f35a0db514f919bf730cd35c37ea75029061 evolution-data-server-1.8.3.tar.bz2 7024111 +SHA256 cbc067d87722afef84e8c4914787d990015e0c69b3bf3576fc15c8193ffd2fcc evolution-data-server-1.8.3.tar.bz2 7024111 diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch new file mode 100644 index 000000000000..dd1943ec838e --- /dev/null +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-category.patch @@ -0,0 +1,12 @@ +diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN evolution-data-server-1.8.3.orig/libedataserverui/e-name-selector-dialog.c evolution-data-server-1.8.3/libedataserverui/e-name-selector-dialog.c +--- evolution-data-server-1.8.3.orig/libedataserverui/e-name-selector-dialog.c 2007-01-29 04:44:33.000000000 -0500 ++++ evolution-data-server-1.8.3/libedataserverui/e-name-selector-dialog.c 2007-03-01 13:28:12.000000000 -0500 +@@ -779,7 +779,7 @@ search_changed (ENameSelectorDialog *nam + text = gtk_entry_get_text (name_selector_dialog->search_entry); + text_escaped = escape_sexp_string (text); + +- if ( !strcmp (category,"Any Category")) { ++ if ( !strcmp (category, _("Any Category"))) { + query_string = g_strdup_printf ("(or (beginswith \"file_as\" %s) " + " (beginswith \"full_name\" %s) " + " (beginswith \"email\" %s) " |