Remove old security vulnerable versions

Package-Manager: portage-2.1.3_rc6

14 files changed, 15 insertions, 411 deletions

diff --git a/app-text/libwpd/ChangeLog b/app-text/libwpd/ChangeLog
index 6538cdb3ce32..8266b069c563 100644
--- a/app-text/libwpd/ChangeLog
+++ b/app-text/libwpd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-text/libwpd
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.53 2007/03/27 15:34:30 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/ChangeLog,v 1.54 2007/07/03 22:00:04 leio Exp $
+
+  03 Jul 2007; Mart Raudsepp <leio@gentoo.org>
+  -files/libwpd-0.8.2-gcc41.patch, -files/libwpd-0.8.4-heap-overflow.patch,
+  -libwpd-0.7.1.ebuild, -libwpd-0.7.2.ebuild, -libwpd-0.8.2.ebuild,
+  -libwpd-0.8.4.ebuild, -libwpd-0.8.4-r1.ebuild:
+  Remove old security vulnerable versions
 
   27 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> libwpd-0.8.9.ebuild:
   Stable on ia64 wrt bug #169675.
diff --git a/app-text/libwpd/Manifest b/app-text/libwpd/Manifest
index abb880f9556a..e8150d847184 100644
--- a/app-text/libwpd/Manifest
+++ b/app-text/libwpd/Manifest
@@ -1,73 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libwpd-0.8.2-gcc41.patch 3887 RMD160 7024b53c33821caf55fa23310f62b8c1672bde21 SHA1 32a94f79cbd9fa3a4c9cbe59c25592810a839b8d SHA256 176eecf0040b087791b96296c7ef5a4de7ee71d58db860f56aed6bb3aca5a96f
-MD5 eb778c0afcfb084ac7033c4587e3218f files/libwpd-0.8.2-gcc41.patch 3887
-RMD160 7024b53c33821caf55fa23310f62b8c1672bde21 files/libwpd-0.8.2-gcc41.patch 3887
-SHA256 176eecf0040b087791b96296c7ef5a4de7ee71d58db860f56aed6bb3aca5a96f files/libwpd-0.8.2-gcc41.patch 3887
-AUX libwpd-0.8.4-heap-overflow.patch 3494 RMD160 cd7055365e15c80a7f71ebc4b4374605dad7800d SHA1 51ad68ce3aec7f9aebf126a7304273fcbbc6c398 SHA256 a34df34880288e6eda18d87a674bb5de88319ee4345fe58857c05678632d089b
-MD5 29e54fa5fde919b8b3814fd2d53b1355 files/libwpd-0.8.4-heap-overflow.patch 3494
-RMD160 cd7055365e15c80a7f71ebc4b4374605dad7800d files/libwpd-0.8.4-heap-overflow.patch 3494
-SHA256 a34df34880288e6eda18d87a674bb5de88319ee4345fe58857c05678632d089b files/libwpd-0.8.4-heap-overflow.patch 3494
-DIST libwpd-0.7.1.tar.gz 399768 RMD160 b7a869ecc0549855d62717c6df6dead72b58a398 SHA1 ea7178aa26c9934a448c5673651b290cf9cd76b2 SHA256 b09c2f9e11c203201215671a563eef34651ca3d4ab177ea571d39349e76cddb9
-DIST libwpd-0.7.2.tar.gz 311872 RMD160 653eb61f7133a36a51fa7205dee964605ce60cca SHA1 93d046ea7f8fb23730c5f880c1577586b6b0964e SHA256 87b94129f5e03aec82bb74fdf6f41effc370adfc339d407c87ee8f7750c0022e
-DIST libwpd-0.8.2.tar.gz 486490 RMD160 b652d1c79a5436df3154d90221b2544d55381a3a SHA1 8eb400f4e26db6333fb418051ae0cc98fe648797 SHA256 9ca228f9ea98d64cc17d9de4605ce6e26d64087042b6ea78a80fe473e367167e
-DIST libwpd-0.8.4.tar.gz 491831 RMD160 ce5826683e37e1b3f1220f8d5c6c40b48610f054 SHA1 ac1e3b9ac145afa4211755bf8950832c3d59973c SHA256 b6393088bf6c49b72a07d2aec7d84d14f6cab0ab00ad177c17157f03095f2096
 DIST libwpd-0.8.9.tar.gz 569384 RMD160 c69853e8f86ee5c936102e00960a7fdea7984ab7 SHA1 f5751f76dca619618659f480f32b35b9b7d88737 SHA256 0c7067a0ae85006f9c43861f0a686dc595b8a123e98d4198716f98cb53ea32dc
-EBUILD libwpd-0.7.1.ebuild 654 RMD160 e767ec7641c2a53121602d471a30de0166625916 SHA1 26e6caf51f825eb4f6efcd2d786ebec5dba21770 SHA256 8b4ca14c5c76156093202c1eeed850939e2e09ca04d72d31991eb0a2188cdf51
-MD5 ae8843192d7ae9b6b06801f3b3247392 libwpd-0.7.1.ebuild 654
-RMD160 e767ec7641c2a53121602d471a30de0166625916 libwpd-0.7.1.ebuild 654
-SHA256 8b4ca14c5c76156093202c1eeed850939e2e09ca04d72d31991eb0a2188cdf51 libwpd-0.7.1.ebuild 654
-EBUILD libwpd-0.7.2.ebuild 661 RMD160 2ec22b05a81a3388f833ca4156644c5d87e07acb SHA1 9574bbdbf49caee22400ca6edd06fd2916d85e2e SHA256 473afe51a5b5d7cb354b6399562e7f7145503d8166825ad3a5d15ad67381501c
-MD5 71a2cbd885492d38000f7a0226e62284 libwpd-0.7.2.ebuild 661
-RMD160 2ec22b05a81a3388f833ca4156644c5d87e07acb libwpd-0.7.2.ebuild 661
-SHA256 473afe51a5b5d7cb354b6399562e7f7145503d8166825ad3a5d15ad67381501c libwpd-0.7.2.ebuild 661
-EBUILD libwpd-0.8.2.ebuild 830 RMD160 075089de7dc901ffddb799410f93fa8a6532a1d0 SHA1 6e2cdd6160df2ff1e21aef5adbc2b00e38de025f SHA256 38b9600bf2362458db6a9ccf88a50b12a198d7bec1af36f6ab885dc4e2a546cc
-MD5 9ee3fc88b98ae463d4c9b3777ec22e66 libwpd-0.8.2.ebuild 830
-RMD160 075089de7dc901ffddb799410f93fa8a6532a1d0 libwpd-0.8.2.ebuild 830
-SHA256 38b9600bf2362458db6a9ccf88a50b12a198d7bec1af36f6ab885dc4e2a546cc libwpd-0.8.2.ebuild 830
-EBUILD libwpd-0.8.4-r1.ebuild 881 RMD160 ed91e937110a3056697ecf8df82200c64b145b72 SHA1 437b1fedb32356782c51726f871b3f111e40ee34 SHA256 b9cfb7d868780264bbf5b69590f02a45a144bf09566366ab0711716148aab672
-MD5 4ba7d9518ea63179577974ecf6d958f5 libwpd-0.8.4-r1.ebuild 881
-RMD160 ed91e937110a3056697ecf8df82200c64b145b72 libwpd-0.8.4-r1.ebuild 881
-SHA256 b9cfb7d868780264bbf5b69590f02a45a144bf09566366ab0711716148aab672 libwpd-0.8.4-r1.ebuild 881
-EBUILD libwpd-0.8.4.ebuild 764 RMD160 947b6021fa60f0db497aa5e6be7fa2874fe189e1 SHA1 9f805613c34656765f63415144454c587698b848 SHA256 951a05fd720d515cc5594db90b3e779b6e74f9d9a4a9dcc44fb48bf895b359f0
-MD5 799b62c768622b5a3f9a3a623eeb36e6 libwpd-0.8.4.ebuild 764
-RMD160 947b6021fa60f0db497aa5e6be7fa2874fe189e1 libwpd-0.8.4.ebuild 764
-SHA256 951a05fd720d515cc5594db90b3e779b6e74f9d9a4a9dcc44fb48bf895b359f0 libwpd-0.8.4.ebuild 764
 EBUILD libwpd-0.8.9.ebuild 782 RMD160 03e035d0aedce9eec67c268ddbb677f8f7c0d222 SHA1 12fade4af5a331fb685ca3e587a8391a248c9b10 SHA256 b337f7362c958b714aadfd824802be6a390ac8600b8ec6090be0210bd68810f5
 MD5 8f4087136a2c35d5a2d8cb516c7d5303 libwpd-0.8.9.ebuild 782
 RMD160 03e035d0aedce9eec67c268ddbb677f8f7c0d222 libwpd-0.8.9.ebuild 782
 SHA256 b337f7362c958b714aadfd824802be6a390ac8600b8ec6090be0210bd68810f5 libwpd-0.8.9.ebuild 782
-MISC ChangeLog 5975 RMD160 bcd6d9b0cf0aa3e12df4cf24735d277f3f62a857 SHA1 b7c255b0ba02899519794ffc21ebc064e0bef451 SHA256 ba165d0e7936edabf2df9db7a83d45b6270f013a0a0e424c62d6585b4b4a0914
-MD5 00bf68a36a05155ca8f061bb8036e24f ChangeLog 5975
-RMD160 bcd6d9b0cf0aa3e12df4cf24735d277f3f62a857 ChangeLog 5975
-SHA256 ba165d0e7936edabf2df9db7a83d45b6270f013a0a0e424c62d6585b4b4a0914 ChangeLog 5975
+MISC ChangeLog 6254 RMD160 626eb7069af3fc1eef9352158adf6e0b5a6bb60c SHA1 f5bed23fbb1e6b4af401d0b8de4ffa9231619d84 SHA256 78b90bccde6deb8da0bb21f3542f78874319fe3fb0cb90dd91083eb3cedf4523
+MD5 411f74d4a7fd1dd1d9f8ed267fe3a42a ChangeLog 6254
+RMD160 626eb7069af3fc1eef9352158adf6e0b5a6bb60c ChangeLog 6254
+SHA256 78b90bccde6deb8da0bb21f3542f78874319fe3fb0cb90dd91083eb3cedf4523 ChangeLog 6254
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
-MD5 89285854933b4df4dae9da620a1b67f7 files/digest-libwpd-0.7.1 238
-RMD160 ee23ecab85f758d2f4327c54edd87048175458d8 files/digest-libwpd-0.7.1 238
-SHA256 f4b52c30bdfed7d792b0baf72037c2fe7bbf9fe579b3601ac23028b499083c45 files/digest-libwpd-0.7.1 238
-MD5 00fe1074a8dbf36a81de6127d8fa8854 files/digest-libwpd-0.7.2 238
-RMD160 8b7d824b8f3ab612a3bb72fdaf5ae38a72ac94d6 files/digest-libwpd-0.7.2 238
-SHA256 1b035d2f56b96c6676dc3fa71c9a5557f79c4edb4f402cd32e1518744d3de1cf files/digest-libwpd-0.7.2 238
-MD5 60609b26a34af547552f1ad5dd1f57a0 files/digest-libwpd-0.8.2 238
-RMD160 2bb6c6165298d3fd4666cd5592860cc8f0f64eb0 files/digest-libwpd-0.8.2 238
-SHA256 2fd543c5797a71ffb70ab38846ca4db9932804eaddb76296c81e6265bfcd4311 files/digest-libwpd-0.8.2 238
-MD5 8529b5b5d576f70afdb2099ea8b7f65e files/digest-libwpd-0.8.4 238
-RMD160 757f038c0c33b0b2492092f9a7bf50955227d27b files/digest-libwpd-0.8.4 238
-SHA256 cbd1b5edc3203e0623b6601ba013d4504bfaa206a8cc585d2e64bd44c4aeb66a files/digest-libwpd-0.8.4 238
-MD5 8529b5b5d576f70afdb2099ea8b7f65e files/digest-libwpd-0.8.4-r1 238
-RMD160 757f038c0c33b0b2492092f9a7bf50955227d27b files/digest-libwpd-0.8.4-r1 238
-SHA256 cbd1b5edc3203e0623b6601ba013d4504bfaa206a8cc585d2e64bd44c4aeb66a files/digest-libwpd-0.8.4-r1 238
 MD5 2f04204a65f8fce677ae13d5e31a2c90 files/digest-libwpd-0.8.9 238
 RMD160 06cd0f2df4e893e84c7dd323083f3fdf6ede3d02 files/digest-libwpd-0.8.9 238
 SHA256 4029c7d070748261fbef09e3ced0f397fcd5954595ed7047178107a3a114d4c6 files/digest-libwpd-0.8.9 238
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGCTmMkT4lNIS36YERAqIUAKCuuWjOPb/ShvZmTRk6Md2wasFKmACfVelO
-oqBm8s5LKtiTNI7LsPeWfnU=
-=ONSW
+iD8DBQFGisaYkeYb6olFHJcRAn94AKCOdUQflVjUfSNY6SpX4PIf1KdsQwCg2Hrl
+kAmdQFktVaxUTwJl93W4szU=
+=EHZT
 -----END PGP SIGNATURE-----
diff --git a/app-text/libwpd/files/digest-libwpd-0.7.1 b/app-text/libwpd/files/digest-libwpd-0.7.1
deleted file mode 100644
index 0741aecd00be..000000000000
--- a/app-text/libwpd/files/digest-libwpd-0.7.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 913e5e46c678efeb79604c2566628a68 libwpd-0.7.1.tar.gz 399768
-RMD160 b7a869ecc0549855d62717c6df6dead72b58a398 libwpd-0.7.1.tar.gz 399768
-SHA256 b09c2f9e11c203201215671a563eef34651ca3d4ab177ea571d39349e76cddb9 libwpd-0.7.1.tar.gz 399768
diff --git a/app-text/libwpd/files/digest-libwpd-0.7.2 b/app-text/libwpd/files/digest-libwpd-0.7.2
deleted file mode 100644
index b1ef42b2f629..000000000000
--- a/app-text/libwpd/files/digest-libwpd-0.7.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 9a4d18f4211d158685385830f41d2c84 libwpd-0.7.2.tar.gz 311872
-RMD160 653eb61f7133a36a51fa7205dee964605ce60cca libwpd-0.7.2.tar.gz 311872
-SHA256 87b94129f5e03aec82bb74fdf6f41effc370adfc339d407c87ee8f7750c0022e libwpd-0.7.2.tar.gz 311872
diff --git a/app-text/libwpd/files/digest-libwpd-0.8.2 b/app-text/libwpd/files/digest-libwpd-0.8.2
deleted file mode 100644
index d83e524f43fa..000000000000
--- a/app-text/libwpd/files/digest-libwpd-0.8.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 264e955e19c7e961e22382db09e19597 libwpd-0.8.2.tar.gz 486490
-RMD160 b652d1c79a5436df3154d90221b2544d55381a3a libwpd-0.8.2.tar.gz 486490
-SHA256 9ca228f9ea98d64cc17d9de4605ce6e26d64087042b6ea78a80fe473e367167e libwpd-0.8.2.tar.gz 486490
diff --git a/app-text/libwpd/files/digest-libwpd-0.8.4 b/app-text/libwpd/files/digest-libwpd-0.8.4
deleted file mode 100644
index 990dbdb70111..000000000000
--- a/app-text/libwpd/files/digest-libwpd-0.8.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0461d4bf2da534b4bed041b67d7f7064 libwpd-0.8.4.tar.gz 491831
-RMD160 ce5826683e37e1b3f1220f8d5c6c40b48610f054 libwpd-0.8.4.tar.gz 491831
-SHA256 b6393088bf6c49b72a07d2aec7d84d14f6cab0ab00ad177c17157f03095f2096 libwpd-0.8.4.tar.gz 491831
diff --git a/app-text/libwpd/files/digest-libwpd-0.8.4-r1 b/app-text/libwpd/files/digest-libwpd-0.8.4-r1
deleted file mode 100644
index 990dbdb70111..000000000000
--- a/app-text/libwpd/files/digest-libwpd-0.8.4-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 0461d4bf2da534b4bed041b67d7f7064 libwpd-0.8.4.tar.gz 491831
-RMD160 ce5826683e37e1b3f1220f8d5c6c40b48610f054 libwpd-0.8.4.tar.gz 491831
-SHA256 b6393088bf6c49b72a07d2aec7d84d14f6cab0ab00ad177c17157f03095f2096 libwpd-0.8.4.tar.gz 491831
diff --git a/app-text/libwpd/files/libwpd-0.8.2-gcc41.patch b/app-text/libwpd/files/libwpd-0.8.2-gcc41.patch
deleted file mode 100644
index 08fca1bdf312..000000000000
--- a/app-text/libwpd/files/libwpd-0.8.2-gcc41.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- libwpd-0.8.1-orig/src/lib/WP3FixedLengthGroup.h.old	2005-11-23 00:39:46.000000000 +0100
-+++ libwpd-0.8.1/src/lib/WP3FixedLengthGroup.h	2005-11-23 00:40:07.000000000 +0100
-@@ -30,8 +30,8 @@
- class WP3FixedLengthGroup : public WP3Part
- {
-  public:
--	WP3FixedLengthGroup::WP3FixedLengthGroup(int groupID);
--	static WP3FixedLengthGroup * WP3FixedLengthGroup::constructFixedLengthGroup(WPXInputStream *input, uint8_t groupID);
-+	WP3FixedLengthGroup(int groupID);
-+	static WP3FixedLengthGroup * constructFixedLengthGroup(WPXInputStream *input, uint8_t groupID);
- 
- 	const uint8_t getGroup() const { return m_group; } 
-  
---- libwpd-0.8.1-orig/src/lib/WP3SingleByteFunction.h.old	2005-11-23 00:41:25.000000000 +0100
-+++ libwpd-0.8.1/src/lib/WP3SingleByteFunction.h	2005-11-23 00:41:41.000000000 +0100
-@@ -32,7 +32,7 @@
- class WP3SingleByteFunction : public WP3Part
- {
-  public:
--	static WP3SingleByteFunction * WP3SingleByteFunction::constructSingleByteFunction(WPXInputStream *input, uint8_t groupID);
-+	static WP3SingleByteFunction * constructSingleByteFunction(WPXInputStream *input, uint8_t groupID);
- };
- 
- /*class WP3SpaceFunction : public WP3SingleByteFunction
---- libwpd-0.8.1-orig/src/lib/WP5SingleByteFunction.h.old	2005-11-23 00:43:46.000000000 +0100
-+++ libwpd-0.8.1/src/lib/WP5SingleByteFunction.h	2005-11-23 00:44:03.000000000 +0100
-@@ -32,7 +32,7 @@
- class WP5SingleByteFunction : public WP5Part
- {
-  public:
--	static WP5SingleByteFunction * WP5SingleByteFunction::constructSingleByteFunction(WPXInputStream *input, uint8_t groupID);
-+	static WP5SingleByteFunction * constructSingleByteFunction(WPXInputStream *input, uint8_t groupID);
- };
- 
- class WP5EOLFunction : public WP5SingleByteFunction
---- libwpd-0.8.1-orig/src/lib/WP6FixedLengthGroup.h.old	2005-11-23 00:44:34.000000000 +0100
-+++ libwpd-0.8.1/src/lib/WP6FixedLengthGroup.h	2005-11-23 00:44:52.000000000 +0100
-@@ -32,7 +32,7 @@
- {
-  public:
- 	WP6FixedLengthGroup(uint8_t groupID);
--	static WP6FixedLengthGroup * WP6FixedLengthGroup::constructFixedLengthGroup(WPXInputStream *input, uint8_t groupID);
-+	static WP6FixedLengthGroup * constructFixedLengthGroup(WPXInputStream *input, uint8_t groupID);
- 
-  	const uint8_t getGroup() const { return m_group; }
-  
---- libwpd-0.8.1-orig/src/lib/WP6SingleByteFunction.h.old	2005-11-23 00:46:34.000000000 +0100
-+++ libwpd-0.8.1/src/lib/WP6SingleByteFunction.h	2005-11-23 00:46:47.000000000 +0100
-@@ -31,7 +31,7 @@
- class WP6SingleByteFunction : public WP6Part
- {
-  public:
--	static WP6SingleByteFunction * WP6SingleByteFunction::constructSingleByteFunction(WPXInputStream *input, uint8_t groupID);
-+	static WP6SingleByteFunction * constructSingleByteFunction(WPXInputStream *input, uint8_t groupID);
- };
- 
- class WP6SpaceFunction : public WP6SingleByteFunction
---- libwpd-0.8.1-orig/src/lib/WP6VariableLengthGroup.h.old	2005-11-23 00:45:14.000000000 +0100
-+++ libwpd-0.8.1/src/lib/WP6VariableLengthGroup.h	2005-11-23 00:45:29.000000000 +0100
-@@ -41,7 +41,7 @@
- 	WP6VariableLengthGroup(); // WP6VariableLengthGroup should _never_ be constructed, only its inherited classes
- 	virtual ~WP6VariableLengthGroup();
- 
--	static WP6VariableLengthGroup * WP6VariableLengthGroup::constructVariableLengthGroup(WPXInputStream *input, uint8_t groupID);
-+	static WP6VariableLengthGroup * constructVariableLengthGroup(WPXInputStream *input, uint8_t groupID);
- 
-  protected:
- 	void _read(WPXInputStream *input);
---- libwpd-0.8.1-orig/src/lib/WPXHLListener.h.old	2005-11-23 00:40:32.000000000 +0100
-+++ libwpd-0.8.1/src/lib/WPXHLListener.h	2005-11-23 00:40:48.000000000 +0100
-@@ -157,7 +157,7 @@
- {
- public:
- 	WPXHLListener(std::vector<WPXPageSpan *> *pageList, WPXHLListenerImpl *listenerImpl);
--	WPXHLListener::~WPXHLListener();
-+	~WPXHLListener();
- 
- 	void startDocument();
- 	void handleSubDocument(uint16_t textPID, const bool isHeaderFooter, WPXTableList tableList, int nextTableIndice);
diff --git a/app-text/libwpd/files/libwpd-0.8.4-heap-overflow.patch b/app-text/libwpd/files/libwpd-0.8.4-heap-overflow.patch
deleted file mode 100644
index 4bd689a30c78..000000000000
--- a/app-text/libwpd/files/libwpd-0.8.4-heap-overflow.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN libwpd-0.8.4.orig/src/lib/WP5DefinitionGroup.cpp libwpd-0.8.4/src/lib/WP5DefinitionGroup.cpp
---- libwpd-0.8.4.orig/src/lib/WP5DefinitionGroup.cpp	2005-12-05 08:51:35.000000000 -0500
-+++ libwpd-0.8.4/src/lib/WP5DefinitionGroup.cpp	2007-03-07 11:59:45.000000000 -0500
-@@ -26,7 +26,7 @@
- #include "WPXListener.h"
- #include "libwpd_internal.h"
- 
--WP5DefinitionGroup_DefineTablesSubGroup::WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input) :
-+WP5DefinitionGroup_DefineTablesSubGroup::WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input, uint16_t subGroupSize) :
- 	WP5VariableLengthGroup_SubGroup(),
- 	m_position(0),
- 	m_numColumns(0),
-@@ -34,6 +34,7 @@ WP5DefinitionGroup_DefineTablesSubGroup:
- 	m_leftGutter(0),
- 	m_rightGutter(0)
- {
-+	long startPosition = input->tell();
- 	// Skip useless old values to read the old column number
- 	input->seek(2, WPX_SEEK_CUR);
- 	m_numColumns = readU16(input);
-@@ -50,12 +51,26 @@ WP5DefinitionGroup_DefineTablesSubGroup:
- 	input->seek(10, WPX_SEEK_CUR);
- 	m_leftOffset = readU16(input);
- 	int i;
-+	if ((m_numColumns > 32) || ((input->tell() - startPosition + m_numColumns*5) > (subGroupSize - 4)))
-+		throw FileException();
- 	for (i=0; i < m_numColumns; i++)
-+	{
-+		if (input->atEOS())
-+			throw FileException();
- 		m_columnWidth[i] = readU16(input);
-+	}
- 	for (i=0; i < m_numColumns; i++)
-+	{
-+		if (input->atEOS())
-+			throw FileException();
- 		m_attributeBits[i] = readU16(input);
-+	}
- 	for (i=0; i < m_numColumns; i++)
-+	{
-+		if (input->atEOS())
-+			throw FileException();
- 		m_columnAlignment[i] = readU8(input);
-+	}
- }
- 
- void WP5DefinitionGroup_DefineTablesSubGroup::parse(WP5Listener *listener)
-@@ -86,7 +101,7 @@ void WP5DefinitionGroup::_readContents(W
- 	switch(getSubGroup())
- 	{
- 		case WP5_TOP_DEFINITION_GROUP_DEFINE_TABLES:
--			m_subGroupData = new WP5DefinitionGroup_DefineTablesSubGroup(input);
-+			m_subGroupData = new WP5DefinitionGroup_DefineTablesSubGroup(input, getSize());
- 			break;
- 		default:
- 			break;
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN libwpd-0.8.4.orig/src/lib/WP5DefinitionGroup.h libwpd-0.8.4/src/lib/WP5DefinitionGroup.h
---- libwpd-0.8.4.orig/src/lib/WP5DefinitionGroup.h	2005-12-05 08:51:35.000000000 -0500
-+++ libwpd-0.8.4/src/lib/WP5DefinitionGroup.h	2007-03-07 12:02:13.000000000 -0500
-@@ -31,7 +31,7 @@
- class WP5DefinitionGroup_DefineTablesSubGroup : public WP5VariableLengthGroup_SubGroup
- {
- public:
--	WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input);
-+	WP5DefinitionGroup_DefineTablesSubGroup(WPXInputStream *input, uint16_t subGroupSize);
- 	virtual void parse(WP5Listener *listener);
- 
- private:
-@@ -58,7 +58,6 @@ protected:
- 
- private:
- 	WP5VariableLengthGroup_SubGroup * m_subGroupData;
--
- };
- 
- #endif /* WP5DEFINITIONGROUP_H */
-diff --exclude-from=/home/dang/bin/scripts/diffrc -up -ruN libwpd-0.8.4.orig/src/lib/WP5VariableLengthGroup.h libwpd-0.8.4/src/lib/WP5VariableLengthGroup.h
---- libwpd-0.8.4.orig/src/lib/WP5VariableLengthGroup.h	2005-12-05 08:51:37.000000000 -0500
-+++ libwpd-0.8.4/src/lib/WP5VariableLengthGroup.h	2007-03-07 12:19:51.000000000 -0500
-@@ -48,6 +48,7 @@ class WP5VariableLengthGroup : public WP
-  	virtual void _readContents(WPXInputStream *input) {} // we don't always need more information than that provided generically
- 
- 	const uint8_t getSubGroup() const { return m_subGroup; }
-+	const uint16_t getSize() const { return m_size; }
- 
-  private:
- 	uint8_t m_subGroup;
diff --git a/app-text/libwpd/libwpd-0.7.1.ebuild b/app-text/libwpd/libwpd-0.7.1.ebuild
deleted file mode 100644
index 3417422e20cc..000000000000
--- a/app-text/libwpd/libwpd-0.7.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.7.1.ebuild,v 1.7 2005/04/24 11:39:21 hansmi Exp $
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-extra/libgsf-1.6"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	econf || die
-	emake || die
-
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc CHANGES COPYING CREDITS INSTALL README TODO
-
-}
-
diff --git a/app-text/libwpd/libwpd-0.7.2.ebuild b/app-text/libwpd/libwpd-0.7.2.ebuild
deleted file mode 100644
index 1fb407afeea7..000000000000
--- a/app-text/libwpd/libwpd-0.7.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.7.2.ebuild,v 1.5 2005/07/16 02:52:56 weeve Exp $
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ppc ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-extra/libgsf-1.6"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	econf || die
-	emake || die
-
-}
-
-src_install() {
-
-	einstall || die
-
-	dodoc CHANGES COPYING CREDITS INSTALL README TODO
-
-}
-
diff --git a/app-text/libwpd/libwpd-0.8.2.ebuild b/app-text/libwpd/libwpd-0.8.2.ebuild
deleted file mode 100644
index 08a5c237d060..000000000000
--- a/app-text/libwpd/libwpd-0.8.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.8.2.ebuild,v 1.13 2006/02/07 05:15:53 agriffis Exp $
-
-inherit eutils
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc-macos ppc64 sparc x86"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-extra/libgsf-1.6
-	doc? ( app-doc/doxygen )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch "${FILESDIR}"/${P}-gcc41.patch
-}
-
-src_compile() {
-	econf $(use_with doc docs) || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc CHANGES COPYING CREDITS INSTALL README TODO
-}
diff --git a/app-text/libwpd/libwpd-0.8.4-r1.ebuild b/app-text/libwpd/libwpd-0.8.4-r1.ebuild
deleted file mode 100644
index a82a103fd9ec..000000000000
--- a/app-text/libwpd/libwpd-0.8.4-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.8.4-r1.ebuild,v 1.4 2007/03/16 11:10:31 fmccor Exp $
-
-inherit eutils
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc-macos ~ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-extra/libgsf-1.6
-	doc? ( app-doc/doxygen )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# Fix for bug #169675
-	epatch "${FILESDIR}"/${P}-heap-overflow.patch
-}
-
-src_compile() {
-	econf $(use_with doc docs) || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc CHANGES COPYING CREDITS INSTALL README TODO
-}
diff --git a/app-text/libwpd/libwpd-0.8.4.ebuild b/app-text/libwpd/libwpd-0.8.4.ebuild
deleted file mode 100644
index 7261059474c8..000000000000
--- a/app-text/libwpd/libwpd-0.8.4.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/libwpd/libwpd-0.8.4.ebuild,v 1.10 2006/10/19 16:05:00 kloeri Exp $
-
-inherit eutils
-
-DESCRIPTION="WordPerfect Document import/export library"
-HOMEPAGE="http://libwpd.sf.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ~ppc-macos ppc64 sparc x86 ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND=">=dev-libs/glib-2
-	>=gnome-extra/libgsf-1.6
-	doc? ( app-doc/doxygen )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-	econf $(use_with doc docs) || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc CHANGES COPYING CREDITS INSTALL README TODO
-}