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

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

4 files changed, 107 insertions, 7 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/Manifest b/media-libs/libchamplain/Manifest
index 83dc8d218bce..5d7e29b83ab6 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX libchamplain-0.12.0-redrawing.patch 834 RMD160 8d0eb51fe8b74aa9256a08dd0d8037a708347813 SHA1 2d5757ac0b4386a89765fc6cd13614ca37279bbb SHA256 8c9a31d2f0c41f05530a8181938de42681e8fa5aeb8d7cbecd7078dec0c1deee
 DIST libchamplain-0.10.1.tar.bz2 670134 RMD160 8d0a571ed762dc8ecd02d438e0e99ee45b711910 SHA1 5998275a6434d900950e31242f3b5041e56055cc SHA256 d7f5c11c4297e7a03444f30e4bb1b78c4da91046796f0c56c4ad5db0f823bc63
+DIST libchamplain-0.12.0.tar.xz 588060 RMD160 6e79749962b09e63fdff77cc1c8f3dd77fad6c24 SHA1 59faa6d5b2cdb65e4d41a7ee3746af2e857487e5 SHA256 c6d2b9dc3b8fd1715c95a11b428c9121828953fd02cf301a7eb577c9b5bdba85
 DIST libchamplain-0.6.0.tar.bz2 699922 RMD160 49c8e48c9b52d4fdf90773f6106e51c98420ef15 SHA1 f2a3b96118416268fa90fb6e5b6422442eed2286 SHA256 e6578cc38cee77b7d03a68e7fda347c64ea1f84a4655b3e1d7a55da900699c24
 DIST libchamplain-0.8.3.tar.bz2 667873 RMD160 e5670e2698e0951f60a4168bbc9b2e788461e2a7 SHA1 da7b335db417574c3d407873c3e86f1263002d3d SHA256 70d533be213a1586d6725d82afb128d1e57ccc262681dfda193af60507ad42e3
 EBUILD libchamplain-0.10.1.ebuild 1864 RMD160 32bb9c35bcaa1ab5db9e200c4c529629a216ff3e SHA1 c601460a9dbcd2bbc00bfda9e7eb70a173708495 SHA256 e878f568c51ceff465283f20923d327a83aa81ec3491a91946dae97f531e5b03
+EBUILD libchamplain-0.12.0-r1.ebuild 2018 RMD160 3e881adfaa5fba4d8f989641f231a512281dd706 SHA1 bf7afcd9fef98f516d23ec55f5fe4a445765d4e8 SHA256 1d2469833a02f4990a2e72cdffa01d98467330610cebffd8b02d12d269da9695
 EBUILD libchamplain-0.6.0.ebuild 2133 RMD160 1ec701653d2d93afe28c75fcd61466c309a3038d SHA1 7cab5eb63c5beb9352d6a1f0f904097ce1a67c72 SHA256 75d0db4311b685f9ece9259785dbab9803f02c308ae8f6c77cc40f1c502a7baf
 EBUILD libchamplain-0.8.3.ebuild 1259 RMD160 9bc21684a4ee110e0c5f05a0c86ac3b66c8a8af2 SHA1 55a2e447320e8174604e5b51f7074ff8407fed59 SHA256 6015eb9a3716e09d5940fd74da9f77d1edc5f6b24a9171915def1e03cf6f9e86
-MISC ChangeLog 3914 RMD160 f2e3202a5ac48b2cd3fe59c65ce4e1c5264caec1 SHA1 89bcb40934f8bf5c164e2c2b49a367ce5c07c87d SHA256 377369f5f7ee1cb8a8863b8ee5eb1e93aac123234ebf1e585018be947a2e0528
+MISC ChangeLog 4190 RMD160 627681167be78c002a19e8715c22d7780e1d0ea3 SHA1 0605cede80c8863959ed06671c371c2b5d1e3d11 SHA256 986f084b8526adfff3546291b6834bbe9fb1f930694e534a4e079a3dc4e55858
 MISC metadata.xml 406 RMD160 c00c800600241193f8cd1c1a3a395aaf5df82c0d SHA1 5094d7dfadb49335e47bb8ef49246f10989559c2 SHA256 5a7e5e53034775fbe975a8611a680c0bf5bcd13588dac58f02b506b1c3f1db9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6cVKwACgkQCaWpQKGI+9T8cgCfR5XS8irliNZ8lBIpNxhKhbid
-H3IAnAkxhrbUbpHCbYkO8NMgZqtEu+hR
-=gPAY
+iF4EAREIAAYFAk6xtagACgkQdjK8w9WeBnAA7AEAsYOIoGFmEvlaEZFy8WfVc+hX
+JTcunHJW+9HPMXZlt5UA/RhX8E8WUH28LkftLgPNIIr0RPFBWAT/MoMH8GJh1Tcy
+=J9nA
 -----END PGP SIGNATURE-----
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
+}