Version bump

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 107 insertions, 6 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index a3f83ed79a4b..4d1fad117546 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libchamplain
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.45 2013/08/30 22:45:47 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.46 2013/09/30 21:48:38 pacho Exp $
+
+*libchamplain-0.12.5 (30 Sep 2013)
+
+  30 Sep 2013; Pacho Ramos <pacho@gentoo.org>
+  +files/libchamplain-0.12.5-configure-maemo.patch, +libchamplain-0.12.5.ebuild:
+  Version bump
 
   30 Aug 2013; Gilles Dartiguelongue <eva@gentoo.org>
   libchamplain-0.12.3.ebuild, libchamplain-0.12.4.ebuild:
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index f2b05932b9cf..1dbbc14851ab 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,16 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX libchamplain-0.12.5-configure-maemo.patch 613 SHA256 c1765a3fb7852c380c45164d40d636cbeb667f9fca638a3afe878b02c7be4172 SHA512 00775ed1c98d7965d5f9ec0941eca288d6a11ee220a8bb102587889d8e91d8b311f62dd121f4bae15fbd111933f61dc882a49f53db54a028d6420022f876d729 WHIRLPOOL 55d2d1c0f95df389ac7709a01cf827047f5f23536d6cab44e7f8d6487eb54db13b17ae43211cdbb522affa872511958612802ca57d07d74ce107827880a4d37c
 DIST libchamplain-0.12.3.tar.xz 583740 SHA256 3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658 SHA512 76101bbdd50c3a08b177d3e261869d3c974923d0deb728e958896d632cce4486cc106a02409c7983624e5cbc6746e96bb4cf5f46a35224585edea230aa72e957 WHIRLPOOL 6882034fc97580e33fa3e24434dc1670055f4e9b78a7aa4a833be9364f2af213745eeaea0ee0b008920ec996f96585efe3006a69d2c68aa8b24f789a255e0efa
 DIST libchamplain-0.12.4.tar.xz 587776 SHA256 631ce8e91b02c596e29778d3f7c1d28013e2e40d080a88f2d9a06f8b79f9e493 SHA512 026ba7b762ec292afbdfdd74439e56632535e48695bf2f130b696df7bf9d062f87914e1bec3063066dd543e08079b8a3257fd4792dccb9076ed1039f859094da WHIRLPOOL baf94ab1243fdcd9c896d4eccc6bf2d4bf111837edce7e8e8260c2c2bbeb91dba0d2a384df6d7817af1a6804c4221af80d14d812d1c52199c40a9af4000ca141
+DIST libchamplain-0.12.5.tar.xz 591936 SHA256 9c937d3775053a7d6b542aad36b16bbb07e02be3adb683ae57d7dcbe89634236 SHA512 2f6d8750e53d6d34a9433e54428d53c5e5cb61f000bd2f6aa09d6eeacf09bf79abbdd686bcd5b5adb27453e6425893522d4b6bac98a5fb861e56ec238e151637 WHIRLPOOL 88a94fbb4d8f1081f6ee862df4ad5ea18325787425030db0942b2e5a601eab475bee3d9c78c90bd3dd46220f153dd1a50edb72a1d830e299c6d634cd54acaab9
 EBUILD libchamplain-0.12.3.ebuild 1808 SHA256 9b368e9feb8c85bde376d99fee6a749af30bca69f41dc33bb2c2faa4fd929fb2 SHA512 f38161f23bfcf8c4962435a65af41263bd65b675b5a491273d66d86dd021dd44be50e566afd7228d1eb01551b6b7dc820556b3225831d9c2975f1346d14d459c WHIRLPOOL 9203c74dcd0e7916663983aebca5a1e7bdf72d9b5dc94c3bb38d732b06a8d9dc6e67256a0ccdc29388791adb9f97a987ae5db88df836bc65d9fff7816feedd5b
 EBUILD libchamplain-0.12.4.ebuild 1829 SHA256 415340e96f79893bf80c29454c972ae78ad7265932c9b0b66353425f14273877 SHA512 4c7080490d27511ff874d5418a2cd5f6a9c17223619a2779b77c0e810023eafb5954b7d6e6caa00787fe71bb9e962568866f7fecaf3589bdd061c021ca0b2ab6 WHIRLPOOL bd92ab67a953b63176436f184f955556081afe49f3c902c12d5bb0a1e869086357aebc323d722cffbe2149122c4f9dac9d78003797b5089cb5295f78c2a659e6
-MISC ChangeLog 7991 SHA256 eae17f6e36e91aafdd1b591fe04fde2025584b88ea175faacbc9af6242747f4e SHA512 1f3c7ef33a62da18c0222a123bfaf972fbcb07d091787a1cd1a07600175c47b313834f7623728b734dc1cfc8dec3058127f7b703ff7cc6462d1e830d6bf1ce25 WHIRLPOOL 9b6fc544996d77ceb6316928a922dff56bb1070412dc3bde5db2c07e0b5b9d2e4ac9f2f7a1da2e6f91036c4477b41d511338a8bacb689a13e83e1aa2758274d1
+EBUILD libchamplain-0.12.5.ebuild 1988 SHA256 6ef9d400479f396acffc0fe9d21537c6d9086355f715565e9d866d02b70a40a1 SHA512 229f302849f370a73cfb12b9b0db1f01bd159eb9276d9611fdff92110fe2f0b62ab86de4540c8114c105b260248129b5bb3b971bc7ea46d8ede7c6fe95b66061 WHIRLPOOL 1e168d19c9af1ca6465d381f82b4c27a4313561660ca670d0cd9ab3fbfb0cc3748637cb6f7c18423eb124db7bd3eca578fccc5314e3edeed5e0625fa8849602d
+MISC ChangeLog 8172 SHA256 b131a823830899a5680d0c4b2c85eba39c691dcf316c5a06e080d91f6e626840 SHA512 a35e750fb4cf1abf336bddd329dd7250bf98741c7f7f275212ca3391face1573f43c1545847d3a4ed452c5ef7679ca1ad46da54013c5a8f266e97f7a85fb3bc1 WHIRLPOOL dce6e9ed29593ff7313d5987fc34b2c1d1033ada47a49f5f4fffffcbce9644661256446152c491ce171d80a3edba57a788093809afd1d50d89960b26409529e2
 MISC metadata.xml 412 SHA256 6ef1d6843bebbc6b34258ec3be80f6c9cd88b393e71ae05c20aeda6f1537ecb3 SHA512 0b1c5dd17013e354edd7db94d7d0c654385a4d440a58516a4998e4d9b5d5964cb6336e932441687a204b959dd50d9f8ded6241dd2be8ebe1186675a39fd9539e WHIRLPOOL 4a7b8102e7888fa6d56740cb7464b359bb0213de5f4514217fdc8896c637230116970ed557700f75b2957cdb2b2c69a340e103218b1423fd737bf482b070778d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.21 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIhIJ0ACgkQ1fmVwcYIWAY55gCcC6GHMHAEBNDXChvB8YISJlQ7
-8dMAn0XHSiZ+DyuqGm33rpRJ6ZmiDEwe
-=oPHH
+iEYEAREIAAYFAlJJ8bcACgkQCaWpQKGI+9QI7ACdHBjmvwQJ4jG1y0Hoy7KWLMk4
+xpUAn16PxmHtUC2XGJgcCMr4eyvBRVU3
+=uTmd
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libchamplain/files/libchamplain-0.12.5-configure-maemo.patch b/media-libs/libchamplain/files/libchamplain-0.12.5-configure-maemo.patch
new file mode 100644
index 000000000000..149babfa1b0d
--- /dev/null
+++ b/media-libs/libchamplain/files/libchamplain-0.12.5-configure-maemo.patch
@@ -0,0 +1,21 @@
+From 04d18bfe6b82b07c68553b2da7958f8f53208610 Mon Sep 17 00:00:00 2001
+From: Jiří Techet <techet@gmail.com>
+Date: Sun, 29 Sep 2013 15:11:52 +0000
+Subject: Make sure Maemo is disabled when --disable-maemo is used
+
+---
+diff --git a/configure.ac b/configure.ac
+index 7981a01..4f3e69c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -125,7 +125,7 @@ fi
+ 
+ AC_ARG_ENABLE(maemo,
+   AS_HELP_STRING([--enable-maemo],[compile with maemo optimizations]),
+-    [enable_maemo=yes])
++    enable_maemo=$enableval, enable_maemo=no)
+ 
+ # -----------------------------------------------------------
+ # Enable gtk
+--
+cgit v0.9.2
diff --git a/media-libs/libchamplain/libchamplain-0.12.5.ebuild b/media-libs/libchamplain/libchamplain-0.12.5.ebuild
new file mode 100644
index 000000000000..f1b527dc47f5
--- /dev/null
+++ b/media-libs/libchamplain/libchamplain-0.12.5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.5.ebuild,v 1.1 2013/09/30 21:48:38 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG=no
+VALA_MIN_API_VERSION=0.14
+VALA_USE_DEPEND=vapigen
+
+inherit autotools eutils gnome2 vala
+
+DESCRIPTION="Clutter based world map renderer"
+HOMEPAGE="http://projects.gnome.org/libchamplain/"
+
+SLOT="0.12"
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug +gtk +introspection vala"
+
+REQUIRED_USE="vala? ( introspection )"
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	>=media-libs/clutter-1.12:1.0[introspection?]
+	media-libs/memphis:0.2[introspection?]
+	net-libs/libsoup-gnome:2.4
+	x11-libs/cairo
+	gtk? (
+		x11-libs/gtk+:3[introspection?]
+		media-libs/clutter-gtk:1.0 )
+	introspection? ( dev-libs/gobject-introspection )
+"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	virtual/pkgconfig
+	vala? ( $(vala_depend) )
+"
+# segfaults with vala:0.12
+# vala-0.14.2-r1 required for bug #402013
+
+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 (2) failed"
+
+	# Make sure Maemo is disabled when --disable-maemo is used (from 'master')
+	epatch "${FILESDIR}/${PN}-0.12.5-configure-maemo.patch"
+	eautoreconf
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# Vala demos are only built, so just disable them
+	gnome2_src_configure \
+		--disable-static \
+		--disable-maemo \
+		--disable-vala-demos \
+		--enable-memphis \
+		$(use_enable debug) \
+		$(use_enable gtk) \
+		$(use_enable introspection)
+}