From 49cacb0b5836ad407a53db292000c5bc2ef26d60 Mon Sep 17 00:00:00 2001 From: Gilles Dartiguelongue Date: Mon, 1 Dec 2008 10:41:28 +0000 Subject: New version for GNOME 2.24. Support for Google and WebDAV contacts backend, Quota for IMAP and sqlite on-disk format. Package-Manager: portage-2.2_rc16/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64 --- gnome-extra/evolution-data-server/ChangeLog | 10 +- gnome-extra/evolution-data-server/Manifest | 15 ++- .../evolution-data-server-2.24.2.ebuild | 109 +++++++++++++++++++++ .../evolution-data-server-2.23.6-as-needed.patch | 54 ++++++++++ 4 files changed, 186 insertions(+), 2 deletions(-) create mode 100644 gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild create mode 100644 gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch (limited to 'gnome-extra') diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index ee4b9c65d1c0..a8db4eb2322c 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-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.192 2008/11/13 19:26:12 ranger Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.193 2008/12/01 10:41:27 eva Exp $ + +*evolution-data-server-2.24.2 (01 Dec 2008) + + 01 Dec 2008; Gilles Dartiguelongue + +files/evolution-data-server-2.23.6-as-needed.patch, + +evolution-data-server-2.24.2.ebuild: + New version for GNOME 2.24. Support for Google and WebDAV contacts + backend, Quota for IMAP and sqlite on-disk format. 13 Nov 2008; Brent Baude evolution-data-server-2.22.3.ebuild: diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index e2cb17c79db9..55297aeac1de 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX evolution-data-server-1.11.3-as-needed.patch 1942 RMD160 1db5815026e06a47c91295f4b502b94692dbe115 SHA1 0f94fb16e14ed685154cd0ad1211095431e179ca SHA256 95b1d4a23e801a36c7027080347e8fcb1ad90bc1d4040e9bdab8d00eb1f27986 AUX evolution-data-server-1.11.3-no-libdb.patch 570 RMD160 404dfda7aac4e9ff6504ecd9ee5b7af6efafc969 SHA1 411f311317439bf20643491d2b7d1cbee99c561e SHA256 992602fd04cfa8afba084238f62f765b1d5caf29cc10ad739c7e63ea78291905 AUX evolution-data-server-1.12.1-icaltz-util.patch 839 RMD160 58b17c2bed830ccabf4682fada9e5bd22d3fae48 SHA1 cd9aa108ba32d38ecc46b1749ff378faff4dc870 SHA256 8d7c5c5abab727eecd5cff1980e9987bf0dcadf0324288775c347e0da4f81175 @@ -10,13 +13,23 @@ AUX evolution-data-server-2.21.4-gtkdoc-rebase.patch 739 RMD160 ed666a6e4118008b AUX evolution-data-server-2.21.90-icaltz-util.patch 1343 RMD160 60db5a03375636b21eb968de35f032e915319277 SHA1 b3d7f3dd6dc32927265a410b82193972198143b0 SHA256 0279c058ad3f06e3703c4876decc644d6fbc18663f5f9c9e470cd31b1735b2a3 AUX evolution-data-server-2.22.3-mail-cleanup-delay.patch 2974 RMD160 b482fbd815f1853522d845fa3acf643dbb5ebac8 SHA1 bae6f30319ea13d0b4c1aed63b92cf9f23f39c29 SHA256 3be97d843539c285a36af973145d3cc8bec99b84a54282eab0900df867b030c4 AUX evolution-data-server-2.22.3-timezone-western.patch 2041 RMD160 8a0d9e308123ebc48a6ea9c7932c8639765a96b8 SHA1 963f7c7a0659a4ca6659f5983e8a47825c70b8e9 SHA256 56e3311334bac728db2c7afcd200e56acc3e0a9819659cdffb745c488bbb4126 +AUX evolution-data-server-2.23.6-as-needed.patch 3469 RMD160 43c48a35d0480a82db6cf131c0fdd0062353efc4 SHA1 96ef4dd901730ab2f77716646517a5ef40a5f982 SHA256 4899ffd8773229ecb43afbffdb91faa1fd433630395792998973f62aa54afb37 AUX evolution-data-server-no_lazy_bindings.patch 551 RMD160 d86bf9a9ed25615bcb3dab23977ac01c341a799c SHA1 34aa3d902e0e704f67c6fceee820dad158d82be2 SHA256 772bdd99f3936d377cd0ce59c4f03789d227b79c4a2ca2d5e7e3165c378c6403 DIST evolution-data-server-1.12.3.tar.bz2 7447166 RMD160 c7102c38af4888f3f8933c9d28981d1809d504f8 SHA1 12b8b23fb77ff6436def3cc5ea472886c8e0350e SHA256 e2d9038e3cd115ea5af2f3b7d381f5803c62d1ec36206e5a1bea0f823d25fab5 DIST evolution-data-server-2.22.2.tar.bz2 7613774 RMD160 92677046697b0f48b273ad3fb3fbf656dac02e5b SHA1 d3fc33802fec51a16b017abb7516f4ed79311dfa SHA256 dc86b3f61cc4f9db08012deee692774562cfc93a3313298517fca8639a6eb3de DIST evolution-data-server-2.22.3.tar.bz2 7621470 RMD160 eed9c26fba0b69f0cbe44b01d698388c4ae44a0b SHA1 5d01b1248fcacef9c478787892f223338dff731b SHA256 6e9fa1258c8b4d1fd75a1da78ee637ad5b8a82bc58c93324d73afecf8d73fe87 +DIST evolution-data-server-2.24.2.tar.bz2 7886652 RMD160 703b064095b960954ebb0621e15887731c429010 SHA1 8c4988446c6a8552972974800766eb536fcf267c SHA256 ac66e2f5341c488fa9e5e02c7e4eb7a7a1c01c093ad4a7a9b9e0e028f43f617a EBUILD evolution-data-server-1.12.3.ebuild 5047 RMD160 47e7a7a27fc51270a57644179594e302ffe11a73 SHA1 8e819d7c74c140aed79e5f265082a96541dbdb74 SHA256 482df2b372d83beaf408af1b0d6e7162d52481eef0513a25b6f9fc1805e7a229 EBUILD evolution-data-server-2.22.2.ebuild 3121 RMD160 b25a0c60d2724073c6fa7a12ef05d37ff64c5c51 SHA1 7792a7a2f0902fd55cfad7dc7a5099ae3b31e3df SHA256 6e2bb7b8b57d839a35bfac3ed3b970da6a3088ca23985170a2941aaf78eb1ece EBUILD evolution-data-server-2.22.3-r1.ebuild 3237 RMD160 c46050274c8c1140e2274614879a359fab45821c SHA1 0aef82139ee98b2be0f0a4483a7d79bd528a8a38 SHA256 58c511ed07f041a90ddd8e42132540857b260590c96f22f598747921b463c5d6 EBUILD evolution-data-server-2.22.3.ebuild 3118 RMD160 11a9c2f85fc84d848c47fc478a55a1ca77361efa SHA1 4b4ecd802fc9c7a1e997f8b35a9e95bcbda0da80 SHA256 2194dfb3d1cdf85e448e6fd6aa3e5a62f0759c7054b3c50fa3cd0ee3af9c4700 -MISC ChangeLog 36957 RMD160 7c33398e7b3f1e69325640d67d9a0e6c7110f59d SHA1 27b2503cbaaedcfc45da465f2cb37ee1e993fec4 SHA256 b01b7e41b37391fdb19be7cc8e030f7d1480e78ec495f632908b99d937dd679c +EBUILD evolution-data-server-2.24.2.ebuild 3015 RMD160 bee5734c69aadc03670b796b2c9aae3e3711e79b SHA1 21c3d1040da61eaf0cd89d959543abaa8933710d SHA256 3f7019bba2a6e621746a0aae94e22e2fd0456c89ee1e02f812cbd34bfb198cc8 +MISC ChangeLog 37271 RMD160 7f3c7c79c3a9963ff499cadb0665b8e5d4835736 SHA1 f0e4e46cb7e545022e4f48e3fd4b3e725f2be13a SHA256 fe24acdc3a275d0ab5409347edc45b80437dd1f3a4078667201e6a478050d584 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.9 (GNU/Linux) + +iEYEARECAAYFAkkzv6sACgkQ1fmVwcYIWAb1dwCfXoCYSOk+xPP1t7AwSRtRkl0B +uCcAn0MBbmY5/OtRsupH4EsIItvSpiv/ +=K0w7 +-----END PGP SIGNATURE----- diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild new file mode 100644 index 000000000000..b25b437ff39b --- /dev/null +++ b/gnome-extra/evolution-data-server/evolution-data-server-2.24.2.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2008 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-2.24.2.ebuild,v 1.1 2008/12/01 10:41:27 eva Exp $ + +inherit db-use eutils flag-o-matic 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 ~x86-fbsd" +IUSE="doc ipv6 kerberos gnome-keyring krb4 ldap ssl" + +RDEPEND=">=dev-libs/glib-2.16.1 + >=x11-libs/gtk+-2.10 + >=gnome-base/orbit-2.9.8 + >=gnome-base/libbonobo-2.20.3 + >=gnome-base/gconf-2 + >=gnome-base/libglade-2 + >=gnome-base/libgnome-2 + >=dev-libs/libxml2-2 + >=net-libs/libsoup-2.4 + gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) + >=dev-db/sqlite-3.5 + ssl? ( + >=dev-libs/nspr-4.4 + >=dev-libs/nss-3.9 ) + >=gnome-base/libgnomeui-2 + sys-libs/zlib + =sys-libs/db-4* + ldap? ( >=net-nds/openldap-2.0 ) + kerberos? ( virtual/krb5 ) + krb4? ( virtual/krb5 )" + +DEPEND="${RDEPEND} + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.35.5 + >=gnome-base/gnome-common-2 + >=dev-util/gtk-doc-am-1.9 + doc? ( >=dev-util/gtk-doc-1.9 )" + +DOCS="ChangeLog MAINTAINERS NEWS TODO" + +pkg_setup() { + G2CONF="${G2CONF} + $(use_with ldap openldap) + $(use_with kerberos krb5 /usr) + $(use_enable ssl nss) + $(use_enable ssl smime) + $(use_enable ipv6) + $(use_enable 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 + + # Adjust to gentoo's /etc/service + epatch "${FILESDIR}"/${PN}-1.2.0-gentoo_etc_services.patch + + # Fix broken libdb build + epatch "${FILESDIR}"/${PN}-1.11.3-no-libdb.patch + + # Rewind in camel-disco-diary to fix a crash + epatch "${FILESDIR}"/${PN}-1.8.0-camel-rewind.patch + + # Don't assume that endian.h and byteswap.h exist on all non sun os's + # upstream bug #551246 + epatch "${FILESDIR}"/${PN}-2.21.90-icaltz-util.patch + + # Fix building evo-exchange with --as-needed, upstream bug #342830 + epatch "${FILESDIR}"/${PN}-2.23.6-as-needed.patch + + # gtk-doc-am and gnome-common needed for this + intltoolize --force --copy --automake || die "intltoolize failed" + eautoreconf +} + +src_compile() { + # Use NSS/NSPR only if 'ssl' is enabled. + if use ssl ; then + sed -i -e "s|mozilla-nss|nss| + s|mozilla-nspr|nspr|" "${S}"/configure + G2CONF="${G2CONF} --enable-nss=yes" + else + G2CONF="${G2CONF} --without-nspr-libs --without-nspr-includes \ + --without-nss-libs --without-nss-includes" + fi + + # /usr/include/db.h is always db-1 on FreeBSD + # so include the right dir in CPPFLAGS + append-cppflags "-I$(db_includedir)" + + cd "${S}" + gnome2_src_compile +} diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch new file mode 100644 index 000000000000..57d10c82b2e4 --- /dev/null +++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.23.6-as-needed.patch @@ -0,0 +1,54 @@ +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am evolution-data-server-2.23.6/addressbook/backends/Makefile.am +--- evolution-data-server-2.23.6.orig/addressbook/backends/Makefile.am 2008-08-04 00:28:27.000000000 -0400 ++++ evolution-data-server-2.23.6/addressbook/backends/Makefile.am 2008-08-05 12:26:15.000000000 -0400 +@@ -4,4 +4,4 @@ else + LDAP_SUBDIR = + endif + +-SUBDIRS = file vcf $(LDAP_SUBDIR) google groupwise webdav ++SUBDIRS = file vcf $(LDAP_SUBDIR) +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am evolution-data-server-2.23.6/calendar/backends/Makefile.am +--- evolution-data-server-2.23.6.orig/calendar/backends/Makefile.am 2008-04-11 07:10:31.000000000 -0400 ++++ evolution-data-server-2.23.6/calendar/backends/Makefile.am 2008-08-05 12:25:51.000000000 -0400 +@@ -1 +1 @@ +-SUBDIRS = file groupwise http contacts weather caldav google ++SUBDIRS = file http contacts weather caldav +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/camel/providers/Makefile.am evolution-data-server-2.23.6/camel/providers/Makefile.am +--- evolution-data-server-2.23.6.orig/camel/providers/Makefile.am 2008-08-01 02:34:59.000000000 -0400 ++++ evolution-data-server-2.23.6/camel/providers/Makefile.am 2008-08-05 12:26:59.000000000 -0400 +@@ -21,6 +21,6 @@ else + SENDMAIL_DIR=sendmail + endif + +-SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) groupwise $(HULA_DIR) ++SUBDIRS = pop3 $(SENDMAIL_DIR) smtp imap $(IMAP4_DIR) $(NNTP_DIR) local $(IMAPP_DIR) $(HULA_DIR) + + +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/Makefile.am evolution-data-server-2.23.6/Makefile.am +--- evolution-data-server-2.23.6.orig/Makefile.am 2008-08-01 02:35:37.000000000 -0400 ++++ evolution-data-server-2.23.6/Makefile.am 2008-08-05 12:28:22.000000000 -0400 +@@ -7,9 +7,12 @@ endif + + if ENABLE_CALENDAR + CALENDAR_DIR = calendar ++CALENDAR_LATER = calendar/backends/groupwise calendar/backends/google + endif + +-SUBDIRS = $(LIBDB) win32 libedataserver libebackend servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po ++LATER = camel/providers/groupwise addressbook/backends/groupwise addressbook/backends/google addressbook/backends/webdav $(CALENDAR_LATER) ++ ++SUBDIRS = $(LIBDB) win32 libedataserver libebackend camel addressbook $(CALENDAR_DIR) libedataserverui servers $(LATER) src docs art po + DIST_SUBDIRS= win32 libedataserver libebackend servers camel addressbook calendar libedataserverui src docs art po + changelogs = \ + ChangeLog +diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am +--- evolution-data-server-2.23.6.orig/servers/exchange/storage/Makefile.am 2008-04-11 07:10:16.000000000 -0400 ++++ evolution-data-server-2.23.6/servers/exchange/storage/Makefile.am 2008-08-05 12:25:51.000000000 -0400 +@@ -64,6 +64,7 @@ libexchange_storage_1_2_la_LIBADD = \ + $(top_builddir)/servers/exchange/lib/libexchange.la \ + $(top_builddir)/servers/exchange/xntlm/libxntlm.la \ + $(top_builddir)/libedataserver/libedataserver-1.2.la \ ++ $(top_builddir)/libedataserverui/libedataserverui-1.2.la \ + $(E_DATA_SERVER_LIBS) \ + $(E_DATA_SERVER_UI_LIBS) \ + $(LDAP_LIBS) \ -- cgit v1.2.3-65-gdbad