Bump to 3.2.2 with assorted bugfixes. Drop old.

Also, QA: eautoreconf should be before gnome2_src_prepare.

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

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 4a1714ab1474e0d2b968212c3b6042e4256974b3..e4bdd71142db8dfb781d8669842524c0df4b8344 100644 (file)
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,15 @@
 # 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.317 2011/11/15 08:54:46 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.318 2011/11/16 00:32:42 tetromino Exp $
+
+*evolution-data-server-3.2.2 (16 Nov 2011)
+
+  16 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-data-server-2.32.2.ebuild, evolution-data-server-2.32.2-r1.ebuild,
+  evolution-data-server-2.32.3-r1.ebuild, -evolution-data-server-3.0.3.ebuild,
+  +evolution-data-server-3.2.2.ebuild:
+  Bump to 3.2.2 with assorted bugfixes. Drop old.
+  Also, QA: eautoreconf should be before gnome2_src_prepare.
 
   15 Nov 2011; Nirbheek Chauhan <nirbheek@gentoo.org>
   evolution-data-server-3.2.1.ebuild:

diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 8427a2e262d4a6d107543d1ddb26e485b49922c7..8f1d063fb9db6088e191cf5a7ccbc089279a19aa 100644 (file)
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX calentry.schema 3661 RMD160 68dfc3a8bbf08a1cf2713727c6617b2de613cb7c SHA1 06ddcc64c3b2b3230fbbef21a7e2a682bd95788c SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431
 AUX e-d-s-camel-skip-failing-test.patch 660 RMD160 0907bb916a124d689f1880016eb8013971944016 SHA1 7ef6fd67bddbba16b3c6dd24a9b50ea9f8f5aa86 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5
@@ -10,29 +10,19 @@ 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.3.tar.xz 3583040 RMD160 0a8ec29328a832d80dd82a9bd1507b9a7c9ba8dd SHA1 c48bd62dec8843637b5e96cefa6b1c00b9a20d6e SHA256 c23cfb53cc6224fd61339b1d4bf8bde869149c808cf31c29529c0f2dd364c033
 DIST evolution-data-server-3.2.1.tar.xz 3724708 RMD160 3b767a101dc33b525b2b13c43d0297c74a2aaf4d SHA1 d735653b64febadbbd447925a06f4714aa2c8678 SHA256 0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3
-EBUILD evolution-data-server-2.32.2-r1.ebuild 4152 RMD160 e54b7f66c57669c5a3f561bc8dea1f27456e6629 SHA1 a7a514e11127dbd10d922ef981ebb30270f508f5 SHA256 5ef16e6793c0717318bedcaf0f5a455c5eb4237860dcd8bcdeeb9d04c1482e12
-EBUILD evolution-data-server-2.32.2.ebuild 3925 RMD160 40696eead31cd6967cee24757284322a03ad54dc SHA1 7982a446e8b556abf0d549a4de9a9faa1966c74b SHA256 1bbf97c42b44a2a47e7bf2d2271694ef1c9f8fe86375da418d73dafd02ec193c
-EBUILD evolution-data-server-2.32.3-r1.ebuild 4645 RMD160 b2886f04ad7cde68a875e086ba60886f84084cbb SHA1 f1c8ea4ca624f41232e6296e73aa1d33cd95da46 SHA256 d1dcff8dac6ec70b125fc6fefcbb107b154308da0e649e466415d48f49caf0ab
-EBUILD evolution-data-server-3.0.3.ebuild 3871 RMD160 f587689dffdf9858b257952d11078a16842ae086 SHA1 6036468edb2b89c8513ee41d8d3f10679ba90f57 SHA256 3b79c526e73c04710b20876a64b00ec2472a29e28456115b4d48b9158ffe48a3
+DIST evolution-data-server-3.2.2.tar.xz 3730352 RMD160 72a5a0e1f697bd6ef0a6a08960fb6847e2d4d7e3 SHA1 0216a09f4792b7fcc15f2cc013849b3be233f4d0 SHA256 2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a
+EBUILD evolution-data-server-2.32.2-r1.ebuild 4150 RMD160 e6f9ece5ae709a5902438f8406466d1115816d9d SHA1 78482f64e9b3ea9c01f9140fdb24fec817614ac1 SHA256 20d91562ef3f87d947576e82e6405942fc64828e37898993032a1c98a05fad2e
+EBUILD evolution-data-server-2.32.2.ebuild 3927 RMD160 3d8501d49cdd7c23eb1cd833eed64ba038c3d9ba SHA1 dedd11c5f0eca2600cff1212ca82c269ad7988b1 SHA256 d779c226a740f32fc493e10f4f144471055cb612126aeb1d525107bdc2fd7c70
+EBUILD evolution-data-server-2.32.3-r1.ebuild 4646 RMD160 49ed0e5b6af98eb652e2ba4186a387eed3f1afd0 SHA1 da8cd64acdf024bf7b5fa2e266593383c9125bea SHA256 291fa98185af328e835c65a7ee02aeafba980b76a7eb47765c6caa5bcc96a7f4
 EBUILD evolution-data-server-3.2.1.ebuild 4154 RMD160 996ac9984c51336f63a6aa0429363704468392a2 SHA1 3237f89f401fb618b197802eb6f98e2a6e9aef51 SHA256 0836a4d6c3f45a77ef81ab0888c599aaebf21367fb132fd248442da967ff90d4
-MISC ChangeLog 60950 RMD160 ffc20c1da8631a91eeff64c091ee89f6a7d3243b SHA1 ba01146b6d80bd20e9b52da943767b931bea8144 SHA256 ca5cbdab722e5cddf09891846bdeaea74912723b0d4fa03e7cc3e48ce28d29e7
+EBUILD evolution-data-server-3.2.2.ebuild 4155 RMD160 ee0d06de73619640321d7d57d8d8250ac579d653 SHA1 aebe764703b860eaa1e87f0c75a9fcf03a7aa0a5 SHA256 8f86f5c789e7478b850b1dd50aef36f594252d941080de03ba1bab7c4d00835c
+MISC ChangeLog 61363 RMD160 97c615ac6c75f70af05903097902e181f21e8098 SHA1 1778b8fd80714fe4dc761c565e1a53e625056291 SHA256 3bd54091107a4f47a6334256685e83dcd39f0cade700b570bf18ec8ab70ca79b
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOwijbAAoJEO/kOhxWD91kyCEP/3HxLoptLh/MrYMdzGspxwD4
-GNLHubp6NFfZrz0CmJNwN3uaa0deg2c8hYdnuUAz6TrF/viJSp5x7k6BBQgAArZH
-XylnCBjhkwuubntiIsIK1d6d7EsumC13ynff5v6wDBBFhm0+8wc6+ZsYxF78s7k6
-Ak7IRGPpz1EjhusPTbiO0cXARhZfI9CjXAH6sw7gWRULuFcDhKf5L+73/WODZ2Tn
-zcYMgGIqlBNhUmfvqDEtmPe5jNK6R6wGPqwY2DNDsG1e1mukS4NVmD6Xbfb66PCP
-N1xUD/HIi21papXkmKD2nauOAKKZIRiKnOQLmYfcbuzMnASBiC/E3h8pIy1WqqVk
-P+76ejg5H5kl2B0Q6c0IIN2F5g/b8z2p/uX5t9Xh9Qz2iAAKTq1StmA3mqABUk7b
-7QkRdL9jgcyG0azS3Ckn7beKqBIJBnDcgkCGtUzSlPvnDUQM/yC+rwoA60CXP0ks
-dpG7ZXmiCQ4CRAqevrM0COWzcAher6OTu+5o7Xx22IHvh/aynhwlkDilwj1LdFvu
-WpCKVi5V18eTKwm7wfooqKUcg80giDO2c8xoCJv3UUallRxV/8RNLI90iTp/u7s1
-9Pa7XCMMBejoxBaJjiqwtMXjvV5SJyEvI6eKFnTCGCHhnQhKIESF7FbMSVWENti3
-eBf+hm0SFs4gUIqNECgt
-=Rigg
+iF4EAREIAAYFAk7DBLEACgkQdjK8w9WeBnAICwEAt1Xd5ozTEjJBQ1/P58r2/pPV
+SDgtmh6+AwNOaRVz7/QBAJ8HZZRZXLVBs7mGZvpM7KhJAN6jYmFuWIhIAv+em1S2
+=cK2x
 -----END PGP SIGNATURE-----

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild
index 34353011889a0f5b02c1a7ea2d587bdbfc1f8915..e5cf618ab332e5a4c910da24d60113428e533f83 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.2-r1.ebuild,v 1.7 2011/10/05 17:47:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.2-r1.ebuild,v 1.8 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -67,8 +67,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       gnome2_src_prepare
-
        # Adjust to gentoo's /etc/service
        epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
@@ -96,6 +94,7 @@ src_prepare() {
 
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
+       gnome2_src_prepare
 }
 
 src_install() {

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
index d56c53b7b4948ac65cb37629c3f9b560db2a2825..b5448eaf7b7008b82139d03ce4d7bfdcbc280356 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.7 2011/03/22 19:22:40 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.2.ebuild,v 1.8 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -63,8 +63,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       gnome2_src_prepare
-
        # Adjust to gentoo's /etc/service
        epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
@@ -89,6 +87,7 @@ src_prepare() {
 
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
+       gnome2_src_prepare
 }
 
 src_install() {

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
index e8bac3a7d99be5675cd1a4729206c0b04f9a547e..03d59069574c53e11a67e7e4059b139ced6e1e2b 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild
@@ -1,6 +1,6 @@
 # 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-r1.ebuild,v 1.6 2011/10/30 16:18:51 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r1.ebuild,v 1.7 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -69,8 +69,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-       gnome2_src_prepare
-
        # Adjust to gentoo's /etc/service
        epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
 
@@ -99,6 +97,7 @@ src_prepare() {
 
        intltoolize --force --copy --automake || die "intltoolize failed"
        eautoreconf
+       gnome2_src_prepare
 }
 
 src_install() {

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.0.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
similarity index 79%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.0.3.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
index db418d9fa3272bf9f99b90fb7c531ec98df57416..3cc708da9e0fc2749b07ad7923c30db01d51f647 100644 (file)
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.0.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
@@ -1,20 +1,20 @@
 # 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-3.0.3.ebuild,v 1.2 2011/09/02 08:21:52 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild,v 1.1 2011/11/16 00:32:42 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit db-use eutils flag-o-matic gnome2 versionator virtualx
+inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx
 
 DESCRIPTION="Evolution groupware backend"
 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 +introspection ipv6 ldap kerberos ssl +weather"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos ssl vala +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
@@ -22,7 +22,7 @@ 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.7.0
+       >=dev-libs/libgdata-0.9.1
        >=gnome-base/gnome-keyring-2.20.1
        >=dev-libs/libical-0.43
        >=net-libs/libsoup-2.31.2:2.4
@@ -30,6 +30,9 @@ RDEPEND=">=dev-libs/glib-2.28:2
        >=sys-libs/db-4
        sys-libs/zlib
        virtual/libiconv
+       gnome-online-accounts? (
+               >=net-libs/gnome-online-accounts-3.1.1
+               >=net-libs/liboauth-0.9.4 )
        introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
        kerberos? ( virtual/krb5 )
        ldap? ( >=net-nds/openldap-2 )
@@ -47,36 +50,41 @@ DEPEND="${RDEPEND}
        >=gnome-base/gnome-common-2
        >=dev-util/gtk-doc-am-1.9
        >=sys-devel/gettext-0.17
-       doc? ( >=dev-util/gtk-doc-1.9 )"
+       doc? ( >=dev-util/gtk-doc-1.9 )
+       vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] )"
 # eautoreconf needs:
 #      >=gnome-base/gnome-common-2
 #      >=dev-util/gtk-doc-am-1.9
 
+REQUIRED_USE="vala? ( introspection )"
+
 # FIXME
-RESTRIC="test"
+RESTRICT="test"
 
 pkg_setup() {
        DOCS="ChangeLog MAINTAINERS NEWS TODO"
        # Uh, what to do about dbus-call-timeout ?
        G2CONF="${G2CONF}
+               VALAC=$(type -P valac-0.14)
+               VAPIGEN=$(type -P vapigen-0.14)
+               $(use_enable gnome-online-accounts goa)
+               $(use_enable introspection)
                $(use_enable ipv6)
-               $(use_with kerberos krb5 /usr)
+               $(use_with kerberos krb5 ${EPREFIX}/usr)
                $(use_with ldap openldap)
                $(use_enable ssl ssl)
                $(use_enable ssl smime)
+               $(use_enable vala vala-bindings)
                $(use_enable weather)
                --enable-calendar
                --enable-nntp
                --enable-largefile
-               --with-libdb=/usr"
+               --with-libdb=${EPREFIX}/usr"
 }
 
 src_prepare() {
        gnome2_src_prepare
 
-       # Adjust to gentoo's /etc/service
-       epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch"
-
        # GNOME bug 611353 (skips failing test atm)
        # XXX: uncomment when there's a proper fix
        #epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch"