Version bump for Gnome 3.6. Clean up old revisions.

Package-Manager: portage-2.2.0_alpha149/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 73 insertions, 8 deletions

diff --git a/gnome-extra/gucharmap/ChangeLog b/gnome-extra/gucharmap/ChangeLog
index c7cda10c32f8..f5092a12f68c 100644
--- a/gnome-extra/gucharmap/ChangeLog
+++ b/gnome-extra/gucharmap/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gucharmap
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.186 2012/11/16 07:34:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/ChangeLog,v 1.187 2012/12/24 18:51:52 eva Exp $
+
+*gucharmap-3.6.1 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> +gucharmap-3.6.1.ebuild,
+  metadata.xml:
+  Version bump for Gnome 3.6. Clean up old revisions.
 
   16 Nov 2012; Pacho Ramos <pacho@gentoo.org> -gucharmap-2.32.1.ebuild,
   -gucharmap-3.2.1.ebuild, -gucharmap-3.2.2.ebuild:
diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest
index b2cdd77e69d4..d9cfdbce11ff 100644
--- a/gnome-extra/gucharmap/Manifest
+++ b/gnome-extra/gucharmap/Manifest
@@ -4,14 +4,16 @@ Hash: SHA256
 AUX gucharmap-3.4.1.1-fix-doc.patch 348 SHA256 ae7f68febd1d5a711d2b27d8c5cc7bee284a2300a217be717b27d8cffe2c846f SHA512 d6e468ce2bbd258e01be0125a1b16529c89ce9758c24504d91550181af3b3e7c6b0e4171d3b26c252339f099927d43a7184f967764d564a4ebf28610968d8d27 WHIRLPOOL 40facbc9ec88d0c15dab45a7a4a1e9d7ae7821a7e392e8f391744297153bc912849cdec977b3930052272269eb9932d9bb2d9a59094c54955cc3dbed883e94ac
 DIST gucharmap-3.0.1.tar.bz2 3275481 SHA256 948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75 SHA512 4d8a2276b5cb1a0b0fadca2a8522755c5884985a12d5b19341b9cefcd7f749ec1286c0271419e38ec84be7edcfa1293e7f0263eb682c75387d692792de3e1fb1 WHIRLPOOL 6c9aaaaf31428db5257f98da741513c192ca32371b5d19952471d09586900186b269192b8ae6902e430e7fb3116bccc7d6ed4bca050ad0ca58eb14d7817d569a
 DIST gucharmap-3.4.1.1.tar.xz 2761188 SHA256 52ea80e9e5f01232801dd24f7eb5c70eb36e7a85e429ad9113e8b71234d94c62 SHA512 ac7ec10537874a21761ea631aac9c07d31900fe2d1a4b86b4c37017a52bb844ede86f46a5cfe96103eb43faed25b496503f5095734b0e3a3b46ea8853ae6e227 WHIRLPOOL a21ac19488d7ace50cc2f6787cc454404116b45b68e269d598218daf66885f17b2d81f20107e5a4ed12d28e9c112138847ec2fb57f34cd62ea1f4e98c4856bd9
+DIST gucharmap-3.6.1.tar.xz 1888388 SHA256 c3aad2990010ab66225b748e6ac5402cad9f21e908cddf728e57d755c54cc6b2 SHA512 ee4fbe8ed6f7703e7c82670554b080a68feb50de11e295cabae747fbc39f11bf38b8f898d834c4d6b99f93411458ee01a5f6b9b0c2f0fde5ed2f30cca3e40200 WHIRLPOOL 6cdb3e6bae7782777d69bb151082779137e3119d91be73757b86696df2a5d89cfce41a519a92562a21038c3f54250d740797c52ce2be1421fea171ec77efc59a
 EBUILD gucharmap-3.0.1-r200.ebuild 1663 SHA256 96fe723314b9ea273e2926582ddf6c7e3edc9707a922f411468a1b47ea899f5e SHA512 5aeadbc50e396d779415de82ac98369060d9b381d5e6eb0498e64169717303950bab22755f22947de4b06cd200ed387efcd8b1d2224727ebb194c20b5e03517b WHIRLPOOL e5600db1405a6d88cc6037a106aa32511386c0446b511e425366abbd56853143a8c5f05c221a4b608e9faffb8a68fe5119c01e7f8378c332c3078830424a8c58
 EBUILD gucharmap-3.4.1.1.ebuild 1488 SHA256 a00c54d8cf4d59cb55831507c1fcd5cf2f64cf8cea5f7e027e48720c6fe5482d SHA512 b76c4db3089e91021297ce91b70dccbe25608f6bfebc186065e6983515ade75da40229d54aaa435c3e6424ebfc870e74f7911a5d28ae356eae209c3984ab82df WHIRLPOOL a8167eb1f1c2db72f87eb8e5f0fa470f4d18bf11553e6d9bff2ae19672a518487b0990cba56eaeb07ab2cf6f88078e9dc9478de2cc4194eef79441b824c7cd87
-MISC ChangeLog 24248 SHA256 34d28958d685d189fe92ecb5730ab40ff442f90c744dd01a9d85a5bef5aa68b2 SHA512 c4d04f13919e3cbd15c15709797f63ca3aef5557aff2641cbdc17d19fee3b2c90dec95a6c6a63faf147f53a90b4cc0afe5385e92f4c432515967f928c3570151 WHIRLPOOL 47f7af29d554adfda1a291abe400988660b366cd90ec0d5752b99402a69e5602383b4c01bf1e9dbde9ef3c1675206eae11b1c59803005f9f17885b46b9613595
-MISC metadata.xml 272 SHA256 d6cd612b3d4d224cec4189a81e42dc98ba6fd96ce241908b57491d78f99e6314 SHA512 f3e9cc433eb6e6475a4281ad4dbb021bd050e00e194e9dd1b7ea619ea55a7f09ea2f4952e1e192e38764aba9260a6b15f06082685def060aa9ac7ead67d97237 WHIRLPOOL ed5cb90610d66f50314f1269b41424aff0990c4ff733c10d2f1424492cd01e4f7de682f1677c15b3e70508fe72dca8d04fccac6282395f0adb27b0df99a307cc
+EBUILD gucharmap-3.6.1.ebuild 1535 SHA256 8ad9f353bbb3c135ad5ca2a35f5e286f74e71fbcc7855bd3d02dadb68c1ac435 SHA512 e69b892697348a7564f48a22d777d6fea70f5a2cbc49b45efdc51a38d7dfab6d6d0bf41592d9eca7098ec835156e911ae9719d3c730d352adbfe819f08266ea6 WHIRLPOOL aceee1c05f55bbf2caf67d426d28ff99413711e6d95ed9bfded2a23d41ffb067aed207647b0063e87b096249e8142a745300ce0ce3211214e51c3c8a27d85127
+MISC ChangeLog 24428 SHA256 06b19851dfeb3f16afa222bede5fbf3aceb6d3306b46411dd86f1d77375d0288 SHA512 be972d90a6764f062e7313db44e949116876235235ebcea098ca8c2b420bf5ffb5736c1a6619a21a18c0fd6acc5bdf9ccb3f57144d69e055bda40f03365e58a6 WHIRLPOOL c88010f1ae904009a888de93d2a61fdc4e1e538cf512bc6aa33b5ff4d03f731efccbe6d5c41d558355e245aae653dfb6561c2e99682061e6b6f21fa7d824b50e
+MISC metadata.xml 242 SHA256 11f4b4bb23bb0e880a44b0f3efb5b4b0eeebaccd23956c72cd0cd9d386739c48 SHA512 686291088cb59735ff7df03fc5f11e43110039e74b8b24a9a8a517ed0f490f5694b873177e1ee808c4576ca26027add8324c6ee4e57b6b44d680a2522ec40b5f WHIRLPOOL f7bdc3a5208e0173deca7b15b26b967b61c3cb33e01b8f16fb87e32870e6c4deae514ac6af3fc91c300f960f2113e663eea02a9c599935072aad91459caf5277
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCl7G0ACgkQCaWpQKGI+9Sg0gCfXR0Bu7mmIA5xCxWjdgEBg4UP
-7OEAn0EgvhI5oI/gsLRnssK1nZtrgGkD
-=+mIi
+iEYEAREIAAYFAlDYpEkACgkQ1fmVwcYIWAYeoQCg1SGWStOr7vt8aanOo5cVvMcr
+OcYAoL1DG0BVn/Jh2MbUV69B9oBSs/yu
+=dlie
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gucharmap/gucharmap-3.6.1.ebuild b/gnome-extra/gucharmap/gucharmap-3.6.1.ebuild
new file mode 100644
index 000000000000..c773ecad5d79
--- /dev/null
+++ b/gnome-extra/gucharmap/gucharmap-3.6.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-3.6.1.ebuild,v 1.1 2012/12/24 18:51:52 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+VALA_MIN_API_VERSION="0.16"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="Unicode character map viewer and library"
+HOMEPAGE="http://live.gnome.org/Gucharmap"
+
+LICENSE="GPL-3"
+SLOT="2.90"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="cjk +introspection test vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32
+	>=x11-libs/pango-1.2.1[introspection?]
+	>=x11-libs/gtk+-3.4.0:3[introspection?]
+
+	introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+	!<gnome-extra/gucharmap-3:0
+"
+DEPEND="${RDEPEND}
+	>=dev-util/gtk-doc-am-1
+	>=dev-util/intltool-0.40
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( ~app-text/docbook-xml-dtd-4.1.2 )
+	vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+	DOCS="AUTHORS ChangeLog NEWS README TODO"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable introspection)
+		$(use_enable cjk unihan)
+		$(use_enable vala)"
+
+	# prevent file collisions with slot 0
+	sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \
+		-i configure.ac configure || die "sed configure.ac configure failed"
+
+	use vala && vala_src_prepare
+	gnome2_src_prepare
+
+	# avoid autoreconf
+	sed -e 's/-Wall //g' -i configure || die "sed failed"
+}
diff --git a/gnome-extra/gucharmap/metadata.xml b/gnome-extra/gucharmap/metadata.xml
index 3147d749554f..c83b6723d9e4 100644
--- a/gnome-extra/gucharmap/metadata.xml
+++ b/gnome-extra/gucharmap/metadata.xml
@@ -3,7 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
-		introspection</flag>
+	<flag name="vala">Enable bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>