add patch to fix GSF_CLASS_FULL. thanks to Eric Anderson <ejona86@gmail.com> for finding it. add another patch to get rid of the deprecation defines. bump dep on libgsf to make sure we use the version with the patched number of args. fixes #131151

Package-Manager: portage-2.1.1_pre2-r6

8 files changed, 333 insertions, 36 deletions

diff --git a/app-office/gnumeric/ChangeLog b/app-office/gnumeric/ChangeLog
index e21353b4159d..015e728888ca 100644
--- a/app-office/gnumeric/ChangeLog
+++ b/app-office/gnumeric/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/gnumeric
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.127 2006/07/12 16:21:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/ChangeLog,v 1.128 2006/07/14 16:46:23 allanonjl Exp $
+
+  14 Jul 2006; John N. Laliberte <allanonjl@gentoo.org>
+  +files/gnumeric-1.4.3-libgsf-1.patch,
+  +files/gnumeric-1.4.3-remove-deprecated.patch, gnumeric-1.4.3-r3.ebuild:
+  add patch to fix GSF_CLASS_FULL. thanks to Eric Anderson <ejona86@gmail.com>
+  for finding it. add another patch to get rid of the deprecation defines.
+  bump dep on libgsf to make sure we use the version with the patched number
+  of args. fixes #131151
 
   12 Jul 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   gnumeric-1.4.3-r3.ebuild:
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 238e71555345..5bf0d09467ba 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gnumeric-1.4.3-libgsf-1.patch 11711 RMD160 2acf38f1833892228139d061345b55a63c9314de SHA1 17106ece54fd09d765bc1537de88c27a6bb600c6 SHA256 fc887b749d970eb7d48c3eea1a5782779bd81c39a4182a81de8f9e41e4229cb8
+MD5 a2f7f0a8158dc565cc4c6d8e62ffeb0f files/gnumeric-1.4.3-libgsf-1.patch 11711
+RMD160 2acf38f1833892228139d061345b55a63c9314de files/gnumeric-1.4.3-libgsf-1.patch 11711
+SHA256 fc887b749d970eb7d48c3eea1a5782779bd81c39a4182a81de8f9e41e4229cb8 files/gnumeric-1.4.3-libgsf-1.patch 11711
 AUX gnumeric-1.4.3-makejobs.patch 1591 RMD160 44c6da58163315878b8e370c36868ab76bdb36c4 SHA1 91ab475c7452e2d8838d3d2412b56e3b0f58ef68 SHA256 1600aa7251226c71f91e420eb61946da9aff8a97ef14a30de3a6326fd83bc04d
 MD5 403a9f34b1159b636dec6156951e023d files/gnumeric-1.4.3-makejobs.patch 1591
 RMD160 44c6da58163315878b8e370c36868ab76bdb36c4 files/gnumeric-1.4.3-makejobs.patch 1591
@@ -13,19 +14,23 @@ AUX gnumeric-1.4.3-pcre_int_overflow.patch 3916 RMD160 b9573faa2702c2feb5e763ec4
 MD5 00512bbcd353d056c02b62335dfd87d1 files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
 RMD160 b9573faa2702c2feb5e763ec46c6fdf61cbaf71d files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
 SHA256 30841c17ba64ae9d8a6830d300ab7d275cb7fbae8537e66bdcfd90f762ba8f37 files/gnumeric-1.4.3-pcre_int_overflow.patch 3916
-DIST gnumeric-1.4.3.tar.bz2 13756646
+AUX gnumeric-1.4.3-remove-deprecated.patch 998 RMD160 4e40e9f81507365d3b45969f0a2707958910566d SHA1 361d74d68be3fdec8819e092055d6b7ba7f34553 SHA256 f8f3485b847fad6e7ea3e9e278b5eaf50e775f995efdb8b43b82bd0892038335
+MD5 871a1e3163510c4651cd6ad3b739f5eb files/gnumeric-1.4.3-remove-deprecated.patch 998
+RMD160 4e40e9f81507365d3b45969f0a2707958910566d files/gnumeric-1.4.3-remove-deprecated.patch 998
+SHA256 f8f3485b847fad6e7ea3e9e278b5eaf50e775f995efdb8b43b82bd0892038335 files/gnumeric-1.4.3-remove-deprecated.patch 998
+DIST gnumeric-1.4.3.tar.bz2 13756646 RMD160 7ebbad9b5244c575ce575575d05ceae648de6afb SHA1 6c5787c1ef2929e022af2a7dca18bad92bc9041e SHA256 0da4852462ea4c5e9494b37d4beea2a93f97efca1f09a02c07332fa1ff20fed6
 DIST gnumeric-1.6.0.tar.bz2 12524922
 DIST gnumeric-1.6.1.tar.bz2 12529002
 DIST gnumeric-1.6.2.tar.bz2 12539827 RMD160 e9273b1305a0bf2b4d5c701a9c8c3cf599805617 SHA256 e21474813318afeb44a59b7903cd7fa1021e822f6db476dcd88f184b07f83b96
-DIST gnumeric-1.6.3.tar.bz2 12540950
+DIST gnumeric-1.6.3.tar.bz2 12540950 RMD160 49be3b72070555ab6b58f1c59a0c22819b9b9096 SHA1 2261b3276ed5ead65047208a6ddb7f3436b7e544 SHA256 badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0
 EBUILD gnumeric-1.4.3-r2.ebuild 2572 RMD160 c80837b92d15171408440f64ba1b8c0e33f50b95 SHA1 85fa8996eb01eee4df3d6f656763d86dd329169f SHA256 1aaf28d4e13cccb0446ee2457b94d8ee733bdc97e21e2d8203ecbc0ff9470add
 MD5 05cab453a958d1d24692202747791548 gnumeric-1.4.3-r2.ebuild 2572
 RMD160 c80837b92d15171408440f64ba1b8c0e33f50b95 gnumeric-1.4.3-r2.ebuild 2572
 SHA256 1aaf28d4e13cccb0446ee2457b94d8ee733bdc97e21e2d8203ecbc0ff9470add gnumeric-1.4.3-r2.ebuild 2572
-EBUILD gnumeric-1.4.3-r3.ebuild 2600 RMD160 9e4d4d684aaf4ebf355ba804154e439b95a071f5 SHA1 f386242f6bce8b5e789b086eb08fa94852bca7bb SHA256 6ea286ae1dc9c1f369fe9b02704fd90175760a4193c4b7ec30313283706125ea
-MD5 ae4413198aa005053ea25ba67a00be32 gnumeric-1.4.3-r3.ebuild 2600
-RMD160 9e4d4d684aaf4ebf355ba804154e439b95a071f5 gnumeric-1.4.3-r3.ebuild 2600
-SHA256 6ea286ae1dc9c1f369fe9b02704fd90175760a4193c4b7ec30313283706125ea gnumeric-1.4.3-r3.ebuild 2600
+EBUILD gnumeric-1.4.3-r3.ebuild 2768 RMD160 6e5b555ba39e87a2d1162ced3eafed11fdfc94f2 SHA1 a9efa3b57997e7e08dbe5021c197f801699b9732 SHA256 1a80d3ecadb68d8d08d7f6337e392b50bda3c37a871b1588b178456a08455476
+MD5 7df0d36e7ec4bfc7f205072037910674 gnumeric-1.4.3-r3.ebuild 2768
+RMD160 6e5b555ba39e87a2d1162ced3eafed11fdfc94f2 gnumeric-1.4.3-r3.ebuild 2768
+SHA256 1a80d3ecadb68d8d08d7f6337e392b50bda3c37a871b1588b178456a08455476 gnumeric-1.4.3-r3.ebuild 2768
 EBUILD gnumeric-1.6.0.ebuild 1980 RMD160 66f8c55c1079b87e6e305aa531c506a74478fa1c SHA1 89f93debf4dfb29081eafeb8615311bf5ca3b574 SHA256 ab8d071ba86ca47337d28eaeb99f44e04d2344a4f2638e2d266b8167a146720b
 MD5 42bfed4f9907ad72a9a1134533e5bb01 gnumeric-1.6.0.ebuild 1980
 RMD160 66f8c55c1079b87e6e305aa531c506a74478fa1c gnumeric-1.6.0.ebuild 1980
@@ -42,20 +47,20 @@ EBUILD gnumeric-1.6.3.ebuild 2004 RMD160 f5ab3b960556971d7830bb59d8e6f8bb797c054
 MD5 7f66a2559a18f6647b0ecaf85aec8fcb gnumeric-1.6.3.ebuild 2004
 RMD160 f5ab3b960556971d7830bb59d8e6f8bb797c054b gnumeric-1.6.3.ebuild 2004
 SHA256 2cc26b48c5d16f9dd4c8b749f2177fb8217641d821c71f2dcca25bbe60177258 gnumeric-1.6.3.ebuild 2004
-MISC ChangeLog 16989 RMD160 87f853d43c0e29d4a23260fc939baffc35cee4ef SHA1 e1408afdd1ff4adb199e513fd95134c3de841b0f SHA256 882bda732b5444e7ee71bf6c541f082b714fb737839450465810ae214d474b7e
-MD5 5b9c7f6573395ea256a75931df5ea678 ChangeLog 16989
-RMD160 87f853d43c0e29d4a23260fc939baffc35cee4ef ChangeLog 16989
-SHA256 882bda732b5444e7ee71bf6c541f082b714fb737839450465810ae214d474b7e ChangeLog 16989
+MISC ChangeLog 17418 RMD160 6480197a7e0573a176329912dcb6adaa87456b0c SHA1 5b074c2479206cc3ba6a5bd9a48d4890d0b40ba1 SHA256 ecf93f2b1b09c81b5e65c5759af041d0a3886cf7cc26e444a081c73c4ee0bb5d
+MD5 461e55eb4f23c05c523049d62a15d525 ChangeLog 17418
+RMD160 6480197a7e0573a176329912dcb6adaa87456b0c ChangeLog 17418
+SHA256 ecf93f2b1b09c81b5e65c5759af041d0a3886cf7cc26e444a081c73c4ee0bb5d ChangeLog 17418
 MISC metadata.xml 167 RMD160 3b9bd7883121c8868b966914627e4f714f0334f5 SHA1 ec07f2508f1d0ed5a20416cdb42bf44ff9198923 SHA256 d1dbd0cf93ea6330c8c2fe1f02775bf64b3019bc51f7351606e3fa61a2d63a83
 MD5 add4556f7fbed381a299100d2457069f metadata.xml 167
 RMD160 3b9bd7883121c8868b966914627e4f714f0334f5 metadata.xml 167
 SHA256 d1dbd0cf93ea6330c8c2fe1f02775bf64b3019bc51f7351606e3fa61a2d63a83 metadata.xml 167
-MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r2 69
-RMD160 8543ee5364dd3bccad82b3b484db108f19ab8660 files/digest-gnumeric-1.4.3-r2 69
-SHA256 c7e1273e349efd4c4969700709d9534830456c951bd0930c194ba860b45e2b69 files/digest-gnumeric-1.4.3-r2 69
-MD5 2bff8e6c3d41ceae3d04783899915363 files/digest-gnumeric-1.4.3-r3 69
-RMD160 8543ee5364dd3bccad82b3b484db108f19ab8660 files/digest-gnumeric-1.4.3-r3 69
-SHA256 c7e1273e349efd4c4969700709d9534830456c951bd0930c194ba860b45e2b69 files/digest-gnumeric-1.4.3-r3 69
+MD5 ba25dc11a1bef23238626e8bd7c39d5c files/digest-gnumeric-1.4.3-r2 253
+RMD160 bcba6fc9975efae88b82ce83910f58f52af5aac7 files/digest-gnumeric-1.4.3-r2 253
+SHA256 bcd7d251d3e1b6f9070edba5191ef3f78c729df9fd62acbb423d1e99afe1d68b files/digest-gnumeric-1.4.3-r2 253
+MD5 ba25dc11a1bef23238626e8bd7c39d5c files/digest-gnumeric-1.4.3-r3 253
+RMD160 bcba6fc9975efae88b82ce83910f58f52af5aac7 files/digest-gnumeric-1.4.3-r3 253
+SHA256 bcd7d251d3e1b6f9070edba5191ef3f78c729df9fd62acbb423d1e99afe1d68b files/digest-gnumeric-1.4.3-r3 253
 MD5 b76afee2920aebc8fd632925765c3c70 files/digest-gnumeric-1.6.0 69
 RMD160 e3db0aac1ba266a2ffbdd946a0c84e55adfec2a3 files/digest-gnumeric-1.6.0 69
 SHA256 e911148e09501de70ada5848f69354aad02254a4d12a0f3b45aee0ba5bf843a0 files/digest-gnumeric-1.6.0 69
@@ -65,13 +70,6 @@ SHA256 100d4334c773541e19c7ff0c76853d13182d355569ea4561bcc33afa7c804da8 files/di
 MD5 16cb5659e6f64b0d5666e9bbdd03fc0c files/digest-gnumeric-1.6.2 253
 RMD160 8bf88722117a84cbffb54ea615bd770e301dc1d8 files/digest-gnumeric-1.6.2 253
 SHA256 83e6173bc7e95ace8c9a7e149e6785bfa48539fb9fe7d0df4ecf7c6e64bec88f files/digest-gnumeric-1.6.2 253
-MD5 d8ab5da085dbf26c2dfef11cef85156e files/digest-gnumeric-1.6.3 69
-RMD160 1dca1316d67fd9d389a91898bc049ab90f6c8669 files/digest-gnumeric-1.6.3 69
-SHA256 87bcb84237484b120e395f1c24fda3c22e941a97662fc57cbb206aea9bee656f files/digest-gnumeric-1.6.3 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.3 (GNU/Linux)
-
-iD8DBQFEtSGGkT4lNIS36YERAifTAJ0VrEWDLfBT7V0SfjSL1L2PuyjEkgCghzSy
-KfQwscLTrFV5Be3hnlvcDfI=
-=7Uw4
------END PGP SIGNATURE-----
+MD5 b32ec85c89f125036acf2f7daa4b61d7 files/digest-gnumeric-1.6.3 253
+RMD160 7711bdf5e469a262a604495feb76a751eafed8cd files/digest-gnumeric-1.6.3 253
+SHA256 c6279535960089bf87bf3787c9833c843669bdbba92b5701b51d9bb4a8ce09ce files/digest-gnumeric-1.6.3 253
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2 b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2
index b63fff8bda02..d9dd7012fb6f 100644
--- a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2
+++ b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r2
@@ -1 +1,3 @@
 MD5 b684eec48b1696d7a8d7152d1e17741c gnumeric-1.4.3.tar.bz2 13756646
+RMD160 7ebbad9b5244c575ce575575d05ceae648de6afb gnumeric-1.4.3.tar.bz2 13756646
+SHA256 0da4852462ea4c5e9494b37d4beea2a93f97efca1f09a02c07332fa1ff20fed6 gnumeric-1.4.3.tar.bz2 13756646
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3 b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3
index b63fff8bda02..d9dd7012fb6f 100644
--- a/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3
+++ b/app-office/gnumeric/files/digest-gnumeric-1.4.3-r3
@@ -1 +1,3 @@
 MD5 b684eec48b1696d7a8d7152d1e17741c gnumeric-1.4.3.tar.bz2 13756646
+RMD160 7ebbad9b5244c575ce575575d05ceae648de6afb gnumeric-1.4.3.tar.bz2 13756646
+SHA256 0da4852462ea4c5e9494b37d4beea2a93f97efca1f09a02c07332fa1ff20fed6 gnumeric-1.4.3.tar.bz2 13756646
diff --git a/app-office/gnumeric/files/digest-gnumeric-1.6.3 b/app-office/gnumeric/files/digest-gnumeric-1.6.3
index c48f284e86a1..3dd53c592777 100644
--- a/app-office/gnumeric/files/digest-gnumeric-1.6.3
+++ b/app-office/gnumeric/files/digest-gnumeric-1.6.3
@@ -1 +1,3 @@
 MD5 78ffd75ae6abc3bb20dd04407a082a26 gnumeric-1.6.3.tar.bz2 12540950
+RMD160 49be3b72070555ab6b58f1c59a0c22819b9b9096 gnumeric-1.6.3.tar.bz2 12540950
+SHA256 badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0 gnumeric-1.6.3.tar.bz2 12540950
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch b/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch
new file mode 100644
index 000000000000..3092d2d29620
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.4.3-libgsf-1.patch
@@ -0,0 +1,256 @@
+Submitted By:            Hugo Villeneuve
+Date:                    2005-09-19
+Initial Package Version: 1.4.3
+Upstream Status:         Unknown
+Origin:                  http://mail-index.netbsd.org/tech-pkg/2005/09/05/0001.html
+Description:             Updated to new GSF_CLASS_FULL signature
+
+$LastChangedBy: randy $
+$Date: 2006/07/14 16:46:23 $
+
+
+diff -Naur gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c
+--- gnumeric-1.4.3-orig/plugins/corba/corba-workbook.c	2004-09-24 16:35:15.000000000 -0400
++++ gnumeric-1.4.3-patched/plugins/corba/corba-workbook.c	2005-09-19 00:44:06.889772528 -0400
+@@ -313,8 +313,8 @@
+ }
+ 
+ GSF_CLASS_FULL (WorkbookControlCORBA, workbook_control_corba,
+-		wbcc_class_init, wbcc_init, 
+-		WORKBOOK_CONTROL_TYPE, 0,
++		NULL, NULL,wbcc_class_init, NULL,
++		wbcc_init, WORKBOOK_CONTROL_TYPE, 0,
+ 		GSF_INTERFACE (wbcc_gnm_cmd_context_init,
+ 			       GNM_CMD_CONTEXT_TYPE))
+ 
+diff -Naur gnumeric-1.4.3-orig/src/command-context-stderr.c gnumeric-1.4.3-patched/src/command-context-stderr.c
+--- gnumeric-1.4.3-orig/src/command-context-stderr.c	2004-06-13 14:48:34.000000000 -0400
++++ gnumeric-1.4.3-patched/src/command-context-stderr.c	2005-09-19 00:44:06.891772224 -0400
+@@ -107,6 +107,6 @@
+ }
+ 
+ GSF_CLASS_FULL (CmdContextStderr, cmd_context_stderr,
+-		NULL, ccs_init,
+-		G_TYPE_OBJECT, 0,
++		NULL, NULL, NULL, NULL,
++		ccs_init, G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (ccs_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-axis.c	2005-02-09 16:54:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-axis.c	2005-09-19 00:44:06.896771464 -0400
+@@ -1678,8 +1678,8 @@
+ }
+ 
+ GSF_CLASS_FULL (GogAxis, gog_axis,
+-		gog_axis_class_init, gog_axis_init,
+-		GOG_STYLED_OBJECT_TYPE, 0,
++		NULL, NULL, gog_axis_class_init, NULL,
++		gog_axis_init, GOG_STYLED_OBJECT_TYPE, 0,
+ 		GSF_INTERFACE (gog_axis_dataset_init, GOG_DATASET_TYPE))
+ 
+ 
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-error-bar.c	2004-12-02 08:57:26.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-error-bar.c	2005-09-19 00:44:06.899771008 -0400
+@@ -488,8 +488,8 @@
+ }
+ 
+ GSF_CLASS_FULL (GogErrorBar, gog_error_bar,
+-		gog_error_bar_class_init, gog_error_bar_init,
+-		G_TYPE_OBJECT, 0,
++		NULL, NULL, gog_error_bar_class_init, NULL,
++		gog_error_bar_init, G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (gog_error_bar_persist_init, GOG_PERSIST_TYPE))
+ 
+ 
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-label.c	2004-10-25 16:36:05.000000000 -0400
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-label.c	2005-09-19 00:44:06.901770704 -0400
+@@ -176,8 +176,8 @@
+ }
+ 
+ GSF_CLASS_FULL (GogLabel, gog_label,
+-		gog_label_class_init, NULL,
+-		GOG_OUTLINED_OBJECT_TYPE, 0,
++		NULL, NULL, gog_label_class_init, NULL,
++		NULL, GOG_STYLED_OBJECT_TYPE, 0,
+ 		GSF_INTERFACE (gog_label_dataset_init, GOG_DATASET_TYPE))
+ 
+ /************************************************************************/
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-series.c	2005-01-05 13:05:53.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-series.c	2005-09-19 00:44:06.904770248 -0400
+@@ -589,8 +589,8 @@
+ }
+ 
+ GSF_CLASS_FULL (GogSeries, gog_series,
+-		gog_series_class_init, gog_series_init,
+-		GOG_STYLED_OBJECT_TYPE, 0,
++		NULL, NULL, gog_series_class_init, NULL,
++		gog_series_init, GOG_STYLED_OBJECT_TYPE, 0,
+ 		GSF_INTERFACE (gog_series_dataset_init, GOG_DATASET_TYPE))
+ 
+ /**
+diff -Naur gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c
+--- gnumeric-1.4.3-orig/src/cut-n-paste-code/goffice/graph/gog-style.c	2004-11-19 10:49:12.000000000 -0500
++++ gnumeric-1.4.3-patched/src/cut-n-paste-code/goffice/graph/gog-style.c	2005-09-19 00:44:06.908769640 -0400
+@@ -1687,8 +1687,8 @@
+ }
+ 
+ GSF_CLASS_FULL (GogStyle, gog_style,
+-		gog_style_class_init, gog_style_init,
+-		G_TYPE_OBJECT, 0,
++		NULL, NULL, gog_style_class_init, NULL,
++		gog_style_init, G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (gog_style_persist_init, GOG_PERSIST_TYPE))
+ 
+ gboolean
+diff -Naur gnumeric-1.4.3-orig/src/gnm-so-filled.c gnumeric-1.4.3-patched/src/gnm-so-filled.c
+--- gnumeric-1.4.3-orig/src/gnm-so-filled.c	2004-10-16 22:36:05.000000000 -0400
++++ gnumeric-1.4.3-patched/src/gnm-so-filled.c	2005-09-19 00:44:06.911769184 -0400
+@@ -113,7 +113,7 @@
+ typedef FooCanvasGroup		FilledFooView;
+ typedef FooCanvasGroupClass	FilledFooViewClass;
+ static GSF_CLASS_FULL (FilledFooView, so_filled_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_GROUP, 0,
+ 	GSF_INTERFACE (so_filled_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+@@ -632,7 +632,7 @@
+ typedef FooCanvasPolygon	PolygonFooView;
+ typedef FooCanvasPolygonClass	PolygonFooViewClass;
+ static GSF_CLASS_FULL (PolygonFooView, so_polygon_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_POLYGON, 0,
+ 	GSF_INTERFACE (so_polygon_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+diff -Naur gnumeric-1.4.3-orig/src/gnm-so-line.c gnumeric-1.4.3-patched/src/gnm-so-line.c
+--- gnumeric-1.4.3-orig/src/gnm-so-line.c	2004-11-30 13:37:07.000000000 -0500
++++ gnumeric-1.4.3-patched/src/gnm-so-line.c	2005-09-19 00:44:06.913768880 -0400
+@@ -111,7 +111,7 @@
+ typedef FooCanvasLine		LineFooView;
+ typedef FooCanvasLineClass	LineFooViewClass;
+ static GSF_CLASS_FULL (LineFooView, so_line_foo_view,
+-	NULL, NULL,
++	NULL, NULL,NULL, NULL,NULL,
+ 	FOO_TYPE_CANVAS_LINE, 0,
+ 	GSF_INTERFACE (so_line_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ #endif /* WITH_GTK */
+diff -Naur gnumeric-1.4.3-orig/src/io-context-gtk.c gnumeric-1.4.3-patched/src/io-context-gtk.c
+--- gnumeric-1.4.3-orig/src/io-context-gtk.c	2004-10-29 23:51:35.000000000 -0400
++++ gnumeric-1.4.3-patched/src/io-context-gtk.c	2005-09-19 00:44:06.915768576 -0400
+@@ -367,8 +367,8 @@
+ }
+ 
+ GSF_CLASS_FULL (IOContextGtk, io_context_gtk,
+-		icg_class_init, icg_init,
+-		TYPE_IO_CONTEXT, 0,
++		NULL, NULL, icg_class_init, NULL,
++		icg_init, TYPE_IO_CONTEXT, 0,
+ 		GSF_INTERFACE (icg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+ 
+ void
+diff -Naur gnumeric-1.4.3-orig/src/io-context.c gnumeric-1.4.3-patched/src/io-context.c
+--- gnumeric-1.4.3-orig/src/io-context.c	2004-07-19 20:37:13.000000000 -0400
++++ gnumeric-1.4.3-patched/src/io-context.c	2005-09-19 00:44:06.917768272 -0400
+@@ -117,8 +117,8 @@
+ }
+ 
+ GSF_CLASS_FULL (IOContext, io_context,
+-		io_context_class_init, io_context_init,
+-		G_TYPE_OBJECT, 0,
++		NULL,NULL,io_context_class_init,NULL,
++		io_context_init,G_TYPE_OBJECT, 0,
+ 		GSF_INTERFACE (io_context_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+ 
+ IOContext *
+diff -Naur gnumeric-1.4.3-orig/src/sheet-filter.c gnumeric-1.4.3-patched/src/sheet-filter.c
+--- gnumeric-1.4.3-orig/src/sheet-filter.c	2004-10-16 22:36:05.000000000 -0400
++++ gnumeric-1.4.3-patched/src/sheet-filter.c	2005-09-19 00:44:06.920767816 -0400
+@@ -563,7 +563,7 @@
+ typedef FooCanvasWidget		FilterFooView;
+ typedef FooCanvasWidgetClass	FilterFooViewClass;
+ static GSF_CLASS_FULL (FilterFooView, filter_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_WIDGET, 0,
+ 	GSF_INTERFACE (filter_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ 
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c
+--- gnumeric-1.4.3-orig/src/sheet-object-cell-comment.c	2005-01-14 00:48:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-cell-comment.c	2005-09-19 00:44:06.922767512 -0400
+@@ -123,7 +123,7 @@
+ typedef FooCanvasPolygon	CommentFooView;
+ typedef FooCanvasPolygonClass	CommentFooViewClass;
+ static GSF_CLASS_FULL (CommentFooView, comment_foo_view,
+-	NULL, NULL,
++	NULL, NULL,NULL,NULL,NULL,
+ 	FOO_TYPE_CANVAS_POLYGON, 0,
+ 	GSF_INTERFACE (comment_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ 
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-graph.c gnumeric-1.4.3-patched/src/sheet-object-graph.c
+--- gnumeric-1.4.3-orig/src/sheet-object-graph.c	2004-10-29 00:13:13.000000000 -0400
++++ gnumeric-1.4.3-patched/src/sheet-object-graph.c	2005-09-19 00:44:06.925767056 -0400
+@@ -94,7 +94,7 @@
+ typedef GogControlFooCanvas		SOGraphFooView;
+ typedef GogControlFooCanvasClass	SOGraphFooViewClass;
+ static GSF_CLASS_FULL (SOGraphFooView, so_graph_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	GOG_CONTROL_FOOCANVAS_TYPE, 0,
+ 	GSF_INTERFACE (so_graph_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ 
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-image.c gnumeric-1.4.3-patched/src/sheet-object-image.c
+--- gnumeric-1.4.3-orig/src/sheet-object-image.c	2004-12-17 23:48:37.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-image.c	2005-09-19 00:44:06.929766448 -0400
+@@ -90,7 +90,7 @@
+ typedef FooCanvasPixbuf		SOImageFooView;
+ typedef FooCanvasPixbufClass	SOImageFooViewClass;
+ static GSF_CLASS_FULL (SOImageFooView, so_image_foo_view,
+-	NULL, NULL,
++	NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_PIXBUF, 0,
+ 	GSF_INTERFACE (so_image_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ 
+diff -Naur gnumeric-1.4.3-orig/src/sheet-object-widget.c gnumeric-1.4.3-patched/src/sheet-object-widget.c
+--- gnumeric-1.4.3-orig/src/sheet-object-widget.c	2005-02-09 16:54:29.000000000 -0500
++++ gnumeric-1.4.3-patched/src/sheet-object-widget.c	2005-09-19 00:44:06.933765840 -0400
+@@ -99,7 +99,7 @@
+ typedef FooCanvasWidget		SOWidgetFooView;
+ typedef FooCanvasWidgetClass	SOWidgetFooViewClass;
+ static GSF_CLASS_FULL (SOWidgetFooView, so_widget_foo_view,
+-	NULL, NULL,
++        NULL, NULL, NULL, NULL, NULL,
+ 	FOO_TYPE_CANVAS_WIDGET, 0,
+ 	GSF_INTERFACE (so_widget_foo_view_init, SHEET_OBJECT_VIEW_TYPE))
+ 
+diff -Naur gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c
+--- gnumeric-1.4.3-orig/src/widgets/gnumeric-expr-entry.c	2004-09-07 15:28:41.000000000 -0400
++++ gnumeric-1.4.3-patched/src/widgets/gnumeric-expr-entry.c	2005-09-19 00:44:06.937765232 -0400
+@@ -503,8 +503,8 @@
+ }
+ 
+ GSF_CLASS_FULL (GnmExprEntry, gnm_expr_entry,
+-		gee_class_init, gee_init,
+-		GTK_TYPE_HBOX, 0,
++		NULL, NULL, gee_class_init, NULL,
++		gee_init, GTK_TYPE_HBOX, 0,
+ 		GSF_INTERFACE (gee_cell_editable_init, GTK_TYPE_CELL_EDITABLE))
+ 
+ /**
+diff -Naur gnumeric-1.4.3-orig/src/workbook-control-gui.c gnumeric-1.4.3-patched/src/workbook-control-gui.c
+--- gnumeric-1.4.3-orig/src/workbook-control-gui.c	2005-03-12 19:05:45.000000000 -0500
++++ gnumeric-1.4.3-patched/src/workbook-control-gui.c	2005-09-19 00:44:06.943764320 -0400
+@@ -2545,8 +2545,8 @@
+ }
+ 
+ GSF_CLASS_FULL (WorkbookControlGUI, workbook_control_gui,
+-		workbook_control_gui_class_init, workbook_control_gui_init,
+-		WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
++		NULL,NULL,workbook_control_gui_class_init,NULL,
++		workbook_control_gui_init,WORKBOOK_CONTROL_TYPE, G_TYPE_FLAG_ABSTRACT,
+ 		GSF_INTERFACE (wbcg_go_plot_data_allocator_init, GOG_DATA_ALLOCATOR_TYPE);
+ 		GSF_INTERFACE (wbcg_gnm_cmd_context_init, GNM_CMD_CONTEXT_TYPE))
+ 
diff --git a/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch b/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch
new file mode 100644
index 000000000000..a465628656b4
--- /dev/null
+++ b/app-office/gnumeric/files/gnumeric-1.4.3-remove-deprecated.patch
@@ -0,0 +1,25 @@
+--- gnumeric-1.4.3/configure.in	2005-01-26 09:56:45.000000000 -0500
++++ gnumeric-1.4.3.new/configure.in	2006-07-14 11:57:47.000000000 -0400
+@@ -192,22 +192,6 @@
+ GNUMERIC_PLUGIN_LDFLAGS="-avoid-version $GNUMERIC_PLUGIN_LDFLAGS"
+ AC_SUBST(GNUMERIC_PLUGIN_LDFLAGS)
+ 
+-dnl disable for in stable release, re-enable for development series
+-CFLAGS="$CFLAGS -DG_DISABLE_DEPRECATED"
+-CFLAGS="$CFLAGS -DPANGO_DISABLE_DEPRECATED"
+-if test "x$gnumeric_with_gtk" = "xtrue"; then
+-	CFLAGS="$CFLAGS -DGDK_PIXBUF_DISABLE_DEPRECATED"
+-	CFLAGS="$CFLAGS -DGDK_DISABLE_DEPRECATED"
+-	CFLAGS="$CFLAGS -DGDK_MULTIHEAD_SAFE"
+-	CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
+-	CFLAGS="$CFLAGS -DLIBGLADE_DISABLE_DEPRECATED"
+-fi
+-if test "x$gnumeric_with_gnome" = "xtrue"; then
+-	CFLAGS="$CFLAGS -DGNOME_DISABLE_DEPRECATED"
+-	CFLAGS="$CFLAGS -DBONOBO_DISABLE_DEPRECATED"
+-	CFLAGS="$CFLAGS -DBONOBO_UI_DISABLE_DEPRECATED"
+-fi
+-
+ dnl ==============================================
+ dnl GNOME Specific extensions
+ with_corba=false
diff --git a/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild b/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
index 642c2234eb10..ba464b077a3a 100644
--- a/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
+++ b/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild,v 1.2 2006/07/12 16:21:12 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/gnumeric/gnumeric-1.4.3-r3.ebuild,v 1.3 2006/07/14 16:46:23 allanonjl Exp $
 
-inherit virtualx eutils flag-o-matic gnome2
+inherit virtualx eutils flag-o-matic gnome2 autotools
 
 DESCRIPTION="Gnumeric, the GNOME Spreadsheet"
 HOMEPAGE="http://www.gnome.org/projects/gnumeric/"
@@ -15,7 +15,7 @@ IUSE="gnome libgda python static"
 # bonobo gnomedb
 
 RDEPEND=">=dev-libs/glib-2.4
-	>=gnome-extra/libgsf-1.12
+	>=gnome-extra/libgsf-1.12.2
 	>=dev-libs/libxml2-2.4.12
 	>=x11-libs/pango-1.4
 
@@ -44,8 +44,6 @@ DEPEND="${RDEPEND}
 	app-text/scrollkeeper"
 
 DOCS="AUTHORS COPYING* ChangeLog HACKING NEWS README TODO"
-USE_DESTDIR="1"
-
 
 pkg_setup() {
 	if use gnome && ! built_with_use gnome-extra/libgsf gnome; then
@@ -71,7 +69,13 @@ src_unpack() {
 	# Backported patch to fix a potential integer overflow (bug #104010)
 	epatch ${FILESDIR}/${P}-pcre_int_overflow.patch
 
-	automake || die
+	# fix for MACRO problem with newer libgsf
+	epatch "${FILESDIR}"/${PN}-1.4.3-libgsf-1.patch
+
+	# blow away deprecated things
+	epatch "${FILESDIR}"/${P}-remove-deprecated.patch
+
+	eautoreconf
 }
 
 src_compile() {