Version bump, drop old

Package-Manager: portage-2.2.19/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 16 insertions, 77 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 520e8583b0d3..db0569a11408 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.286 2015/03/15 13:15:53 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.287 2015/05/17 09:08:24 pacho Exp $
+
+*gnumeric-1.12.22 (17 May 2015)
+
+  17 May 2015; Pacho Ramos <pacho@gentoo.org> +gnumeric-1.12.22.ebuild,
+  -gnumeric-1.12.18.ebuild, -gnumeric-1.12.20.ebuild:
+  Version bump, drop old
 
   15 Mar 2015; Pacho Ramos <pacho@gentoo.org> gnumeric-1.12.21.ebuild:
   x86 stable, bug 534012
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index faf8dee26ad1..bbffb705888a 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST gnumeric-1.12.18.tar.xz 18064824 SHA256 402224f858cfa4e91503ab1be0491fa3322713dabe56b6eae171def8b736d9e9 SHA512 241a80d79d1d20f484b2e262b86c6dd12192842b5baf7f11c3402b63810f1e67080b6ec44f05a1de88ae3f0cd476cd9ffb2ecbebe2cdf9104bb45287c8e5b8b9 WHIRLPOOL 8b646780e493d3bbb1ee357876481c2a19115bfed3909db0fddf212fc6ba808493e2c7c477efc13d23240aa36ba6957b3041d96c260fe155a5157530fdefcdbf
-DIST gnumeric-1.12.20.tar.xz 18440828 SHA256 4d491147e973afc0302823047780027c255a91343d839cf17562a852f42c21cd SHA512 12c58ff1fa802459529f273c9df4962ee6b5056f03539ab9a9351816cfabb706e1832a3eb365a12083a7c11c9bd35d63af3d2558116842c4e3fea50bab3c05ee WHIRLPOOL 55654477f5ff43b8a99263c10d537c70d083768da064b98f2f7387b989ae28c5ddf238f288c0297e5e7b552d99978ae99e410050624dc1b600351bfaa49b4e1d
 DIST gnumeric-1.12.21.tar.xz 18460624 SHA256 6eed42120babb7b2a857115f2ad6320bf255c7bd71a939344e5a6df744a09ef4 SHA512 5341cf04fe0f1115e8bda53fce57650b44195d482abef5f9f8c5683de756007df5f167d5df0ae2ea5a40d06b7cce3ab67233d49cbe28a32eadbd1dced16c773d WHIRLPOOL 3339aab18bd2bcf4c32417d7b92093c9deac730553fc79046e6138ed4c6234d2830c8c3392493b7e314c4c87983f36b9c385f69c020538426c4f2788900c9338
-EBUILD gnumeric-1.12.18.ebuild 1594 SHA256 a7330712b8b84b256e4956e2d8803e77bc5ed3894a04cb134aac9a002e73c81f SHA512 e468a29f6a7c9b891388dcbb20f426c8ccd4b76dda30084d450620535787a94b615894da4f42bdef4457b4b099ba273a099e5540209e48f31ae56551f06b1f76 WHIRLPOOL 206d05501fa2625d3f79c47f5a913da96dec0334728c23fc881c3c11c930322cb46eee6e58ad348c4a96c35dbd0ae93980df356c0009f11828272f20384993c2
-EBUILD gnumeric-1.12.20.ebuild 1596 SHA256 d770f5ed7f17950be58369c5c4f86cf42547fdc91623be709e4501362c00dd40 SHA512 aa3d266c8dc7ecb598aaf2e69407d14d17c70317f4774bd645cc5c56611f7eb1b57c5a1da97890e2246c60054ed07ec9c4fffc51c944cfc5c34dfe0ebce7f425 WHIRLPOOL b0ed58e18219a6a00ef1e2718588eadb9723c5ad91642e93c1e1f10818dafc22550b5721f0e53cb575a7186994ff85e8df87a06bd53e33f750238fa049192eab
+DIST gnumeric-1.12.22.tar.xz 18541384 SHA256 3908cfd6520b599eefefe222aadeaa5126394b54d9a9a7f5e0f938eb674dcf47 SHA512 04accd723db1b88fab80c93234f584f99138ae9c04fe6809cac59d5d4be9f4c105c288f6607ac22f019e3388ad821461e2423405353a42d3936c067219683390 WHIRLPOOL e7a6270ec7e72f4d2c75bcef984b4db7fa3aea8f4fff29d34e8b949dfac354e855af23d02e7a316b5db744b883c72e3056b196c8c1af734a4f03686691cf22ba
 EBUILD gnumeric-1.12.21.ebuild 1594 SHA256 2ffbc76e72373a9f056932be869aea0fec8b3624d0b02c20cc982d6583361936 SHA512 d98c08d16d07a3030288e367070fb465f40eff5f1727c6b730773467d68e9a01c5f3c7ecda06a552a7b05e6ca65b285ed255d6aace7258bc727bae6ba7ad250e WHIRLPOOL 2aac3c5502ac93d9d6fa6394c0faf5da227836d55cb2920ae343666d471777e1abd5f59d54c002c3cb2803fbc31213c1f2e49b44bdd26bfe2f5f5ab1eeddc374
-MISC ChangeLog 39200 SHA256 3ac7384f5e1fc5c8adde5c1a14540228e3b53d959c0bdcf5fb904df338bb12dd SHA512 1a4b19c3ed9e506a7a995417182a85f59d005c4ef2a9a02e5480b63059099a527199e05fc8a5de2c303a9d6a72861ee51349db270364f6e48ad4ca86e3c730e8 WHIRLPOOL 5aaadeabbae05c0df92f8f02850de8586743e4e0a932573f365e033b05886734b382d8a0f0616d16e165c38adf5204aa6510218f1e60c648043df7bb5e7741ba
+EBUILD gnumeric-1.12.22.ebuild 1596 SHA256 90438c65d38c98dd8963af19ffe1529fb324f790bce61fbfb33db12a99224b13 SHA512 faa991d669ddfaf58386084f6252fd0166c834a0352fef4ef8955d7bd167a1334a7d4a0d0c4b2724e5a3e334ef931af8c6ebb602aecd7389927a52dc132e1114 WHIRLPOOL c02e2b30e0cf96ac172a99198d1017a347763b8d094a76674cf2d869e879013465632c190f09cc1872eccb95e6f5e9a4f30ac2c79b18cc665713beac78455578
+MISC ChangeLog 39385 SHA256 0d6c2c697ca244584f5e99570671630457133229ce81909515838e166e8181af SHA512 70ff2c9f59998a78ef8ea20b5e67efc43f01cb65ad630f8d34e996a04f11a2aa25bd905b0e540284d800c12a5e1a0293d42572de07e32f74f48ed27f5f8162b4 WHIRLPOOL fca22fc927afdf04573413a0579ebfeae83b5ce5427158f8ab05de349c537d03928f61eaaaf122ec6538b5dd975043592b013daf6e75559c86e2e017d39fde2e
 MISC metadata.xml 381 SHA256 62ca3ef5ae5a5c0443e9ab858424733291f62c080115b0a08b2d1cbfcc17ee75 SHA512 c50ea74e4db4ffadd19e5ca582fce83fe9ab1511613bef5db7f7c07b682a35bb47f398a1e245cf3ef077d4df4872483f41666fd5473cbd6ebce201e65292cc03 WHIRLPOOL 6a6ea6ca7ca29840551e68066f0274bcc612dffe099e1505fccb46d0ca06c18d3439144a708b986d7e8f5a54b1088852f5d587a82b797c6232395a4607af86ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlUFhfwACgkQCaWpQKGI+9TuYQCfW6wriJDBghiG6/hnsV07zarX
-cUEAnjxOWMMMZfl+4nWVtte8UOZU0/4A
-=botR
+iEYEAREIAAYFAlVYWokACgkQCaWpQKGI+9StsQCfZCgENBErt7U1l90JNXPKfGPr
+IfUAn2eFPETOQnDDqdwFxNE7vJA3RuFy
+=GzHd
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/gnumeric-1.12.18.ebuild b/app-office/gnumeric/gnumeric-1.12.18.ebuild
deleted file mode 100644
index 42873ed7b45b..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.18.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.18.ebuild,v 1.3 2014/12/19 13:34:21 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-
-inherit gnome2 flag-o-matic python-single-r1
-
-DESCRIPTION="The GNOME Spreadsheet"
-HOMEPAGE="http://www.gnumeric.org/"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-
-IUSE="+introspection libgda perl python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Missing gnome-extra/libgnomedb required version in tree
-# but its upstream is dead and will be dropped soon.
-
-# lots of missing files, also fails tests due to 80-bit long story
-# upstream bug #721556
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/bzip2
-	sys-libs/zlib
-	>=dev-libs/glib-2.38.0:2
-	>=gnome-extra/libgsf-1.14.24:=
-	>=x11-libs/goffice-0.10.14:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.8.7:3
-	x11-libs/cairo:=[svg]
-
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	perl? ( dev-lang/perl )
-	python? ( ${PYTHON_DEPS}
-		>=dev-python/pygobject-3:3[${PYTHON_USEDEP}] )
-	libgda? ( gnome-extra/libgda:5[gtk] )
-"
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--with-zlib \
-		$(use_with libgda gda) \
-		$(use_enable introspection) \
-		$(use_with perl) \
-		$(use_with python)
-}
diff --git a/app-office/gnumeric/gnumeric-1.12.20.ebuild b/app-office/gnumeric/gnumeric-1.12.22.ebuild
index a72caec76418..bc977a8b8800 100644
--- a/app-office/gnumeric/gnumeric-1.12.20.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.20.ebuild,v 1.2 2015/03/07 10:54:04 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.22.ebuild,v 1.1 2015/05/17 09:08:24 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -30,8 +30,8 @@ RDEPEND="
 	app-arch/bzip2
 	sys-libs/zlib
 	>=dev-libs/glib-2.38.0:2
-	>=gnome-extra/libgsf-1.14.24:=
-	>=x11-libs/goffice-0.10.19:0.10
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.22:0.10
 	>=dev-libs/libxml2-2.4.12:2
 	>=x11-libs/pango-1.24.0:=