Version bump

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 16 insertions, 89 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index f9ffc659bfeb..1fafc695cb46 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.201 2010/05/31 22:13:22 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.202 2010/06/17 19:18:40 pacho Exp $
+
+*gnumeric-1.10.6 (17 Jun 2010)
+
+  17 Jun 2010; Pacho Ramos <pacho@gentoo.org> -gnumeric-1.10.1.ebuild,
+  -gnumeric-1.10.3.ebuild, +gnumeric-1.10.6.ebuild:
+  Version bump a lot of bugfixes. Removing old testing versions.
 
 *gnumeric-1.10.5 (01 Jun 2010)
 
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index bd4310f2eb31..0f9240fd30bc 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -4,20 +4,18 @@ Hash: SHA1
 AUX gnumeric-1.8.4-CVE-2009-0318.patch 626 RMD160 ec133b7ec03d9ea2b14a9d2bcb2798f624173744 SHA1 8a4237843309e1bf5b47dd1fbb3e69ecaccd4aa8 SHA256 fab335e4db5f17f74b110d473ad50b14510d56d43168fc3b84f115d907bba964
 AUX gnumeric-1.8.4-gtk216-abi-spinbuttons.patch 14242 RMD160 5fb5cff75cbaba6b6f8e3dd0ceb48454c16eea38 SHA1 d69b15735fc870d9dc8e246f4c0cb7ff7a89b799 SHA256 e29eadcb5e92c904001fd4af7d23916208e6563ed49da0028c4cf113fc0a9de5
 AUX gnumeric-1.8.4-gtk216-im-block.patch 8431 RMD160 d7d0ecf0104f7670bc8d9a7bcf36913150ed653a SHA1 ac6f2dc7d0a480dd6197597d1e16197635e081a5 SHA256 2029b766687c3d59ef5c9e6e8c8606451e15f1962a7257af30fd29bb27e4e59a
-DIST gnumeric-1.10.1.tar.bz2 17502592 RMD160 deddb4c990d31d0589d0ad3a45ffe3776d62e3d8 SHA1 f547d488ae8d9cdb0c5d8780f8616d61df3ab7af SHA256 91a0a9aa47ae82b14fe717e5d49d164cfe871add2bf71d0cb2f68cf3d383c9db
-DIST gnumeric-1.10.3.tar.bz2 17645603 RMD160 ee3fb3e3d93b1e67d5256e62e339803025947f47 SHA1 06987beea6dd10e27f04c3fb72929f81b0381e0d SHA256 3eeeb0d0bf9a6c3a1319c186984dc91f66c99b687a6cbe11a8999902d7382c64
 DIST gnumeric-1.10.5.tar.bz2 17674361 RMD160 e213ae973743ba016c2513dc2b31ab0cc491964f SHA1 4422e6b5becc6aeb30f8ce794b037eeeaa9ea04e SHA256 2b32c0f1f00870149de85f4dc86d316d2287db4b4950a6d7afa4155287e7476a
+DIST gnumeric-1.10.6.tar.bz2 17787316 RMD160 15dbe348afcdd38c59fe9b0ea7ceae2426d79e14 SHA1 c885c1fd7033bd355245cd3d2820e73d668d1861 SHA256 7e1b6ad04ba9bf1b2015c6b88cf3c2b46ec69b67312a44284f049a2ff8aeed6d
 DIST gnumeric-1.8.4.tar.bz2 14087780 RMD160 461ea59b2ce30d2ce7dd5bca2cea2c50b955dc57 SHA1 2d765b0d06509e0695c4d3ec96b94f8acba88735 SHA256 a3c7fdbbafa6c9cfee7f16c067b043c3041cd0240292aa92b653a2221ae04503
-EBUILD gnumeric-1.10.1.ebuild 1678 RMD160 880bc2f1299b026f85dcbf4a54a5b93cc56bc40a SHA1 49774fbd89aa911f066f65350d5b13e2ff2d5c5f SHA256 cf0ba2edddd2f4fb6730076e04812afd1087dbfcc1f91021d798abaf269c457d
-EBUILD gnumeric-1.10.3.ebuild 1680 RMD160 77f0ebc37300ef807bdb0be299fe45bbff26dcd6 SHA1 1506fc7e37c7d9a1a241282f0cf8039ad8b9a4bb SHA256 04710757afff7e138d59ee64049ba2c02bf65594b56e6db4e9f779ae7e7d08bc
 EBUILD gnumeric-1.10.5.ebuild 1678 RMD160 7a03593acdbdaf80ab9e20adbc07c2b82c908bd4 SHA1 3e0f8934e637a363029edbec19bb23beeb1b5085 SHA256 cd5cf498a4a325c2f1e45e191626eae9f483afdb7844df8ac1a138cf81b8da7c
+EBUILD gnumeric-1.10.6.ebuild 1680 RMD160 027f010538c86c5abf6efabc43dee33d0c29c9d6 SHA1 deab54c29273565aed757385c825678f63bbe8e7 SHA256 339fdcb295ee5c8f0ce065d4afe7287f3a0e3a8c16357f02566fe3e4d65cd006
 EBUILD gnumeric-1.8.4-r2.ebuild 2354 RMD160 b03d15dc5eca62b292142b7483a7e8affe920c95 SHA1 ca80a8001702fe1a57624f015a7a890c5f673402 SHA256 ab0a1cefec2e37491c6890ea9df7edc6ca5e5b2865a31234d93ede7ceede4705
-MISC ChangeLog 27490 RMD160 bd73380502c40e5d258501af7ad224c99ff34877 SHA1 b844134581032b0503b8ffff6ed15528059790c6 SHA256 cce2a04054c81113d861523ad4d071cf332d03aca0e629e6878f5522256a5518
+MISC ChangeLog 27713 RMD160 e07a09f1f37bf86980126482d4b32f04bceca95a SHA1 d9ec1fdc0f752c235dc9a61107b49cbb6e281bfe SHA256 8f2ea8bc78b02bce94f5c5b6d00896a11b467f21f97f06d6243f69c49936f577
 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkwEUKkACgkQ1fmVwcYIWAbl2gCg3Tm/fihivXMneFQBiGJ1MEFU
-y80AniTfoihBGprOFoMYDBcigHnXNvsw
-=N7af
+iEYEARECAAYFAkwadRYACgkQCaWpQKGI+9RnSgCeOzTeITrbU3XD/jwFcb2JQda9
+/78An15CrPaGc1Vy+kVeAZX8vgQnEDWS
+=dTWo
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/gnumeric-1.10.3.ebuild b/app-office/gnumeric/gnumeric-1.10.3.ebuild
deleted file mode 100644
index e3a096d37912..000000000000
--- a/app-office/gnumeric/gnumeric-1.10.3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.3.ebuild,v 1.2 2010/05/09 13:14:27 pacho Exp $
-
-EAPI="2"
-
-inherit gnome2 flag-o-matic python
-
-DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
-HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="gnome perl python"
-# libgda
-
-# lots of missing files, wait for next release
-# also fails tests due to 80-bit long story
-RESTRICT="test"
-
-RDEPEND="sys-libs/zlib
-	app-arch/bzip2
-	>=dev-libs/glib-2.12
-	>=gnome-extra/libgsf-1.14.15[gnome?]
-	>=x11-libs/goffice-0.8.3:0.8
-	>=dev-libs/libxml2-2.4.12
-	>=x11-libs/pango-1.12
-
-	>=x11-libs/gtk+-2.16
-	x11-libs/cairo[svg]
-	>=gnome-base/libglade-2.3.6
-
-	gnome? (
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnome-2
-		>=gnome-base/libgnomeui-2
-		>=gnome-base/libbonobo-2.2
-		>=gnome-base/libbonoboui-2.2 )
-	perl? ( dev-lang/perl )
-	python? (
-		>=dev-lang/python-2
-		>=dev-python/pygtk-2 )
-"
-#	libgda? (
-#		>=gnome-extra/libgda-4.1.1:4.0
-#		>=gnome-extra/libgnomedb-3.99.6:4.0 )
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.25
-	>=dev-util/pkgconfig-0.18
-	app-text/scrollkeeper"
-
-DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--enable-ssindex
-		--disable-static
-		--without-gda
-		--with-zlib
-		$(use_with perl)
-		$(use_with python)
-		$(use_with gnome)"
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove useless .la files
-	find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	python_need_rebuild
-}
diff --git a/app-office/gnumeric/gnumeric-1.10.1.ebuild b/app-office/gnumeric/gnumeric-1.10.6.ebuild
index 9c2c3f525cb6..be5dcf23fabc 100644
--- a/app-office/gnumeric/gnumeric-1.10.1.ebuild
+++ b/app-office/gnumeric/gnumeric-1.10.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.1.ebuild,v 1.2 2010/05/09 09:29:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.6.ebuild,v 1.1 2010/06/17 19:18:40 pacho Exp $
 
 EAPI="2"
 
@@ -24,11 +24,11 @@ RDEPEND="sys-libs/zlib
 	app-arch/bzip2
 	>=dev-libs/glib-2.12
 	>=gnome-extra/libgsf-1.14.15[gnome?]
-	>=x11-libs/goffice-0.8:0.8
+	>=x11-libs/goffice-0.8.6:0.8
 	>=dev-libs/libxml2-2.4.12
 	>=x11-libs/pango-1.12
 
-	>=x11-libs/gtk+-2.16
+	>=x11-libs/gtk+-2.18
 	x11-libs/cairo[svg]
 	>=gnome-base/libglade-2.3.6