Version bump. Add accidentally forgotten ~ppc keyword to >=0.12.2 (bug #388367). Drop old.

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

4 files changed, 14 insertions, 50 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index 9f21c0a08733..bc52d4be02c8 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/libchamplain
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.28 2012/07/09 14:08:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.29 2012/07/15 23:10:07 tetromino Exp $
+
+*libchamplain-0.12.3 (15 Jul 2012)
+
+  15 Jul 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libchamplain-0.12.1.ebuild,
+  -files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch,
+  libchamplain-0.12.2.ebuild, +libchamplain-0.12.3.ebuild:
+  Version bump. Add accidentally forgotten ~ppc keyword to >=0.12.2 (bug
+  #388367). Drop old.
 
   09 Jul 2012; Brent Baude <ranger@gentoo.org> libchamplain-0.12.1.ebuild:
   Marking libchamplain-0.12.1 ~ppc for bug 388367
diff --git a/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch b/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch
deleted file mode 100644
index 0bbd3ecb988d..000000000000
--- a/media-libs/libchamplain/files/libchamplain-0.12.1-vala-cogl-pango-1.0.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 79062869a18ef70862f5cadb51a53731d3ba5cc1 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sat, 4 Feb 2012 16:51:53 -0500
-Subject: [PATCH] Call vapigen with --pkg cogl-pango-1.0
-
-https://bugzilla.gnome.org/show_bug.cgi?id=669378
----
- champlain-gtk/Makefile.am |    2 +-
- champlain/Makefile.am     |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
-index 1efeeea..549c197 100644
---- a/champlain-gtk/Makefile.am
-+++ b/champlain-gtk/Makefile.am
-@@ -113,7 +113,7 @@ if ENABLE_VALA
- CLEANFILES += $(dist_vapi_DATA)
- 
- champlain-gtk-@CHAMPLAIN_API_VERSION@.vapi:	GtkChamplain-@CHAMPLAIN_API_VERSION@.gir
--	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir )
-+	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-gtk-@CHAMPLAIN_API_VERSION@ --vapidir=$(top_builddir)/champlain --pkg champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-gtk-1.0 --pkg cogl-pango-1.0 --pkg gtk+-3.0 --pkg atk --pkg pangocairo --girdir=$(top_builddir)/champlain $(builddir)/GtkChamplain-@CHAMPLAIN_API_VERSION@.gir )
- 
- endif
- 
-diff --git a/champlain/Makefile.am b/champlain/Makefile.am
-index a4b55a6..f145e9f 100644
---- a/champlain/Makefile.am
-+++ b/champlain/Makefile.am
-@@ -206,7 +206,7 @@ if ENABLE_VALA
- CLEANFILES += $(dist_vapi_DATA)
- 
- champlain-@CHAMPLAIN_API_VERSION@.vapi:	Champlain-@CHAMPLAIN_API_VERSION@.gir
--	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir )
-+	$(AM_V_GEN) ( $(VAPIGEN) --library champlain-@CHAMPLAIN_API_VERSION@ --pkg clutter-1.0 --pkg cogl-pango-1.0 --pkg atk --pkg pangocairo $(builddir)/Champlain-@CHAMPLAIN_API_VERSION@.gir )
- 
- endif
- 
--- 
-1.7.8.4
-
diff --git a/media-libs/libchamplain/libchamplain-0.12.2.ebuild b/media-libs/libchamplain/libchamplain-0.12.2.ebuild
index c14dd5b02f52..c9379b33f69e 100644
--- a/media-libs/libchamplain/libchamplain-0.12.2.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.2.ebuild,v 1.2 2012/05/05 08:02:28 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.2.ebuild,v 1.3 2012/07/15 23:10:07 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://blog.pierlux.com/projects/libchamplain/en/"
 
 LICENSE="LGPL-2"
 SLOT="0.12"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="debug doc +gtk +introspection vala"
 
 REQUIRED_USE="vala? ( introspection )"
diff --git a/media-libs/libchamplain/libchamplain-0.12.1.ebuild b/media-libs/libchamplain/libchamplain-0.12.3.ebuild
index 8046aabf8939..621f43fd25ab 100644
--- a/media-libs/libchamplain/libchamplain-0.12.1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.3.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.1.ebuild,v 1.4 2012/07/09 14:08:33 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild,v 1.1 2012/07/15 23:10:07 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
 
 DESCRIPTION="Clutter based world map renderer"
 HOMEPAGE="http://blog.pierlux.com/projects/libchamplain/en/"
@@ -40,7 +40,6 @@ 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
@@ -53,9 +52,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# bug #402013, https://bugzilla.gnome.org/show_bug.cgi?id=669378
-	epatch "${FILESDIR}/${P}-vala-cogl-pango-1.0.patch"
-
 	# Fix documentation slotability
 	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
 		-i docs/reference/Makefile.{am,in} || die "sed (1) failed"
@@ -64,6 +60,5 @@ src_prepare() {
 	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"
 
-	eautoreconf
 	gnome2_src_prepare
 }