Version bump, drop old

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

5 files changed, 13 insertions, 100 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index d9efd63355e2..dfd8908d0da9 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libchamplain
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.61 2014/12/19 13:40:14 pacho Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.62 2015/03/19 11:51:00 pacho Exp $
+
+*libchamplain-0.12.10 (19 Mar 2015)
+
+  19 Mar 2015; Pacho Ramos <pacho@gentoo.org> +libchamplain-0.12.10.ebuild,
+  -files/libchamplain-0.12.5-configure-maemo.patch, -libchamplain-0.12.7.ebuild,
+  -libchamplain-0.12.8.ebuild, metadata.xml:
+  Version bump, drop old
 
   19 Dec 2014; Pacho Ramos <pacho@gentoo.org> libchamplain-0.12.9.ebuild:
   amd64 stable, bug 529964
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
deleted file mode 100644
index 149babfa1b0d..000000000000
--- a/media-libs/libchamplain/files/libchamplain-0.12.5-configure-maemo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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.8.ebuild b/media-libs/libchamplain/libchamplain-0.12.10.ebuild
index 75475b04986c..c03ec2308835 100644
--- a/media-libs/libchamplain/libchamplain-0.12.8.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.8.ebuild,v 1.3 2014/07/23 15:19:41 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.10.ebuild,v 1.1 2015/03/19 11:51:00 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG=no
@@ -14,9 +14,9 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libchamplain"
 
 SLOT="0.12"
 LICENSE="LGPL-2"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="debug +gtk +introspection vala"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
+IUSE="debug +gtk +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
diff --git a/media-libs/libchamplain/libchamplain-0.12.7.ebuild b/media-libs/libchamplain/libchamplain-0.12.7.ebuild
deleted file mode 100644
index 41d06cf4edff..000000000000
--- a/media-libs/libchamplain/libchamplain-0.12.7.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.7.ebuild,v 1.6 2014/05/26 19:02:24 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG=no
-VALA_MIN_API_VERSION=0.14
-VALA_USE_DEPEND=vapigen
-
-inherit 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?]
-	media-libs/cogl:=
-	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"
-
-	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)
-}
diff --git a/media-libs/libchamplain/metadata.xml b/media-libs/libchamplain/metadata.xml
index a8e0773a5af4..0cf683cda8fe 100644
--- a/media-libs/libchamplain/metadata.xml
+++ b/media-libs/libchamplain/metadata.xml
@@ -5,9 +5,4 @@
 	<maintainer>
 		<email>jlec@gentoo.org</email>
 	</maintainer>
-	<use>
-		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
-		<flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
-	</use>
 </pkgmetadata>