Fix building without java and libxslt >=1.1.5, closes bug #106174

Package-Manager: portage-2.0.52-r1

2 files changed, 32 insertions, 30 deletions

diff --git a/app-office/openoffice-ximian/Manifest b/app-office/openoffice-ximian/Manifest
index f5b27cc8ae3c..2e85dd702bb3 100644
--- a/app-office/openoffice-ximian/Manifest
+++ b/app-office/openoffice-ximian/Manifest
@@ -1,7 +1,7 @@
 MD5 3908545ea3f61c386910277dc6201042 openoffice-ximian-1.3.14.ebuild 17995
-MD5 d988cd13c1a42ab71db133d116c19f67 openoffice-ximian-1.3.16.ebuild 17832
+MD5 1b8e32bdb264470ac97dab820cd3e39c openoffice-ximian-1.3.16.ebuild 18004
 MD5 2172597e048d38d848b3ee1ffdda7790 openoffice-ximian-1.3.9-r1.ebuild 17912
-MD5 39ffa2d96ae8afecd31f1f6157b5652e ChangeLog 34186
+MD5 7cc1e5f4abb8c08bdb4015581e9e46dc ChangeLog 34377
 MD5 f3942f82433bf5ae16461240cbcc4984 metadata.xml 300
 MD5 e84e07ee231b9ceaabacc5556a63f647 files/digest-openoffice-ximian-1.3.9-r1 492
 MD5 62fa209accdad43ffb6c4fe805cddda5 files/digest-openoffice-ximian-1.3.14 493
@@ -32,5 +32,6 @@ MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
 MD5 ba6affa60977e5d658fe5a2125abb691 files/1.1.5/xooffice-wrapper-1.3 6091
 MD5 3d3555a66a2d8a66613d4e4471701eb8 files/1.1.5/pthreadlink-fix.patch 1163
 MD5 3f008e2c5595512c7f6306b1a722612e files/1.1.5/nptl.patch 243
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650
 MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472
 MD5 a9233bc0091b925de38145108267b949 files/1.1.5/newstlportfix.patch 3638
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index e6a137b3be76..c2e46eb016c5 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,37 +1,38 @@
-MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
-MD5 4b12e8586216fcc0161474fc2d96873c ChangeLog 27541
-MD5 69348bc843afd9853907a13f44d13c8f openoffice-1.1.5.ebuild 16483
 MD5 60a58fcd938c9d5a770a92f6b7eb9b5d openoffice-1.1.4-r1.ebuild 16561
+MD5 e97a8df189232c5d9b595913d6cef33d openoffice-1.1.5.ebuild 16649
+MD5 c0002b169af404ea9dbdb91763ddcbd3 ChangeLog 27722
+MD5 e3ec4a70395943b59adad7fc4f0538d7 metadata.xml 461
 MD5 387adcb6e397b6e7f825c8384ce52389 files/digest-openoffice-1.1.5 322
 MD5 b2cb01ba0d5824f2892c150dce1d8771 files/digest-openoffice-1.1.4-r1 325
-MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
-MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393
-MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.5/gcc34.patch.bz2 34342
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576
-MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.5/gcc34-sal-link-to-libsupc++.diff 405
-MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
-MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
-MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.5/gcc34-nojava-fix.patch 329
-MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472
-MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.5/nptl.patch 785
-MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.5/freetype-217.patch 766
-MD5 a9233bc0091b925de38145108267b949 files/1.1.5/newstlportfix.patch 3638
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
+MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
 MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.4/openoffice-java.patch 2092
+MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
 MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.4/getcompver.awk.patch 418
-MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.4/gcc-instlib.patch 393
-MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.4/gcc34.patch.bz2 34342
 MD5 b2ea5c34d4a5e430c21a2da7426b9e39 files/1.1.4/cws-heapbug_CAN-2005-0941.diff 598
-MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.4/hardened-link.patch 576
-MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405
-MD5 4045e7a45d5209ff0ac93c5c5db0114b files/1.1.4/ooffice-wrapper-1.3 6659
-MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
 MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.4/gcc34-nojava-fix.patch 329
-MD5 24035033f41d743378e16582c2e51469 files/1.1.4/javafix.patch 1382
-MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
-MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
+MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.4/pthreadlink-fix.patch 1133
 MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.4/freetype-217.patch 766
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.4/nptl.patch 785
+MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.4/gcc34-sal-link-to-libsupc++.diff 405
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.4/STLport-vector.patch 1472
 MD5 a9233bc0091b925de38145108267b949 files/1.1.4/newstlportfix.patch 3638
-MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.4/pyunolink-fix.patch 475
+MD5 f0c4c412675085f96c20d0b5ac753694 files/1.1.5/gcc34.patch.bz2 34342
+MD5 aa01d8f68b27d3df4af58ed02c080df5 files/1.1.5/pyunolink-fix.patch 475
+MD5 475dbfca78a66962143b39d3aac7915a files/1.1.5/ooffice-wrapper-1.3 6659
+MD5 ffcbf659ca6f54e8e15401cced99af77 files/1.1.5/gcc-instlib.patch 393
+MD5 35601b7efe487b346f78d43c23e2f8f3 files/1.1.5/openoffice-java.patch 2092
+MD5 24035033f41d743378e16582c2e51469 files/1.1.5/javafix.patch 1382
+MD5 ddb36dfd1d142b8a03850e3bee62a8c3 files/1.1.5/hardened-link.patch 576
+MD5 e08721c60cf0f7bc7ea0a714baeac120 files/1.1.5/getcompver.awk.patch 418
+MD5 a9cbc34e9462f6b64ca9e564c3b3a084 files/1.1.5/gcc34-nojava-fix.patch 329
+MD5 fd1c64677627b46e5528f72564bcc8fd files/1.1.5/pthreadlink-fix.patch 1133
+MD5 cd0429c945d4f2e1fbbb9fd5322a6c2b files/1.1.5/freetype-217.patch 766
+MD5 8c58ee1fa6e9199546bca43730d2400c files/1.1.5/nptl.patch 785
+MD5 9784ab4484e09b8230284b27d20d4264 files/1.1.5/build-new-xslt.diff 650
+MD5 f43ca2544f6cd797bed8e5aad1e50a29 files/1.1.5/gcc34-sal-link-to-libsupc++.diff 405
+MD5 6f7ff745a5659e605fb05206914ab344 files/1.1.5/STLport-vector.patch 1472
+MD5 a9233bc0091b925de38145108267b949 files/1.1.5/newstlportfix.patch 3638