Version bump. Fix, documentation/translation updates.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

3 files changed, 72 insertions, 40 deletions

diff --git a/dev-libs/libgdata/ChangeLog b/dev-libs/libgdata/ChangeLog
index e4403649ea61..4171809d926a 100644
--- a/dev-libs/libgdata/ChangeLog
+++ b/dev-libs/libgdata/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libgdata
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.5 2010/03/01 22:50:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.6 2010/04/01 23:22:54 eva Exp $
+
+*libgdata-0.6.4 (01 Apr 2010)
+
+  01 Apr 2010; Gilles Dartiguelongue <eva@gentoo.org>
+  -libgdata-0.5.1.ebuild, +libgdata-0.6.4.ebuild:
+  Version bump. Fix, documentation/translation updates.
 
   01 Mar 2010; Gilles Dartiguelongue <eva@gentoo.org> libgdata-0.6.2.ebuild:
   Add preserve_old_lib calls since the soname changed.
diff --git a/dev-libs/libgdata/libgdata-0.5.1.ebuild b/dev-libs/libgdata/libgdata-0.5.1.ebuild
deleted file mode 100644
index 47f5ef1088c6..000000000000
--- a/dev-libs/libgdata/libgdata-0.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.5.1.ebuild,v 1.1 2009/12/10 22:26:15 eva Exp $
-
-EAPI="2"
-
-inherit eutils gnome2
-
-DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
-HOMEPAGE="http://live.gnome.org/libgdata"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc gnome"
-
-RDEPEND=">=dev-libs/glib-2.19.0
-	>=dev-libs/libxml2-2
-	>=net-libs/libsoup-2.26.1:2.4[gnome?]
-	gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	doc? ( >=dev-util/gtk-doc-1 )"
-
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
-# FIXME: fails testsuite, upstream bug #604313
-RESTRICT="test"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		$(use_enable gnome)"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed"
-}
diff --git a/dev-libs/libgdata/libgdata-0.6.4.ebuild b/dev-libs/libgdata/libgdata-0.6.4.ebuild
new file mode 100644
index 000000000000..0387922d6bfb
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.6.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.6.4.ebuild,v 1.1 2010/04/01 23:22:54 eva Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="http://live.gnome.org/libgdata"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gnome" # introspection
+
+# gtk+ is needed for gdk
+RDEPEND=">=dev-libs/glib-2.19
+	>=x11-libs/gtk+-2
+	>=dev-libs/libxml2-2
+	>=net-libs/libsoup-2.26.1:2.4[gnome?]
+	gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	doc? ( >=dev-util/gtk-doc-1 )"
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-static
+		--disable-introspection
+		$(use_enable gnome)"
+}
+
+src_prepare() {
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \
+		|| die "sed failed"
+
+	# Disable broken tests, update upstream bug #604313
+	sed -e 's:^\(.*"/media/thumbnail".*\):/*\1*/:' \
+		-e 's:^\(.*"/service/network_error".*\):/*\1*/:' \
+		-i gdata/tests/general.c || die
+	sed 's:^\(.*"/contacts/insert/simple".*\):/*\1*/:' \
+		-i gdata/tests/contacts.c || die
+	sed -e 's:^\(.*"/documents/upload/only_file_get_entry".*\):/*\1*/:' \
+		-e 's:^\(.*"/documents/update/only_metadata".*\):/*\1*/:' \
+		-i gdata/tests/documents.c || die
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+	emake check || die "emake check failed"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgdata.so.6
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.6
+}