Add missing header (#502178 by David W Noon and approved by M Welinder), drop old.

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

5 files changed, 30 insertions, 74 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index 60d83596b5bc..d67a270340ec 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.262 2014/02/22 21:03:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.263 2014/03/01 07:45:28 pacho Exp $
+
+  01 Mar 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/gnumeric-1.12.11-missing-header.patch, -gnumeric-1.12.10.ebuild,
+  gnumeric-1.12.11.ebuild:
+  Add missing header (#502178 by David W Noon and approved by M Welinder), drop
+  old.
 
   22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gnumeric-1.12.11.ebuild:
   Fix wrong commit, bug 502160
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index e64a178db85d..48823c4f9f30 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,21 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX gnumeric-1.12.11-missing-header.patch 246 SHA256 907b8716d8ee0ec527ea18327b41d9f5d9b113c709c529cf6e6bd26a3a7604a5 SHA512 ee1196125858a5c7b7fb8e7284aea3124b9a72b2e020f61089eebd128318f3853656397da58305656495bd7f52b667255915b4036830be1dd0f903679e4d2bdb WHIRLPOOL e4b38c9ed9beba82207ed698fe608670e561d7f9272045e8d8c5935fc144613387e33f88f147d07075a27c5c5c4acfa0aa7bc56ede94dc2a7239723e4072bd9e
 DIST gnumeric-1.12.0-annotation-syntax.patch.xz 13408 SHA256 8cc904ced03d1cdb894afa896c7fc8be22bd3cf16f0c8427c965eb813a406a48 SHA512 b1062a75750630e4e0cb479a994db2c98aae4668355a7756bd6ca9f64407571d73af0fd428453e373d4d0d9f77d842869cbe4f7d5ba0054103cd8add0e09d5b6 WHIRLPOOL aec5b51c9af1e6b3806c7f5f22930c41d42ed0dfbcb66407a18ded9cf565b78daae76d2b8a5952ce4f7379b11c9bad68a02982f7248a62d0c5a87e8ae60a71f4
 DIST gnumeric-1.12.0.tar.xz 15631708 SHA256 037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111 SHA512 5bcf5e04d3c871d755a560207db2bce9d81bbe24f9c330a8a0555a386c38f505997c0a24a44afe0ab28539f03a921ce13f82ea8c6e828e17d998ce4951639223 WHIRLPOOL 2de92f2fecc9389e92a1e50f3c37361e0c06e792d0e75ca17beb1a5c6a9b344bc14d3eeef561ecdda5a3e6c60f4fe73f6fb2fd22e343b6edf842f7a81d64a825
-DIST gnumeric-1.12.10.tar.xz 18032544 SHA256 4c9ee095af14a24b3cb9ed9051736d41488cacaf2960a00fe1e135ca0f3b1fde SHA512 017e2af94094a4792fd68088010fb11f544019f11c12733dc470a50dcf1a7a0fb1f3e4c22da79c6e02578dfe0c729aedcde2a0d83eb8401d2e8e03b8c28dcd67 WHIRLPOOL 7e4e6b391a3f543ac0bdb117e2c7eff3c16988beca8f0cb3197e0a944ad3c664ce5c4bf0617d4ff698484449edbe1b06d2f97e7cdfc4a2e92286e75c0bb0de13
 DIST gnumeric-1.12.11.tar.xz 18035884 SHA256 554224f8a91743702b90010bf4bd7f04b9086e89c023a2aa1b2dbc31426c538f SHA512 c06e4cf35f594f5bd0eead414c36d26be9b1e767c71779b22f760f67c49c7e8022d6098bdd8993e73ae4c21397efa428f05cb0aa0cf7cfc952a5ca08d08e1ec3 WHIRLPOOL f8aa31ca784bc6d1dbcaa598d7601e6c13548efd8cf57d561deee7ef05fbb3f0a89c4e93f07e60add563daff688fb16461a508f4c10e5d8f400f6309f2df5d07
 DIST gnumeric-1.12.8.tar.xz 15545900 SHA256 02688fb6c32c28db2eb4e9a8e012cf1386f4f3a18b4c94f5ecdd13342521ec76 SHA512 be590dd515c14cd1a7b78f2a36acac271f24570d052c5dbaa6a35cec4c5c2603f632ffdc511455e1bb0f1d0451d92445fbd2dfb09cef26bfad0b088f0ff787d1 WHIRLPOOL b730e9c1f44832e8a9203a1dcd4e06e56669de746dcb324b5fbd0c0ffbb595af4fed204355e14afe7ac725c066d8d41f78e49549c903187091d4c286595ddf2c
 EBUILD gnumeric-1.12.0-r1.ebuild 1886 SHA256 fd6400c6fa9584e87a4701d6a116f82087819bc943146f6dd29cd02bc17fbea2 SHA512 574f5b13f2382870b325131940b34c4f7c31e934ce6f4cee6c7ef490f045e72241f4016c9250e8a6388b5d31bd16c669cd22a840b76cc828d5eeff277cc5e2f0 WHIRLPOOL f3b324f698f5bbcd2362fcb93a0d196bacd569d3e71505afd08a96503212bcca0a79c919f5e4c7b1240c7803f50193844ac46b69aa88726ac1194d92a05342c3
-EBUILD gnumeric-1.12.10.ebuild 1605 SHA256 a1811b7240063d1ab23f789fb22fb73498fdf40fd5d9acf2ffaf99c1485609b6 SHA512 2f16d25d2ca15ba9e1fa9783a20307f82133f95e3c99a20de3f78ef61ff6294dc15924aeec9dfef2d957968f74d89d1e2b6e0b02eb95a66d7a6c091bc688d8bd WHIRLPOOL 407fe8316d473551b9cb7bc57b0f5f5766bda9685e4a3436e3e1e749f66deeafc4faa3df7a71b3a3a4826bc0d75b6c827386784b51916cc7ce14e48fd1550e19
-EBUILD gnumeric-1.12.11.ebuild 1605 SHA256 8ed7fef231824f49150201b23931745749f0838bc558eb5e213faa00fadb5b67 SHA512 2ab51ca64834a2d03f9170e7f1b12b6db26c1200ac2020ff6db578be26b617e31a828cdf48a127bfa8d5e561fd68e4f0a7db110834c168b575e8164cf4b2d949 WHIRLPOOL c88ac468104baa3324126942dcf5fef23162485fee54f59af558cd8ff0dad1fc1dcad894a7a735385e780528227037079980f076386fdab633e6b96e17f68c90
+EBUILD gnumeric-1.12.11.ebuild 1727 SHA256 4207f60df82d3d3b087a93a79752980ee8f58cb27accd99e50fd7b3829b4a449 SHA512 5f9f41a04307f8ea80b1f3325433739f2d1f4003f71867a4fea5635ca9654ed10dfef946bf7cd0ed233ebe02713158d8bca501595bce2351c3f9835882134c7b WHIRLPOOL df41631f7b98988c7ed7df4ce7a218778fb4879f0b1d458bbd2ff089854ec862eeba98752b9c3cbd5d7fdfcb6ca6617208280cd0e741c48e51f69665ef927c27
 EBUILD gnumeric-1.12.8.ebuild 1593 SHA256 19d713d84602dfabe6010dee44898483c3e22841e74ba858f854a523ecce89c4 SHA512 476890ab2cd8dd68deb5357ef17834783c18bf4888f6fd8d44a9f4e635c05e7e6ca83696a2af063c823440e631f9e57386939ca4ef0ddca4a4d3aa838b3d021d WHIRLPOOL 6b4135bf3e1b5e29063b3e9dbc6a3cb4794a3b7278d3874c792227b097de099245342406fa9c484e702e559e13a623c6dbca73df9929ecd33c3dd256029be969
-MISC ChangeLog 36116 SHA256 06bd03437a02b220c789f71cbb65d3426b2189beb6ae26c826cd21af7142b057 SHA512 3a53b17ca672ed7e9724ff91ac1e7b6218d7e972ca36394073f72a31a54cd6d5655c9727bcf5d7213f89325dcd7f4ad6bf76c2df0e0692d5b5991cd25fe731a0 WHIRLPOOL 33d7f4fcbbef50475a0e063e39cb940c8c2954dcc10ae580f1c3b1eed1f24251b1cc3175fbb048df343f76ee2b518c9fbfe124bc2b817fcab7a7ea63b54359f6
+MISC ChangeLog 36351 SHA256 0c5663980470b861fae8b431d1b73864354ad068fd013fe9fba06f2a66cdc5bf SHA512 d45c02fb11dd29f9250c400b8350f94af0082665a9b5d6e3cbc6bc19d40424c65eee34ef4113dd20759bcd8d425c61c4d2a28eb45a6ddfbf3a5d864ddf54b538 WHIRLPOOL aa18e9e33ee99ff4fcc4c750eb1d528aa940d83af61693b04db898fc9b0a9649d877c24e708876a5be602077e1c3cbdf4876f88516ffa76d932e9bc5702f219a
 MISC metadata.xml 381 SHA256 62ca3ef5ae5a5c0443e9ab858424733291f62c080115b0a08b2d1cbfcc17ee75 SHA512 c50ea74e4db4ffadd19e5ca582fce83fe9ab1511613bef5db7f7c07b682a35bb47f398a1e245cf3ef077d4df4872483f41666fd5473cbd6ebce201e65292cc03 WHIRLPOOL 6a6ea6ca7ca29840551e68066f0274bcc612dffe099e1505fccb46d0ca06c18d3439144a708b986d7e8f5a54b1088852f5d587a82b797c6232395a4607af86ee
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMJEI4ACgkQCaWpQKGI+9Tt0wCfaxKpjzFe63FmFT//8barLEVA
-/J8AniRPSxbbnDO+IaLrTdDGMVucghDx
-=CST4
+iEYEAREIAAYFAlMRkBkACgkQCaWpQKGI+9R+RgCfapCZZTzTSBSgIAVOlT9gmBNa
+6j4An1eXNbEyfHFzBzp+PKEoct7QQMzw
+=olCe
 -----END PGP SIGNATURE-----
diff --git a/app-office/gnumeric/files/gnumeric-1.12.11-missing-header.patch b/app-office/gnumeric/files/gnumeric-1.12.11-missing-header.patch
new file mode 100644
index 000000000000..f22e8ade3e77
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.12.11-missing-header.patch
@@ -0,0 +1,10 @@
+--- plugins/excel/crypt-md4.c
++++ plugins/excel/crypt-md4.c
+@@ -22,6 +22,7 @@
+ /* NOTE: This code makes no attempt to be fast! */
+ #include <glib.h>
+ #include <gsf/gsf.h>
++#include <gsf/gsf-utils.h>
+ #include <string.h>
+ #include "crypt-md4.h"
+ 
diff --git a/app-office/gnumeric/gnumeric-1.12.10.ebuild b/app-office/gnumeric/gnumeric-1.12.10.ebuild
deleted file mode 100644
index ab3179377bfd..000000000000
--- a/app-office/gnumeric/gnumeric-1.12.10.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.10.ebuild,v 1.1 2014/02/15 10:32:46 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python{2_6,2_7} )
-
-inherit eutils 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.28:2
-	>=gnome-extra/libgsf-1.14.24:=
-	>=x11-libs/goffice-0.10.10:0.10
-	>=dev-libs/libxml2-2.4.12:2
-	>=x11-libs/pango-1.24.0:=
-
-	>=x11-libs/gtk+-3.2: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.11.ebuild b/app-office/gnumeric/gnumeric-1.12.11.ebuild
index 8c6a63a33818..18f884bfa292 100644
--- a/app-office/gnumeric/gnumeric-1.12.11.ebuild
+++ b/app-office/gnumeric/gnumeric-1.12.11.ebuild
@@ -1,6 +1,6 @@
 # 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.11.ebuild,v 1.3 2014/02/22 21:03:09 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.12.11.ebuild,v 1.4 2014/03/01 07:45:28 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -54,6 +54,12 @@ pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
+src_prepare() {
+	# Add missing header, bug #502178
+	epatch "${FILESDIR}"/${P}-missing-header.patch
+	gnome2_src_prepare
+}
+
 src_configure() {
 	gnome2_src_configure \
 		--disable-static \