Version bump. Various fixes backported from trunk.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

3 files changed, 78 insertions, 6 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index 0755ae40a350..20a92a359cde 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libchamplain
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.19 2011/07/25 09:09:15 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.20 2011/09/19 20:56:06 eva Exp $
+
+*libchamplain-0.10.1 (19 Sep 2011)
+
+  19 Sep 2011; Gilles Dartiguelongue <eva@gentoo.org>
+  +libchamplain-0.10.1.ebuild:
+  Version bump. Various fixes backported from trunk.
 
   25 Jul 2011; Gilles Dartiguelongue <eva@gentoo.org>
   -libchamplain-0.8.0.ebuild, -libchamplain-0.8.1.ebuild,
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index a6d6f1da27ad..945d461429dc 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -2,17 +2,19 @@
 Hash: SHA1
 
 DIST libchamplain-0.10.0.tar.bz2 684141 RMD160 8fec982305536f14fc7b8245e225d143cee3c70e SHA1 e97f307ee1a3a36b421e8cb311496cfb06a8cb1b SHA256 98700bb3f3ada5f9bd6b938486e55f90ea76ce4108a8b62928cf185ded49dbb1
+DIST libchamplain-0.10.1.tar.bz2 670134 RMD160 8d0a571ed762dc8ecd02d438e0e99ee45b711910 SHA1 5998275a6434d900950e31242f3b5041e56055cc SHA256 d7f5c11c4297e7a03444f30e4bb1b78c4da91046796f0c56c4ad5db0f823bc63
 DIST libchamplain-0.6.0.tar.bz2 699922 RMD160 49c8e48c9b52d4fdf90773f6106e51c98420ef15 SHA1 f2a3b96118416268fa90fb6e5b6422442eed2286 SHA256 e6578cc38cee77b7d03a68e7fda347c64ea1f84a4655b3e1d7a55da900699c24
 DIST libchamplain-0.8.3.tar.bz2 667873 RMD160 e5670e2698e0951f60a4168bbc9b2e788461e2a7 SHA1 da7b335db417574c3d407873c3e86f1263002d3d SHA256 70d533be213a1586d6725d82afb128d1e57ccc262681dfda193af60507ad42e3
 EBUILD libchamplain-0.10.0.ebuild 1864 RMD160 ff9f4fce66fba4d9e7701edef896a38bf0463f30 SHA1 d0208790be41792ed779857e0fc68db7d0832e2d SHA256 d8c3d52ee8adae4c67969c0a415aa449051afeea0a4ce858e22338a11741d3f9
+EBUILD libchamplain-0.10.1.ebuild 1862 RMD160 63c58171b1227f966b14a4dccbfaa980fa6e46f5 SHA1 37288e6d0b3cb77634054a41c990c76085372dff SHA256 8527d424184e1b422bbe10817532e623c1a6e8ab3ec97d6f1816905f1a8d4be7
 EBUILD libchamplain-0.6.0.ebuild 1995 RMD160 f203188863984d950ee41487625f79e87044c37e SHA1 0193e2b0fd398f481546e55bbaede304f04d399f SHA256 41314914e13e6b64ffcd8825b93d8f2560c05f957abbdd0f77e00dc89d4776b8
 EBUILD libchamplain-0.8.3.ebuild 1083 RMD160 4428327b35ae815363c8f8dde25b7e766a3f4d27 SHA1 6eb36b1e6526ba76d2cfc3e0d5c56026da6cfb02 SHA256 90594573996d9179fca184e961f592574c32a617da59cb2112c44db2d26dfcba
-MISC ChangeLog 3446 RMD160 ec8e019a0454b44b31eb04629a0bc12ddcf1bed1 SHA1 8c633633e07eac7554099c507ceed154c4fb6843 SHA256 278793ab080764e3bf5b07cabc70901078e0fa3558ce990cae6b5af4cc1b5902
+MISC ChangeLog 3621 RMD160 9ea6784513796f28dd78440f2e47a04eedc62a85 SHA1 0a5931702b2df264a4ac503b3741ac062deba642 SHA256 c747efa1a8cc0abd5ab282eeb66579c51a696df14489c838e8ef7c4c048274e4
 MISC metadata.xml 406 RMD160 c00c800600241193f8cd1c1a3a395aaf5df82c0d SHA1 5094d7dfadb49335e47bb8ef49246f10989559c2 SHA256 5a7e5e53034775fbe975a8611a680c0bf5bcd13588dac58f02b506b1c3f1db9c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk4tNfAACgkQ1fmVwcYIWAZqVQCfSoORmP7wsYsjrV/Qgls9Wdia
-FVsAn2dX/EBQw7PEb4E2vLKyP0w2vBQ7
-=bZhe
+iEYEARECAAYFAk53rHIACgkQ1fmVwcYIWAaDAgCdGiNRWRuT5dhqesVTB71FYn3q
+UVsAn3hVO57TRSJS3QuoqxIUOIHyh0zm
+=EZPt
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libchamplain/libchamplain-0.10.1.ebuild b/media-libs/libchamplain/libchamplain-0.10.1.ebuild
new file mode 100644
index 000000000000..5816930eef0f
--- /dev/null
+++ b/media-libs/libchamplain/libchamplain-0.10.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 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.1 2011/09/19 20:56:06 eva Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="Clutter based world map renderer"
+HOMEPAGE="http://blog.pierlux.com/projects/libchamplain/en/"
+
+LICENSE="LGPL-2"
+SLOT="0.10"
+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
+	gtk? (
+		>=x11-libs/gtk+-2.90:3[introspection?]
+		>=media-libs/clutter-gtk-0.90:1.0 )
+	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( >=dev-util/gtk-doc-1.9 )
+	vala? ( dev-lang/vala:0.12[vapigen] )"
+
+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
+		--enable-memphis
+		VAPIGEN=$(type -p vapigen-0.12)
+		$(use_enable debug)
+		$(use_enable gtk)
+		$(use_enable introspection)
+		$(use_enable vala)"
+}
+
+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 (1) failed"
+
+	gnome2_src_prepare
+}