Version bump, drop old.

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

3 files changed, 19 insertions, 17 deletions

diff --git a/media-libs/libchamplain/ChangeLog b/media-libs/libchamplain/ChangeLog
index d60a40efe5d1..ea1397a0de84 100644
--- a/media-libs/libchamplain/ChangeLog
+++ b/media-libs/libchamplain/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2012/02/14 18:30:07 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/ChangeLog,v 1.26 2012/03/15 18:50:21 tetromino Exp $
+
+*libchamplain-0.12.2 (15 Mar 2012)
+
+  15 Mar 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -libchamplain-0.12.0-r1.ebuild, +libchamplain-0.12.2.ebuild:
+  Version bump, drop old.
 
   14 Feb 2012; Justin Lecher <jlec@gentoo.org> libchamplain-0.6.0.ebuild,
   metadata.xml:
diff --git a/media-libs/libchamplain/Manifest b/media-libs/libchamplain/Manifest
index 9be968cbfc43..7c0bd7be5212 100644
--- a/media-libs/libchamplain/Manifest
+++ b/media-libs/libchamplain/Manifest
@@ -1,24 +1,24 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX libchamplain-0.12.0-redrawing.patch 834 RMD160 8d0eb51fe8b74aa9256a08dd0d8037a708347813 SHA1 2d5757ac0b4386a89765fc6cd13614ca37279bbb SHA256 8c9a31d2f0c41f05530a8181938de42681e8fa5aeb8d7cbecd7078dec0c1deee
 AUX libchamplain-0.12.1-vala-cogl-pango-1.0.patch 2028 RMD160 1d87d1431a14b8a91028db722a59546cdc014f0f SHA1 9d4f5ec52d16a54e27d3d78167a0ebdb8dbfa218 SHA256 dc3c7ba357267989293efa3cfec09421d4ad5f4f140ac7d1d665ffb6cb983a38
 DIST libchamplain-0.10.1.tar.bz2 670134 RMD160 8d0a571ed762dc8ecd02d438e0e99ee45b711910 SHA1 5998275a6434d900950e31242f3b5041e56055cc SHA256 d7f5c11c4297e7a03444f30e4bb1b78c4da91046796f0c56c4ad5db0f823bc63
-DIST libchamplain-0.12.0.tar.xz 588060 RMD160 6e79749962b09e63fdff77cc1c8f3dd77fad6c24 SHA1 59faa6d5b2cdb65e4d41a7ee3746af2e857487e5 SHA256 c6d2b9dc3b8fd1715c95a11b428c9121828953fd02cf301a7eb577c9b5bdba85
 DIST libchamplain-0.12.1.tar.xz 590176 RMD160 0f14c5266ba6e11e223a88a22823a6bf18cbf7cf SHA1 323bab0eeea8d2b63b21bd6cdfcf59c3600f7f64 SHA256 ac51b31ae46d22e1f3200b0e897b18bc5af2832eed24125d2a20adbc1ac232a1
+DIST libchamplain-0.12.2.tar.xz 581356 RMD160 62afc534c7a87330e8c1766e5a7d45b260bf31a1 SHA1 5548be62288437e8c6b2478bf931d9ef52329ed2 SHA256 d23f97875e407fdc3e8fc86bef538a377c42f37f5be4fc8ec6063e7446fd7e2e
 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.1.ebuild 1864 RMD160 32bb9c35bcaa1ab5db9e200c4c529629a216ff3e SHA1 c601460a9dbcd2bbc00bfda9e7eb70a173708495 SHA256 e878f568c51ceff465283f20923d327a83aa81ec3491a91946dae97f531e5b03
-EBUILD libchamplain-0.12.0-r1.ebuild 2018 RMD160 3e881adfaa5fba4d8f989641f231a512281dd706 SHA1 bf7afcd9fef98f516d23ec55f5fe4a445765d4e8 SHA256 1d2469833a02f4990a2e72cdffa01d98467330610cebffd8b02d12d269da9695
 EBUILD libchamplain-0.12.1.ebuild 2072 RMD160 7cfd6e6b4c2554fb5cce96da0c7f0d10ee8b8720 SHA1 2c2c46eb8616d161d0d838507af44088a10e7223 SHA256 0c218f6b508e2bcf98b621484701928991db9f7de57c3da3cb400042d16d4b67
+EBUILD libchamplain-0.12.2.ebuild 1894 RMD160 e1c3193e48d397d9f549d857e7511e3944d74ece SHA1 4dd13350f4acf4986397a2fdfbf2da075ad2e535 SHA256 dac3a8430add0da472ae68c577e2d6fdd86585f24846b870155afa0b1857b353
 EBUILD libchamplain-0.6.0.ebuild 2147 RMD160 b50c4981912588e609eb5c4f14a914d02280685c SHA1 be1817f3fdd8bea74b154ec7cbc0ba8fd8ed2bc6 SHA256 bc0d924a6eff9ec5c6b41b923c57ac25eefa6c0aaff24dc64470c615386230a8
 EBUILD libchamplain-0.8.3.ebuild 1259 RMD160 9bc21684a4ee110e0c5f05a0c86ac3b66c8a8af2 SHA1 55a2e447320e8174604e5b51f7074ff8407fed59 SHA256 6015eb9a3716e09d5940fd74da9f77d1edc5f6b24a9171915def1e03cf6f9e86
-MISC ChangeLog 4693 RMD160 13538534f1af6d572462ef61a28128ec3d440282 SHA1 c43f728a1843ac52d2a3e5225114560610dd78e6 SHA256 d003996db3287fe7f77817608245533b516e2a9ea6cd6ee4ebb097e9e3017952
+MISC ChangeLog 4883 RMD160 7af18797e48e5c27dbe241a96eab8c9e053d8dc3 SHA1 334eb471befd3dec474e1a4fcc3897777c234662 SHA256 b804da8bf8a2bce66da5aa016ba051f7d2606b5bc3aaabaa1eccce795c520a54
 MISC metadata.xml 414 RMD160 8c6b42adb6e3b005725fe54bfab5afec4d8e6e3b SHA1 c8cbb2810e95d283f13ed97115d793247befd1f0 SHA256 cb0eedb3c2ff12250a8ce6ce569b0af4fb241cb9bb68e414c7d0e2610dfdf414
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk86qDYACgkQgAnW8HDreRZZVgCdFjei38VjcAFD5b9xfJxmDh33
-QeMAoIjGVLzxAR8HOqjOfef1YtQHtww7
-=LhHg
+iF4EAREIAAYFAk9iOfMACgkQdjK8w9WeBnB1VQD8C6k6vSmROs3nUR3MF48i9+L7
+BCZPoYukDlFmGl3R4XQA/jYG3qeKB5GbsoVBmLPxooBgss+UvU4rcnWVMClPeO2d
+=OVtv
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libchamplain/libchamplain-0.12.0-r1.ebuild b/media-libs/libchamplain/libchamplain-0.12.2.ebuild
index d1714aaaad27..bc147d6fe563 100644
--- a/media-libs/libchamplain/libchamplain-0.12.0-r1.ebuild
+++ b/media-libs/libchamplain/libchamplain-0.12.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.1 2011/11/02 21:26:59 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libchamplain/libchamplain-0.12.2.ebuild,v 1.1 2012/03/15 18:50:21 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -32,14 +32,14 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
 	doc? ( >=dev-util/gtk-doc-1.9 )
-	vala? ( dev-lang/vala:0.14[vapigen] )"
+	vala? ( >=dev-lang/vala-0.14.2-r1:0.14[vapigen] )"
 # segfaults with vala:0.12
+# vala-0.14.2-r1 required for bug #402013
 
 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
@@ -58,11 +58,7 @@ src_prepare() {
 	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"
-
-	# Upstream patch from master branch to fix scale redrawing issues;
-	# not in 0.12 branch yet.
-	epatch "${FILESDIR}/${PN}-0.12.0-redrawing.patch"
+	mv "${S}"/docs/reference-gtk/${PN}-gtk{,-${SLOT}}-docs.sgml || die "mv (2) failed"
 
 	gnome2_src_prepare
 }