Version bump, drop old

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 9 insertions, 57 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index e195a3ce6c57..bbab0a6c1039 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.154 2014/09/15 08:24:39 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.155 2014/10/01 12:36:08 pacho Exp $
+
+*goffice-0.10.18 (01 Oct 2014)
+
+  01 Oct 2014; Pacho Ramos <pacho@gentoo.org> +goffice-0.10.18.ebuild,
+  -goffice-0.10.14.ebuild, -goffice-0.10.16.ebuild:
+  Version bump, drop old
 
   15 Sep 2014; Agostino Sarubbo <ago@gentoo.org> goffice-0.10.17.ebuild:
   Stable for sparc, wrt bug #512012
diff --git a/x11-libs/goffice/goffice-0.10.14.ebuild b/x11-libs/goffice/goffice-0.10.14.ebuild
deleted file mode 100644
index 39bda874987a..000000000000
--- a/x11-libs/goffice/goffice-0.10.14.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.14.ebuild,v 1.3 2014/05/04 12:13:15 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 flag-o-matic
-
-DESCRIPTION="A library of document-centric objects and utilities"
-HOMEPAGE="http://git.gnome.org/browse/goffice/"
-
-LICENSE="GPL-2"
-SLOT="0.10"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
-IUSE="+introspection"
-
-# Build fails with -gtk
-# FIXME: add lasem to tree
-RDEPEND="
-	>=app-text/libspectre-0.2.6:=
-	>=dev-libs/glib-2.28:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.9:=[introspection?]
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24:=
-	>=x11-libs/cairo-1.10:=[svg]
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	>=x11-libs/gdk-pixbuf-2.22:2
-	>=x11-libs/gtk+-3.2:3
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-# gnome-base/gnome-common
-
-src_configure() {
-	filter-flags -ffast-math
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.16.ebuild b/x11-libs/goffice/goffice-0.10.18.ebuild
index 21f95294f1e5..263cd1484100 100644
--- a/x11-libs/goffice/goffice-0.10.16.ebuild
+++ b/x11-libs/goffice/goffice-0.10.18.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.16.ebuild,v 1.1 2014/05/31 09:38:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.18.ebuild,v 1.1 2014/10/01 12:36:08 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 flag-o-matic
+inherit gnome2
 
 DESCRIPTION="A library of document-centric objects and utilities"
 HOMEPAGE="http://git.gnome.org/browse/goffice/"
@@ -44,7 +44,6 @@ DEPEND="${RDEPEND}
 # gnome-base/gnome-common
 
 src_configure() {
-	filter-flags -ffast-math
 	gnome2_src_configure \
 		--without-lasem \
 		--with-gtk \