From: Daniel Gryniewicz Date: Mon, 16 Apr 2007 16:33:50 +0000 (+0000) Subject: Bump to 1.8.3-r2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a015b9f61fed3b5864465e0ff7504d72258303cd;p=gentoo.git Bump to 1.8.3-r2 Fix DST changes; bug #172835 Package-Manager: portage-2.1.2.3 --- diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index 79e827196aae..62f76c830762 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,14 @@ # 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.111 2007/03/27 15:04:38 dang Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.112 2007/04/16 16:33:50 dang Exp $ + +*evolution-data-server-1.8.3-r2 (16 Apr 2007) + + 16 Apr 2007; Daniel Gryniewicz + +files/evolution-data-server-1.8.3-dst.patch.gz, + +evolution-data-server-1.8.3-r2.ebuild: + Bump to 1.8.3-r2 + Fix DST changes; bug #172835 *evolution-data-server-1.10.0 (27 Mar 2007) diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index f5eb74c4ae61..2dfd149b3a81 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -29,6 +29,10 @@ AUX evolution-data-server-1.8.3-category.patch 848 RMD160 996e6a7f6ea137762974d6 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-1.8.3-dst.patch.gz 6376 RMD160 e8d9b8948d86a2c937cc28c79811c52bc2adc391 SHA1 d6138ccac57fb4638bb95c11706965ec30e5388e SHA256 16261fae1a9c0bc388fceee3ec18184c82449481c94cbca28998d995b8131b47 +MD5 28ce2e76e8b6bb54f814e98d9c548ef5 files/evolution-data-server-1.8.3-dst.patch.gz 6376 +RMD160 e8d9b8948d86a2c937cc28c79811c52bc2adc391 files/evolution-data-server-1.8.3-dst.patch.gz 6376 +SHA256 16261fae1a9c0bc388fceee3ec18184c82449481c94cbca28998d995b8131b47 files/evolution-data-server-1.8.3-dst.patch.gz 6376 AUX evolution-data-server-1.9.91-as-needed.patch 3305 RMD160 b4e19cdf22885530966922fb173e33c31445405b SHA1 7047c935eaeeabfe5fbbacafc23d608de6876b5d SHA256 50343d5e7f4f98bdc9335bd5991d77ccaef701d2eff0e7418259740892795c90 MD5 bfaee338c362bdf3d4960767076a0fcb files/evolution-data-server-1.9.91-as-needed.patch 3305 RMD160 b4e19cdf22885530966922fb173e33c31445405b files/evolution-data-server-1.9.91-as-needed.patch 3305 @@ -57,14 +61,18 @@ EBUILD evolution-data-server-1.8.3-r1.ebuild 4607 RMD160 be75ed1f49e05b8e6bf06e1 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-r2.ebuild 4680 RMD160 c2af4ca041bd07eebc971437d2c31af1354f49e5 SHA1 1bc3312ada2c41b18cf5e3b74687110d6f2e178d SHA256 0f9def0a7830a3a1b42882cdd61f830fab5705912dbdeb29c36a8bb8b7c9d28a +MD5 2f7b092131094506955d24506d9880ac evolution-data-server-1.8.3-r2.ebuild 4680 +RMD160 c2af4ca041bd07eebc971437d2c31af1354f49e5 evolution-data-server-1.8.3-r2.ebuild 4680 +SHA256 0f9def0a7830a3a1b42882cdd61f830fab5705912dbdeb29c36a8bb8b7c9d28a evolution-data-server-1.8.3-r2.ebuild 4680 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 16744 RMD160 2569d77d0a3eae6063e02b8601d4ddebdfdc9001 SHA1 6d3ce8c8caa991c0716616c5997dcbb1e005b465 SHA256 826f2421e6f4da69df32e707d681c0055855643e400c83a703277ffb5811d562 -MD5 163f8285169e04637c3209f3ce9671e9 ChangeLog 16744 -RMD160 2569d77d0a3eae6063e02b8601d4ddebdfdc9001 ChangeLog 16744 -SHA256 826f2421e6f4da69df32e707d681c0055855643e400c83a703277ffb5811d562 ChangeLog 16744 +MISC ChangeLog 16987 RMD160 32ecb6943a3644fce687cd573170dad1ac28cfff SHA1 71b01a05075c9a3d0931b003a4989a790b0f59d5 SHA256 f46cea19998eba9d72e2685d5bd0d64d2f6d12df68a58881ce4ca048b104e4ca +MD5 edc0d8acef5fe42be83ed42448f4ad97 ChangeLog 16987 +RMD160 32ecb6943a3644fce687cd573170dad1ac28cfff ChangeLog 16987 +SHA256 f46cea19998eba9d72e2685d5bd0d64d2f6d12df68a58881ce4ca048b104e4ca ChangeLog 16987 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -84,10 +92,13 @@ SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/di 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 +MD5 159e4efbb6f5fe2e3973464851a6015b files/digest-evolution-data-server-1.8.3-r2 289 +RMD160 9311383fcc0546bb79ba3632bf984e3bb2783652 files/digest-evolution-data-server-1.8.3-r2 289 +SHA256 00dcc94a5030febdfc278394de4449c744c57e0fa812818a260fa807276ecca8 files/digest-evolution-data-server-1.8.3-r2 289 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGCTIlomPajV0RnrERAqtgAJ48qMIIyUughyeRdRt09gmXElcatACeLmU8 -70eIc6gYC2c97IP1Yu7CBK0= -=tglt +iD8DBQFGI6VzomPajV0RnrERAlZPAJwK/Up40bbvty/v00bazrMC282UXQCaApOK +tnmB2b2eD/0Qyly4JSnWZGE= +=bcDV -----END PGP SIGNATURE----- diff --git a/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r2.ebuild new file mode 100644 index 000000000000..db0882df3dbe --- /dev/null +++ b/gnome-extra/evolution-data-server/evolution-data-server-1.8.3-r2.ebuild @@ -0,0 +1,149 @@ +# 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-r2.ebuild,v 1.1 2007/04/16 16:33:50 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 + + # Fix DST changes; bug #172835 + epatch "${FILESDIR}"/${P}-dst.patch.gz + +#-------------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::"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-r2 b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r2 new file mode 100644 index 000000000000..0defb70b07af --- /dev/null +++ b/gnome-extra/evolution-data-server/files/digest-evolution-data-server-1.8.3-r2 @@ -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-dst.patch.gz b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz new file mode 100644 index 000000000000..a5705b6b377b Binary files /dev/null and b/gnome-extra/evolution-data-server/files/evolution-data-server-1.8.3-dst.patch.gz differ