Version bump, drop old

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

3 files changed, 25 insertions, 9 deletions

diff --git a/x11-libs/goffice/ChangeLog b/x11-libs/goffice/ChangeLog
index a43b885ca14c..855a08331675 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.137 2014/02/22 22:43:07 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/ChangeLog,v 1.138 2014/03/08 10:46:35 pacho Exp $
+
+*goffice-0.10.12 (08 Mar 2014)
+
+  08 Mar 2014; Pacho Ramos <pacho@gentoo.org> +goffice-0.10.12.ebuild,
+  -goffice-0.10.10.ebuild:
+  Version bump, drop old
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> goffice-0.10.11.ebuild:
   Fix wrong commit, bug 502160
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index 68e66add328f..38162f3ef123 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -3,21 +3,21 @@ Hash: SHA256
 
 AUX goffice-0.8.17-no-pcre.patch 6490 SHA256 dd22ff8ffdea5618ff7357b9a36d68522f0bd4a9236d40e578182f8a6c2049d5 SHA512 70af548433fed3f95b4b64cd7debf0cef0b8b7f7796c155be5d29a060ec2f3883d06703fc42e6dae40d4eb6933f45f2eef1c0d9f2088b5fc2e89ef580fc79b13 WHIRLPOOL ed84effb61cc08076245871e16172de1eceba0c063bf92351e95ba37e8f23e5094db7d7a67ba572d2bd5648877a5b86eb22beb7e260455f9ea0a84aa516267ea
 DIST goffice-0.10.0.tar.xz 2121692 SHA256 7e7577f69203b03c4966906bcaabc6e87a629efb1684630c2bee7907bed08439 SHA512 5d3df468129baaf64fb275f16c433ae40c3d3d33ea49bd9b3f62b3977083863e19c36e65c8d5d1ef3536a792bfb8817d199830115220f8f9fbd40d67cd121863 WHIRLPOOL 4870d7618f01314e3776ebcc29356621cd99ac91e26bc8a8d5d0aab2c4c1a5b7e9721469bc3d7676496ac2e51a2f82b8d65053df923d49ed5e606a0bdf0588bb
-DIST goffice-0.10.10.tar.xz 2228484 SHA256 03f5305d6d99c3c5afa808ba8e65abb3f7f738ecc06d25911de32945920bd538 SHA512 bb6f9bc2b724cc92fce285dc3471ee888709e95ad407887db9748d80fd8e8695592b2bbdc440f68ffdb1f3c2b2b32691e022f620b96c265804483732b727934e WHIRLPOOL a0e993cac6ec7db3b8f79f79ab5adee902d6dacfb1931d7c32e736f2de13d4366d7bcd61ee12fd958ffbd55ea8c0c7990bf132aa85003e2cb2fbb1cc9a2e9e05
 DIST goffice-0.10.11.tar.xz 2228656 SHA256 43f419aff4ecdfff8c201e2cac884050e6906dc679e6bbac9c6647c6c706ff24 SHA512 22f33100461aa0118885cf969af0b2321843096d5b67ed207bb9b308303b239e4f2f788a148bd82aa3302f705bbdbd9aba8b8c8d8156805540ae3b6993a928c5 WHIRLPOOL ded7669fa096c5eb84e4a0fbe4ea7c1bbc39889e5e13c8c00d776a9d6b96ef6eb1f620679cb5578ec7af3e437d20a3235084ea3b13c311ee57b418c6d342ef3c
+DIST goffice-0.10.12.tar.xz 2257080 SHA256 ce91a3bf20416301f00ceb46c160631234e451a502f54ee0ef1ad9f262d3006e SHA512 277282e6945b24464b1ab03218ba816e81b085e5478304e6145aa92e2e439fee80ed598ab3d4980a6a75e2d9f3b01e18c79505aeb7d6ee1244fade2671bda1c7 WHIRLPOOL 4ade4a2b934d7f51303bc991d57f95bbada04458fe8b300c6757afcafb106953e3c1148950e4efb9c3304cbb072da71eccd930d713bdde1e9f7221b7ed166bbd
 DIST goffice-0.10.8.tar.xz 2205528 SHA256 11964b907b03dede6d8d8a1a4ae2d5727ffbe8d7bab5c92dec586acb616e807c SHA512 2bfc6f3da977e6e554a65be3e64d0ee9a567e754d718b6a1ac7f6ae267edbc0a729fe43091be768f11acfd945fcfc8bd25f720d6948c8cfaa5439c95977805e8 WHIRLPOOL ae11e0dfc20f77a093b1ec78a5f0dbed2890172e4ba4fd4b93170982c82ef782fb1ff67b8937e0c2fb7572415b1f0718cd5bf99075bfcd28a0e6ada245e2a432
 DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
 EBUILD goffice-0.10.0.ebuild 1344 SHA256 50a08ec3d86de66a3731a71bc7527faf7b3f7f867f9751bdb5b882712973f7c1 SHA512 aad099d43cf2346ad8c0ada65f98153da7ebd6cc28cbca6d64746b77fedc01a6cb9e8da6c494416705fdefe0eb2bb4bdf2ae18ea8068b6838ff26e164f85587f WHIRLPOOL fcced19d5dd3c5e180d47b4065711068adeeac824384d458e8c39faacfa92110d574dd33e2f8186d5c93da921c01cb977ecb2f10aaa8b1406505c4ee09bee2fb
-EBUILD goffice-0.10.10.ebuild 1359 SHA256 0a7778b8e1a5f604bc1dab7407b65280b87d2678e2ff9db91ffe0157a611281f SHA512 c03d79a74e7a544ee7b639c64e94f87e0c873467fad7b98d7015d828e5e22ed765e4d88bac8b70ada7f502e063c000243cbe8336e32f62b746187fbd13f50a77 WHIRLPOOL ac61b5a7aef1cde76011ffa323528b8dc43113eebd54aaf2932443bed07bb30b47444bc3e57e369353680d305fd8de37d892cfb42e1ca0a8fb7e403ef85f70ea
 EBUILD goffice-0.10.11.ebuild 1359 SHA256 52ac7914db66043631b4b485ee08b1382c29fe449b0e9d944b4a6ba6f4169bfe SHA512 f6d6e69b616fca3a25e18829ad2a6cd1d3b7a294a19d197a3e0e7a9ed8f3e75f18e8beb4c3f739745958ab810c8d99fada86cc3ed9b8a31e5849c971a4c77a71 WHIRLPOOL c2df75d610437972b2f1d0878b3c1884e76f9409a4b7d866028b71cd8cce2f4f28b26c94b5bf8b7a8edde8184d10698bea739050af4b410482c3988835efda96
+EBUILD goffice-0.10.12.ebuild 1557 SHA256 5e9deb0836a247381cf5d3e6955abfb48be68cd2ffeea8927b99dd51bfecfbbc SHA512 3f8ba2ed427da38c654670c08acd748a640fada11ce5202396bfe28350099861972732691fca140c2e20ae3b06f0f0163219c91a56eeaa9fe1805dc87410154e WHIRLPOOL 2f69a1a692b7f5f2c794befbe6a01dbf487177a80ccccf0464539a595cccb02226f644f1f7ff474e350e16c2035794853f2ca015389579715e2ba7271daae4a5
 EBUILD goffice-0.10.8.ebuild 1356 SHA256 b410105242c8cdcdaa0207be1d12eb461717a655b5ce345eb23914978faab3ff SHA512 c857c697cff2a83c4ef9e372a3e3aaea94e48d39d03764c854528ea5d1760067b35a8ab6e571a4d9ec3223dde4dfe36198b1b7defc0f64a0b0644edde43f87ec WHIRLPOOL 116705924daaad5ccaa414dc237d9665fd9dd18caf9d44bbc4a159a144b335e2e9d622bb80bf8fa1e2bdc8f5163ce56fcf1d7ff13bf2e31ddff598f1905c3bf9
 EBUILD goffice-0.8.17-r1.ebuild 1549 SHA256 35a6feffe6003aea2054466d08cb7ccffb40c1b80706d97c8c5172026e758462 SHA512 6a3ff3368b60427ec405a19cbde09cf37524c97fe7a71ff65ba9e7eb3cea09a31a24189bf30fbc6dd60883d25db4a5f54479b93f368a4cd83afc8985a9dc3913 WHIRLPOOL 7c968aebb95f37271e02adc397d8f98dceff0daf5b1bb0fd6b22b1ee55595c9e763e783816b305284581ea0ee753bccc183ee15554a7a3a59ad02d009ddecf0c
-MISC ChangeLog 18582 SHA256 86514b242c86d4eb96315338b12af4c011b5d5dfcc04a8349ebfa4bd009788e3 SHA512 acccead381367709e53b47fd62b07100b8047be82b6576c7fe6aa22001a8a3c4ecf0a67a7be685a3593793db34cacf425c1ede03d4d6ad95266e210132348be6 WHIRLPOOL f6e9f4a9cc85dbc41da87d43d3d01cd44499c51a9c302ef21669e89598dae48b4afc490ba4e57f36c72bb92ead5c76989752bd044ddf34caf427bc689c5631f2
+MISC ChangeLog 18738 SHA256 38d69613e8447c8517262f29faaa1c6276e0fbf53afb8267b2727f4a81541878 SHA512 8f41f5f09a07e202082b90fbf963da1b38350a09681e8fd572e1ec289c594969f1df36f9e1f413426ac8842174fe38d4322caa11248f4823ff0ca428157c5943 WHIRLPOOL fd9615ccea0ecb68389c415a23d4baf51d4ac5cd3571a189fe7bae7f2edf0ae650719b605402238f16e78d3383d76fbd629884755d0a45d27611a5af50483a95
 MISC metadata.xml 355 SHA256 5eedbf049eb7d297420c9dc4f58b392f9a05405a9d755e75661157a45fb51962 SHA512 3d35480e156bde69be5c8b13e4fbc4ede877280dda5f6d0f28e3ca564e9c29919aa234b3a1986965714619b3daa286011d1af4d35dd7b3c696a6f85a4b88432a WHIRLPOOL 05578e14eb4c23bf265ad7456ac2f7c46fbb89672acbff9e4dbb25cc28cc9942caae9a2c63146a3850cda61bfb91036cc47b9ea985a3251a6e037112e44e4a5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJJ/0ACgkQCaWpQKGI+9RFUgCeLmPg8AzxCE7cZHEQfnRhKOOT
-Tm8AmQHNbMNIf3i/W2QOmuU7iZLSXKuw
-=2SvW
+iEYEAREIAAYFAlMa9QwACgkQCaWpQKGI+9R9wwCdEHY29GqPoX3SzuhSIeSqo9QD
+7y0An3+3GtKf4ugPpyjjKp7STXwVplmV
+=henE
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/goffice/goffice-0.10.10.ebuild b/x11-libs/goffice/goffice-0.10.12.ebuild
index 8bde035dc8c0..08f6fd3adaa8 100644
--- a/x11-libs/goffice/goffice-0.10.10.ebuild
+++ b/x11-libs/goffice/goffice-0.10.12.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.10.ebuild,v 1.1 2014/02/15 10:31:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/goffice/goffice-0.10.12.ebuild,v 1.1 2014/03/08 10:46:35 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2 flag-o-matic
+inherit autotools gnome2 flag-o-matic
 
 DESCRIPTION="A library of document-centric objects and utilities"
 HOMEPAGE="http://git.gnome.org/browse/goffice/"
@@ -21,6 +21,7 @@ IUSE="+introspection"
 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
@@ -38,10 +39,19 @@ DEPEND="${RDEPEND}
 	>=dev-util/gtk-doc-am-1.12
 	>=dev-util/intltool-0.35
 	virtual/pkgconfig
+
+	gnome-base/gnome-common
 "
 # eautoreconf requires:
 # gnome-base/gnome-common
 
+src_prepare() {
+	# Fix DESTDIR, upstream bug #725935
+	sed -i -e 's/$(DESTDIR)//' mmlitex/Makefile.am || die
+	eautoreconf
+	gnome2_src_prepare
+}
+
 src_configure() {
 	filter-flags -ffast-math
 	gnome2_src_configure \