This only needs to have stable versions for amd64 and x86

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

5 files changed, 16 insertions, 70 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index 672c1152a6c8..0c677b97f422 100644
--- a/x11-libs/goffice/ChangeLog
+++ b/x11-libs/goffice/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/goffice
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.172 2015/05/17 08:59:55 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.173 2015/05/17 09:14:03 pacho Exp $
+
+  17 May 2015; Pacho Ramos <pacho@gentoo.org> -goffice-0.10.18.ebuild,
+  goffice-0.10.21.ebuild, goffice-0.8.17-r1.ebuild:
+  This only needs to have stable versions for amd64 and x86
 
 *goffice-0.10.22 (17 May 2015)
 
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index b1fb61a32421..6a391cb9ac8c 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -2,20 +2,18 @@
 Hash: SHA256
 
 AUX goffice-0.8.17-no-pcre.patch 6490 SHA256 dd22ff8ffdea5618ff7357b9a36d68522f0bd4a9236d40e578182f8a6c2049d5 SHA512 70af548433fed3f95b4b64cd7debf0cef0b8b7f7796c155be5d29a060ec2f3883d06703fc42e6dae40d4eb6933f45f2eef1c0d9f2088b5fc2e89ef580fc79b13 WHIRLPOOL ed84effb61cc08076245871e16172de1eceba0c063bf92351e95ba37e8f23e5094db7d7a67ba572d2bd5648877a5b86eb22beb7e260455f9ea0a84aa516267ea
-DIST goffice-0.10.18.tar.xz 2306320 SHA256 4743a148d4452743f3484ed28285a6889adb4af2a61b72448e0ddfe7d5142c64 SHA512 2bf0ded67424171d9d803d0ffb8634fa34cb7a0eb844b3fe1a988f7030613d3525eaffc7b31d90e74cd2e53c86cbd9c76c9d183247c8f3acc9394591ede62052 WHIRLPOOL ac3d5aacc35c6065e6dd227652532cbbdcc6a0c65f7ba333217246fbffafc4d8ed6002b0f2acfdc3b5c827d5443cca799d8791588408c3785df54bad227eb5df
 DIST goffice-0.10.21.tar.xz 2336136 SHA256 be3cd0f31bb304369283fd13b441aa67705e62231db2001da191c49f724749c2 SHA512 e2363b84c9fac4a46860401e3bba3a92bc527bd0f40d593309788bd4a02bfe7cc55f49bb0587639435563b02e9729ee592069a4120482f2194eeb2c59512912f WHIRLPOOL f45ce739effe3df1f19f54f1673f0faba676b566c6677372c33a9df643422318e45463e9b85a5f9a944c7baeda4c228ba0aa8f40ff6d1a8d4c6d6ff064af0987
 DIST goffice-0.10.22.tar.xz 2347728 SHA256 0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28 SHA512 e9a8a6177d3f8ac866c7e9b508ca6a92bb9ab7eec00d4472b9ad31c4c54c1e337a8b21e23dd668f1adc8d5dd0c3df8f1f115fc7c10ffda31993c262b7eccb514 WHIRLPOOL c2c9e45391e1ae5d68c48462fc361be39a6def78bbd60f111fb1d96358794332e6d9490ea220a13d7b6df213d9ca00b9335b4fa8ed79ee496f9bbafc85fcc983
 DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
-EBUILD goffice-0.10.18.ebuild 1439 SHA256 fe085de4aeccdb6d953e5ba87125e05c7a38bfbd5c6423fe45f50363967c9df2 SHA512 f06a3e61ee4e28e30366a1c70d789a0893cbc4535ea78057b9b408622bf449bebd626a0e495e1a34e4423255cf35f1ad88421456a868fb1560bf4fa93617d65b WHIRLPOOL 1c7082a2aa9d772f7f7c84567ea7767247cd3559783dad67354df64790c8eb54dd332f906a9836dda9b39e1cd9065fa90a6369945d199302910df3bd25e6eda6
-EBUILD goffice-0.10.21.ebuild 1442 SHA256 01d98c0f785ebc3ef1be79d05e8232c6be7a99c0aad26f0038007f019c5d5a50 SHA512 cbd5cbdafff155a56f1aaac986e889db2a0d1472fa8041032f3163a533e3495f2b0ca1aec706865d63d4cdaa4cc78997d544800c40ca435fb88cdc704c9b3fdb WHIRLPOOL 82b96069980f4e5e30ff55ffdb856b441148b3be3159be8bb42beed52e9122ee9ff5f6fa15c6fff23208f6dffbb3fd228126edaabd6c1a6910575c53938c4f80
+EBUILD goffice-0.10.21.ebuild 1440 SHA256 5755503bff07c69fad4dd06d663ecee07d91425333f1b681578ce7faab41b1a9 SHA512 56228c045fe8ca75fee118f08aec91fa96dfc6ee1847462e27f5301b93c3274ea374117ed36224780cb995adf21bf66d988f1d7129ba5e3b2bb8697423e140ae WHIRLPOOL f4364ed529d63c56cceb3c63254283d19db3368eb41c0f36820bbacc66fdf2abd81190c3db4d8b335fbb8dff347a7ab54918b4ffd04a9611574c431262171c60
 EBUILD goffice-0.10.22.ebuild 1442 SHA256 0056f98f38c226941f7b9d2565c7238f9dd6608b5696a3156087fd4f8df41808 SHA512 4eb7f2689c7aaf26367939c909a4a09871e80cea6800ddf37e0b4072f6a0cd4fe71061f37aabce6cef12c7fc22d4b6b988bba39e32ddc88946f8017295f7771d WHIRLPOOL 4fec53ab2ae9a6d56a5d6530d6afadeb4325119972702c7b3f9747a71a425cd6cb33343b8e511bcf58b24aeabc23768c982be3cf331bc89176c9e03f722ddcff
-EBUILD goffice-0.8.17-r1.ebuild 1549 SHA256 35a6feffe6003aea2054466d08cb7ccffb40c1b80706d97c8c5172026e758462 SHA512 6a3ff3368b60427ec405a19cbde09cf37524c97fe7a71ff65ba9e7eb3cea09a31a24189bf30fbc6dd60883d25db4a5f54479b93f368a4cd83afc8985a9dc3913 WHIRLPOOL 7c968aebb95f37271e02adc397d8f98dceff0daf5b1bb0fd6b22b1ee55595c9e763e783816b305284581ea0ee753bccc183ee15554a7a3a59ad02d009ddecf0c
-MISC ChangeLog 22958 SHA256 cd66eab0d8eb0f5a91258de5e1cee31852dd786d251422c65bff29a1f59e5956 SHA512 be1a8e9a4505d43f6e5f305f19fe130425ebb0382a0ca8dd60b0289a0e9291dbe2b4201e55e50b898e5198422b41fe05ea29f2cfd0c470ff345f011221f7eefe WHIRLPOOL 5b9bc4d87edaa668a9c5c19e40fd6d701ddae0f1ca8538ae026311893b707c2b7905f8bbdd7cc0ed6726250d45135d443923f141a85c9ad97e57774cead5e5a3
+EBUILD goffice-0.8.17-r1.ebuild 1552 SHA256 e1594767b430d136471765031711d37b14df67c248f48363e3541fb1c5a0061e SHA512 e1a5825ba19d8d57b5c983c3606821abd549fecd6a88b99d98c78cbafc60a3d6ceff5d127b8ab0ce30135c370d2938a8f7a703636da8a378fbe963969f7adc7b WHIRLPOOL b8005fee8078083884260199eb993b216fd16062e6b74138ea0e239131eb4429111de741eb1c5604bb47d4fdda537cf04c7cc8c4d4e2b750e3dc7872e8768b63
+MISC ChangeLog 23142 SHA256 f1e5cece60efd86afd5edc43225c310aad2c796559b85cd2c9819df600fb09bd SHA512 daf642dc855b4d14462919232a459a81617ec263f929f4bae556533a988de1fff00e65e61fdf58c32c9485e0bc2e64e8c9994b1e0697124cd83852c46622e73c WHIRLPOOL e8b3a238d0b53e47cc77bab9103331b3a2ed70e4fc5f2575b9adc495ec659f28dbdffce78e1f50e3e5ae4f0466bc2a42950e5fe8ad1f254f86398d7d30d44574
 MISC metadata.xml 355 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962 SHA512 3d35480e156bde69be5c8b13e4fbc4ede877280dda5f6d0f28e3ca564e9c29919aa234b3a1986965714619b3daa286011d1af4d35dd7b3c696a6f85a4b88432a WHIRLPOOL 05578e14eb4c23bf265ad7456ac2f7c46fbb89672acbff9e4dbb25cc28cc9942caae9a2c63146a3850cda61bfb91036cc47b9ea985a3251a6e037112e44e4a5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlVYWIwACgkQCaWpQKGI+9TKRQCeJAQxZBzjgL3vhWch8opMx6Np
-RFkAnidlwC7zDzCDghXhTPwBn7vGYobV
-=s2/r
+iEYEAREIAAYFAlVYW90ACgkQCaWpQKGI+9RZcwCcCeUov5QnE8dRJ6nvvmdykheK
+cB0AnjjpzLFXOaXsi7kKT2VSN2ut3sWk
+=Bu+s
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/goffice/goffice-0.10.18.ebuild b/x11-libs/goffice/goffice-0.10.18.ebuild
deleted file mode 100644
index ed25900f3abf..000000000000
--- a/x11-libs/goffice/goffice-0.10.18.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.18.ebuild,v 1.9 2015/03/25 14:06:13 tetromino Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-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.38.0:2
-	dev-libs/libxslt
-	>=gnome-base/librsvg-2.22:2
-	>=gnome-extra/libgsf-1.14.24:=[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.8.7:3
-	introspection? (
-		>=dev-libs/gobject-introspection-1:=
-		>=gnome-extra/libgsf-1.14.23:= )
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	virtual/perl-Getopt-Long
-	virtual/perl-IO-Compress
-	virtual/perl-Compress-Raw-Zlib
-	>=dev-util/gtk-doc-am-1.12
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-# eautoreconf requires:
-# gnome-base/gnome-common
-
-src_configure() {
-	gnome2_src_configure \
-		--without-lasem \
-		--with-gtk \
-		--with-config-backend=gsettings \
-		$(use_enable introspection)
-}
diff --git a/x11-libs/goffice/goffice-0.10.21.ebuild b/x11-libs/goffice/goffice-0.10.21.ebuild
index a8d6c0cfd208..e8b40e4e7e4f 100644
--- a/x11-libs/goffice/goffice-0.10.21.ebuild
+++ b/x11-libs/goffice/goffice-0.10.21.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/x11-libs/goffice/goffice-0.10.21.ebuild,v 1.6 2015/03/25 02:25:20 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.21.ebuild,v 1.7 2015/05/17 09:14:03 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="+introspection"
 
 # Build fails with -gtk
diff --git a/x11-libs/goffice/goffice-0.8.17-r1.ebuild b/x11-libs/goffice/goffice-0.8.17-r1.ebuild
index 263e764b1936..35f4c85834cd 100644
--- a/x11-libs/goffice/goffice-0.8.17-r1.ebuild
+++ b/x11-libs/goffice/goffice-0.8.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.17-r1.ebuild,v 1.9 2013/10/25 21:06:43 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.8.17-r1.ebuild,v 1.10 2015/05/17 09:14:03 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -13,7 +13,7 @@ HOMEPAGE="http://git.gnome.org/browse/goffice/"
 
 LICENSE="GPL-2"
 SLOT="0.8"
-KEYWORDS="alpha amd64 ~arm ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="doc gnome"
 
 # Build fails with -gtk