Bump to 3.0.2.1, from gnome overlay for GNOME 3, remove old.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 7884c1f153d56d7bfeb583066aa924d1247a1d14..d241f2550d58d6e44a03d68772f0111ed9a42d66 100644 (file)
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.307 2011/08/13 17:32:13 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.308 2011/08/18 07:48:34 nirbheek Exp $
+
+*evolution-data-server-3.0.2.1 (18 Aug 2011)
+
+  18 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
+  -evolution-data-server-2.32.3.ebuild, +evolution-data-server-3.0.2.1.ebuild,
+  metadata.xml:
+  Bump to 3.0.2.1, from gnome overlay for GNOME 3, remove old.
 
   13 Aug 2011; Raúl Porcel <armin76@gentoo.org>
   evolution-data-server-2.32.2-r1.ebuild:

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 9c0477af72c59015525124a21c6e2cf18742bf12..f62e6c17567d6b695f04794fa6714beb3659c60e 100644 (file)
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -10,16 +10,27 @@ DIST evolution-data-server-2.32.2-patches.tar.bz2 7910 RMD160 cadba4cec671aed612
 DIST evolution-data-server-2.32.2.tar.bz2 4290879 RMD160 a024d3032d12c3cfe31e2471218c7c6817e2168f SHA1 a8d1820d7b89fabed8dc44ad51eb90fc5a61e9da SHA256 d22fcd9e6f1cee7b4b11a25ae3c3d19e6a454e4f09b983a954ff2d7640bf1c36
 DIST evolution-data-server-2.32.3-patches.tar.xz 24072 RMD160 2508b5b101f59bb383020728a8abb9ee2eb7836d SHA1 76b86f747415c117c660ec70561a786ff772d2b2 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 RMD160 adc8b07aef41a89d16fc426541c12190a3688b8f SHA1 cbf32c3438c4f1650b35b87007a337ebc1c56cec SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c
+DIST evolution-data-server-3.0.2.1.tar.bz2 4455987 RMD160 bdb38eaf3acedeef20d46d9d5f9b1396167a5037 SHA1 2a2b01bc735080119d6dc49c172581e583409b3d SHA256 1b14c57a835745ee2c0141a76a07d44688dfb2d758bf3b818fe1860b59451f9b
 EBUILD evolution-data-server-2.32.2-r1.ebuild 4151 RMD160 098b52365c1df58b9cb10eea1f46e475fc8f3158 SHA1 a2ed04eb371695babb3d812b085d6d61741a788b SHA256 b9b0c1e3c6ef9206af5b3e9b6b882417a5d04187352a455b3776c62825026964
 EBUILD evolution-data-server-2.32.2.ebuild 3925 RMD160 40696eead31cd6967cee24757284322a03ad54dc SHA1 7982a446e8b556abf0d549a4de9a9faa1966c74b SHA256 1bbf97c42b44a2a47e7bf2d2271694ef1c9f8fe86375da418d73dafd02ec193c
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4651 RMD160 0c879e58e9056d2350d2513efcaf1993a09a2d0f SHA1 0c70319aecdd0469c419456f6a9522f0ffad667f SHA256 783bb1cf852caee24ade1f148cb2df77eee38966f9cf465f2883e8b14f846515
-EBUILD evolution-data-server-2.32.3.ebuild 4502 RMD160 262f6faa999dbc937a81677673dc725db3896476 SHA1 a80d1d5b9340326f156de4c6f1019c5576ab1e4d SHA256 099b631abe1855705568d19b2ec4931427066e5a8ae73ce966eecf5a7cc3e891
-MISC ChangeLog 59143 RMD160 fb6d941f500c12197e534e9c396f1d4578b5a816 SHA1 062d0e9791e80ef4043ee2c68629d8e15da5872b SHA256 409bfa088840a6147cbffab88dc188270f8655b89ccf665befb1dfbd7f508303
-MISC metadata.xml 242 RMD160 930a0247c2ceed0dfad103c8e18493d54fa77382 SHA1 d332c62f5dff3da42709228dfcd0131d81a7048c SHA256 cea2d969f6f71bb465d787a64966e9bafd3706b2d2f8fe3b81cb85c409b74104
+EBUILD evolution-data-server-3.0.2.1.ebuild 4038 RMD160 115741002e3fa53d213b9ca3528910faabf6f8f2 SHA1 4df8399fcfa31e25312de6e813981abc4fe25b1e SHA256 16207c82748c126a33fafe039bb163fce4e1fd86ac97fbb84f2ace83a062ae02
+MISC ChangeLog 59403 RMD160 a5d072903bbe795b20627f7d36cf9da9f5204994 SHA1 985c7485cfac248f4b6f6154f152ab5f023c09c0 SHA256 9f0d257c1bab262ef857b094692d1a17ad0448e4d7379bf55bef16e2c2543962
+MISC metadata.xml 348 RMD160 f60cb046b2bc01d7ec62b57f3ba49ac296a58ef0 SHA1 cfc2ce6cc4abcf993a19ac5c2f6aea7b949d872d SHA256 c45eeae495b3321df26f82242845d9635e51d4958b1f4d5fcb52d22e133f8ec7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk5GtSMACgkQuQc30/atMkAytwCeP1PISwPWyMBfTnaYzWnk3n2B
-PqcAoIW7+leAQPbz4wtSAXv6INWKoCpF
-=H6XJ
+iQIcBAEBAgAGBQJOTMPZAAoJEO/kOhxWD91kU94P/1QAXUg167cZIjF5aRAD1Esq
+4USk9WTfIAB16hLA9rKlnHp7UI/g7ZrL3WlUHLzZxafGfyjiVQAy3hz5X4K7cxkd
+1efb9aORyxvkI4B3xP7Le1UkizjSdtUOBRKXEDrsDocBzxuCbuP4785bordTebCl
+leDxZYySgsOzJFRHFYLAHf6u3k8s3lMgPMRFu4e6mh0m1Z7sjCEWcI6d8wDBaI6X
++ICTuiHXlJkP8Bs//BvJuk2adEjGZRkxGcejtnDDDbz0AV4hrmMyUUr7Db4Ce+Fe
+yDI+v5RaABtCMRVYUYO3nD9Kxn68nGz3SPDEkd7z4TvsIu786CXDkGiYXlihOzij
+by60Qi66RdkHo9XCmUKjsm+8My9Ndc69m/oHshYulGK/pRsw3P0yN4hXIa9LXMKe
+KnA6kbWpsiBk3t1B5WLx9K2LPSlGva0FPpslr4tRRCj7pmYBWi/cdkhxJEfrhNlt
+dWILXGvyCewGFzwa3pPWbyOmurA5kC9Zail8Qhtva5PveUfhZwEgi4YnFAt8H+ej
+ZOM/Rvzb2Dqu32kSgdg2teiN8OiuVwYHiGqWLZA6tKec2UsHhkxAAxQ29npTMzBG
+/1XbgVG9bPvVpsMsKU2kYQgiIRtaoPPPVgqY/HKrx4P7xrcOpzs7MUwYuf2Oii5i
+lv7J9YQCReS9qIAZirfX
+=cOOa
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild
similarity index 58%
rename from gnome-extra/evolution-data-server/evolution-data-server-2.32.3.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild
index 739e9dcc39f8737da8d32243f11b2d42135327be..0551635ec984fae7d47a52ff80cee72f5fbd0e05 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild
@@ -1,71 +1,81 @@
 # Copyright 1999-2011 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.32.3.ebuild,v 1.1 2011/06/19 21:32:43 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.0.2.1.ebuild,v 1.1 2011/08/18 07:48:34 nirbheek Exp $
 
-EAPI="4"
+EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
 
 inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
+if [[ ${PV} = 9999 ]]; then
+       inherit gnome2-live
+fi
 
 DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="http://projects.gnome.org/evolution/"
-
-SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz"
+HOMEPAGE="http://www.gnome.org/projects/evolution/"
 
 LICENSE="LGPL-2 BSD DB"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-IUSE="doc ipv6 kerberos gnome-keyring ldap +weather"
-
-RDEPEND=">=dev-libs/glib-2.25.12:2
-       >=x11-libs/gtk+-2.24:2
+if [[ ${PV} = 9999 ]]; then
+       KEYWORDS=""
+else
+       KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+fi
+IUSE="doc +introspection ipv6 ldap kerberos ssl +weather"
+
+# GNOME3: How do we slot libedataserverui-3.0.so?
+# Also, libedata-cal-1.2.so and libecal-1.2.so use gtk-3, but aren't slotted
+RDEPEND=">=dev-libs/glib-2.28:2
+       >=x11-libs/gtk+-3.0:3
        >=gnome-base/gconf-2
        >=dev-db/sqlite-3.5
-       >=dev-libs/libgdata-0.6.3
+       >=dev-libs/libgdata-0.7.0
+       >=gnome-base/gnome-keyring-2.20.1
        >=dev-libs/libical-0.43
-       >=net-libs/libsoup-2.4:2.4
+       >=net-libs/libsoup-2.31.2:2.4
        >=dev-libs/libxml2-2
        >=sys-libs/db-4
        sys-libs/zlib
        virtual/libiconv
-       >=dev-libs/nspr-4.4
-       >=dev-libs/nss-3.9
-       gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 )
+       introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
        kerberos? ( virtual/krb5 )
        ldap? ( >=net-nds/openldap-2 )
-       weather? ( >=dev-libs/libgweather-2.25.4:2 )
+       ssl? (
+               >=dev-libs/nspr-4.4
+               >=dev-libs/nss-3.9 )
+       weather? ( >=dev-libs/libgweather-2.90.0:2 )
 "
 DEPEND="${RDEPEND}
+       dev-lang/perl
        dev-util/gperf
        >=dev-util/pkgconfig-0.9
        >=dev-util/intltool-0.35.5
        sys-devel/bison
        >=gnome-base/gnome-common-2
        >=dev-util/gtk-doc-am-1.9
+       >=sys-devel/gettext-0.17
        doc? ( >=dev-util/gtk-doc-1.9 )"
 # eautoreconf needs:
 #      >=gnome-base/gnome-common-2
 #      >=dev-util/gtk-doc-am-1.9
 
+# FIXME
+RESTRIC="test"
+
 pkg_setup() {
        DOCS="ChangeLog MAINTAINERS NEWS TODO"
-
-       # ssl stuff always enabled as recommended in upstream bug #642984
+       # Uh, what to do about dbus-call-timeout ?
        G2CONF="${G2CONF}
-               $(use_enable gnome-keyring)
                $(use_enable ipv6)
                $(use_with kerberos krb5 /usr)
                $(use_with ldap openldap)
-               $(use_with weather)
-               --disable-gtk3
+               $(use_enable ssl ssl)
+               $(use_enable ssl smime)
+               $(use_enable weather)
+               --enable-calendar
+               --enable-nntp
                --enable-largefile
-               --with-libdb=/usr
-               --enable-ssl
-               --enable-smime"
-
+               --with-libdb=/usr"
 }
 
 src_prepare() {
@@ -75,15 +85,13 @@ src_prepare() {
        epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
        # GNOME bug 611353 (skips failing test atm)
-       epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
+       # XXX: uncomment when there's a proper fix
+       #epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"
 
        # GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo)
-       sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
-               -i addressbook/tests/Makefile.{am,in} \
-               || die "failing test sed 1 failed"
-
-       # Apply multiple backports and fixed from master and 2.32 branches
-       epatch "${WORKDIR}/${P}-patches"/*.patch
+       #sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \
+       #       -i addressbook/tests/Makefile.{am,in} \
+       #       || die "failing test sed 1 failed"
 
        # /usr/include/db.h is always db-1 on FreeBSD
        # so include the right dir in CPPFLAGS
@@ -103,9 +111,8 @@ src_install() {
        # every .la file's relink_command field, forcing libtool to look there
        # first during relinking. This will mangle the .la files installed by
        # make install, but we don't care because we will be punting them anyway.
-       perl "${FILESDIR}/fix_relink_command.pl" . \
-               || die "fix_relink_command.pl failed"
-
+       perl "${FILESDIR}/fix_relink_command.pl" . ||
+               die "fix_relink_command.pl failed"
        gnome2_src_install
 
        if use ldap; then
@@ -125,29 +132,9 @@ src_test() {
        Xemake check || die "Tests failed."
 }
 
-pkg_preinst() {
-       gnome2_pkg_preinst
-
-       for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-               libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-               libedata-book-1.2.so.2 libebook-1.2.so.9 \
-               libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-       do
-               preserve_old_lib /usr/$(get_libdir)/$lib
-       done
-}
-
 pkg_postinst() {
        gnome2_pkg_postinst
 
-       for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \
-               libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \
-               libedata-book-1.2.so.2 libebook-1.2.so.9 \
-               libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8
-       do
-               preserve_old_lib_notify /usr/$(get_libdir)/$lib
-       done
-
        if use ldap; then
                elog ""
                elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"

diff --git a/gnome-extra/evolution-data-server/metadata.xml b/gnome-extra/evolution-data-server/metadata.xml
index de1b8f9461efa3f9ecc1bcd67b698578fe8d24d9..9647eabe2a6f3772ad78afcb5c249ee153562cd3 100644 (file)
--- a/gnome-extra/evolution-data-server/metadata.xml
+++ b/gnome-extra/evolution-data-server/metadata.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<use>
-       <flag name="weather">Enable optional weather calendar support.</flag>
-</use>
+       <herd>gnome</herd>
+       <use>
+               <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+                       for introspection</flag>
+               <flag name="weather">Enable optional weather calendar support</flag>
+       </use>
 </pkgmetadata>