Version bump, also build --without-gnome as suggested by upstream in https://bugzilla.gnome.org/show_bug.cgi?id=652802#c1 since it's going away and let gnumeric stop depending on deprecated stuff. Remove old.

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

3 files changed, 23 insertions, 26 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 248b486245aa..c85d42b7f49e 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.222 2011/06/03 16:22:51 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.223 2011/06/20 11:16:17 pacho Exp $
+
+*gnumeric-1.10.16 (20 Jun 2011)
+
+  20 Jun 2011; Pacho Ramos <pacho@gentoo.org> -gnumeric-1.10.14.ebuild,
+  +gnumeric-1.10.16.ebuild:
+  Version bump, also build --without-gnome as suggested by upstream in
+  https://bugzilla.gnome.org/show_bug.cgi?id=652802#c1 since it's going away
+  and let gnumeric stop depending on deprecated stuff. Remove old.
 
 *gnumeric-1.10.15 (03 Jun 2011)
 
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 5738e0a8d55f..0225564c7c61 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -2,17 +2,17 @@
 Hash: SHA1
 
 DIST gnumeric-1.10.13.tar.bz2 18275243 RMD160 85dde877e2314fb31d1666fb9ae0d7697cf7b73f SHA1 002ed0aefb53a7b2ed51cd6feb519775a68696e3 SHA256 2de0ea8e19f6741a2a6d991a91796ef2a48a64804fdef2a50b8c01cb92315033
-DIST gnumeric-1.10.14.tar.bz2 18580112 RMD160 d590d4435827d3129e0317f15c93cb1e3aee78b7 SHA1 48e482e6d5a889a2f649ab2b7099ad2886e32596 SHA256 b655fa76dd2e6654b8543fbcd92982e9fdcb4c0ae113aa577ce114109deb1587
 DIST gnumeric-1.10.15.tar.bz2 18577516 RMD160 da08913df9b650933d1b30f9b1e661ca5a22a4fe SHA1 049e219e069d689e921d79fc6270766e70f9ae5f SHA256 4343a8e72bd19380d83ab5d4937388b2327e0dbb6187296e66dc7ca2d2b9025a
+DIST gnumeric-1.10.16.tar.xz 14275616 RMD160 37fa68306a7c6d80f66922f4f09c2b49b1171b30 SHA1 bd2daf02d055964b5c39a3753297e57672bd4337 SHA256 1d3d66bdb32b767a6db833d94a6ab2012eb4a39109140f6bc571334afac567fc
 EBUILD gnumeric-1.10.13.ebuild 1770 RMD160 f1cd17f42180ade61e6e8dd2c2b3a0961a4325db SHA1 6bc1b8356e9125cec830cdb04b109cbab4a587e8 SHA256 734ae89d59a70b98ccd666c02445f5dd7f4684d9da06cc13ba6064286bc52852
-EBUILD gnumeric-1.10.14.ebuild 1831 RMD160 07e25fd01cf2d4ab34c7324eeb659bbf6a93556f SHA1 4eca75effa4d860e6fd3dc65c71f18a5c2d6ddcf SHA256 b16c7841411e783ae660715855887c0c2aeb6d445662b9b3ea899e2e5937932d
 EBUILD gnumeric-1.10.15.ebuild 1742 RMD160 d8343a69c8d642d9551836e8b8956910da394817 SHA1 c5a357b040b8535a9e9b3895e2b594958ff86e10 SHA256 8f60bee60b1062223516293f1b6fb097645e2399a684f34a65dd309c98c839ec
-MISC ChangeLog 30684 RMD160 4ea98d3cca8cca7a02fe612125a778751346b2bf SHA1 ce7fdc11569d776fedec20ba1392cae085b2b78d SHA256 53892736085bacb1ba10ba7d87f26c6388ceec60a433164fdbd923885e3038e5
+EBUILD gnumeric-1.10.16.ebuild 1601 RMD160 82b57612fb2a095ab1b8d8bc0e1f8c675abc8bbf SHA1 edf851919abda7c884427356e6865f6671f92558 SHA256 1f0a31e0c38f3ea3a7070019096f282b29008d6fdf645cbebf8ec1a4c0acfb69
+MISC ChangeLog 31033 RMD160 31b0c78be6c8297fef482c24bc8641b492beb15c SHA1 7b362a3545e9be15d2e14934b2e3cb0c84b6acda SHA256 535f4077ede02cf5fcfb02654e9eae1d58e469afef3e10c9975fd2741263f908
 MISC metadata.xml 364 RMD160 864c3698f6ae825aa9badd409f07ff4499cbf0f1 SHA1 39dbd02b506842082781dd6d08dceb3abaf20046 SHA256 d230daad082bc155b5f1dd6cfdfd4e1aa2584227b385e9c57a17db57e9bc940f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3pCmEACgkQCaWpQKGI+9R/iQCfa4/qbdYXHaeYIiHUDOrETfG1
-E88Anjgd6V3E2vLgBfItmGXgJUWbj807
-=fWet
+iEYEARECAAYFAk3/LAgACgkQCaWpQKGI+9T2jACgh7dh9HjzHdJL5dr5ppLXeQiH
+wy8AnRylKxiROlzFWfeyNB7wc4//bJwx
+=It9n
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/gnumeric-1.10.14.ebuild b/app-office/gnumeric/gnumeric-1.10.16.ebuild
index 933e3ab3d35f..4c0d667fcead 100644
--- a/app-office/gnumeric/gnumeric-1.10.14.ebuild
+++ b/app-office/gnumeric/gnumeric-1.10.16.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.14.ebuild,v 1.1 2011/03/26 21:04:39 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.16.ebuild,v 1.1 2011/06/20 11:16:17 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="xz"
 PYTHON_DEPEND="python? 2:2.4"
 
 inherit gnome2 flag-o-matic python
@@ -15,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
-IUSE="gnome perl python"
+IUSE="perl python"
 # Missing gnome-extra/libgnomedb required version in tree
 # but its upstream is dead and will be dropped soon.
 
@@ -26,20 +28,14 @@ RESTRICT="test"
 RDEPEND="sys-libs/zlib
 	app-arch/bzip2
 	>=dev-libs/glib-2.12:2
-	>=gnome-extra/libgsf-1.14.19[gnome?]
-	>=x11-libs/goffice-0.8.10:0.8
+	>=gnome-extra/libgsf-1.14.19
+	>=x11-libs/goffice-0.8.15:0.8
 	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.12
 
 	>=x11-libs/gtk+-2.18:2
 	x11-libs/cairo[svg]
 
-	gnome? (
-		>=gnome-base/gconf-2: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-python/pygtk-2:2 )
 "
@@ -55,22 +51,15 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--enable-ssindex
 		--disable-static
+		--without-gnome
 		--without-gda
 		--with-zlib
 		$(use_with perl)
-		$(use_with python)
-		$(use_with gnome)"
+		$(use_with python)"
 	DOCS="AUTHORS BEVERAGES BUGS ChangeLog HACKING MAINTAINERS NEWS README"
 	use python && python_set_active_version 2
 }
 
-src_install() {
-	gnome2_src_install
-
-	# Remove useless .la files
-	find "${ED}" -name "*.la" -delete || die
-}
-
 pkg_postinst() {
 	gnome2_pkg_postinst
 	python_need_rebuild