Bump, fixes assorted bugs and crashes. Drop old.

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

4 files changed, 23 insertions, 157 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 77429d50ca3a..a5e9b26dfa7c 100644
--- 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.322 2012/01/06 06:43:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.323 2012/01/20 23:26:38 tetromino Exp $
+
+*evolution-data-server-3.2.3 (20 Jan 2012)
+
+  20 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -evolution-data-server-3.2.1.ebuild, -evolution-data-server-3.2.2.ebuild,
+  +evolution-data-server-3.2.3.ebuild:
+  Bump, fixes assorted bugs and crashes. Drop old.
 
   06 Jan 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   evolution-data-server-3.2.2-r1.ebuild,
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 9712023fe529..f016760e1340 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -15,20 +15,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.2.1.tar.xz 3724708 RMD160 3b767a101dc33b525b2b13c43d0297c74a2aaf4d SHA1 d735653b64febadbbd447925a06f4714aa2c8678 SHA256 0091e41e87d589a984c6d089919fece2d28101df5b37e4b2d8615efdf60a09c3
 DIST evolution-data-server-3.2.2.tar.xz 3730352 RMD160 72a5a0e1f697bd6ef0a6a08960fb6847e2d4d7e3 SHA1 0216a09f4792b7fcc15f2cc013849b3be233f4d0 SHA256 2a129b4c9412b8b855ce28bd682e522b3af0309e407f9d900f1d48be649bc76a
+DIST evolution-data-server-3.2.3.tar.xz 3729592 RMD160 9c352af61ff65592dd40928bbdb9ce0cf262046c SHA1 b96936bbeae52eb35113003f7d4e96f09a4fef25 SHA256 8760814491fa1ecf8806b31231b30c5f20169790abdc6b78a2faa194fde3987c
 EBUILD evolution-data-server-2.32.2-r1.ebuild 4183 RMD160 7066ac38cb483b128d30c49e54e867be9baf1cf1 SHA1 8fd78b1ebaced2e794cf26b1d75056deb7dcc85c SHA256 f2c6795902f273ab94e4e436a6d09c3343ce8e06633a4d22597609b41ce08181
 EBUILD evolution-data-server-2.32.2.ebuild 3960 RMD160 38edf685841fb2232d8359903fa87f53997fa529 SHA1 9b24e22f3f906c5588ae50a26e921bbcc286d83a SHA256 8f779e1329a9e6b4516d3de887dbb9d6f08dbb05232623919ed099f22637fa34
 EBUILD evolution-data-server-2.32.3-r1.ebuild 4679 RMD160 98d6e8724787c5ce4a4bcc5a5f460d8207fc7659 SHA1 d220e447812971ef2250432bb28c4289232f4caa SHA256 26ae4496ffac82ce37101706a9cfc588500d812cc7fa9f03914f4b8b40c7ba11
-EBUILD evolution-data-server-3.2.1.ebuild 4212 RMD160 fa1bcbe4389685a183ee5febdb8120debb5f9b20 SHA1 b90b92e5d49065ce6ea665edc9b5da38d9d8fc3b SHA256 3b7d702270a05019f1e9fc14ad7c9eef4423b1e3492c30d66a5890853612ed19
 EBUILD evolution-data-server-3.2.2-r1.ebuild 4601 RMD160 bedbfb9a9fb98bab8bd37172e2cc5f8056c935eb SHA1 5c7f96f3792d8b82654f953d05d8d5a4b07743b4 SHA256 92b93f167129cf074480e4d6fd940740340be78a4adba206b16da7bb7b451a43
-EBUILD evolution-data-server-3.2.2.ebuild 4212 RMD160 e12e568a4240a10171620545d44a07e42d96c708 SHA1 1fa0de4e6b3bcc7c6c3a1c1a47caedc9277400dc SHA256 bb3c5e0f44e3199b817e5c4e96040f083763b36eddfd2c3c4d6b3f2d3a1b7630
-MISC ChangeLog 62736 RMD160 c2b503a7a183c6593dbd5d6c49bca9a754461732 SHA1 73cbaa335a1a0ccb751faa59618c1343025dfe96 SHA256 c6f1e192997978cabc0525bdd2362b164290428bf70f42730ab55c3463c61549
+EBUILD evolution-data-server-3.2.3.ebuild 4222 RMD160 e0a496168623b3b72bc1efa74e813630e4d53835 SHA1 7820829731971e1d7205731c00cf3762de4fd2db SHA256 3a8f14dc83fe445965d39e7266976b3a57cb94b01e287d445a5b7ff8f78cc285
+MISC ChangeLog 63006 RMD160 73c99427d9226b7506bc2f4a13e37389563058a4 SHA1 be39d7ae2107b0203005beeafe9738b239673a6a SHA256 b9004a8db58eddacc9227482e8083546ae71961ce892e236d91e0d9696c544f2
 MISC metadata.xml 535 RMD160 206f4b4067eab119530224247177d5f8ca6c97e2 SHA1 21a9ce92639d7c5aed6b189eca4f40b00b97778b SHA256 f458f1517ae769596f0dab7860b2789867e773eb32ad7cc00279dc7e2e82d64c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk8Gl/wACgkQdjK8w9WeBnByLgD/TzDCcC4r5ied54t61KqoFSvR
-yHHVy0/Pyr/0PfR1BsQA/j4cvOrexpC5VrVPpiwr8gKM2mLRzyn0Dvc0db1hM/V1
-=0cSo
+iF4EAREIAAYFAk8Z+DQACgkQdjK8w9WeBnAsUwD9EfsYC56OWNZH/h+GAzKmHNEe
+Z9WFX9FC5l1txNr4bPcA/iQ/kSkfYYjMbN0moCMvWIs3bNYzsqdIvK9+K2zS+dnx
+=vegx
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
deleted file mode 100644
index ffabf5f82ac5..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# 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.2.2.ebuild,v 1.2 2011/12/02 17:58:17 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit 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="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-IUSE="doc +gnome-online-accounts +introspection ipv6 ldap kerberos 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
-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.9.1
-	>=gnome-base/gnome-keyring-2.20.1
-	>=dev-libs/libical-0.43
-	>=net-libs/libsoup-2.31.2:2.4
-	>=dev-libs/libxml2-2
-	>=dev-libs/nspr-4.4
-	>=dev-libs/nss-3.9
-	>=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 )
-	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 )
-	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
-RESTRICT="test"
-
-pkg_setup() {
-	DOCS="ChangeLog MAINTAINERS NEWS TODO"
-	# Uh, what to do about dbus-call-timeout ?
-	# Fails to build with --disable-ssl; bug #392679, https://bugzilla.gnome.org/show_bug.cgi?id=642984
-	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 ${EPREFIX}/usr)
-		$(use_with ldap openldap)
-		$(use_enable vala vala-bindings)
-		$(use_enable weather)
-		--enable-calendar
-		--enable-largefile
-		--enable-nntp
-		--enable-ssl
-		--enable-smime
-		--with-libdb=${EPREFIX}/usr"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# 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"
-
-	# 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"
-
-	# /usr/include/db.h is always db-1 on FreeBSD
-	# so include the right dir in CPPFLAGS
-	append-cppflags "-I$(db_includedir)"
-
-	# FIXME: Fix compilation flags crazyness
-	# Touch configure.ac if doing eautoreconf
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
-}
-
-src_install() {
-	# Prevent this evolution-data-server from linking to libs in the installed
-	# evolution-data-server libraries by adding -L arguments for build dirs to
-	# 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"
-	gnome2_src_install
-
-	if use ldap; then
-		MY_MAJORV=$(get_version_component_range 1-2)
-		insinto /etc/openldap/schema
-		doins "${FILESDIR}"/calentry.schema || die "doins failed"
-		dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
-	fi
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	unset ORBIT_SOCKETDIR
-	unset SESSION_MANAGER
-	export XDG_DATA_HOME="${T}"
-	unset DISPLAY
-	Xemake check || die "Tests failed."
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if use ldap; then
-		elog ""
-		elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema"
-	fi
-}
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3.ebuild
index 7ddb442d80f3..c7815be3cd73 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.2.1.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.2.3.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.2.1.ebuild,v 1.3 2011/12/02 17:58:17 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.2.3.ebuild,v 1.1 2012/01/20 23:26:38 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/"
@@ -83,6 +83,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# fix linking with glib-2.31, bug #395777
+	epatch "${FILESDIR}/${PN}-3.2.2-gmodule-explicit.patch"
+	epatch "${FILESDIR}/${PN}-3.2.2-g_thread_init.patch"
+
+	eautoreconf
+
 	gnome2_src_prepare
 
 	# GNOME bug 611353 (skips failing test atm)
@@ -97,11 +103,6 @@ src_prepare() {
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"
-
-	# FIXME: Fix compilation flags crazyness
-	# Touch configure.ac if doing eautoreconf
-	sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-		-i configure || die "sed failed"
 }
 
 src_install() {