Bump to 0.12 from the gnome overlay, needed for empathy-3.2. Notable changes: better zoom.

(Portage version: 2.2.0_alpha72/cvs/Linux x86_64)

3 files changed, 98 insertions, 1 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index bbe5107ee28e..2a3f4050e119 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libchamplain
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.21 2011/10/17 16:15:32 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.22 2011/11/02 21:26:59 tetromino Exp $
+
+*libchamplain-0.12.0-r1 (02 Nov 2011)
+
+  02 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +libchamplain-0.12.0-r1.ebuild, +files/libchamplain-0.12.0-redrawing.patch:
+  Bump to 0.12 from the gnome overlay, needed for empathy-3.2. Notable changes:
+  better zoom.
 
   17 Oct 2011; Pacho Ramos <pacho@gentoo.org> libchamplain-0.6.0.ebuild,
   libchamplain-0.8.3.ebuild, -libchamplain-0.10.0.ebuild,
diff --git a/media-libs/libchamplain/files/libchamplain-0.12.0-redrawing.patch b/media-libs/libchamplain/files/libchamplain-0.12.0-redrawing.patch
new file mode 100644
index 000000000000..e8fc11691b54
--- /dev/null
+++ b/media-libs/libchamplain/files/libchamplain-0.12.0-redrawing.patch
@@ -0,0 +1,22 @@
+From 864e445974de7c843cdb4ee008bad0a550e5af6e Mon Sep 17 00:00:00 2001
+From: Jiří Techet <techet@gmail.com>
+Date: Thu, 06 Oct 2011 22:06:59 +0000
+Subject: When re-creating scale, remove all actors first
+
+Otherwise the previously inserted actors are still used for redrawing.
+---
+diff --git a/champlain/champlain-scale.c b/champlain/champlain-scale.c
+index 34f5f06..a4befcd 100644
+--- a/champlain/champlain-scale.c
++++ b/champlain/champlain-scale.c
+@@ -476,6 +476,8 @@ create_scale (ChamplainScale *scale)
+   gfloat width;
+   ChamplainScalePrivate *priv = scale->priv;
+ 
++  clutter_group_remove_all (priv->content_group);
++  
+   text = clutter_text_new_with_text ("Sans 9", "X km");
+   clutter_actor_set_name (text, "scale-far-label");
+   clutter_container_add_actor (CLUTTER_CONTAINER (priv->content_group), text);
+--
+cgit v0.9.0.2
diff --git a/media-libs/libchamplain/libchamplain-0.12.0-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.0-r1.ebuild
new file mode 100644
index 000000000000..d1714aaaad27
--- /dev/null
+++ b/media-libs/libchamplain/libchamplain-0.12.0-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.0-r1.ebuild,v 1.1 2011/11/02 21:26:59 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="Clutter based world map renderer"
+HOMEPAGE="http://blog.pierlux.com/projects/libchamplain/en/"
+
+LICENSE="LGPL-2"
+SLOT="0.12"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc +gtk +introspection vala"
+
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	>=dev-libs/glib-2.16:2
+	>=x11-libs/cairo-1.4
+	>=media-libs/clutter-1.2:1.0[introspection?]
+	>=media-libs/memphis-0.2.1:0.2[introspection?]
+	>=net-libs/libsoup-gnome-2.4.1:2.4
+	dev-db/sqlite:3
+	gtk? (
+		>=x11-libs/gtk+-2.90:3[introspection?]
+		>=media-libs/clutter-gtk-0.90:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	vala? ( dev-lang/vala:0.14[vapigen] )"
+# segfaults with vala:0.12
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	# Vala demos are only built, so just disable them
+	G2CONF="${G2CONF}
+		--disable-maintainer-mode
+		--disable-static
+		--disable-maemo
+		--disable-vala-demos
+		--enable-memphis
+		VAPIGEN=$(type -p vapigen-0.14)
+		$(use_enable debug)
+		$(use_enable gtk)
+		$(use_enable introspection)
+		$(use_enable vala)"
+}
+
+src_prepare() {
+	# Fix documentation slotability
+	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
+		-i docs/reference/Makefile.{am,in} || die "sed (1) failed"
+	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-gtk-${SLOT}/" \
+		-i docs/reference-gtk/Makefile.{am,in} || die "sed (2) failed"
+	mv "${S}"/docs/reference/${PN}{,-${SLOT}}-docs.sgml || die "mv (1) failed"
+	mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (1) failed"
+
+	# Upstream patch from master branch to fix scale redrawing issues;
+	# not in 0.12 branch yet.
+	epatch "${FILESDIR}/${PN}-0.12.0-redrawing.patch"
+
+	gnome2_src_prepare
+}