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

Package-Manager: portage-2.2.0_alpha142/cvs/Linux x86_64
Manifest-Sign-Key: 0x8009D6F070EB7916

7 files changed, 295 insertions, 71 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/Manifest b/media-libs/libchamplain/Manifest
index 1d918eb4d853..3c6562976def 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,20 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX libchamplain-0.12.0-redrawing.patch 834 SHA256 8c9a31d2f0c41f05530a8181938de42681e8fa5aeb8d7cbecd7078dec0c1deee SHA512 b302cbd56fdcaf693f350b7b15b158797215e958fdc204131abf49b16ccdc3bf1cd1742d607aa9d2e9917d54de92907c79eaee07332a22b1cdd6a7dc8cec415f WHIRLPOOL 1ceb28ec93ec264cebdef69c10f54c8f926374e594943cb07508855ca4bf22ec5a44b6cb34f7fc49dcba2b00723312cbeb4e6cd63ea18874627b1727060f8ed1
+AUX libchamplain-0.8.3-gthread.patch 3045 SHA256 3e846dbcb3bc34de41c6c8045483841be94a374941338eb3c95bcded586cd314 SHA512 f67e5f63771c075e2509002075131bda5872bed3810e599f0e589c6d9c6ff933af1becd56bb0d1a2b5fdf88e8ade3da8773fe5eda4941404b1391ce29cf5a157 WHIRLPOOL 175a101f7b775113568753b1c0fcf51a9df7eca0d920395c3d3b4df98d7baf2be3d036e9b2de36d7c4455c995364af2c31e3b0d0251d6107eaece7b1aaf5e1f7
+AUX libchamplain-gthread.patch 3123 SHA256 083615a4f50748d6993d403a5eefb6bedd8e788096f250c8f8917a6688d2750f SHA512 3a63d1d0701ecdf768b53e240dec8a0d9c54c2d035dcf2a40ee0e0ff6480f291b6b33e7ba3d871e32eee57c9b0cf053af2d0055f0c9c497f98dc360e5478fa3f WHIRLPOOL 607054bd3c535f44a17c51603406a5681d2028bda7c67f8576b9339a8817d4287310ce04db74bf85985c43bcc23157de501e2299cfef7a7cc56df5ec9d3ac47f
 DIST libchamplain-0.10.1.tar.bz2 670134 SHA256 d7f5c11c4297e7a03444f30e4bb1b78c4da91046796f0c56c4ad5db0f823bc63 SHA512 84699ec26b55e43cc6004af1bd3b512e4da5e72daa335e9ccc36cd7481e5780a0ad624890b34d45338414fbb3d5594da1a9f16a5c837f3c4cda8f3e00d332797 WHIRLPOOL 5774fb328d287ff3c6d33c31ce0a953d2f526cd63335598c816613dd6359895ee8ab09e4227bfed0843984ded2a0f80fb7c5a15516b6e411c476639782367e25
 DIST libchamplain-0.12.3.tar.xz 583740 SHA256 3d03d4e6892305a3b5b78e0718e486f6a13271df33d82383fd8361ef71f3e658 SHA512 76101bbdd50c3a08b177d3e261869d3c974923d0deb728e958896d632cce4486cc106a02409c7983624e5cbc6746e96bb4cf5f46a35224585edea230aa72e957 WHIRLPOOL 6882034fc97580e33fa3e24434dc1670055f4e9b78a7aa4a833be9364f2af213745eeaea0ee0b008920ec996f96585efe3006a69d2c68aa8b24f789a255e0efa
 DIST libchamplain-0.8.3.tar.bz2 667873 SHA256 70d533be213a1586d6725d82afb128d1e57ccc262681dfda193af60507ad42e3 SHA512 d0e045bb98aece9191a0ccd19605aac571df156baab7465738e78d378c750b8e9313f46cc9933a6b475fd88811e7ebb6df5f69a0cee6f654bf6f72db3918850a WHIRLPOOL 411be8c8e9f442b6491d6b50eb79b9f862e78e6f97473f2f104514fccd1a25236cf6da331d16bbbc29c06179832d3bb3b9eb7939be189a4754cee2c53e65cf00
-EBUILD libchamplain-0.10.1.ebuild 1857 SHA256 3c3808477b5601c4a9b3992d9ebc70148d2b70dae4b1a4edaa7757ebe1292902 SHA512 25ea245802c0d5f1bf96b245f3cbc992d8780fd47c8b31d50d051cdaf576ad7337bff9872b48021fed863fb23447b731a0d81a918467db2829ac339c23d56121 WHIRLPOOL 0be31cafa371b8518332781da94c805512904e606f8db8491037aa2ed2ed6d0ce84a8d4eab93cbe8405d3e999650e60be5e90004371924d5c9fbc6a320b3c61c
-EBUILD libchamplain-0.12.3.ebuild 1887 SHA256 a4c867d9c9a63bfa26a4ab14f0e83a2688bb73b8ac50c72af494fe2be02b778a SHA512 862cc3dce7eccbdb9748c3d3d99d14f61934bd5a059850bef3b77b9ee3664febd3b427e22e2a3fc5dd204a45fc13d1193d2b67a58d2ef478acdf72bb58d0db26 WHIRLPOOL 93e52ecbaa9464ba84d38e5a0119cd2bcafe8a1d9cea58116ba6be3130e17aef0811e324e8986031b89b4e359306323e82b47fd4274a9770879471063ea26ea2
-EBUILD libchamplain-0.8.3.ebuild 1252 SHA256 f529cef573045d5892419d614d53bffe65f51ce08a94a24ce664afb04f022a80 SHA512 e6e7d213487d54da850492bd3ff233545e872d394ae99f7a2a12c1e7b6f3f5252af826c76741596c43cd199a4499d0e5a312c48b5f0d30fa372e8d3c1887a0ee WHIRLPOOL b8699672fb525d79d9841b072ff74e1f99fc8191167e4ace6b2e8d56ce34b7b009a816481c4cd4ba35a6a4c9d8357f9759a746ceb1c6bac39449e713a18f5051
-MISC ChangeLog 6189 SHA256 acbf3bcf43f66058253db52d14a43ed290ecb02b8dea0403b9494f759e5b9df9 SHA512 e37e8fc71d4895de9fc9a0c85c26fd2b2dffad7746b6c52715f7344f18c64aa13ab0a9172c400069d5fbfbf805db46a71c77c13f094116c326a05acfa9cdcd76 WHIRLPOOL e3329aee3a6537ffafcca83eb3afebb7dbeb4f1635e66e93c70b569f94e0091e7ef701f5f56b42f8333e61e8d9718f140f1e37698d2f6e1131722af5d43fe4f7
+EBUILD libchamplain-0.10.1.ebuild 1824 SHA256 35b37fab022d0084d1d034375d0a156e162740e8f9297a0d721e82d59c3c875d SHA512 fd2fa254d77e428e6818ff694b59b9231d0c081629c9bd4dfdb80409a91a62481d4d8c1bb5a9d7e177a41044488e5f4b44fc507da4f5fd65b2a959c031b7fb83 WHIRLPOOL b984c08b9cd9baa805402a6e98a9126a7fbd036bf0962d1aa8845060f0ff1db954cfa17f2a69c9c1184904b19d303d127d24a39929652e86f3cbff57c7075495
+EBUILD libchamplain-0.12.3.ebuild 1800 SHA256 2c6e6d24bb58540a65daec370ed5fafe7fd22ddd318c054cb62d87b77ff78871 SHA512 b6f3a3160932b1cdbff8b029be5be66fc2532fe7f7debb34b2f38c05c4f9604ad94cd8ea0c31269005ad8801205a98fb657ba33c8b8c74ffcb692cbc16bdd5a5 WHIRLPOOL 72e41caf12f9cb7aff3f1a51558a90a418ba404287a46b451642a280b618e19199ca0a692c41f0f6e6d93225f0bda994aacae127ad794a4f3ee39927d1dd7e82
+EBUILD libchamplain-0.8.3.ebuild 1254 SHA256 3e5fe2c11bb88081decac281fec6344c4df5f97a261bfb0e5d4de3bf133648f6 SHA512 d2f9edecff08d9bd278232735f6e22327df146c2725bcd8e8d4a15a01dce9163938ce8e6e1347576aff3a027578e749814c88e67c84b8ade7d571ed8b9ba56ff WHIRLPOOL ea07d740a40bd3a56c4901318ce7353e781617da802a46ec3f5dce76b56ab6bb7bb65aa1b5146e2c113db268bd4186f3f9f50974ccf7556c622b1af0caaeb0b3
+MISC ChangeLog 6438 SHA256 70450d685c654449b90888833a25679d99036ac10d6840b59790c856500e765c SHA512 87cb7c259bf9f3731945a1a75396cd89f2196cf17450e37596bc268e2a10ed76651ae57cc1874ec36295bc66ea3d13381e8824d1ad5106149074bcfa42ba7fb4 WHIRLPOOL cff8c3ff88629aac0adc518f3f3a02e89a17420cf557ff153e474dcb2974589b90a66edd5a1bb49da01fb14aa124fc27f3ce2235e3a794eacc5b46b8f496cf52
 MISC metadata.xml 341 SHA256 de6ecc9e8ab16294509978246c090abb086b1301636ca0f87668b98f39267551 SHA512 0f1690c58f83c40cbdec8d878efbf343512803f233a258e06f51db484eee250f3dae4ffda503200361dae0208fc640d02707882c32b48b731e34893bf43eb8bd WHIRLPOOL a7ee00184d873773e026a6638520c27f0309954f8d04454348c9a6c3771accbe7376916132a895f7c117b55c60d01c6d461e30742116192c35bec0215b7264ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
-Comment: GPGTools - http://gpgtools.org
 
-iEYEAREIAAYFAlCAPjkACgkQgAnW8HDreRbbLQCgxTUuriY9tNE7osSdQzEWGpMA
-31AAoK73Cc4sYxFZE4GzQEX0wK/W7ao/
-=HmnT
+iEYEAREKAAYFAlCST7YACgkQgAnW8HDreRYoEwCgt1bUab1zv3Jg1mV3Hqei6oLX
+M9QAn0EcD6Pa/W2hVPQyQDor9V9V915a
+=y2XU
 -----END PGP SIGNATURE-----
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
 }