Version bump with a lot of fixes, remove old.

(Portage version: 2.1.9.44/cvs/Linux x86_64)

3 files changed, 11 insertions, 81 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 7ca964bd4901..47c010fe4ae7 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,12 @@
 # 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.220 2011/03/22 19:56:44 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.221 2011/03/26 21:04:39 pacho Exp $
+
+*gnumeric-1.10.14 (26 Mar 2011)
+
+  26 Mar 2011; Pacho Ramos <pacho@gentoo.org> -gnumeric-1.10.6.ebuild,
+  -gnumeric-1.10.12.ebuild, +gnumeric-1.10.14.ebuild:
+  Version bump with a lot of fixes, remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> gnumeric-1.10.13.ebuild:
   Marking gnumeric-1.10.13 ppc stable for bug 353436
diff --git a/app-office/gnumeric/gnumeric-1.10.12.ebuild b/app-office/gnumeric/gnumeric-1.10.14.ebuild
index 98c382acaf5f..933e3ab3d35f 100644
--- a/app-office/gnumeric/gnumeric-1.10.12.ebuild
+++ b/app-office/gnumeric/gnumeric-1.10.14.ebuild
@@ -1,6 +1,6 @@
 # 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.12.ebuild,v 1.2 2011/03/16 09:05:05 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.10.14.ebuild,v 1.1 2011/03/26 21:04:39 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -17,6 +17,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 
 IUSE="gnome perl python"
 # Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
 
 # lots of missing files, wait for next release
 # also fails tests due to 80-bit long story
@@ -40,13 +41,13 @@ RDEPEND="sys-libs/zlib
 		>=gnome-base/libbonobo-2.2
 		>=gnome-base/libbonoboui-2.2 )
 	perl? ( dev-lang/perl )
-	python? ( >=dev-python/pygtk-2 )
+	python? ( >=dev-python/pygtk-2: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/intltool-0.35.0
 	>=dev-util/pkgconfig-0.18
 	app-text/scrollkeeper"
 
diff --git a/app-office/gnumeric/gnumeric-1.10.6.ebuild b/app-office/gnumeric/gnumeric-1.10.6.ebuild
deleted file mode 100644
index 466e69fbaae5..000000000000
--- a/app-office/gnumeric/gnumeric-1.10.6.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# 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.6.ebuild,v 1.8 2011/03/16 09:05:05 nirbheek 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 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:2
-	>=gnome-extra/libgsf-1.14.15[gnome?]
-	>=x11-libs/goffice-0.8.6: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-base/libglade-2.3.6:2.0
-
-	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-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
-}