Remove vulnerable ebuilds for security bug #181921

(Portage version: 2.1.3_rc3)

16 files changed, 0 insertions, 1071 deletions

diff --git a/app-office/openoffice/files/2.1.0/detect-db4.5.diff b/app-office/openoffice/files/2.1.0/detect-db4.5.diff
deleted file mode 100644
index 0a708e9c2ce8..000000000000
--- a/app-office/openoffice/files/2.1.0/detect-db4.5.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- patches/src680.orig/system-db-check.diff	2007-02-08 14:18:23.000000000 +0100
-+++ patches/src680/system-db-check.diff	2007-03-06 10:56:17.754647295 +0100
-@@ -12,7 +12,7 @@
- -             [ AC_MSG_ERROR(no. install the db4 libraries) ], []+             )
- -        ], []
- -    )
--+    for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-++    for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
- +       AC_CHECK_HEADER(db$dbver/db.h, [ DB_INCLUDES="/usr/include/db$dbver"; break ])
- +    done
- +    if test "$DB_INCLUDES" = ""; then
-@@ -31,7 +31,7 @@
- -    AC_HAVE_LIBRARY(db, [],
- -      [AC_MSG_ERROR([db not installed or functional])], [])
- +    save_LIBS="$LIBS"
--+    for dbver in -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
-++    for dbver in -4.5 4.5 -4.4 4.4 -4.3 4.3 -4.2 4.2 -4.1 4.1 -4 4 ''; do
- +       AC_CHECK_LIB(db$dbver, db_create, [ DB_LIB="db$dbver"; DB_CPPLIB="db_cxx$dbver"; LIBS="-ldb$dbver $LIBS"; break ])
- +    done
- +    AC_CHECK_FUNC(db_create, [], [ AC_MSG_ERROR([db not installed or functional]) ])
diff --git a/app-office/openoffice/files/2.1.0/disable-regcomp-java.diff b/app-office/openoffice/files/2.1.0/disable-regcomp-java.diff
deleted file mode 100644
index f9a1ff10a483..000000000000
--- a/app-office/openoffice/files/2.1.0/disable-regcomp-java.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
---- solenv/bin/modules/installer/servicesfile.pm.orig	2006-04-29 11:25:25.000000000 +0200
-+++ solenv/bin/modules/installer/servicesfile.pm	2006-04-29 12:24:45.000000000 +0200
-@@ -471,7 +473,7 @@
- 	$python_error_occured = 0;
- 
- 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
--	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
-+	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
- 	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
- 		
- 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
diff --git a/app-office/openoffice/files/2.1.0/disable-regcomp-python.diff b/app-office/openoffice/files/2.1.0/disable-regcomp-python.diff
deleted file mode 100644
index e63a91f009eb..000000000000
--- a/app-office/openoffice/files/2.1.0/disable-regcomp-python.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
---- solenv/bin/modules/installer/servicesfile.pm.orig	2006-10-23 13:49:24.000000000 +0200
-+++ solenv/bin/modules/installer/servicesfile.pm	2006-10-23 13:50:04.000000000 +0200
-@@ -472,7 +472,7 @@
- 
- 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
- 	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
--	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
-+	if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
- 		
- 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
- 	
diff --git a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff b/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
deleted file mode 100644
index b911c448b251..000000000000
--- a/app-office/openoffice/files/2.1.0/gentoo-2.1.0.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -57,6 +57,7 @@
- #!/bin/sh
- export OOO_EXTRA_ARG='$2'
-+unset PYTHONPATH
- $OOINSTBASE/program/ooqstart $3 "\$@"
- EOT
-     chmod 755 $1
- }
diff --git a/app-office/openoffice/files/2.1.0/ooo-build-2.1.6-hyperlinks-quotes.diff b/app-office/openoffice/files/2.1.0/ooo-build-2.1.6-hyperlinks-quotes.diff
deleted file mode 100644
index 0a21ab51ab03..000000000000
--- a/app-office/openoffice/files/2.1.0/ooo-build-2.1.6-hyperlinks-quotes.diff
+++ /dev/null
@@ -1,382 +0,0 @@
---- patches/src680/apply
-+++ patches/src680/apply
-@@ -400,6 +400,10 @@
- # silly leaks around the place
- leak-sal-file.diff, i#49510, michael
- 
-+[ Fixes ]
-+# Security issue with hyper links, CVE-2007-0239, n#241636
-+hyperlinks-2.1.diff
-+cws-obr04-quotes.diff
- 
- [ QuickStarter ]
- # External splash screen implementation / 2nd time accelerator
---- patches/src680/cws-obr04-quotes.diff
-+++ patches/src680/cws-obr04-quotes.diff
-@@ -0,0 +1,123 @@
-+Index: shell/source/unix/misc/cde-open-url.sh
-+===================================================================
-+RCS file: /cvs/gsl/shell/source/unix/misc/cde-open-url.sh,v
-+retrieving revision 1.3
-+retrieving revision 1.3.120.1
-+diff -u -p -u -p -r1.3 -r1.3.120.1
-+--- shell/source/unix/misc/cde-open-url.sh	27 Sep 2005 12:54:22 -0000	1.3
-++++ shell/source/unix/misc/cde-open-url.sh	20 Dec 2006 15:03:24 -0000	1.3.120.1
-+@@ -58,5 +58,5 @@ else
-+ fi
-+ 
-+ if [ -z "$TMPFILE" ]; then exit 1; fi
-+-( echo $1 > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) &
-++( echo "$1" > "$TMPFILE"; dtaction Open "$TMPFILE"; rm -f "$TMPFILE" ) &
-+ exit 0
-+Index: shell/source/unix/misc/gnome-open-url.sh
-+===================================================================
-+RCS file: /cvs/gsl/shell/source/unix/misc/gnome-open-url.sh,v
-+retrieving revision 1.3
-+retrieving revision 1.3.166.1
-+diff -u -p -u -p -r1.3 -r1.3.166.1
-+--- shell/source/unix/misc/gnome-open-url.sh	13 May 2005 07:31:07 -0000	1.3
-++++ shell/source/unix/misc/gnome-open-url.sh	20 Dec 2006 15:03:25 -0000	1.3.166.1
-+@@ -50,6 +50,6 @@ case `uname -s` in
-+ esac
-+ 
-+ # use gnome-open utility coming with libgnome if available
-+-gnome-open $1 2>/dev/null || "$0.bin" $1
-++gnome-open "$1" 2>/dev/null || "$0.bin" $1
-+ 
-+ exit 0
-+Index: shell/source/unix/misc/kde-open-url.sh
-+===================================================================
-+RCS file: /cvs/gsl/shell/source/unix/misc/kde-open-url.sh,v
-+retrieving revision 1.2
-+retrieving revision 1.2.254.1
-+diff -u -p -u -p -r1.2 -r1.2.254.1
-+--- shell/source/unix/misc/kde-open-url.sh	10 May 2004 13:08:06 -0000	1.2
-++++ shell/source/unix/misc/kde-open-url.sh	20 Dec 2006 15:03:25 -0000	1.2.254.1
-+@@ -51,9 +51,9 @@ esac
-+ 
-+ # special handling for mailto: uris
-+ if echo $1 | grep '^mailto:' > /dev/null; then
-+-  kmailservice $1 &
-++  kmailservice "$1" &
-+ else
-+-  kfmclient openURL $1 &
-++  kfmclient openURL "$1" &
-+ fi
-+ 
-+ exit 0
-+Index: shell/source/unix/misc/open-url.sh
-+===================================================================
-+RCS file: /cvs/gsl/shell/source/unix/misc/open-url.sh,v
-+retrieving revision 1.3
-+retrieving revision 1.3.120.2
-+diff -u -p -u -p -r1.3 -r1.3.120.2
-+--- shell/source/unix/misc/open-url.sh	27 Sep 2005 12:54:42 -0000	1.3
-++++ shell/source/unix/misc/open-url.sh	20 Dec 2006 15:03:25 -0000	1.3.120.2
-+@@ -96,15 +96,15 @@ esac
-+ # special handling for mailto: uris
-+ if echo $1 | grep '^mailto:' > /dev/null; then
-+   # check $MAILER variable
-+-  if [ $MAILER ]; then
-+-    $MAILER $1 &
-++  if [ ! -z "$MAILER" ]; then
-++    $MAILER "$1" &
-+     exit 0
-+   else
-+     # mozilla derivates may need -remote semantics
-+     for i in thunderbird mozilla netscape; do
-+       mailer=`which $i`
-+       if [ ! -z "$mailer" ]; then
-+-        run_mozilla $mailer $1
-++        run_mozilla "$mailer" "$1"
-+         exit 0
-+       fi
-+     done
-+@@ -113,15 +113,15 @@ if echo $1 | grep '^mailto:' > /dev/null
-+   fi
-+ else
-+   # check $BROWSER variable
-+-  if [ $BROWSER ]; then
-+-    $BROWSER $1 &
-++  if [ ! -z "$BROWSER" ]; then
-++    $BROWSER "$1" &
-+     exit 0
-+   else
-+     # mozilla derivates may need -remote semantics
-+     for i in firefox mozilla netscape; do
-+       browser=`which $i`
-+       if [ ! -z "$browser" ]; then
-+-        run_mozilla $browser $1
-++        run_mozilla "$browser" "$1"
-+         exit 0
-+       fi
-+     done
-+Index: scp2/source/ooo/file_ooo.scp
-+===================================================================
-+RCS file: /cvs/installation/scp2/source/ooo/file_ooo.scp,v
-+retrieving revision 1.175
-+retrieving revision 1.175.10.1
-+diff -u -p -u -p -r1.175 -r1.175.10.1
-+--- scp2/source/ooo/file_ooo.scp	13 Dec 2006 15:14:08 -0000	1.175
-++++ scp2/source/ooo/file_ooo.scp	12 Jan 2007 08:06:00 -0000	1.175.10.1
-+@@ -369,7 +369,7 @@ File gid_File_Bin_Gnome_Open_Url
-+     BIN_FILE_BODY;
-+     Dir = gid_Dir_Program;
-+     Name = "gnome-open-url";
-+-    Styles = (PACKED);
-++    Styles = (PACKED, PATCH);
-+ End
-+ 
-+ File gid_File_Bin_Gnome_Open_Url_Bin
-+@@ -383,7 +383,7 @@ File gid_File_Bin_Kde_Open_Url
-+     BIN_FILE_BODY;
-+     Dir = gid_Dir_Program;
-+     Name = "kde-open-url";
-+-    Styles = (PACKED);
-++    Styles = (PACKED, PATCH);
-+ End
-+ 
-+ File gid_File_Bin_Cde_Open_Url
---- patches/src680/hyperlinks-2.1.diff
-+++ patches/src680/hyperlinks-2.1.diff
-@@ -0,0 +1,240 @@
-+--- shell/source/unix/exec/shellexec.hxx.old	2005-09-07 21:54:18.000000000 +0200
-++++ shell/source/unix/exec/shellexec.hxx	2007-02-01 18:41:49.000000000 +0100
-+@@ -44,6 +44,10 @@
-+ #include <osl/mutex.hxx>
-+ #endif
-+ 
-++#ifndef _RTL_USTRBUF_HXX_
-++#include <rtl/ustrbuf.hxx>
-++#endif
-++
-+ #ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_
-+ #include <com/sun/star/lang/XServiceInfo.hpp>
-+ #endif
-+@@ -65,6 +69,8 @@
-+     ::rtl::OString m_aDesktopEnvironment;
-+     ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
-+     m_xContext;
-++
-++    sal_Int32 SAL_CALL tryExecuteProcess( const rtl::OUString& aCommand, const rtl::OUString& aParameter );
-+     
-+ public:
-+     ShellExec(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& xContext);
-+--- shell/source/unix/exec/shellexec.cxx.old	2006-09-17 03:41:54.000000000 +0200
-++++ shell/source/unix/exec/shellexec.cxx	2007-02-02 16:03:56.000000000 +0100
-+@@ -56,10 +56,6 @@
-+ #include <rtl/strbuf.hxx>
-+ #endif
-+ 
-+-#ifndef _RTL_USTRBUF_HXX_
-+-#include <rtl/ustrbuf.hxx>
-+-#endif
-+-
-+ #ifndef _RTL_URI_H_
-+ #include <rtl/uri.hxx>
-+ #endif
-+@@ -124,6 +120,47 @@
-+     }
-+ }
-+ 
-++//------------------------------------------------------------------------
-++// helper method
-++//------------------------------------------------------------------------
-++
-++sal_Int32 SAL_CALL ShellExec::tryExecuteProcess( const OUString& aCommand, const OUString& aParameter )
-++{
-++    OUString aCommandURL;
-++    osl::FileBase::getFileURLFromSystemPath(aCommand, aCommandURL);
-++
-++    rtl_uString *args[] = { aCommandURL.pData, aParameter.pData };
-++    oslProcess pProcess = NULL;
-++    sal_Int32 rc = 1;
-++
-++    oslProcessError error = osl_executeProcess(
-++	    args[0],	/* ustrImageName */
-++	    args+1,     /* ustrArguments[] */
-++	    1, 		/* nArguments */
-++	    osl_Process_WAIT | osl_Process_SEARCHPATH | osl_Process_NORMAL, /* Options */
-++	    NULL,	/* Security */
-++	    NULL,	/* ustrDirectory */
-++	    NULL,	/* ustrEnvironments[] */
-++	    0,		/* nEnvironmentVars */
-++	    &pProcess);	/* pProcess*/
-++
-++    if (error == osl_Process_E_None)
-++    {
-++	error = osl_joinProcess( pProcess );
-++	if (error==osl_Process_E_None)
-++	{
-++	    oslProcessInfo aProcessInfo;
-++	    aProcessInfo.Size = sizeof(aProcessInfo);
-++	    error = osl_getProcessInfo( pProcess, osl_Process_EXITCODE, &aProcessInfo );
-++	    if (error==osl_Process_E_None)
-++	        rc = aProcessInfo.Code;
-++	}
-++    }
-++    osl_freeProcessHandle(pProcess);
-++
-++    return rc;
-++}
-++
-+ //-----------------------------------------------------------------------------------------
-+ // 
-+ //-----------------------------------------------------------------------------------------
-+@@ -157,23 +194,28 @@
-+ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aParameter, sal_Int32 /*nFlags*/ ) 
-+     throw (IllegalArgumentException, SystemShellExecuteException, RuntimeException)
-+ {
-+-    OStringBuffer aBuffer, aLaunchBuffer;
-++    OStringBuffer aOfficeLauncher;
-++    OUString aURL;
-++
-++    sal_Bool bTryDesktopLauncher = sal_False;
-+ 
-+     // DESKTOP_LAUNCH, see http://freedesktop.org/pipermail/xdg/2004-August/004489.html
-+-    static const char *pDesktopLaunch = getenv( "DESKTOP_LAUNCH" );
-++    static const char *pDesktopLauncher = getenv( "DESKTOP_LAUNCH" );
-+     
-+     // Check wether aCommand contains a document url or not
-+     sal_Int32 nIndex = aCommand.indexOf( OUString( RTL_CONSTASCII_USTRINGPARAM(":/") ) );
-+     
-+     if( nIndex > 0 || 0 == aCommand.compareToAscii("mailto:", 7) )
-+     {
-+-        // It seems to be a url ..
-++        // It seems to be an url ..
-++        if ( pDesktopLauncher && *pDesktopLauncher )
-++	    bTryDesktopLauncher = sal_True;
-++
-+         // We need to re-encode file urls because osl_getFileURLFromSystemPath converts
-+         // to UTF-8 before encoding non ascii characters, which is not what other apps
-+         // expect.
-+-        OUString aURL(
-+-            com::sun::star::uri::ExternalUriReferenceTranslator::create(
-+-                m_xContext)->translateToExternal(aCommand));
-++        aURL = com::sun::star::uri::ExternalUriReferenceTranslator::create(
-++                m_xContext)->translateToExternal(aCommand);
-+         if ( aURL.getLength() == 0 && aCommand.getLength() != 0 )
-+         {
-+             throw RuntimeException(
-+@@ -183,15 +225,17 @@
-+                  + aCommand),
-+                 static_cast< cppu::OWeakObject * >(this));
-+         }
-+-        
-++
-++	// URL needs furher changes depending on the launcher
-++	// FIXME: Should we try pDesktopLauncher before we modify the URL?
-+ #ifdef MACOSX
-+-        aBuffer.append("open");
-++        aOfficeLauncher.append("open");
-+ #else
-+         OUString aProgramURL;
-+         if ( osl_Process_E_None != osl_getExecutableFile(&aProgramURL.pData) )
-+         {
-+             throw SystemShellExecuteException(
-+-                OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not determine executable path")), 
-++                OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not determine executable path")),
-+                 static_cast < XSystemShellExecute * > (this), ENOENT );
-+         }
-+         
-+@@ -199,7 +243,7 @@
-+         if ( FileBase::E_None != FileBase::getSystemPathFromFileURL(aProgramURL, aProgram))
-+         {
-+             throw SystemShellExecuteException(
-+-                OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not convert executable path")), 
-++                OUString(RTL_CONSTASCII_USTRINGPARAM("Cound not convert executable path")),
-+                 static_cast < XSystemShellExecute * > (this), ENOENT );
-+         }
-+         
-+@@ -208,7 +252,7 @@
-+         OString aTmp = OUStringToOString(aProgram, osl_getThreadTextEncoding());
-+         nIndex = aTmp.lastIndexOf('/');
-+         if (nIndex > 0)
-+-            aBuffer.append(aTmp.copy(0, nIndex+1));
-++            aOfficeLauncher.append(aTmp.copy(0, nIndex+1));
-+             
-+         // Respect the desktop environment - if there is an executable named 
-+         // <desktop-environement-is>-open-url, pass the url to this one instead
-+@@ -216,17 +260,17 @@
-+         if ( m_aDesktopEnvironment.getLength() > 0 )
-+         {
-+             OString aDesktopEnvironment(m_aDesktopEnvironment.toAsciiLowerCase());
-+-            OStringBuffer aCopy(aBuffer);
-++            OStringBuffer aCopy(aOfficeLauncher);
-+             
-+             aCopy.append(aDesktopEnvironment);
-+             aCopy.append("-open-url");
-+             
-+             if ( 0 == access( aCopy.getStr(), X_OK) )
-+             {
-+-                aBuffer.append(aDesktopEnvironment);
-+-                aBuffer.append("-");
-++                aOfficeLauncher.append(aDesktopEnvironment);
-++                aOfficeLauncher.append("-");
-+ 
-+-                /* CDE requires file urls to be decoded */                
-++                /* CDE requires file urls to be decoded */
-+                 if ( m_aDesktopEnvironment.equals("CDE") && 0 == aURL.compareToAscii("file://", 7) )
-+                 {
-+                     aURL = rtl::Uri::decode(aURL, rtl_UriDecodeWithCharset, osl_getThreadTextEncoding());
-+@@ -234,44 +278,30 @@
-+             }
-+         }
-+              
-+-        aBuffer.append("open-url");
-++        aOfficeLauncher.append("open-url");
-+ #endif
-+-        aBuffer.append(" \'");
-+-        aBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding()));
-+-        aBuffer.append("\'");
-+-        
-+-        if ( pDesktopLaunch && *pDesktopLaunch )
-+-        {
-+-            aLaunchBuffer.append( pDesktopLaunch );
-+-            aLaunchBuffer.append( " \'" );
-+-            aLaunchBuffer.append(OUStringToOString(aURL, osl_getThreadTextEncoding()));
-+-            aLaunchBuffer.append( "\'" );
-+-        }
-+     } else {
-+-        aBuffer.append(OUStringToOString(aCommand, osl_getThreadTextEncoding()));
-+-        aBuffer.append(" ");
-+-        aBuffer.append(OUStringToOString(aParameter, osl_getThreadTextEncoding()));
-++        aOfficeLauncher.append(OUStringToOString(aCommand, osl_getThreadTextEncoding()));
-++        aURL = aParameter;
-+     }
-+     
-+-    // Prefer DESKTOP_LAUNCH when available
-+-    if ( aLaunchBuffer.getLength() > 0 )
-++    if ( bTryDesktopLauncher )
-+     {
-+-        FILE *pLaunch = popen( aLaunchBuffer.makeStringAndClear().getStr(), "w" );
-+-        if ( pLaunch != NULL )
-+-        {
-+-            if ( 0 == pclose( pLaunch ) )
-+-                return;
-+-        }
-+-        // Failed, do not try DESKTOP_LAUNCH any more
-+-        pDesktopLaunch = NULL;
-++	sal_Int32 nErr = tryExecuteProcess( OUString::createFromAscii(pDesktopLauncher), aURL);
-++        if ( nErr )
-++    	    // Failed, do not try DESKTOP_LAUNCH any more
-++    	    pDesktopLauncher = NULL;
-++	else
-++	    return;
-+     }
-+ 
-+-    OString cmd = aBuffer.makeStringAndClear();
-+-    if ( 0 != pclose(popen(cmd.getStr(), "w")) )
-++    OUString aOfficeLauncherOUStr = ::rtl::OStringToOUString(aOfficeLauncher.makeStringAndClear(), osl_getThreadTextEncoding());
-++    sal_Int32 nErr = tryExecuteProcess( aOfficeLauncherOUStr, aURL);
-++    if ( nErr )
-+     {
-+-        int nerr = errno;
-+-        throw SystemShellExecuteException(OUString::createFromAscii( strerror( nerr ) ), 
-+-            static_cast < XSystemShellExecute * > (this), nerr );
-++        OUString msg = OUString::createFromAscii( "Failed to execute ") + aOfficeLauncherOUStr;
-++        throw SystemShellExecuteException(msg, 
-++            static_cast < XSystemShellExecute * > (this), nErr );
-+     }
-+ }
-+ 
diff --git a/app-office/openoffice/files/2.1.0/ooo-build-2.1.6-starcalc-file-format-parser-2.2.diff b/app-office/openoffice/files/2.1.0/ooo-build-2.1.6-starcalc-file-format-parser-2.2.diff
deleted file mode 100644
index 4e04dfb19bc0..000000000000
--- a/app-office/openoffice/files/2.1.0/ooo-build-2.1.6-starcalc-file-format-parser-2.2.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- patches/src680/apply
-+++ patches/src680/apply
-@@ -405,6 +405,9 @@
- hyperlinks-2.1.diff
- cws-obr04-quotes.diff
- 
-+# Critical vulnerability in OpenOffice StarCalc file format parser, CVE-2007-0238, n#241652
-+starcalc-file-format-parser-2.2.diff
-+
- [ QuickStarter ]
- # External splash screen implementation / 2nd time accelerator
- # (Old version of these is in CWS unxsplash)
---- patches/src680/starcalc-file-format-parser-2.2.diff
-+++ patches/src680/starcalc-file-format-parser-2.2.diff
-@@ -0,0 +1,28 @@
-+Index: sc/source/filter/starcalc/scflt.cxx
-+===================================================================
-+RCS file: /cvs/sc/sc/source/filter/starcalc/scflt.cxx,v
-+retrieving revision 1.16
-+retrieving revision 1.16.84.1
-+diff -u -p -u -p -r1.16 -r1.16.84.1
-+--- sc/source/filter/starcalc/scflt.cxx	5 Oct 2006 16:21:16 -0000	1.16
-++++ sc/source/filter/starcalc/scflt.cxx	10 Jan 2007 14:31:00 -0000	1.16.84.1
-+@@ -1770,12 +1770,13 @@ void Sc10Import::LoadCol(SCCOL Col, SCTA
-+ 			rStream >> NoteLen;
-+ 			if (NoteLen != 0)
-+ 			{
-+-				sal_Char Note[4096];
-+-				rStream.Read(Note, NoteLen);
-+-				Note[NoteLen] = 0;
-+-			        String aText( SC10TOSTRING(Note));
-+-			        ScPostIt aNote(aText, pDoc);
-++				sal_Char* pNote = new sal_Char[NoteLen+1];
-++				rStream.Read(pNote, NoteLen);
-++				pNote[NoteLen] = 0;
-++				String aText( SC10TOSTRING(pNote));
-++				ScPostIt aNote(aText, pDoc);
-+ 				pDoc->SetNote(Col, static_cast<SCROW> (Row), Tab, aNote );
-++				delete [] pNote;
-+ 			}
-+ 		}
-+ 		pPrgrsBar->Progress();
-+
diff --git a/app-office/openoffice/files/2.1.0/ooo-wrapper.in b/app-office/openoffice/files/2.1.0/ooo-wrapper.in
deleted file mode 100755
index 4a4475aaa996..000000000000
--- a/app-office/openoffice/files/2.1.0/ooo-wrapper.in
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/perl -w
-#
-# ooffice - Wrapper script for OpenOffice.org
-#
-
-# Define system installation directory
-my $SystemInstallDir = '@OOINSTBASE@';
-# Suffix for parallel installable versioning
-my $BinSuffix = '@BINSUFFIX@';
-# ooo-build version
-my $OOO_BUILDVERSION = '@OOO_BUILDVERSION@';
-
-if ($SystemInstallDir =~ /^@/) {
-    $SystemInstallDir = '/usr/lib/ooo-2.0';
-    $BinSuffix = '';
-}
-
-my $Binary = 'soffice';
-if (-x "$SystemInstallDir/program/ooqstart") {
-    $Binary = 'ooqstart';
-    $ENV{OOO_EXTRA_ARG} ||= '';
-}
-
-my @ooo_argv;
-my $widgets_set;
-while ($ARGV[0]) {
-    $_ = shift;
-    if (m/^--widgets-set/) {
-	$widgets_set = shift;
-	(defined $widgets_set) || die "Error: The option --widgets-set requires a value\n" .
-	                            "For example: --widgets-set gtk\n";
-    } elsif (m/^--version/) {
-	print "This is OpenOffice.org built with ooo-build-$OOO_BUILDVERSION\n";
-	exit 0;
-    } elsif (m/^-(base|calc|draw|impress|math|web|writer)$/ && $Binary eq "ooqstart") {
-        $ENV{OOO_EXTRA_ARG} = $_;
-    } elsif (m/^-fromtemplate$/ && $Binary eq "ooqstart") {
-        $ENV{OOO_EXTRA_ARG} = "slot:5500";
-    } else {
-        push @ooo_argv, $_;
-    }
-}
-
-if (!@ooo_argv) {
-    my $arg;
-    if ($0 =~ m/\/oo(calc|draw|impress|math|web|writer|base)$BinSuffix$/) {
-        $arg = "-$1";
-    } elsif ($0 =~ m/\/oofromtemplate$BinSuffix$/) {
-        $arg = "slot:5500";
-    }
-
-    if ($arg) {
-        if ($Binary eq "soffice") {
-            push @ooo_argv, "$arg";
-	} else {
-	    $ENV{OOO_EXTRA_ARG} = $arg;
-	}
-    }
-}
-
-if (defined $widgets_set) {
-    $ENV{SAL_USE_VCLPLUGIN} = $widgets_set;
-}
-
-# FIXME: the following two fixes should be done by OOo itself
-# create the user config directory  with safe rights 700 if it we find
-# the right path and the directory does not exist
-if (open BOOTSTRAPRC, "$SystemInstallDir/program/bootstraprc") {
-    while (my $line = <BOOTSTRAPRC>) {
-	chomp $line;
-    	if (($line =~ m/^\s*UserInstallation\s*=\s*([^\s]*)\s*$/) && ($1)) {
-	    my $userConfDir=$1;
-	    $userConfDir =~ s|\$SYSUSERCONFIG|$ENV{HOME}|;
-	    $userConfDir =~ s|file://||;
-	    mkdir ($userConfDir,0700) unless (-d $userConfDir);
-	    last;
-	}
-    }
-    close BOOTSTRAPRC;
-}
-# touch ~/.recently-used with safe rights 700 if it does not exist
-if (! -f "$ENV{HOME}/.recently-used") {
-    open (RECENTLY_USED, ">$ENV{HOME}/.recently-used") &&
-    close RECENTLY_USED &&
-    chmod 0600, "$ENV{HOME}/.recently-used";
-}
-	
-if (!(-f '/proc/version')) {
-    print STDERR "\n\n --- Warning - OO.o will not work without a mounted /proc filesystem --- \n\n\n";
-}
-
-# And here we go.
-exec "$SystemInstallDir/program/$Binary", @ooo_argv
diff --git a/app-office/openoffice/files/2.1.0/regcompapply.diff b/app-office/openoffice/files/2.1.0/regcompapply.diff
deleted file mode 100644
index 007a74949a6b..000000000000
--- a/app-office/openoffice/files/2.1.0/regcompapply.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -1089,6 +1089,9 @@
- system-db-check.diff, i#65979, hmth
- # User ~/.ooo-2.0 as user dir
- scp2-user-config-ooo-2.0.diff, pmladek
-+#fix build on ppc
-+disable-regcomp-java.diff
-+disable-regcomp-python.diff
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-
diff --git a/app-office/openoffice/files/2.1.0/wrapper-readd.diff b/app-office/openoffice/files/2.1.0/wrapper-readd.diff
deleted file mode 100644
index 862bb705b5b5..000000000000
--- a/app-office/openoffice/files/2.1.0/wrapper-readd.diff
+++ /dev/null
@@ -1,330 +0,0 @@
---- bin/setup.in
-+++ bin/setup.in
-@@ -28,6 +28,7 @@
- ENABLE_ODK='@ENABLE_ODK@'
- USE_PREBUILD_UNOWINREG_DLL='@USE_PREBUILD_UNOWINREG_DLL@'
- ENABLE_MONO='@ENABLE_MONO@'
-+ENABLE_QUICKSTART='@ENABLE_QUICKSTART@'
- ENABLE_GRAPHITE='@ENABLE_GRAPHITE@'
- GRAPHITE_SRC='@GRAPHITE_SRC@'
- PROPAGATED_ARGS="@PROPAGATED_ARGS@"
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -15,6 +15,14 @@
- rm -Rf $OOINSTDIR;
- set -e
- 
-+echo "Building $OOINSTDIR/ooo-wrapper$BINSUFFIX";
-+sed -e "s|@OOINSTBASE@|$OOINSTBASE|g
-+	s|@SYSCONFDIR@|$SYSCONFDIR|g
-+	s|@BINSUFFIX@|$BINSUFFIX|g
-+	s|@OOO_BUILDVERSION@|$OOO_BUILDVERSION|g
-+	s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g
-+	s|@VENDORNAME@|$VENDORNAME|g" $TOOLSDIR/bin/ooo-wrapper.in \
-+		>| "$OOBUILDDIR/ooo-wrapper$BINSUFFIX" || exit 1;
- mkdir -p $PREFIX/bin
- 
- sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/ootool.in \
-@@ -28,6 +36,20 @@
- 
- sed -e "s|@OOINSTBASE@|$OOINSTBASE|g" $TOOLSDIR/bin/oosmoketest.in \
- 		>| "$OOBUILDDIR/oosmoketest$BINSUFFIX" || exit 1;
-+
-+create_simple_wrapper()
-+{
-+    cat <<EOT >$2
-+#!/bin/sh
-+
-+# Keep in ~sync with ooo-wrapper
-+
-+SystemInstallDir="$OOINSTBASE"
-+
-+exec "$1" "\$@"
-+EOT
-+    chmod 755 $2
-+}
- 
- create_qstart_wrapper()
- {
-@@ -45,50 +67,60 @@
-     chmod +x $2
- }
- 
--# directory for man
--mkdir -p $MANDIR/man1
--
--# startup wrappers
--for app in calc draw impress math web writer base; do
--    create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" "" || exit 1;
--done
--create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "" "slot:5500" || exit 1;
--create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" "" || exit 1;
--if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
--    -o "z$VENDORNAME" = "zDebian" \
--    -o "z$VENDORNAME" = "zMandriva"; then
--    for app in calc draw impress math web writer base fromtemplate ffice ; do
--        echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
--    done
--fi
--
--# /usr/bin/ooffice symlink is necessary by java UNO components to find
--# the UNO installation using $PATH, see
--# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
--# Note: if you want to support parallel installation of more OOo versions
--#       you cannot include this link directly into the package
--#       For example, the Novell package mark this symlink as %ghost
--#	and update it in %post and %postun
--ln -sf $OOINSTBASE/program/soffice $PREFIX/bin/soffice
--
--# no man-page so ...
--if test "z$VENDORNAME" != "zDebian" -a "z$VENDORNAME" != "zMandriva"; then
--    install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
--    install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
--fi
--
--if test "z$VENDORNAME" = "zMandriva"; then
--    install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig$BINSUFFIX
--    install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
--fi
--
--# create bash completion
--mkdir -p $OODESTDIR/etc/bash_completion.d
--gen_bash_comp_opts=--binsuffix="$BINSUFFIX"
--if test "z$ENABLE_OPENXML" = "zyes" ; then
--    gen_bash_comp_opts="$gen_bash_comp_opts --enable-openxml"
--fi
--$TOOLSDIR/bin/generate-bash-completion $gen_bash_comp_opts $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
-+# Skip the versioning and linking dance of the wrapper script for Red Hat
-+if test "z$VENDORNAME" = "zRedHat"; then
-+	install_script $OOBUILDDIR/ooo-wrapper$BINSUFFIX $PREFIX/bin/ooffice
-+	for app in calc draw impress html math writer; do
-+		ln -sf /usr/bin/ooffice $PREFIX/bin/oo${app}
-+	done
-+else
-+	mkdir -p $MANDIR/man1
-+	if test "z$ENABLE_QUICKSTART" = "z"; then
-+	    install_script $OOBUILDDIR/ooo-wrapper$BINSUFFIX $PREFIX/bin/ooo-wrapper$BINSUFFIX
-+	    for app in base calc draw fromtemplate impress math web writer ffice; do
-+		ln -sf ooo-wrapper${BINSUFFIX} $PREFIX/bin/oo${app}${BINSUFFIX}
-+		if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
-+		    -o "z$VENDORNAME" = "zDebian"; then
-+		    echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
-+		fi
-+	    done
-+	else
-+	    for app in calc draw impress math web writer base; do
-+		create_qstart_wrapper "$PREFIX/bin/oo${app}${BINSUFFIX}" "-${app}" "" || exit 1;
-+	    done
-+	    create_qstart_wrapper "$PREFIX/bin/oofromtemplate${BINSUFFIX}" "" "slot:5500" || exit 1;
-+	    create_qstart_wrapper "$PREFIX/bin/ooffice${BINSUFFIX}" "" "" || exit 1;
-+	    if test "z$VENDORNAME" = "zNovell" -o "z$VENDORNAME" = "zPLD" \
-+		-o "z$VENDORNAME" = "zDebian"; then
-+		for app in calc draw impress math web writer base fromtemplate ffice ; do
-+		    echo ".so man1/openoffice$BINSUFFIX.1" >| $MANDIR/man1/oo${app}$BINSUFFIX.1;
-+		done
-+	    fi
-+	fi
-+
-+	# /usr/bin/ooffice symlink is necessary by java UNO components to find
-+	# the UNO installation using $PATH, see
-+	# http://udk.openoffice.org/common/man/spec/transparentofficecomponents.html
-+	# Note: if you want to support parallel installation of more OOo versions
-+	#       you cannot include this link directly into the package
-+	#       For example, the Novell package mark this symlink as %ghost
-+	#	and update it in %post and %postun
-+	ln -sf $OOINSTBASE/program/soffice $PREFIX/bin/soffice
-+
-+	# no man-page so ...
-+	if test "z$VENDORNAME" != "zDebian"; then
-+	    install_script $TOOLSDIR/bin/ooconfig $PREFIX/bin/ooconfig
-+	    install_script $OOBUILDDIR/ootool$BINSUFFIX $PREFIX/bin/ootool$BINSUFFIX
-+	fi
-+
-+	# create bash completion
-+	mkdir -p $OODESTDIR/etc/bash_completion.d
-+	if test "z$ENABLE_QUICKSTART" = "z"; then
-+	    $TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooo-wrapper$BINSUFFIX.sh
-+	else
-+	    $TOOLSDIR/bin/generate-bash-completion --binsuffix="$BINSUFFIX" $TOOLSDIR/bin/bash-completion.in $OODESTDIR/etc/bash_completion.d/ooffice${BINSUFFIX}.sh
-+	fi
-+fi
- 
- if test "z$VENDORNAME" != "zRedHat"; then
- 	mkdir -p $MANDIR/man1
-@@ -622,8 +664,14 @@
- 		directory=$1
- 		shift
- 		mkdir -m755 -p "$directory"/usr/bin
-+		if test "$ENABLE_QUICKSTART" = ""; then
-+			mkdir -m755 -p "$directory"/usr/share/man/man1
-+		fi
- 		while test -n "$1"; do
- 			mv usr/*bin/"$1$BINSUFFIX" "$directory"/usr/bin
-+			if test "$ENABLE_QUICKSTART" = ""; then
-+				mv usr/share/man/man1/"$1$BINSUFFIX.1" "$directory"/usr/share/man/man1
-+			fi
- 			shift
- 		done
- 	}
-@@ -634,6 +682,11 @@
- 	move_wrappers pkg/openoffice.org-impress ooimpress
- 	move_wrappers pkg/openoffice.org-math oomath
- 	move_wrappers pkg/openoffice.org-draw oodraw
-+	if test "$ENABLE_QUICKSTART" = ""; then
-+		for F in bin/ooo-wrapper; do
-+			mv usr/$F$BINSUFFIX pkg/openoffice.org-common/usr/bin
-+		done
-+	fi
- 
- 	# Core package contains arch dependent files
- 	#mkdir -m755 -p pkg/openoffice.org-core/$OOINSTBASE/program/filter
-@@ -662,8 +715,13 @@
- 	mv usr/share/man/man1/openoffice$BINSUFFIX.1 \
- 		pkg/openoffice.org-common/usr/share/man/man1
- 	mkdir -p pkg/openoffice.org-common/etc/bash_completion.d
--	mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \
--		pkg/openoffice.org-common/etc/bash_completion.d
-+	if test "$ENABLE_QUICKSTART" = ""; then
-+		mv etc/bash_completion.d/ooo-wrapper$BINSUFFIX.sh \
-+			pkg/openoffice.org-common/etc/bash_completion.d
-+	else
-+		mv etc/bash_completion.d/ooffice$BINSUFFIX.sh \
-+			pkg/openoffice.org-common/etc/bash_completion.d
-+	fi
- 	mv .$OOINSTBASE/program/java-set-classpath \
- 		pkg/openoffice.org-common/$OOINSTBASE/program
- 	if [ -e .$OOINSTBASE/program/kdebe1.uno.so ]; then \
---- configure.in 
-+++ configure.in 
-@@ -204,6 +204,11 @@
- AC_ARG_ENABLE(gtk,
- [
-   --disable-gtk           Disables gtk+ native widgets.],
-+,)
-+
-+AC_ARG_ENABLE(quickstart,
-+[
-+  --disable-quickstart    Disables tiny stub factory/splash X11+glib app build.]
- ,)
- 
- AC_ARG_ENABLE(kde,
-@@ -587,6 +592,30 @@
- 
- AC_MSG_RESULT($OOO_WIDGET_FLAGS)
- AC_SUBST(OOO_WIDGET_FLAGS)
-+
-+AC_MSG_CHECKING([for quick-start])
-+ENABLE_QUICKSTART=
-+if test "$enable_quickstart" != "no"; then
-+   ENABLE_QUICKSTART=TRUE
-+   AC_MSG_RESULT([enabled])
-+else
-+   AC_MSG_RESULT([disabled])
-+fi
-+AC_SUBST(ENABLE_QUICKSTART)
-+
-+PKG_CHECK_MODULES( libstartup_notification, [ libstartup-notification-1.0 ],
-+		   have_startup_notification=true, have_startup_notification=false )
-+
-+AC_MSG_CHECKING([for startup notification in dekstop files])
-+if test "$have_startup_notification" = "true" -a \
-+        "$ENABLE_QUICKSTART" != "TRUE" ; then
-+	STARTUPNOTIFY='true'
-+	AC_MSG_RESULT([enabled])
-+else
-+	STARTUPNOTIFY='false'
-+	AC_MSG_RESULT([disabled])
-+fi
-+AC_SUBST(STARTUPNOTIFY)
- 
- if test "z$BUILD_WIN32" = "zyes" -a "z$enable_cairo" = "z" ; then
-     AC_MSG_WARN([On Cygwin, automatically using --disable-cairo])
---- desktop/base.desktop.in.in 
-+++ desktop/base.desktop.in.in 
-@@ -8,7 +8,7 @@
- Icon=ooo-base@OOO_BINSUFFIX@.png
- Type=Application
- Categories=Office;Database
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base
- _Name=OpenOffice.org Base
- _GenericName=Database
---- desktop/calc.desktop.in.in 
-+++ desktop/calc.desktop.in.in 
-@@ -8,7 +8,7 @@
- Type=Application
- InitialPreference=6
- Categories=Office;Spreadsheet
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/vnd.stardivision.calc;application/vnd.stardivision.chart;application/msexcel;application/vnd.ms-excel;text/x-comma-separated-values;text/x-csv;application/vnd.lotus-1-2-3;text/spreadsheet;application/excel;application/x-excel;application/x-ms-excel;application/x-msexcel;application/x-sylk;application/x-xls;application/xls@ADD_OPENXML_SPREADSHEET_MIME@
- _Name=OpenOffice.org Calc
- _GenericName=Spreadsheet
---- desktop/draw.desktop.in.in 
-+++ desktop/draw.desktop.in.in 
-@@ -7,7 +7,7 @@
- Icon=ooo-draw@OOO_BINSUFFIX@.png
- Type=Application
- Categories=Graphics;VectorGraphics
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- InitialPreference=6
- MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.stardivision.draw
- _Name=OpenOffice.org Draw
---- desktop/impress.desktop.in.in 
-+++ desktop/impress.desktop.in.in 
-@@ -7,7 +7,7 @@
- Icon=ooo-impress@OOO_BINSUFFIX@.png
- Type=Application
- Categories=Office;Presentation
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/vnd.stardivision.impress;application/mspowerpoint;application/vnd.ms-powerpoint@ADD_OPENXML_PRESENTATION_MIME@
- InitialPreference=5
- _Name=OpenOffice.org Impress
---- desktop/math.desktop.in.in 
-+++ desktop/math.desktop.in.in 
-@@ -7,7 +7,7 @@
- Exec=oomath@OOO_BINSUFFIX@ %U
- Icon=ooo-math@OOO_BINSUFFIX@.png
- Type=Application
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.stardivision.math
- _Name=OpenOffice.org Math
- _GenericName=Formula
---- desktop/template.desktop.in.in 
-+++ desktop/template.desktop.in.in 
-@@ -8,7 +8,7 @@
- Icon=ooo-template@OOO_BINSUFFIX@.png
- Type=Application
- Categories=X-SuSE-Core-Office;Office;
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- _Name=OpenOffice.org
- _GenericName=Office Suite
- 
---- desktop/web.desktop.in.in 
-+++ desktop/web.desktop.in.in 
-@@ -7,7 +7,7 @@
- Icon=ooo-web@OOO_BINSUFFIX@.png
- Type=Application
- Categories=Network;WebDevelopment
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.text-web
- _Name=OpenOffice.org Writer/Web
- _GenericName=Web Page Creation
---- desktop/writer.desktop.in.in 
-+++ desktop/writer.desktop.in.in 
-@@ -7,7 +7,7 @@
- Icon=ooo-writer@OOO_BINSUFFIX@.png
- Type=Application
- Categories=Office;WordProcessor
--StartupNotify=false
-+StartupNotify=@STARTUPNOTIFY@
- MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-master;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/vnd.stardivision.writer;application/msword;application/vnd.ms-word;application/x-doc;text/rtf;application/rtf;application/vnd.wordperfect@ADD_OPENXML_WORD_MIME@
- InitialPreference=5
- _Name=OpenOffice.org Writer
-
diff --git a/app-office/openoffice/files/2.2.0/disable-regcomp-java.diff b/app-office/openoffice/files/2.2.0/disable-regcomp-java.diff
deleted file mode 100644
index f9a1ff10a483..000000000000
--- a/app-office/openoffice/files/2.2.0/disable-regcomp-java.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
---- solenv/bin/modules/installer/servicesfile.pm.orig	2006-04-29 11:25:25.000000000 +0200
-+++ solenv/bin/modules/installer/servicesfile.pm	2006-04-29 12:24:45.000000000 +0200
-@@ -471,7 +473,7 @@
- 	$python_error_occured = 0;
- 
- 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
--	if ( $#javacomponents > -1 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
-+	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
- 	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
- 		
- 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
diff --git a/app-office/openoffice/files/2.2.0/disable-regcomp-python.diff b/app-office/openoffice/files/2.2.0/disable-regcomp-python.diff
deleted file mode 100644
index e63a91f009eb..000000000000
--- a/app-office/openoffice/files/2.2.0/disable-regcomp-python.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Workaround, see http://www.openoffice.org/issues/show_bug.cgi?id=65026
---- solenv/bin/modules/installer/servicesfile.pm.orig	2006-10-23 13:49:24.000000000 +0200
-+++ solenv/bin/modules/installer/servicesfile.pm	2006-10-23 13:50:04.000000000 +0200
-@@ -472,7 +472,7 @@
- 
- 	if ( $#unocomponents > -1 ) { $uno_error_occured = register_unocomponents(\@unocomponents, $regcompfileref, $servicesfile); }
- 	if ( 0 ) { $java_error_occured = register_javacomponents(\@javacomponents, $regcompfileref, $servicesfile, $regcomprdb); }
--	if ( $#pythoncomponents > -1 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
-+	if ( 0 ) { $python_error_occured = register_pythoncomponents(\@pythoncomponents, $regcompfileref, $servicesfile, $includepatharrayref); }
- 		
- 	if ( $uno_error_occured || $java_error_occured || $python_error_occured ) { $registererrorflag = 1; }
- 	
diff --git a/app-office/openoffice/files/2.2.0/gentoo-2.2.0.diff b/app-office/openoffice/files/2.2.0/gentoo-2.2.0.diff
deleted file mode 100644
index b911c448b251..000000000000
--- a/app-office/openoffice/files/2.2.0/gentoo-2.2.0.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- bin/package-ooo 
-+++ bin/package-ooo 
-@@ -57,6 +57,7 @@
- #!/bin/sh
- export OOO_EXTRA_ARG='$2'
-+unset PYTHONPATH
- $OOINSTBASE/program/ooqstart $3 "\$@"
- EOT
-     chmod 755 $1
- }
diff --git a/app-office/openoffice/files/2.2.0/ooo-env_log.diff b/app-office/openoffice/files/2.2.0/ooo-env_log.diff
deleted file mode 100644
index 908169ab6c5a..000000000000
--- a/app-office/openoffice/files/2.2.0/ooo-env_log.diff
+++ /dev/null
@@ -1,25 +0,0 @@
---- bin/build-ooo.orig	2007-04-18 18:32:06.000000000 +0200
-+++ bin/build-ooo	2007-04-18 18:32:45.000000000 +0200
-@@ -21,9 +21,8 @@
- echo "configuring ...";
- autoconf || exit 1;
- 
--echo "Env for configure:"
--set
--echo "Env for configure ends"
-+echo "Log Env for configure to `pwd`/env.log"
-+set > env.log
- 
- eval ./configure "$CONFIGURE_OPTIONS" "$PROPAGATED_ARGS" || exit 1;
- 
-@@ -88,8 +88,8 @@
- # similar that gives child nmake's pain.
- unset MAKEFLAGS
- 
--echo "Env:"
--set
-+echo "Log Env to `pwd`/env.log"
-+set > env.log
- 
- # What extra localizations are avilable as $SRCDIR/GSI_*.sdf and are not
- # already merged?
diff --git a/app-office/openoffice/files/2.2.0/regcompapply.diff b/app-office/openoffice/files/2.2.0/regcompapply.diff
deleted file mode 100644
index 007a74949a6b..000000000000
--- a/app-office/openoffice/files/2.2.0/regcompapply.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- patches/src680/apply 
-+++ patches/src680/apply 
-@@ -1089,6 +1089,9 @@
- system-db-check.diff, i#65979, hmth
- # User ~/.ooo-2.0 as user dir
- scp2-user-config-ooo-2.0.diff, pmladek
-+#fix build on ppc
-+disable-regcomp-java.diff
-+disable-regcomp-python.diff
- 
- [ DebianBaseOnly ]
- SectionOwner => rengelha
-
diff --git a/app-office/openoffice/files/digest-openoffice-2.1.0-r1 b/app-office/openoffice/files/digest-openoffice-2.1.0-r1
deleted file mode 100644
index e65a447e2ce4..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.1.0-r1
+++ /dev/null
@@ -1,42 +0,0 @@
-MD5 927c57be1e322d1d16a3e08f2e581b02 OOo_2.1.0_src_binfilter.tar.bz2 16349604
-RMD160 69625f4ac6e1c72bf901b69173195009a78d33ba OOo_2.1.0_src_binfilter.tar.bz2 16349604
-SHA256 0145872512badc637b17be36444211b17d83676ce3570068950dac763ea65be0 OOo_2.1.0_src_binfilter.tar.bz2 16349604
-MD5 bf80f2a2d6139787b17c018ad7a98c8e OOo_2.1.0_src_core.tar.bz2 122566860
-RMD160 11256b125fdc412480d90983b0f80f35d4833e9a OOo_2.1.0_src_core.tar.bz2 122566860
-SHA256 44d1f4696a3eddef02fd3b4dde07c2049884953dcd96c1121513ad6eddd5db77 OOo_2.1.0_src_core.tar.bz2 122566860
-MD5 46c8140b4ab5ef2b528a0e0596c88dec OOo_2.1.0_src_l10n.tar.bz2 73603380
-RMD160 4b8e95a35f2222330790a442aa1a9a4988d9d37e OOo_2.1.0_src_l10n.tar.bz2 73603380
-SHA256 269a08ca3e14cf69f4ad82c4743029aaf87510c9a9b7c6dfd9b35f6b4c75bbd1 OOo_2.1.0_src_l10n.tar.bz2 73603380
-MD5 cfb76978fa162b50d771bdbce4b691fa OOo_2.1.0_src_sdk.tar.bz2 29297196
-RMD160 64d8a113ad1307c8fa66880bb0edf83c769f5978 OOo_2.1.0_src_sdk.tar.bz2 29297196
-SHA256 1d860adc52390b2910961e33b8ac5d27a55cc4212b9db8f73ccc1e05fbef2863 OOo_2.1.0_src_sdk.tar.bz2 29297196
-MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
-RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
-SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
-MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
-SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
-MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
-RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
-SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
-MD5 cd5997284f4ba1e8dde5d1e5869fc342 libwpd-0.8.8.tar.gz 563088
-RMD160 09632cf9c84f12d7850399e0119407b1a0d29139 libwpd-0.8.8.tar.gz 563088
-SHA256 3ded0ca9a24b55c844c2e82b84e6e55db4c46acbed4137c7be1f44b2cd68232b libwpd-0.8.8.tar.gz 563088
-MD5 2e442485100f7e00685737513f853546 libwps-0.1.0~svn20070129.tar.gz 426668
-RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 libwps-0.1.0~svn20070129.tar.gz 426668
-SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec libwps-0.1.0~svn20070129.tar.gz 426668
-MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
-RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
-SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 c79b9548f56562a35ad2d2a530e32587 ooo-build-2.1.10.tar.gz 4442422
-RMD160 9974eecc218a5164037edecba9a446665471e5fa ooo-build-2.1.10.tar.gz 4442422
-SHA256 984bf5efea22a5b331756e1ada95b53f00d1e74b996af0c314fe1e4f28a2df93 ooo-build-2.1.10.tar.gz 4442422
-MD5 4df701e758322b49e7978974abcf3d50 ooo_tango_images-1.tar.bz2 1250240
-RMD160 bf770dd86e571d59217d01f1ca23559507b33a0d ooo_tango_images-1.tar.bz2 1250240
-SHA256 21cf830d485d7e2125f1b478bcfbd941896bfe7c8c5c070e87dfae0bd90a8bcf ooo_tango_images-1.tar.bz2 1250240
-MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
-RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
-SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
-MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
-RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
-SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516
diff --git a/app-office/openoffice/files/digest-openoffice-2.2.0 b/app-office/openoffice/files/digest-openoffice-2.2.0
deleted file mode 100644
index 601413f318c5..000000000000
--- a/app-office/openoffice/files/digest-openoffice-2.2.0
+++ /dev/null
@@ -1,42 +0,0 @@
-MD5 6e0882dbd1a3f387f3c8647e5b6e11ff OOo_2.2.0_src_binfilter.tar.bz2 7763249
-RMD160 1bb07f01e872ed003dbac3e11bc5732904076ae1 OOo_2.2.0_src_binfilter.tar.bz2 7763249
-SHA256 0bc27b517ca31e529496f290682b0ff52969381832fc976f81c1ea38af939adf OOo_2.2.0_src_binfilter.tar.bz2 7763249
-MD5 d917e7eeccec60376eef4e8a91b7136e OOo_2.2.0_src_core.tar.bz2 123160673
-RMD160 84e2bfaad21760c5a92a73aac46765ed01638ffa OOo_2.2.0_src_core.tar.bz2 123160673
-SHA256 4bd626f7d2076fdf8e49e14531ecf50382b1d657d775edb699c5b94c64801cce OOo_2.2.0_src_core.tar.bz2 123160673
-MD5 bc389f251b9d9a54e3e7243596debe60 OOo_2.2.0_src_l10n.tar.bz2 76592096
-RMD160 8b66d4e05ebfbc673eac3a5326f88d5ba0a3e7b2 OOo_2.2.0_src_l10n.tar.bz2 76592096
-SHA256 266dad5d5a85d56a7fc16092f12f0521e219d243da1c859b4d66c8288ac3a6eb OOo_2.2.0_src_l10n.tar.bz2 76592096
-MD5 79e3b143cc72930e63b537c42886eb84 OOo_2.2.0_src_sdk.tar.bz2 29291964
-RMD160 43cfb7571deba86f85e1bccdcd07a5d105dfefc8 OOo_2.2.0_src_sdk.tar.bz2 29291964
-SHA256 ee680c2cccf39276b36f51fcadd6dc63120256f5d25d220bad6c64ef2f31cb78 OOo_2.2.0_src_sdk.tar.bz2 29291964
-MD5 1948e39a68f12bfa0b7eb309c14d940c biblio.tar.bz2 6000
-RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 biblio.tar.bz2 6000
-SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b biblio.tar.bz2 6000
-MD5 733051ebeffae5232a2eb760162da020 extras-2.tar.bz2 94740
-RMD160 cba0fdebbbf84e6520af08d1cbb09363d36874bd extras-2.tar.bz2 94740
-SHA256 26e593ad0fecc6642b59349923434c6b36c224db5a26239c760b119ba29c9863 extras-2.tar.bz2 94740
-MD5 4cc68d37ed3a3191bb78a14630e14c64 hunspell_UNO_1.1.tar.gz 13774
-RMD160 9c0c31220d63894c9060a05fd136083b0b017b94 hunspell_UNO_1.1.tar.gz 13774
-SHA256 9de07fbe97c9539bae9c76502474c76471ab173dac365e251ca3fc5281008149 hunspell_UNO_1.1.tar.gz 13774
-MD5 cd5997284f4ba1e8dde5d1e5869fc342 libwpd-0.8.8.tar.gz 563088
-RMD160 09632cf9c84f12d7850399e0119407b1a0d29139 libwpd-0.8.8.tar.gz 563088
-SHA256 3ded0ca9a24b55c844c2e82b84e6e55db4c46acbed4137c7be1f44b2cd68232b libwpd-0.8.8.tar.gz 563088
-MD5 ca7cf690e5ba186ec3c025199fa35282 libwpg-0.1.0~cvs20070507.tar.gz 385942
-RMD160 bf97ceb497b059620a7b415641f2d2854b4cc23c libwpg-0.1.0~cvs20070507.tar.gz 385942
-SHA256 838f6123ae37685c65c734d891fec8659e96f19148daae255b326dedd74e71fb libwpg-0.1.0~cvs20070507.tar.gz 385942
-MD5 2e442485100f7e00685737513f853546 libwps-0.1.0~svn20070129.tar.gz 426668
-RMD160 5936f952392ec44aaa7d3fb836bc76421377f669 libwps-0.1.0~svn20070129.tar.gz 426668
-SHA256 586d0e527f065bc462a2df16cc5842203377bb8b835faa4ce545f26e7e3956ec libwps-0.1.0~svn20070129.tar.gz 426668
-MD5 2ff7b4c52f9c3937ebe3002798fbc479 lp_solve_5.5.tar.gz 495452
-RMD160 4f54d0d2116998da5de38cf51505835a8fd6e412 lp_solve_5.5.tar.gz 495452
-SHA256 6f9946c08c8fc3c97f74b58db8a62eac74027a7e709d81ee968716f7386682f1 lp_solve_5.5.tar.gz 495452
-MD5 73aedaa4afd0aa3a4505855c6931b103 ooo-build-2.2.0.2.tar.gz 4826885
-RMD160 d22fe423ad0fb6931c21be6e6965480cbd475ab0 ooo-build-2.2.0.2.tar.gz 4826885
-SHA256 f1db200433a70c9851c7dab5c1e51f952e67379e975504a9338281c1a6955f00 ooo-build-2.2.0.2.tar.gz 4826885
-MD5 e3a0b76dcd876f3d721ee7183729153d unowinreg.dll 6144
-RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 unowinreg.dll 6144
-SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c unowinreg.dll 6144
-MD5 0395e6e7da27c1cea7e1852286f6ccf9 xt-20051206-src-only.zip 423516
-RMD160 5fd5bb66b6586809e27fc240d624d64589ec4b9d xt-20051206-src-only.zip 423516
-SHA256 38121476c238c81760e1285e3aeea9eda1a7ab18c0c31a54e3645910bd8fb38e xt-20051206-src-only.zip 423516