media-libs/libchamplain: Backport upstream fixes for #440646

(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)

6 files changed, 285 insertions, 62 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index 8caf0d15807a..bcc57044895c 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,11 @@
 # 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.33 2012/10/18 17:36:56 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.34 2012/11/01 10:32:18 jlec Exp $
+
+  01 Nov 2012; Justin Lecher <jlec@gentoo.org> libchamplain-0.8.3.ebuild,
+  +files/libchamplain-0.8.3-gthread.patch, libchamplain-0.10.1.ebuild,
+  libchamplain-0.12.3.ebuild, +files/libchamplain-gthread.patch:
+  Backport upstream fixes for #440646
 
   18 Oct 2012; Justin Lecher <jlec@gentoo.org> -libchamplain-0.6.0.ebuild,
   -libchamplain-0.12.2.ebuild, metadata.xml:
diff --git a/media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch b/media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch
new file mode 100644
index 000000000000..36512d802b53
--- /dev/null
+++ b/media-libs/libchamplain/files/libchamplain-0.8.3-gthread.patch
@@ -0,0 +1,106 @@
+ demos/animated-marker.c | 1 -
+ demos/launcher-gtk.c    | 1 -
+ demos/launcher.c        | 1 -
+ demos/local-rendering.c | 1 -
+ demos/minimal-gtk.c     | 1 -
+ demos/minimal.c         | 1 -
+ demos/polygons.c        | 1 -
+ demos/url-marker.c      | 1 -
+ 8 files changed, 8 deletions(-)
+
+diff --git a/demos/animated-marker.c b/demos/animated-marker.c
+index ebcbe72..5c5a8ce 100644
+--- a/demos/animated-marker.c
++++ b/demos/animated-marker.c
+@@ -123,7 +123,6 @@ main (int argc, char *argv[])
+   ChamplainLayer *layer;
+   GpsCallbackData callback_data;
+ 
+-  g_thread_init (NULL);
+   clutter_init (&argc, &argv);
+ 
+   stage = clutter_stage_get_default ();
+diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
+index 897e148..b4cb06d 100644
+--- a/demos/launcher-gtk.c
++++ b/demos/launcher-gtk.c
+@@ -207,7 +207,6 @@ main (int argc,
+   ChamplainView *view;
+   ChamplainLayer *layer;
+ 
+-  g_thread_init (NULL);
+   gtk_clutter_init (&argc, &argv);
+ 
+   /* create the main, top level, window */
+diff --git a/demos/launcher.c b/demos/launcher.c
+index a7a5fd8..acdd1cf 100644
+--- a/demos/launcher.c
++++ b/demos/launcher.c
+@@ -93,7 +93,6 @@ main (int argc,
+   ChamplainLayer *layer;
+   gfloat width, total_width = 0;
+ 
+-  g_thread_init (NULL);
+   clutter_init (&argc, &argv);
+ 
+   stage = clutter_stage_get_default ();
+diff --git a/demos/local-rendering.c b/demos/local-rendering.c
+index 43ad2ad..7577071 100644
+--- a/demos/local-rendering.c
++++ b/demos/local-rendering.c
+@@ -725,7 +725,6 @@ main (int argc,
+ {
+   GtkWidget *widget, *hbox, *bbox, *menubox, *button, *viewport, *label;
+ 
+-  g_thread_init (NULL);
+   gtk_clutter_init (&argc, &argv);
+ 
+   /* create the main, top level, window */
+diff --git a/demos/minimal-gtk.c b/demos/minimal-gtk.c
+index ea3383a..195f9e4 100644
+--- a/demos/minimal-gtk.c
++++ b/demos/minimal-gtk.c
+@@ -29,7 +29,6 @@ main (int argc, char *argv[])
+   GtkWidget *window, *widget;
+ 
+   /* initialize threads and clutter */
+-  g_thread_init (NULL);
+   gtk_clutter_init (&argc, &argv);
+ 
+   /* create the top-level window and quit the main loop when it's closed */
+diff --git a/demos/minimal.c b/demos/minimal.c
+index 4a66c6e..bd20929 100644
+--- a/demos/minimal.c
++++ b/demos/minimal.c
+@@ -23,7 +23,6 @@ main (int argc, char *argv[])
+ {
+   ClutterActor *actor, *stage;
+ 
+-  g_thread_init (NULL);
+   clutter_init (&argc, &argv);
+ 
+   stage = clutter_stage_get_default ();
+diff --git a/demos/polygons.c b/demos/polygons.c
+index 5d07bb3..6884a3c 100644
+--- a/demos/polygons.c
++++ b/demos/polygons.c
+@@ -74,7 +74,6 @@ main (int argc,
+   ChamplainPolygon *polygon;
+   gfloat width, total_width = 0;;
+ 
+-  g_thread_init (NULL);
+   clutter_init (&argc, &argv);
+ 
+   stage = clutter_stage_get_default ();
+diff --git a/demos/url-marker.c b/demos/url-marker.c
+index 6fbbfb0..71d90c5 100644
+--- a/demos/url-marker.c
++++ b/demos/url-marker.c
+@@ -244,7 +244,6 @@ main (int argc, char *argv[])
+   ChamplainLayer *layer;
+   SoupSession *session;
+ 
+-  g_thread_init (NULL);
+   clutter_init (&argc, &argv);
+ 
+   stage = clutter_stage_get_default ();
diff --git a/media-libs/libchamplain/files/libchamplain-gthread.patch b/media-libs/libchamplain/files/libchamplain-gthread.patch
new file mode 100644
index 000000000000..eb68bd9adbfd
--- /dev/null
+++ b/media-libs/libchamplain/files/libchamplain-gthread.patch
@@ -0,0 +1,106 @@
+From b6098de723f14f8dd5051a83f54bb7503f7e8a47 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Fri, 04 Nov 2011 02:29:37 +0000
+Subject: demos: Don't call g_thread_init
+
+Doing so now requires linking -lgthread, but it's been pointless
+since GLib 2.18, which is ancient history now.
+---
+diff --git a/demos/animated-marker.c b/demos/animated-marker.c
+index 7f3fd6e..71580a7 100644
+--- a/demos/animated-marker.c
++++ b/demos/animated-marker.c
+@@ -127,7 +127,6 @@ main (int argc, char *argv[])
+   ChamplainMarkerLayer *layer;
+   GpsCallbackData callback_data;
+ 
+-  g_thread_init (NULL);
+   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+     return 1;
+ 
+diff --git a/demos/launcher-gtk.c b/demos/launcher-gtk.c
+index 67b7a6a..8e699a9 100644
+--- a/demos/launcher-gtk.c
++++ b/demos/launcher-gtk.c
+@@ -223,7 +223,6 @@ main (int argc,
+   ClutterActor *scale;
+   ChamplainLicense *license_actor;
+ 
+-  g_thread_init (NULL);
+   gtk_clutter_init (&argc, &argv);
+ 
+   /* create the main, top level, window */
+diff --git a/demos/launcher.c b/demos/launcher.c
+index 1f222d4..26e585f 100644
+--- a/demos/launcher.c
++++ b/demos/launcher.c
+@@ -95,7 +95,6 @@ main (int argc,
+   ChamplainPathLayer *path;
+   gfloat width, total_width = 0;
+ 
+-  g_thread_init (NULL);
+   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+     return 1;
+ 
+diff --git a/demos/local-rendering.c b/demos/local-rendering.c
+index 16bc9a5..98208b9 100644
+--- a/demos/local-rendering.c
++++ b/demos/local-rendering.c
+@@ -730,7 +730,6 @@ main (int argc,
+ {
+   GtkWidget *widget, *hbox, *bbox, *menubox, *button, *viewport, *label;
+ 
+-  g_thread_init (NULL);
+   gtk_clutter_init (&argc, &argv);
+ 
+   /* create the main, top level, window */
+diff --git a/demos/minimal-gtk.c b/demos/minimal-gtk.c
+index ea3383a..195f9e4 100644
+--- a/demos/minimal-gtk.c
++++ b/demos/minimal-gtk.c
+@@ -29,7 +29,6 @@ main (int argc, char *argv[])
+   GtkWidget *window, *widget;
+ 
+   /* initialize threads and clutter */
+-  g_thread_init (NULL);
+   gtk_clutter_init (&argc, &argv);
+ 
+   /* create the top-level window and quit the main loop when it's closed */
+diff --git a/demos/minimal.c b/demos/minimal.c
+index 6ada0a9..b3ec2ef 100644
+--- a/demos/minimal.c
++++ b/demos/minimal.c
+@@ -23,7 +23,6 @@ main (int argc, char *argv[])
+ {
+   ClutterActor *actor, *stage;
+ 
+-  g_thread_init (NULL);
+   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+     return 1;
+ 
+diff --git a/demos/polygons.c b/demos/polygons.c
+index 996a61f..df54689 100644
+--- a/demos/polygons.c
++++ b/demos/polygons.c
+@@ -84,7 +84,6 @@ main (int argc,
+   ChamplainPathLayer *layer;
+   gfloat width, total_width = 0;;
+ 
+-  g_thread_init (NULL);
+   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+     return 1;
+ 
+diff --git a/demos/url-marker.c b/demos/url-marker.c
+index 6e34d09..a73bd27 100644
+--- a/demos/url-marker.c
++++ b/demos/url-marker.c
+@@ -243,7 +243,6 @@ main (int argc, char *argv[])
+   ChamplainMarkerLayer *layer;
+   SoupSession *session;
+ 
+-  g_thread_init (NULL);
+   if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
+     return 1;
+ 
+--
+cgit v0.9.0.2
diff --git a/media-libs/libchamplain/libchamplain-0.10.1.ebuild b/media-libs/libchamplain/libchamplain-0.10.1.ebuild
index 447387846c45..0cc5c7ae6b1f 100644
--- a/media-libs/libchamplain/libchamplain-0.10.1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.10.1.ebuild
@@ -1,41 +1,42 @@
 # 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.10.1.ebuild,v 1.4 2012/08/14 22:57:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.10.1.ebuild,v 1.5 2012/11/01 10:32:18 jlec Exp $
 
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-GNOME_TARBALL_SUFFIX="bz2"
+EAPI=4
 
-inherit gnome2
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+GNOME_TARBALL_SUFFIX=bz2
+
+inherit eutils gnome2
 
 DESCRIPTION="Clutter based world map renderer"
 HOMEPAGE="http://projects.gnome.org/libchamplain/"
 
-LICENSE="LGPL-2"
 SLOT="0.10"
+LICENSE="LGPL-2"
 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
+	dev-libs/glib:2
+	media-libs/clutter:1.0[introspection?]
+	media-libs/memphis:0.2[introspection?]
+	net-libs/libsoup-gnome:2.4
+	x11-libs/cairo
 	gtk? (
-		>=x11-libs/gtk+-2.90:3[introspection?]
-		>=media-libs/clutter-gtk-0.90:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
+		x11-libs/gtk+:3[introspection?]
+		media-libs/clutter-gtk:1.0 )
+	introspection? ( dev-libs/gobject-introspection )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
+	doc? ( dev-util/gtk-doc )
 	vala? ( dev-lang/vala:0.14[vapigen] )"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	# Vala demos are only built, so just disable them
 	G2CONF="${G2CONF}
@@ -49,16 +50,18 @@ pkg_setup() {
 		$(use_enable gtk)
 		$(use_enable introspection)
 		$(use_enable vala)"
-}
 
-src_prepare() {
 	# Fix documentation slotability
-	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
+	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}/" \
+	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"
+	mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed"
+
+	epatch "${FILESDIR}"/${PN}-gthread.patch
 
 	gnome2_src_prepare
 }
diff --git a/media-libs/libchamplain/libchamplain-0.12.3.ebuild b/media-libs/libchamplain/libchamplain-0.12.3.ebuild
index 4bc1082f2538..aba2807cc2d9 100644
--- a/media-libs/libchamplain/libchamplain-0.12.3.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.3.ebuild
@@ -1,42 +1,43 @@
 # 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.3.ebuild,v 1.4 2012/10/17 03:22:36 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.3.ebuild,v 1.5 2012/11/01 10:32:17 jlec Exp $
 
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
+EAPI=4
 
-inherit gnome2
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+
+inherit eutils gnome2
 
 DESCRIPTION="Clutter based world map renderer"
 HOMEPAGE="http://projects.gnome.org/libchamplain/"
 
-LICENSE="LGPL-2"
 SLOT="0.12"
+LICENSE="LGPL-2"
 KEYWORDS="amd64 ~ppc 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
+	dev-libs/glib:2
+	media-libs/clutter:1.0[introspection?]
+	media-libs/memphis:0.2[introspection?]
+	net-libs/libsoup-gnome:2.4
+	x11-libs/cairo
 	gtk? (
-		>=x11-libs/gtk+-2.90:3[introspection?]
-		>=media-libs/clutter-gtk-0.90:1.0 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
+		x11-libs/gtk+:3[introspection?]
+		media-libs/clutter-gtk:1.0 )
+	introspection? ( dev-libs/gobject-introspection )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	vala? ( >=dev-lang/vala-0.14.2-r1:0.14[vapigen] )"
+	doc? ( dev-util/gtk-doc )
+	vala? ( dev-lang/vala:0.14[vapigen] )"
 # segfaults with vala:0.12
 # vala-0.14.2-r1 required for bug #402013
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	# Vala demos are only built, so just disable them
 	G2CONF="${G2CONF}
@@ -49,13 +50,13 @@ pkg_setup() {
 		$(use_enable gtk)
 		$(use_enable introspection)
 		$(use_enable vala)"
-}
 
-src_prepare() {
 	# Fix documentation slotability
-	sed -e "s/^DOC_MODULE.*/DOC_MODULE = ${PN}-${SLOT}/" \
+	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}/" \
+	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"
diff --git a/media-libs/libchamplain/libchamplain-0.8.3.ebuild b/media-libs/libchamplain/libchamplain-0.8.3.ebuild
index d3102e746e0a..46038bb76ae2 100644
--- a/media-libs/libchamplain/libchamplain-0.8.3.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.8.3.ebuild
@@ -1,37 +1,38 @@
 # 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.8.3.ebuild,v 1.8 2012/08/14 22:57:01 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.8.3.ebuild,v 1.9 2012/11/01 10:32:18 jlec Exp $
 
-EAPI="3"
-GCONF_DEBUG="no"
+EAPI=3
 
-inherit gnome2
+GCONF_DEBUG=no
+
+inherit eutils gnome2
 
 DESCRIPTION="Clutter based world map renderer"
 HOMEPAGE="http://projects.gnome.org/libchamplain/"
 
-LICENSE="LGPL-2"
 SLOT="0.8"
+LICENSE="LGPL-2"
 KEYWORDS="amd64 x86"
 IUSE="debug doc gtk +introspection"
 
 RDEPEND="
+	dev-db/sqlite:3
 	dev-libs/glib:2
-	>=x11-libs/cairo-1.4
-	net-libs/libsoup-gnome:2.4
 	media-libs/clutter:1.0[introspection?]
 	media-libs/memphis:0.2[introspection?]
-	dev-db/sqlite:3
+	net-libs/libsoup-gnome:2.4
+	x11-libs/cairo
 	gtk? (
 		x11-libs/gtk+:2[introspection?]
 		media-libs/memphis:0.2[introspection?]
-		>=media-libs/clutter-gtk-0.10:0.10 )"
+		media-libs/clutter-gtk:0.10 )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	doc? ( >=dev-util/gtk-doc-1.9 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
+	doc? ( dev-util/gtk-doc )
+	introspection? ( dev-libs/gobject-introspection )"
 
-pkg_setup() {
+src_prepare() {
 	DOCS="AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--disable-static
@@ -39,12 +40,13 @@ pkg_setup() {
 		$(use_enable debug)
 		$(use_enable gtk)
 		$(use_enable introspection)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
 
 	# Drop DEPRECATED flags, bug #387335
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		tidy/Makefile.am tidy/Makefile.in || die
+	sed \
+		-e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+		-i tidy/Makefile.am tidy/Makefile.in || die
+
+	epatch "${FILESDIR}"/${P}-gthread.patch
+
+	gnome2_src_prepare
 }