Clean out old, security vulnerable version

Package-Manager: portage-2.2_rc43/cvs/Linux i686

6 files changed, 7 insertions, 568 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 4e1dfe8c43a9..c69b8b1013fa 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.488 2009/10/04 07:56:22 volkmar Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.489 2009/10/04 12:34:42 suka Exp $
+
+  04 Oct 2009; Andreas Proschofsky <suka@gentoo.org>
+  -openoffice-3.0.0.ebuild, -files/gentoo-3.0.0.diff,
+  -files/fixsandbox.diff, -files/nojavanostax.diff:
+  Clean out old, security vulnerable version
 
   04 Oct 2009; Mounir Lamouri <volkmar@gentoo.org> openoffice-3.1.1.ebuild:
   Stable for ppc, bug 283370
diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest
index c948d830445f..60cc103f174a 100644
--- a/app-office/openoffice/Manifest
+++ b/app-office/openoffice/Manifest
@@ -1,12 +1,9 @@
 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03
 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07
 AUX buildfix-gcc44.diff 611 RMD160 31e7c33977941458b1472d92c645ed2b2ef64a82 SHA1 ed17195077f5212bfc6f546004f5e6f429b03c14 SHA256 dd66bbe257c9a88c757037d65f48ea4976d7cee8a38e96b6282611c1b70cecff
-AUX fixsandbox.diff 412 RMD160 2f49f40ccb3b06c2678402f25fbc65658061c35c SHA1 d7ef14c375634358351ce13de4b01fabc54e9c33 SHA256 fd6d40c11f37ed1db0b09cfd1f166cf84e96a759b58064ce58980eb63b2b8d49
-AUX gentoo-3.0.0.diff 3086 RMD160 69856c46b641e09c5ffd561cf78c7f2334649d87 SHA1 a8aa9bde2cbde25c1fb54a84a4908a6b4f468873 SHA256 5c3e931564cadf9a5d212fab7c4708cf9f131057ffd1e15276dc343c36a4e33d
 AUX gentoo-3.1.1.diff 1869 RMD160 bd517c6cfe97710cb6f4c1f6a83d5f72c4686098 SHA1 c08c2a393611296e69b0ff46adecd583d24fa020 SHA256 14aa1b87b252c133f0e6917d89b75a42fa3bd5c558db26285771009201f37266
 AUX gentoo-pythonpath.diff 173 RMD160 dacec2c40bd4bd8e2c07fb849afb6f3fe3643371 SHA1 1430513326652f7b09eb04ee8f420532ac60b5c2 SHA256 de9316222af0f197a11041ba1105bfd070ba31cbcc1a2a212641d911b728ed5a
 AUX hunspell-one-dir-nocrash.diff 874 RMD160 b28b5379b59e30debd4aedb290dd8a1c4ac420a5 SHA1 0df98e9d92c779530fd9cd7e7e2e573ee1b7a603 SHA256 1cd1517d3ea63563a5acdb08f20c9d07cd55f0b646b7435b89d4121945a59ac5
-AUX nojavanostax.diff 1374 RMD160 676450cd667425b1ac2ad4df561633778469cb82 SHA1 34e4481f199f23ebca4ff89f8ffc00f3cd08337f SHA256 17e39229576e415e52ff3685d5c4cdfb5e2c6f6177aad23e6e341c256fe3b310
 AUX ooo-env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
 AUX solenv.workaround-for-the-kde-mess.diff 17556 RMD160 9a7f9d4336f62fb2a0108523dfa7e58ca3c0a5b8 SHA1 55f79297410cf19dd80673cff6eafb715806ded5 SHA256 da5a549f4672ea6304b630c3950bb935a6b2a7df5f291950250a4a023aef1a5e
 DIST Sun_ODF_Template_Pack_de.oxt 4953135 RMD160 2d7ef049b2ac625ce9d952d097ed09baab0cc510 SHA1 9ae5905490a662c25cd3014023eec271c0b0d46e SHA256 7b63da46eb4f168a3406b38643ad2c29559f63882112037eea958819b380a32a
@@ -20,27 +17,8 @@ DIST extras-3.tar.bz2 130640 RMD160 c6b6efb20cbec79b48bd21046f93959367fe1bd4 SHA
 DIST libwpg-0.1.3.tar.gz 410799 RMD160 6e9e0545215af2ee05780887ad57ca1ae7ef78f5 SHA1 6d350eb0ad57b97499ef8335506f172b0c21375a SHA256 19a52f4eede1da890ac6a5dfa5f0d9a63a73a6dfc3f17cb3423563c53cc665e3
 DIST libwps-0.1.2.tar.gz 413360 RMD160 a3f60fed70ab0c4f34091c10f4eb4a421cb87d44 SHA1 3da402f74a6296425e88d0ab1cf197a5927288d6 SHA256 e8f03fc83f7ddd3976adb61f693eaeebefee852655875816e5f945e0efabb2b1
 DIST lp_solve_5.5.0.12_source.tar.gz 787446 RMD160 8cd5299543e07d2bf1819297fe0a18400b18d12b SHA1 ffa7e52c18ffacef7ed3dfe535f4221e853068df SHA256 bc26d07fe39ae50264e15ee54dbbcf4cb1fe6ecd2fef10142be5bdd38947f193
-DIST ooo-build-3.0.0.3.6.tar.gz 10574055 RMD160 9517a4a7d0ce0557f7a220510598cea493d702c0 SHA1 c00aa4eb426e3897181ecb71ef68d1f19ac6eaa9 SHA256 0ae1d2bbdd7f73f0aa1f6f50e6ea18a4dc6c2baafae9ab3a5715270e2ec8a4da
 DIST ooo-build-3.1.0.6.tar.gz 13199374 RMD160 52193324c3e69e403ed725fdfc1ac0065eb2a51c SHA1 a3325be780a3ae2833af3dffdc0c40482f0d1c8e SHA256 9c930bf6bb93595c6b3b4227c2e6188ef31698818fe6de15dc42f09089359798
 DIST ooo-build-3.1.1.2.tar.gz 13981745 RMD160 505db0e1673765d3e398e022f03535b00f76a01b SHA1 0d4533cedcfd7a7f22715668764b599f1fc6a10d SHA256 e94729b359ab5f5db6eb506b4562e8e4ab5140463be13a7d5536d43a6e8227b5
-DIST ooo300-m9-artwork.tar.bz2 9692435 RMD160 706e568f4af998404d2c2ea2f643f90ccc800ed4 SHA1 92bea75c7f803b11a6aa043990cbc8560d16fcaf SHA256 d181de6723a3b09e9571a22a488fa6b50ea10f19bad7fa91f1ebc2d085a7be58
-DIST ooo300-m9-base.tar.bz2 2937373 RMD160 b0c75fe7b45b56c4e3115112b0f0b59eadd0c136 SHA1 8402f672b817213f98f322ce7e622fbc52865224 SHA256 2c34b6c6229d7b8f87df50d3c4eb16cce1bdbf9af49fa31e688ba9c40e022889
-DIST ooo300-m9-bootstrap.tar.bz2 7020977 RMD160 f5163c83e77c0113ee8d98f20939ab6c7f4f50a2 SHA1 c75b506063415a43c0fe347c900341fe73234a24 SHA256 3b8964bb5d8dd93a038def27a73504416c4320115b92359a0bcd61a53c15e043
-DIST ooo300-m9-calc.tar.bz2 8694713 RMD160 563b979236a1f94f941f9e3a85f83e497b7d49e2 SHA1 b8f689a8a3c207b37eb91bcf6d2f11f9dddd30b7 SHA256 f30a7026606581f0aeae8405d88dbfb4c31da5e69adb3033744724a5e43fa0b7
-DIST ooo300-m9-components.tar.bz2 5560717 RMD160 98e3e86c743c06efe98d8af54673d98dd535274a SHA1 0c4942f3964faff11e1c18ec3fd59f32ea9c26d2 SHA256 cd1b1330e190e8897941f42566301c15dbe7cf3163af62e31382b0bf9acde83a
-DIST ooo300-m9-extensions.tar.bz2 13938498 RMD160 d5dd90cebd9b502a89340e66b964304bec3e6c2e SHA1 0abec2fc3e02534e82149cd7a6fc9255f45f1d29 SHA256 cf36d0fdaa99c6f69d11b4f2572e67d7dd4adad03dce3d8657229e28c61c5d0f
-DIST ooo300-m9-filters.tar.bz2 10980545 RMD160 73f2e03211e78d25b91502c8f9f20b3ad7263f4f SHA1 0e83233b2121c65d54a7c07647f4014150c003cc SHA256 a1d732d31f677f8e000d07fcb7a373124e79d8b925fd6f96270c32c5944789d9
-DIST ooo300-m9-impress.tar.bz2 3379898 RMD160 dbe0fdf458c55a58be325fbc9f3c9dd0fa30a02a SHA1 8014e1744ef0675b5f63a73014a16ed540403d32 SHA256 2658fdd1575477b9be3f5c11be5a18ad94985b941b1fab0b2a66bc83774eaf23
-DIST ooo300-m9-l10n.tar.bz2 86646168 RMD160 66911e6f41a67284f737629d7f5f558e1851022e SHA1 934220e786a9890784975d08cb847cf37de70e8d SHA256 1013c4be4972b58a1afc239130495fb1b5717ca8984b28b328cfb5db34c8eb9c
-DIST ooo300-m9-libs_core.tar.bz2 23863498 RMD160 3ce14f6898247529ea0e1b1a9edef67d33b7caf2 SHA1 3895c3f656859d3c52a356aaa875ebfd8f0215b2 SHA256 866f9b58c4cddb487ea8b1d4e84b8cdd0d19d26ee51b942d80d461b8b2088e53
-DIST ooo300-m9-libs_extern.tar.bz2 39393026 RMD160 2ee8a4b6072bd4e5c7fc0ce5b1a304cd2964d54e SHA1 349fdcad8ac8c6cbe7540e765546e13a80602897 SHA256 e4844cfec29a91ae34085ba49fed73a13145139d972c6de25e24ae6f4d53edf3
-DIST ooo300-m9-libs_extern_sys.tar.bz2 94519989 RMD160 21a08b0ce08d541b4542dc4e3b7ecc745f90fce2 SHA1 dc75a0ac6d4d71449bdd899fad35942059aed32d SHA256 cd7fc910826040b5b72ace93bacc1b035b1f5972df9e1ed971d01ff087fceb53
-DIST ooo300-m9-libs_gui.tar.bz2 11165771 RMD160 b0d3b299d3e7bffc10db3aded0d64e99005fa72a SHA1 63d555676ad0d62c1c646851e718b435926f8f1e SHA256 9ac622184b05590b650f3998afd874649f058adda3255a8f9fe9b5e09af7813f
-DIST ooo300-m9-postprocess.tar.bz2 17467 RMD160 3f351c6cabdfc98372aad3b58a8259696e8b2a42 SHA1 e22bfee64c085e59ac979dfe26349df9a0768a03 SHA256 fcd6ee69429d3c21d19523de1541d0c50d5dd17daf2cf1c01f8edeb2ee35f3ea
-DIST ooo300-m9-sdk.tar.bz2 1612540 RMD160 92a29fdcc10cc6962f7814cc9f7aa58f725478ef SHA1 356252ecfe5ffcda0720fbf6ffaa9e9f4ba50519 SHA256 03060eecf82b4c71d9e7280910b430be5bd2b3584bcb9e28df28e9d8e98ce080
-DIST ooo300-m9-testing.tar.bz2 1770240 RMD160 56c07b529fed1e7b661fb95b21f26312588cc61e SHA1 a66f762a6b9b24b6c202b0fdcd784d8c4b4beb58 SHA256 aeed10dfc5d62772a2becea749c46a1dccf54f5262af3174b29ee469abffec10
-DIST ooo300-m9-ure.tar.bz2 5263384 RMD160 3a43b0d2b5c79ec54379d4aeac50eef2b2436d71 SHA1 79c438126fb7ec9676ddc45ec079905128db9a34 SHA256 65e4b573e5df271e255fb0073ef9cfa52c107bb6addf2987034dd2b1ed8e6b50
-DIST ooo300-m9-writer.tar.bz2 8364085 RMD160 92ac8eada6e2983e78d1ec02b48791f66a249734 SHA1 0b23415f1173a77fd1598a275f40fecdf152a1ce SHA256 7910b0a2d28945183c27b951952da1d2475d7c121d3f2643c7d26ff62ac0cfe1
 DIST ooo310-m11-artwork.tar.bz2 9699172 RMD160 879132806579fdec881e7ed4e32191414c52cc0e SHA1 2dd68a74d1ce40f0bf6270c0e414876396958350 SHA256 c3af24301c85235afe0e3e86ceee56c36fae9318fdaa366f55cbe256dbc7737e
 DIST ooo310-m11-base.tar.bz2 3310363 RMD160 66e79afe97dcc7d82c76f682ea799e495bd10942 SHA1 e7c5fb4ced44f329769181d943d4284f8212b2a3 SHA256 2443026c719a55715788bcf67192cf39410b112a830998709e70fe6f2b5946d0
 DIST ooo310-m11-bootstrap.tar.bz2 7245734 RMD160 800f4828f33b4617cbe266fdb19cf93e80f32de3 SHA1 786975ce10b4ab38a6f9a0bb3cba005b83713242 SHA256 c97ee7594b769c765ec8b94205d3d76289d3d4b1a5b808e259f7d00588ab6961
@@ -82,8 +60,7 @@ DIST ooo310-m19-writer.tar.bz2 9021103 RMD160 47d18795af5e643d4f9eb323b27458ad1f
 DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a
 DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
-EBUILD openoffice-3.0.0.ebuild 12681 RMD160 20d2e4f6ea1e979f33f033d284d97d6a8e9bd4b8 SHA1 7a79d589ade481854fa81ab0309b972883ea6390 SHA256 4d096777f0cb9a99b1dfbfc363efc641a78650032c9544b95f997383e3b6a1f3
 EBUILD openoffice-3.1.0-r1.ebuild 13569 RMD160 6e7162ea3eff111c981eb03e2dbd510110aba38c SHA1 a2b4c10d0c6877022dbfaac230ab58be9ebe8437 SHA256 ee5e3cd6a7f0d534b036b8d04b4ddaa830aff0d72bb095cea88cc145a68974f2
 EBUILD openoffice-3.1.1.ebuild 13672 RMD160 102c648b873f70cb717d22112978dbbbffdd3c7b SHA1 e6dc3afe3af9ebac35fec01c3d2327fef1f4c93b SHA256 0139ed1b5d59c3fea25fc8f70b92b88eb9db4d8ef149be620b0c258923bb9d25
-MISC ChangeLog 101603 RMD160 b2685d965f843fa17547ecf05c5a60c8fec0a851 SHA1 d4818781a171821d8f9083e8f47612ce3b25207c SHA256 5c6e177cb4ffa2ba0c91206d1715f95d8c5010843058f55e942f17f29d39ff54
+MISC ChangeLog 101805 RMD160 1287418e649b878f1f2890b95fc5faedafc96865 SHA1 24c7bf4e7a26b9bbf3536b4c1efc7cf823c2fc15 SHA256 8603f254a2f1107527993cc94f9c28fc89ad863bef124b853f864a938cf5a7d3
 MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78
diff --git a/app-office/openoffice/files/fixsandbox.diff b/app-office/openoffice/files/fixsandbox.diff
deleted file mode 100644
index 9249da284baa..000000000000
--- a/app-office/openoffice/files/fixsandbox.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- officecfg/util/makefile.mk 
-+++ officecfg/util/makefile.mk 
-@@ -41,7 +41,6 @@
- 
- $(MISC)$/$(TARGET)_delzip :
- 	-$(RM) $(BIN)$/registry_{$(alllangiso)}.zip	
--	-$(RM) $(COMMON_OUTPUT)$/bin$/registry_{$(alllangiso)}.zip
- 
- $(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
- 	cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
-
diff --git a/app-office/openoffice/files/gentoo-3.0.0.diff b/app-office/openoffice/files/gentoo-3.0.0.diff
deleted file mode 100644
index 88ffb8ac43ce..000000000000
--- a/app-office/openoffice/files/gentoo-3.0.0.diff
+++ /dev/null
@@ -1,76 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -33,6 +33,7 @@
- {
-     cat <<EOT >$1
- #!/bin/sh
-+unset PYTHONPATH
- $OOINSTBASE/program/soffice $2 "\$@"
- EOT
-     chmod 755 $1
---- patches/dev300/apply 
-+++ patches/dev300/apply 
-@@ -259,6 +259,9 @@
- # (happened to me with DirectX SDK)
- buildfix-directx-path.diff, i#93333, jholesov
- 
-+# workaround for building with KDE when both KDE 3.5 and 4.1 are present
-+solenv.workaround-for-the-kde-mess.diff, i#95552, dtardon
-+
- [ CJK ]
- #set default CJK font fontsize as 10.5pt
- sw-default-cjk-fontsize.diff i#72010, jianhua
-@@ -1458,6 +1458,12 @@
- [ GentooOnly ]
- SectionOwner => aprosky
- 
-+# No java build
-+nojavanostax.diff
-+# Fix freezes with dict|hyph-stuff in one dir
-+hunspell-one-dir-nocrash.diff
-+# Sandbox problem with wrong path
-+fixsandbox.diff
- # Allow build to proceed with PaX enabled
- gentoo-pax-fix.diff, aprosky
- # support server-only versions of 64bit JDKs
---- patches/dev300/scp2_build_extensions.diff.orig	2009-01-11 11:57:12.000000000 +0100
-+++ patches/dev300/scp2_build_extensions.diff	2009-01-11 11:57:24.000000000 +0100
-@@ -4,7 +4,7 @@
-  cp    scp2\source\canvas          nmake    -    all    cp_canvas cp_langmacros cp_langtemplates NULL
-  cp    scp2\source\crashrep        nmake    -    all    cp_crashrep cp_langmacros cp_langtemplates NULL
-  cp    scp2\source\draw            nmake    -    all    cp_draw cp_langmacros cp_langtemplates NULL
--+cp    scp2\source\extensions      nmake    -    all    cp_extensions cp_langmacros NULL
-++cp    scp2\source\extensions      nmake    -    all    cp_extensions cp_langmacros cp_langtemplates NULL
-  cp    scp2\source\gnome           nmake    -    all    cp_gnome cp_langmacros cp_langtemplates NULL
-  cp    scp2\source\graphicfilter   nmake    -    all    cp_graphicfilter cp_langmacros cp_langtemplates NULL
-  cp    scp2\source\impress         nmake    -    all    cp_impress cp_langmacros cp_langtemplates NULL
---- patches/dev300/svg-import-filter.diff
-+++ patches/dev300/svg-import-filter.diff
-@@ -787,7 +787,7 @@
- +			$(SLO)$/units.obj
- +
- +.IF "$(COMID)"=="gcc3"
--+.IF "$(CCNUMVER)">="000400000000" 
-++.IF "$(CCNUMVER)">="000400000000" || "$(SYSTEM_BOOST)"=="YES"
- +CFLAGS+=-DUSE_MODERN_SPIRIT
- +.ENDIF
-  .ENDIF
---- bin/install-mono 
-+++ bin/install-mono 
-@@ -32,13 +32,13 @@
- # to be found in PKG_CONFIG_PATH, though
- mkdir -p $OODESTDIR${LIBDIRBASE}/pkgconfig/
- sed -e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
--    $SRCDIR/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
-+    $TOOLSDIR/src/mono-ooo.pc.in >${OODESTDIR}${LIBDIRBASE}/pkgconfig/mono-$OOOINSTALLDIRNAME.pc
- 
- # extra dlls config files
- for dll in cli_uno_bridge.dll ; do
-     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
- 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
--	$SRCDIR/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
-+	$TOOLSDIR/src/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
-     if test -n "$OODESTDIR" ; then
- 	file_list=`grep "^$OOINSTBASE/ure/lib/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
- 	echo "$OOINSTBASE/ure/lib/$dll.config" >>$file_list
-
diff --git a/app-office/openoffice/files/nojavanostax.diff b/app-office/openoffice/files/nojavanostax.diff
deleted file mode 100644
index 9134872f8048..000000000000
--- a/app-office/openoffice/files/nojavanostax.diff
+++ /dev/null
@@ -1,58 +0,0 @@
---- config_office/configure.in 
-+++ config_office/configure.in 
-@@ -3452,6 +3452,7 @@
- dnl ===================================================================
- dnl Check for building stax
- dnl ===================================================================
-+if test "$SOLAR_JAVA" != ""; then
- AC_MSG_CHECKING([whether to build the stax])
- if test -f "../external/StAX/jsr173_1.0_api.jar"; then
-    BUILD_STAX=NO
-@@ -3459,6 +3460,7 @@
- else
-    BUILD_STAX=YES
-    AC_MSG_RESULT([yes])
-+fi
- fi
- AC_SUBST(BUILD_STAX)
- 
---- stax/makefile.mk 
-+++ stax/makefile.mk 
-@@ -35,12 +35,13 @@
- TARGET=stax
- USE_JAVAVER=TRUE
- 
-+.IF "$(SOLAR_JAVA)" != ""
-+
- # --- Settings -----------------------------------------------------
- 
- .INCLUDE :	settings.mk
- .INCLUDE : antsettings.mk
- 
--.IF "$(SOLAR_JAVA)" != ""
- .IF "$(JAVANUMVER:s/.//)" >= "000100060000" || "$(JDK)"=="gcj"
- all:
- 	@echo "Your java version already contains StAX"
-@@ -68,14 +69,20 @@
- 
- OUT2CLASS=jsr173_1.0_api.jar
- 
-+.ENDIF			#  "$(BUILD_STAX)" != "YES"
-+
-+.ELSE			# $(SOLAR_JAVA)==""
-+all:
-+	@echo "Nothing to do: SOLAR_JAVA not set"
- .ENDIF			# $(SOLAR_JAVA)!= ""
- # --- Targets ------------------------------------------------------
- 
-+.IF "$(SOLAR_JAVA)" != ""
- .INCLUDE : set_ext.mk
-+.ENDIF
- .INCLUDE : target.mk
- .IF "$(SOLAR_JAVA)" != ""
- .INCLUDE : tg_ext.mk
--.ENDIF
- 
- .ENDIF			#  "$(BUILD_STAX)" != "YES"
- 
-
diff --git a/app-office/openoffice/openoffice-3.0.0.ebuild b/app-office/openoffice/openoffice-3.0.0.ebuild
deleted file mode 100644
index b0f1a0150316..000000000000
--- a/app-office/openoffice/openoffice-3.0.0.ebuild
+++ /dev/null
@@ -1,398 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.0.0.ebuild,v 1.28 2009/07/22 20:30:15 suka Exp $
-
-WANT_AUTOCONF="2.5"
-WANT_AUTOMAKE="1.9"
-EAPI="1"
-
-inherit autotools check-reqs db-use eutils fdo-mime flag-o-matic java-pkg-opt-2 kde-functions mono multilib toolchain-funcs
-
-IUSE="binfilter cups dbus debug eds gnome gstreamer gtk kde ldap mono nsplugin odk opengl pam templates"
-
-MY_PV="3.0.0.3.6"
-PATCHLEVEL="OOO300"
-SRC="OOo_${PV}_src"
-MST="ooo300-m9"
-DEVPATH="http://download.go-oo.org/${PATCHLEVEL}/${MST}"
-S="${WORKDIR}/ooo"
-S_OLD="${WORKDIR}/ooo-build-${MY_PV}"
-CONFFILE="${S}/distro-configs/Gentoo.conf.in"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-
-SRC_URI="${DEVPATH}-artwork.tar.bz2
-	${DEVPATH}-base.tar.bz2
-	${DEVPATH}-bootstrap.tar.bz2
-	${DEVPATH}-calc.tar.bz2
-	${DEVPATH}-components.tar.bz2
-	${DEVPATH}-extensions.tar.bz2
-	${DEVPATH}-filters.tar.bz2
-	${DEVPATH}-impress.tar.bz2
-	${DEVPATH}-l10n.tar.bz2
-	${DEVPATH}-libs_core.tar.bz2
-	${DEVPATH}-libs_extern.tar.bz2
-	${DEVPATH}-libs_extern_sys.tar.bz2
-	${DEVPATH}-libs_gui.tar.bz2
-	${DEVPATH}-postprocess.tar.bz2
-	${DEVPATH}-sdk.tar.bz2
-	${DEVPATH}-testing.tar.bz2
-	${DEVPATH}-ure.tar.bz2
-	${DEVPATH}-writer.tar.bz2
-	templates? ( http://extensions.services.openoffice.org/files/273/0/Sun_ODF_Template_Pack_en-US.oxt
-		http://extensions.services.openoffice.org/files/295/1/Sun_ODF_Template_Pack_de.oxt
-		http://extensions.services.openoffice.org/files/299/0/Sun_ODF_Template_Pack_it.oxt
-		http://extensions.services.openoffice.org/files/297/0/Sun_ODF_Template_Pack_fr.oxt
-		http://extensions.services.openoffice.org/files/301/1/Sun_ODF_Template_Pack_es.oxt )
-	http://download.go-oo.org/${PATCHLEVEL}/ooo-build-${MY_PV}.tar.gz
-	odk? ( java? ( http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll ) )
-	http://download.go-oo.org/SRC680/extras-3.tar.bz2
-	http://download.go-oo.org/SRC680/biblio.tar.bz2
-	http://download.go-oo.org/SRC680/lp_solve_5.5.0.12_source.tar.gz
-	http://download.go-oo.org/DEV300/scsolver.2008-10-30.tar.bz2
-	http://download.go-oo.org/SRC680/libwps-0.1.2.tar.gz
-	http://download.go-oo.org/SRC680/libwpg-0.1.3.tar.gz"
-
-LANGS1="af ar as_IN be_BY bg bn br bs ca cs cy da de dz el en_GB en_ZA eo es et fa fi fr ga gl gu_IN he hi_IN hr hu it ja km ko ku lt lv mk ml_IN mr_IN nb ne nl nn nr ns or_IN pa_IN pl pt pt_BR ru rw sh sk sl sr ss st sv sw_TZ ta_IN te_IN tg th ti_ER tn tr ts uk ur_IN ve vi xh zh_CN zh_TW zu"
-LANGS="${LANGS1} en en_US"
-
-for X in ${LANGS} ; do
-	IUSE="${IUSE} linguas_${X}"
-done
-
-HOMEPAGE="http://go-oo.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~sparc x86"
-
-COMMON_DEPEND="!app-office/openoffice-bin
-	x11-libs/libXaw
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	>=dev-lang/perl-5.0
-	dbus? ( >=dev-libs/dbus-glib-0.71 )
-	gnome? ( >=x11-libs/gtk+-2.10
-		>=gnome-base/gnome-vfs-2.6
-		>=gnome-base/gconf-2.0
-		>=x11-libs/cairo-1.0.2 )
-	gtk? ( >=x11-libs/gtk+-2.10
-		>=x11-libs/cairo-1.0.2 )
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	gstreamer? ( >=media-libs/gstreamer-0.10
-			>=media-libs/gst-plugins-base-0.10 )
-	kde? ( kde-base/kdelibs:3.5 )
-	java? ( >=dev-java/bsh-2.0_beta4
-		>=dev-db/hsqldb-1.8.0.9 )
-	mono? ( || ( >dev-lang/mono-2.4-r1 <dev-lang/mono-2.4 ) )
-	nsplugin? ( || ( =net-libs/xulrunner-1.9.0* net-libs/xulrunner:1.8 =www-client/seamonkey-1* )
-		>=dev-libs/nspr-4.6.6
-		>=dev-libs/nss-3.11-r1 )
-	opengl? ( virtual/opengl
-		virtual/glu )
-	>=net-misc/neon-0.24.7
-	>=dev-libs/openssl-0.9.8g
-	>=media-libs/freetype-2.1.10-r2
-	>=media-libs/fontconfig-2.3.0
-	cups? ( net-print/cups )
-	media-libs/jpeg
-	media-libs/libpng
-	app-arch/zip
-	app-arch/unzip
-	>=app-text/hunspell-1.1.4-r1
-	dev-libs/expat
-	>=dev-libs/icu-3.8
-	>=sys-libs/db-4.3
-	>=app-text/libwpd-0.8.8
-	>=media-libs/vigra-1.4
-	>=virtual/poppler-0.8.0"
-
-RDEPEND="java? ( >=virtual/jre-1.5 )
-	${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-proto/printproto
-	x11-proto/xextproto
-	x11-proto/xproto
-	x11-proto/xineramaproto
-	>=sys-apps/findutils-4.1.20-r1
-	dev-perl/Archive-Zip
-	virtual/perl-IO-Compress
-	>=virtual/perl-Compress-Raw-Zlib-2.002
-	dev-util/pkgconfig
-	dev-util/intltool
-	>=dev-libs/boost-1.33.1
-	sys-devel/flex
-	sys-devel/bison
-	dev-libs/libxslt
-	>=dev-libs/libxml2-2.0
-	>=dev-util/gperf-3
-	>=net-misc/curl-7.12
-	sys-libs/zlib
-	sys-apps/coreutils
-	pam? ( sys-libs/pam )
-	>=dev-lang/python-2.3.4
-	java? ( || ( =virtual/jdk-1.6* =virtual/jdk-1.5* )
-		>=dev-java/ant-core-1.7 )
-	ldap? ( net-nds/openldap )"
-
-PROVIDE="virtual/ooo"
-
-pkg_setup() {
-
-	ewarn
-	ewarn " It is important to note that OpenOffice.org is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again. Also note that building OOo takes a lot of time and "
-	ewarn " hardware ressources: 4-6 GB free diskspace and 256 MB RAM are "
-	ewarn " the minimum requirements. If you have less, use openoffice-bin "
-	ewarn " instead. "
-	ewarn
-	ewarn " Also if you experience a build break, please make sure to retry "
-	ewarn " with MAKEOPTS="-j1" before filing a bug. "
-	ewarn
-
-	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="8192" || CHECKREQS_DISK_BUILD="5120"
-	check_reqs
-
-	strip-linguas ${LANGS}
-
-	if [[ -z "${LINGUAS}" ]]; then
-		export LINGUAS_OOO="en-US"
-		ewarn
-		ewarn " To get a localized build, set the according LINGUAS variable(s). "
-		ewarn
-	else
-		export LINGUAS_OOO=`echo ${LINGUAS} | \
-			sed -e 's/\ben\b/en_US/g' -e 's/_/-/g'`
-	fi
-
-	if use !java; then
-		ewarn " You are building with java-support disabled, this results in some "
-		ewarn " of the OpenOffice.org functionality being disabled. "
-		ewarn " If something you need does not work for you, rebuild with "
-		ewarn " java in your USE-flags. "
-		ewarn
-	fi
-
-	if use !gtk && use !gnome; then
-		ewarn " If you want the OpenOffice.org systray quickstarter to work "
-		ewarn " activate either the 'gtk' or 'gnome' use flags. "
-		ewarn
-	fi
-
-	if is-flagq -ffast-math ; then
-		eerror " You are using -ffast-math, which is known to cause problems. "
-		eerror " Please remove it from your CFLAGS, using this globally causes "
-		eerror " all sorts of problems. "
-		eerror " After that you will also have to - at least - rebuild python otherwise "
-		eerror " the openoffice build will break. "
-		die
-	fi
-
-	if use pam; then
-		if ! built_with_use sys-apps/shadow pam; then
-			eerror " shadow needs to be built with pam-support. "
-			eerror " rebuild it accordingly or remove the pam use-flag "
-			die
-		fi
-	fi
-
-	if use nsplugin; then
-		if pkg-config --exists libxul; then
-			BRWS="libxul"
-		elif pkg-config --exists xulrunner-xpcom; then
-			BRWS="xulrunner"
-		elif pkg-config --exists seamonkey-xpcom; then
-			BRWS="seamonkey"
-		else
-			die "USE flag [nsplugin] set but no installed xulrunner or seamonkey found!"
-		fi
-	fi
-
-	# Check python
-	if ! built_with_use dev-lang/python threads
-	then
-	    eerror "Python needs to be built with threads."
-	    die
-	fi
-
-	java-pkg-opt-2_pkg_setup
-
-	# sys-libs/db version used
-	local db_ver="$(db_findver '>=sys-libs/db-4.3')"
-
-}
-
-src_unpack() {
-
-	unpack ooo-build-${MY_PV}.tar.gz
-
-	# Hackish workaround for overlong path problem, see bug #130837
-	mv "${S_OLD}" "${S}" || die
-
-	#Some fixes for our patchset
-	cd "${S}"
-	epatch "${FILESDIR}/gentoo-${PV}.diff"
-	epatch "${FILESDIR}/ooo-env_log.diff"
-	cp -f "${FILESDIR}/nojavanostax.diff" "${S}/patches/dev300" || die
-	cp -f "${FILESDIR}/hunspell-one-dir-nocrash.diff" "${S}/patches/dev300" || die
-	cp -f "${FILESDIR}/fixsandbox.diff" "${S}/patches/dev300" || die
-	cp -f "${FILESDIR}/solenv.workaround-for-the-kde-mess.diff" "${S}/patches/dev300" || die
-
-	#Use flag checks
-	if use java ; then
-		echo "--with-ant-home=${ANT_HOME}" >> ${CONFFILE}
-		echo "--with-jdk-home=$(java-config --jdk-home 2>/dev/null)" >> ${CONFFILE}
-		echo "--with-java-target-version=$(java-pkg_get-target)" >> ${CONFFILE}
-		echo "--with-system-beanshell" >> ${CONFFILE}
-		echo "--with-system-hsqldb" >> ${CONFFILE}
-		echo "--with-beanshell-jar=$(java-pkg_getjar bsh bsh.jar)" >> ${CONFFILE}
-		echo "--with-hsqldb-jar=$(java-pkg_getjar hsqldb hsqldb.jar)" >> ${CONFFILE}
-	fi
-
-	if use nsplugin ; then
-		echo "--enable-mozilla" >> ${CONFFILE}
-		echo "--with-system-mozilla=${BRWS}" >> ${CONFFILE}
-	else
-		echo "--disable-mozilla" >> ${CONFFILE}
-		echo "--without-system-mozilla" >> ${CONFFILE}
-	fi
-
-	echo "`use_enable binfilter`" >> ${CONFFILE}
-	echo "`use_enable cups`" >> ${CONFFILE}
-	echo "`use_enable dbus`" >> ${CONFFILE}
-	echo "`use_enable eds evolution2`" >> ${CONFFILE}
-	echo "`use_enable gnome gnome-vfs`" >> ${CONFFILE}
-	echo "`use_enable gnome lockdown`" >> ${CONFFILE}
-	echo "`use_enable gstreamer`" >> ${CONFFILE}
-	echo "`use_enable gtk systray`" >> ${CONFFILE}
-	echo "`use_enable ldap`" >> ${CONFFILE}
-	echo "`use_enable opengl`" >> ${CONFFILE}
-	echo "`use_with ldap openldap`" >> ${CONFFILE}
-	echo "`use_enable debug crashdump`" >> ${CONFFILE}
-	echo "`use_enable debug strip-solver`" >> ${CONFFILE}
-
-	# Extension stuff
-	echo "--with-extension-integration" >> ${CONFFILE}
-	echo "--enable-minimizer" >> ${CONFFILE}
-	echo "--enable-pdfimport" >> ${CONFFILE}
-	echo "--enable-presenter-console" >> ${CONFFILE}
-
-	# Use splash screen without Sun logo
-	echo "--with-intro-bitmaps=\\\"${S}/build/${MST}/ooo_custom_images/nologo/introabout/intro.bmp\\\"" >> ${CONFFILE}
-
-	eautoreconf
-
-}
-
-src_compile() {
-
-	# Use multiprocessing by default now, it gets tested by upstream
-	export JOBS=`echo "${MAKEOPTS}" | sed -e "s/.*-j\([0-9]\+\).*/\1/"`
-
-	# Compile problems with these ...
-	filter-flags "-funroll-loops"
-	filter-flags "-fprefetch-loop-arrays"
-	filter-flags "-fno-default-inline"
-	filter-flags "-ftracer"
-	filter-flags "-fforce-addr"
-
-	filter-flags "-O[s2-9]"
-
-	if [[ $(gcc-major-version) -lt 4 ]]; then
-		filter-flags "-fstack-protector"
-		filter-flags "-fstack-protector-all"
-		replace-flags "-fomit-frame-pointer" "-momit-leaf-frame-pointer"
-	fi
-
-	# Build with NVidia cards breaks otherwise
-	use opengl && append-flags "-DGL_GLEXT_PROTOTYPES"
-
-	# Now for our optimization flags ...
-	export ARCH_FLAGS="${CXXFLAGS}"
-	use debug || export LINKFLAGSOPTIMIZE="${LDFLAGS}"
-
-	# Make sure gnome-users get gtk-support
-	local GTKFLAG="--disable-gtk --disable-cairo --without-system-cairo"
-	( use gtk || use gnome ) && GTKFLAG="--enable-gtk --enable-cairo --with-system-cairo"
-
-	cd "${S}"
-	./configure \
-		--with-distro="Gentoo" \
-		--with-arch="${ARCH}" \
-		--with-srcdir="${DISTDIR}" \
-		--with-lang="${LINGUAS_OOO}" \
-		--with-num-cpus="${JOBS}" \
-		--without-binsuffix \
-		--with-installed-ooo-dirname="openoffice" \
-		--with-tag="${MST}" \
-		${GTKFLAG} \
-		`use_enable mono` \
-		`use_enable kde` \
-		`use_enable !debug strip` \
-		`use_enable odk` \
-		`use_enable pam` \
-		`use_with java` \
-		`use_with templates sun-templates` \
-		--disable-access \
-		--disable-post-install-scripts \
-		--enable-extensions \
-		--with-system-libwpd \
-		--mandir=/usr/share/man \
-		--libdir=/usr/$(get_libdir) \
-		|| die "Configuration failed!"
-
-	einfo "Building OpenOffice.org..."
-	use kde && set-kdedir 3
-	make || die "Build failed"
-
-}
-
-src_install() {
-
-	export PYTHONPATH=""
-
-	einfo "Preparing Installation"
-	make DESTDIR="${D}" install || die "Installation failed!"
-
-	# Fix the permissions for security reasons
-#	chown -RP root:0 "${D}"
-
-	# record java libraries
-	use java && java-pkg_regjar "${D}"/usr/$(get_libdir)/openoffice/basis3.0/program/classes/*.jar
-
-}
-
-pkg_postinst() {
-
-	fdo-mime_desktop_database_update
-	fdo-mime_mime_database_update
-
-	[[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin
-
-	# Add available & useful jars to openoffice classpath
-	use java && /usr/$(get_libdir)/openoffice/basis3.0/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null
-
-	elog
-	elog " Spell checking is provided through our own myspell-ebuilds, "
-	elog " if you want to use it, please install the correct myspell package "
-	elog " according to your language needs. "
-	elog
-
-	elog " Some aditional functionality can be installed via Extension Manager: "
-	elog " *) PDF Import "
-	elog " *) Presentation Console "
-	elog " *) Presentation Minimizer "
-	elog
-	elog " Please use the packages provided in "
-	elog " /usr/$(get_libdir)/openoffice/share/extension/install/ "
-	elog " instead of those from the SUN extension site. "
-	elog
-
-}