Version bump

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 99 insertions, 1 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/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)
+}