Version bump for Gnome 3.6.

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

4 files changed, 31 insertions, 69 deletions

diff --git a/gnome-extra/gcalctool/ChangeLog b/gnome-extra/gcalctool/ChangeLog
index 54e49741964d..2681b8c72089 100644
--- a/gnome-extra/gcalctool/ChangeLog
+++ b/gnome-extra/gcalctool/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gcalctool
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.223 2012/05/24 09:22:18 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/ChangeLog,v 1.224 2012/12/24 17:25:25 eva Exp $
+
+*gcalctool-6.6.2 (24 Dec 2012)
+
+  24 Dec 2012; Gilles Dartiguelongue <eva@gentoo.org> -gcalctool-6.2.0.ebuild,
+  -gcalctool-6.4.1.1.ebuild, +gcalctool-6.6.2.ebuild:
+  Version bump for Gnome 3.6.
 
 *gcalctool-6.4.2.1 (24 May 2012)
 
diff --git a/gnome-extra/gcalctool/Manifest b/gnome-extra/gcalctool/Manifest
index 852e275862f8..bd81860c82e7 100644
--- a/gnome-extra/gcalctool/Manifest
+++ b/gnome-extra/gcalctool/Manifest
@@ -1,25 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX gcalctool-5.32.2-missing-header.patch 262 RMD160 5bae9a4cae9788676ce8bad0d62531cbb2864a77 SHA1 b31d228be15e8ee18dc79075e4133298f8ef0cf8 SHA256 ff47c2953d8dfc4dfe5b3b229c354a7df11f9930be012e2de0724c6025498175
-DIST gcalctool-5.32.2.tar.bz2 1178049 RMD160 df98f5ff659f8abc877a20e146ea791b7411a8a2 SHA1 a894d910a45a20d4eab1cbd5d4277939145ec64c SHA256 b281cc545f27b37a0fd120366b1be517574d9f505b59dfc34f9860007df0b788
-DIST gcalctool-6.2.0.tar.xz 999804 RMD160 9341e924cca8757caf4f6f5c0190ad0b3e8c7b50 SHA1 dc69bc1b65b29ce4e40263cfdac1c02602fc4bf3 SHA256 ddc2efe25220e9341832304dfd9e5e2390a70bb6bd70d1afeb49da88023cdffb
-DIST gcalctool-6.4.1.1.tar.xz 1008540 RMD160 2f9f548d5196076d604eb8aaebc712da8fe4b042 SHA1 ffe41321d5b0a1b0e6331168e654d92fa75464b1 SHA256 6c166b1d0fec157e523caf82d6357c4a2f572cb21729272c9975003661b8c84e
-DIST gcalctool-6.4.2.1.tar.xz 1009352 RMD160 ec0d3b722ba694bca159344c69836f60bf11f6b0 SHA1 808cdacb849a75e37c7cd0df418aa220c3cb93ed SHA256 d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8
-EBUILD gcalctool-5.32.2.ebuild 1068 RMD160 fc27993ad9dbe8b0e4b7ee030ed4357b330c1c37 SHA1 d8ccbe8ce2809ff9a4da76374b10b266fff35a6a SHA256 952e7f8ec0612463c7593225bcaa65e67e67f1712d35371b09fd4ad8b7796fa8
-EBUILD gcalctool-6.2.0.ebuild 969 RMD160 40cc8a8cb1fbfa4be1e74eccd79c753187cd17d2 SHA1 82cbad015c727d80530972a657e23ccf0b368b2f SHA256 3696f9bb91a9f0dc42e9184415a0832ca110cc153a390b1027de08c5a18f3ef0
-EBUILD gcalctool-6.4.1.1.ebuild 989 RMD160 9977363c36f97d41c97b5ca4d88b8231592e9952 SHA1 6639739ec49bbef43f82dabff9c96fcdfdf23c26 SHA256 37a042461144e494787afa726cf060f1030015e188646d703cb7928e174f4ba7
-EBUILD gcalctool-6.4.2.1.ebuild 992 RMD160 476043e6bdc4358e199c02c89d0b4e3ed27afcfa SHA1 bd1e22e9bfc4919dd554e261c29948baf0e363bb SHA256 ca2aa3e1c18cf911405bd156d6bdcb2aab57d642d929b8a78945e2340a2351fb
-MISC ChangeLog 28551 RMD160 3e3599900f5bcc98b2b4914db2f3b93e412e588f SHA1 ac368df0339d7c3a776b6286fcb020eb53c5d2b9 SHA256 567b5195147e4f3f288f4330d91716fccf3433a893f9bdadb4b9e2005b741b64
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+AUX gcalctool-5.32.2-missing-header.patch 262 SHA256 ff47c2953d8dfc4dfe5b3b229c354a7df11f9930be012e2de0724c6025498175 SHA512 4b160c81b2777a67a462cb72055a1378ffcfc3d4440c6c736d02832356a13056a66a8a67e0b5b6e348026688d968285bfa9a42d49d5ae2d28c1eaf72876ba2f4 WHIRLPOOL 99c453494acfcd0041ddbf6801fc620b4e95dae2381878765600e62e26cb942d710af582c83b3901e7480653148e5cddc9c4a0e5689da5ffa588136e1c631750
+DIST gcalctool-5.32.2.tar.bz2 1178049 SHA256 b281cc545f27b37a0fd120366b1be517574d9f505b59dfc34f9860007df0b788 SHA512 7685872b8668f5cf3aec8ca79352d9194d5a64c4d9f9cc8b462fd54715231f4a113c21cc1ea75911ebb3430f66fe13dc6a2747f3cc2caeb772b6b5887297768a WHIRLPOOL 43b8f58ed4be6d876fc648218ed267315561c28cb20489a8b76b23c7e121d2b5367822fb1d6841b76a4b2089ad9366ff75dac0ee2b55fd4c94530c15dafbbdbb
+DIST gcalctool-6.4.2.1.tar.xz 1009352 SHA256 d79f7272534fc33357acc4438fe7746fa125fb05c45dfdb468a193b7490ca1f8 SHA512 816dbe677a25c45a202143b4b88a2d79ffa2a0775ab7fc66c81516698997e89c37f74c4713dfa26ae6ab16fd68d605d625eb21a4846be3527628ff9ad2483bc3 WHIRLPOOL 17c8bbaf5bec0ff25294c8e9e1f213f684c2fde3ecd396e6d183c502f50fb18eeb1ba8098b6f9ebe56f67c4b6f2f6278723e8abb02aa78f0b295739e65e65449
+DIST gcalctool-6.6.2.tar.xz 968148 SHA256 e708a16cc758c3a9fcb07e9c3e45989f7d9d64e2993f440e99707fcea3e1b76c SHA512 67ecb2548ebea3729dfd25b784994c09679f2b0a840aa0679c5dac72a32cddda932c9ff153562902f7cbbfa61809235b88c3b5aeff2239656b46dfec65d40fb7 WHIRLPOOL 59225c91b8a6879c5f9f498f9771511954f195dac15d58626458f00ebf37db6439b225ebaf3ca23ef4743abbe174e9295288b90328ba72ee9fc6a7ac9bccc387
+EBUILD gcalctool-5.32.2.ebuild 1068 SHA256 952e7f8ec0612463c7593225bcaa65e67e67f1712d35371b09fd4ad8b7796fa8 SHA512 acd83dcf34205bbdf6b80948d79dca01f00ba70ecfb371e26e96d32c566ba66c391d4bb3ca3652aaf3854022998b700c573944f091c128c4932ac98d1e1991c8 WHIRLPOOL 74a5c976a6019a5e481cb5c811320e958733496023e84daf8d437f9470799f47e8d377fc48ba1f0968465528410367f4db4fd098a2d4d1d1d28083ffaccf550d
+EBUILD gcalctool-6.4.2.1.ebuild 992 SHA256 ca2aa3e1c18cf911405bd156d6bdcb2aab57d642d929b8a78945e2340a2351fb SHA512 46aac65d1fdab50407b73e35fdfa6d85af5fc0009847764bab7fc9b7b6069c437e937415e41656a3aa77cbe833c0a8f33d6f971e984f71122d689c7a58da40ce WHIRLPOOL dd14e39eb62f1a39481d40f46cbe37c38c0f6bcdb30765dba550e9931a316542086f8cbf93b55c3c2fb48487bd6a3b395b02b2d8730f31b576ecfb2206ab0c3a
+EBUILD gcalctool-6.6.2.ebuild 896 SHA256 f6d93b3cfb2a4ee4d5d8a9579654e9f3aa128ec5b24ff667622f5b533ae3028d SHA512 e1685e8c4c44662d475c3a475ee37c39606495ac19ba6513b626b0ae5cf5787ca1f181ceac83b0b315076e6fae6b8faad7cd06378adcce2ead3ef308bd36f2ff WHIRLPOOL 1fcdf86f99a2792e03ea043d99bef7cfe5fbeed458a5a174cad88e0cc4d0c044408af0a26f09a51c8b11bdc91183fc8df433be2c2ee30f3343cf9d94af056dfb
+MISC ChangeLog 28741 SHA256 c3ed9dd69836e7604e8624ad21a72030e773b53ebd878bb25f1a3de2d6dadab5 SHA512 43e9670fb25ad3d30fc9503168f15f19ce2a091c0bb8a5e1f2cb0a4d0f959904432f2b8047fff250d1951278166afe48fe1661578a74670df1f7a61ff0bee35e WHIRLPOOL 41d37f3d80ff3acc5633c61a97557f43c5e68c3285d74d0760df7652885ac8bdd8bf49fba45e2e14d1c1fa7ffe60dfeb18a26afb915e2a1be18ebe3f898d812d
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPvf3PAAoJEJ0WA1zPCt1h99gH/jGNVPnFJyuWvdKQajaWM8ez
-RGMuYSbEz0yu/vFZOqmbMQS1p3bTtxayBH5Y1LiawoAFdVCK7udf/ehnNuxtrn0q
-a7HJpK7z6aSkBwf7KT8uziw/rjXrsjt1NxgxijzjrmPtr6250IYyiMF2DlLyjjnB
-2wOif8WkTMiA9qhKaME9+WHqbp7tY2bWOiB3WcyyAjQByXHB5+xUeVhPWx1UWXpH
-b4vkAoIeidI5Z7rDBDnWbRSjiejf8I48mcH6m/q2s0sXPxKNl6i+J3bVTSB0J/Yn
-GH32k1y10kqAZnTPiEHAsxi6z4I4bDuH4fBOjKK4IqkKU+Yj1sl0lAhmH5jG8zg=
-=QqHi
+iEYEAREIAAYFAlDYkAYACgkQ1fmVwcYIWAbUUQCdEbLeyl9oVQIn0ALovMTfHZxO
+mTkAoO5smLmG1pPJbjxkO8mPK5NKvuaG
+=+PJp
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild b/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild
deleted file mode 100644
index 6c619c2d0389..000000000000
--- a/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.2.0.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-
-inherit gnome2
-
-DESCRIPTION="A calculator application for GNOME"
-HOMEPAGE="http://live.gnome.org/Gcalctool http://calctool.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND=">=x11-libs/gtk+-2.90.7:3
-	>=dev-libs/glib-2.25.10:2
-	dev-libs/libxml2"
-DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.3.2
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext"
-RDEPEND="${COMMON_DEPEND}
-	!<gnome-extra/gnome-utils-2.3"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile"
-	DOCS="AUTHORS ChangeLog* NEWS README"
-}
diff --git a/gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild b/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild
index dfaa8663fc56..3d227662edbd 100644
--- a/gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild
+++ b/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.4.1.1.ebuild,v 1.2 2012/05/05 06:25:17 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gcalctool/gcalctool-6.6.2.ebuild,v 1.1 2012/12/24 17:25:25 eva Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 
 inherit gnome2
@@ -15,23 +15,21 @@ SLOT="0"
 IUSE=""
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
-COMMON_DEPEND=">=x11-libs/gtk+-3:3
+COMMON_DEPEND="
+	>=x11-libs/gtk+-3:3
 	>=dev-libs/glib-2.31:2
-	dev-libs/libxml2"
+	dev-libs/libxml2:2
+"
 RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-utils-2.3"
 DEPEND="${COMMON_DEPEND}
-	>=app-text/gnome-doc-utils-0.3.2
-	app-text/scrollkeeper
 	>=dev-util/intltool-0.35
+	sys-devel/gettext
 	virtual/pkgconfig
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext"
+"
 
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile
-		ITSTOOL=$(type -P true)"
+src_configure() {
 	DOCS="AUTHORS ChangeLog* NEWS README"
+	G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+	gnome2_src_configure
 }