commit:     a6fddb6719be381991045bf125a0297257e1770a
Author:     Andreas K. Huettel (dilfridge) <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 20 19:07:01 2014 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct 20 19:07:01 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=dev/dilfridge.git;a=commit;h=a6fddb67

[app-office/libreoffice] not needed anymore

---
 app-office/libreoffice/Manifest                    |   9 -
 .../files/libreoffice-3.7-separate-checks.patch    |  48 --
 .../files/libreoffice-3.7-system-pyuno.patch       |  44 --
 .../files/libreoffice-4.1.3.2-kde-calchang.patch   |  74 ---
 .../libreoffice-4.1.3.2-kde-recursiverepaint.patch | 141 -----
 .../files/libreoffice-4.1.4.2-curl-config.patch    |  60 ---
 .../files/libreoffice-4.2.0.4-curl-config.patch    |  60 ---
 .../files/libreoffice-9999-curl-config.patch       |  70 ---
 app-office/libreoffice/libreoffice-4.1.9999.ebuild | 586 --------------------
 app-office/libreoffice/libreoffice-4.2.9999.ebuild | 589 ---------------------
 app-office/libreoffice/libreoffice-9999-r2.ebuild  | 586 --------------------
 app-office/libreoffice/metadata.xml                |  19 -
 12 files changed, 2286 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
deleted file mode 100644
index 89e85d1..0000000
--- a/app-office/libreoffice/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 
a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
 WHIRLPOOL 
c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec
-DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 
eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 
854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c
 WHIRLPOOL 
16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5
-DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 
390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 
5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91
 WHIRLPOOL 
6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca
-DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 
64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 
4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a
 WHIRLPOOL 
a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
-DIST 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip 1521926 SHA256 
1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131df34e21753 SHA512 
ec5ae23c8fe2f5efc377f7a9665039afadf28b4d8f2791379296766a5fbc9a3bf7548f9b0e3b3b07762229ec733a92ccbb69791ee0318c9c6f78f8e847253d3f
 WHIRLPOOL 
8e446eb44188046b0e90694feba232f42c2e9f13d0f43783a18de37c94b86ff919b994931125c5d8001ecd320c1f4db5da482847304aa61646600a3bb33144b4
-DIST a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip 23150 SHA256 
75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870 SHA512 
2d3835f7ac356805025cafedcad97faa48d0f5da386e6ac7b7451030059df8e2fdb0861ade07a576ebf9fb5b88a973585ab0437944b06aac9289d6898ba8586a
 WHIRLPOOL 
60b98d9af2c83c0cf12a5a60ba30957d335b8b967cac07971e1edbc787b9caecd4b3c5bb480e8b38fe8109c1cf74439ebafae130c976182c2c15399f38f5d28c
-DIST d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz 16525605 SHA256 
1f188ac03a8aa4663223eca8c82f91a55293d066d67127082e29a7dba1a98c9f SHA512 
d08a7fe432e8df47d1d8992a45bb5f33149cb75b90eb74b2f2e457628d21a94b17eae0045096b053d2a866bf7710c775581c3e417b5dfaf66601aa18071b7305
 WHIRLPOOL 
95dc6ec0fb293c3538c1d51241283edf4e21647dcfd10229233ab7c3f13f7c78e6bb02c4d292a7cd2a2ec95575d775f0395e837bbc88ab4ddbaa5adfd62be2f0
-DIST ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz 12735186 SHA256 
dc6445d2c0445e5536010b80bd811adda6741ed82b288fe831d5be9902457941 SHA512 
a8c39d205051a8f8abaecb7a6fdc0c2c37baf5eee2a082af8819555f442dab525649b86cae569048357eb1e6e651deff4b62183de417e15b403e1ac09c40ba7b
 WHIRLPOOL 
fd9b6bbd214113334d3d5e542bbc9b70d5a9505281454e7f4447c6c73af733e10b007a2d4225acb39db0fc17401c2ae36b6628c59d31f09bec485f4cfc009eb5
-DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 
22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 
785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f
 WHIRLPOOL 
1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538

diff --git a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch 
b/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
deleted file mode 100644
index dbeb503..0000000
--- a/app-office/libreoffice/files/libreoffice-3.7-separate-checks.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff --git a/Makefile.top b/Makefile.top
-index 9e67a71..64a7b6c 100644
---- a/Makefile.top
-+++ b/Makefile.top
-@@ -244,7 +244,7 @@ stlport\
- sysui\
- xpdf\
- 
--export gb_TAILBUILDTARGET=all slowcheck
-+export gb_TAILBUILDTARGET=all
- 
- define gbuild_module_rules
- .PHONY: $(1) $(1).all $(1).build $(1).check $(1).clean $(1).subsequentcheck 
$(1).deliver
-@@ -546,7 +546,7 @@ findunusedcode:
-               | grep -v ^WSObject \
-               > unusedcode.easy
- 
--check: dev-install subsequentcheck
-+check: unitcheck slowcheck dev-install subsequentcheck
- 
- subsequentcheck :| $(if $(filter-out 
subsequentcheck,$(MAKECMDGOALS)),dev-install)
-       $(GNUMAKE) -j $(CHECK_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
-diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
-index c8e62ee..11a9069 100755
---- a/solenv/bin/build.pl
-+++ b/solenv/bin/build.pl
-@@ -1902,7 +1902,7 @@ sub run_job {
-             return 1 if (! $path =~ /prj$/ );
-             mkpath("$workdir/Logs");
-             my $gbuild_flags = '-j' . $ENV{PARALLELISM};
--            my $gbuild_target = 'all slowcheck';
-+            my $gbuild_target = 'all';
-             if ($registered_name =~ /tail_build\/prj$/ )
-             {
-                 $gbuild_target = $ENV{gb_TAILBUILDTARGET};
-diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
-index 97f1a81..c7ae7f4 100644
---- a/solenv/gbuild/Module.mk
-+++ b/solenv/gbuild/Module.mk
-@@ -139,7 +139,7 @@ gb_Module_DEVINSTALLHINT=
- debugrun :| build
- endif
- 
--all : build unitcheck
-+all : build
-       $(info $(gb_Module_BUILDHINT))
- 
- build : 

diff --git a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch 
b/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch
deleted file mode 100644
index fe93728..0000000
--- a/app-office/libreoffice/files/libreoffice-3.7-system-pyuno.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/desktop/scripts/soffice.sh b/desktop/scripts/soffice.sh
-index a259bf6..672fa23 100755
---- a/desktop/scripts/soffice.sh
-+++ b/desktop/scripts/soffice.sh
-@@ -129,6 +129,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "`uname -s`" in
- NetBSD|OpenBSD|FreeBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
-diff --git a/pyuno/source/module/uno.py b/pyuno/source/module/uno.py
-index 4ff2606..6a05eed 100644
---- a/pyuno/source/module/uno.py
-+++ b/pyuno/source/module/uno.py
-@@ -16,8 +16,12 @@
- #   except in compliance with the License. You may obtain a copy of
- #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- #
-+import os
- import sys
- 
-+sys.path.append('%eprefix%/usr/%libdir%/libreoffice/program')
-+if getattr(os.environ, 'URE_BOOTSTRAP', None) is None:
-+    os.environ['URE_BOOTSTRAP'] = 
"vnd.sun.star.pathname:%eprefix%/usr/%libdir%/libreoffice/program/fundamentalrc"
- import pyuno
- 
- try:
-diff --git a/scripting/source/pyprov/officehelper.py 
b/scripting/source/pyprov/officehelper.py
-index 99d3b03..704edab 100755
---- a/scripting/source/pyprov/officehelper.py
-+++ b/scripting/source/pyprov/officehelper.py
-@@ -44,7 +44,7 @@ def bootstrap():
-         if "UNO_PATH" in os.environ:
-             sOffice = os.environ["UNO_PATH"]
-         else:
--            sOffice = "" # lets hope for the best
-+            sOffice = "%eprefix%/usr/%libdir%/libreoffice/program"
-         sOffice = os.path.join(sOffice, "soffice")
-         if platform.startswith("win"): 
-             sOffice += ".exe"

diff --git 
a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch 
b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch
deleted file mode 100644
index 8cf3a2b..0000000
--- a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-calchang.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 95f60222e75486336b6569afa8f34d60b51c94ad Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <[email protected]>
-Date: Thu, 21 Nov 2013 12:40:57 +0100
-Subject: [PATCH] fdo#67011: Run Display::Yield through KDEXLib::Yield.
-
-Drag'n'Drop is handled in a second thread, which tries to "yield
-the display" while the main Qt thread probably is already
-yielding. Both need the YieldMutex, which freezes the application
-until the D'n'D thread times out.
-
-Trying to yield the display throught the application yield
-results in a recursive loop.
-
-So this catches and breaks the recursion, but just inside the Qt
-thread, so other processes can "yield on the display", instead
-of simply disabling the Display::Yield.
-
-Change-Id: Ifba91aa89fe5b0a89cc94820935dc996a065112f
-Reviewed-on: https://gerrit.libreoffice.org/6750
-Tested-by: Jan-Marek Glogowski <[email protected]>
-Reviewed-by: Jan-Marek Glogowski <[email protected]>
----
- vcl/unx/kde4/KDESalDisplay.cxx | 22 ++++++++++++++++------
- 1 file changed, 16 insertions(+), 6 deletions(-)
-
-diff --git a/vcl/unx/kde4/KDESalDisplay.cxx b/vcl/unx/kde4/KDESalDisplay.cxx
-index 21440fc..ee330e7 100644
---- a/vcl/unx/kde4/KDESalDisplay.cxx
-+++ b/vcl/unx/kde4/KDESalDisplay.cxx
-@@ -25,6 +25,8 @@
- #include <assert.h>
- #include <unx/saldata.hxx>
- 
-+#include <qthread.h>
-+
- SalKDEDisplay* SalKDEDisplay::selfptr = NULL;
- 
- SalKDEDisplay::SalKDEDisplay( Display* pDisp )
-@@ -48,18 +50,26 @@ SalKDEDisplay::~SalKDEDisplay()
- 
- void SalKDEDisplay::Yield()
- {
--    if( DispatchInternalEvent() )
-+    // We yield the display throught the main Qt thread.
-+    // Actually this Yield may call the Display::Yield, which results in an
-+    // unlimited cycle.
-+    static bool break_cyclic_yield_recursion = false;
-+    bool is_qt_gui_thread = ( qApp->thread() == QThread::currentThread() );
-+
-+    if( DispatchInternalEvent() || break_cyclic_yield_recursion )
-         return;
- 
-+    if( is_qt_gui_thread )
-+        break_cyclic_yield_recursion = true;
-+
-     DBG_ASSERT( 
static_cast<SalYieldMutex*>(GetSalData()->m_pInstance->GetYieldMutex())->GetThreadId()
 ==
-                 osl::Thread::getCurrentIdentifier(),
-                 "will crash soon since solar mutex not locked in 
SalKDEDisplay::Yield" );
- 
--    XEvent event;
--    XNextEvent( pDisp_, &event );
--    if( checkDirectInputEvent( &event ))
--        return;
--    qApp->x11ProcessEvent( &event );
-+    static_cast<KDEXLib*>(GetXLib())->Yield( true, false );
-+
-+    if( is_qt_gui_thread )
-+        break_cyclic_yield_recursion = false;
- }
- 
- // HACK: When using Qt event loop, input methods (japanese, etc.) will get 
broken because
--- 
-1.8.5.1
-

diff --git 
a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch 
b/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch
deleted file mode 100644
index 7067c01..0000000
--- 
a/app-office/libreoffice/files/libreoffice-4.1.3.2-kde-recursiverepaint.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Minor modification for libreoffice-4.1: in line 137, reset Q_EMIT to 
-emit... [email protected]
-
-From 13a34f4c6307d1bd2443cbf3fbd83bfdd8cdbafb Mon Sep 17 00:00:00 2001
-From: Jan-Marek Glogowski <[email protected]>
-Date: Fri, 15 Nov 2013 13:42:15 +0000
-Subject: Rewrite Qt4 based nested yield mutex locking.
-
-The Qt event loop may start a nested event loop, when checking for
-clipboard and Drag'n'Drop events.
-
-Previously this was handled by running this nested yield loop
-inside the main glib loop using
-  qApp->clipboard()->property( "useEventLoopWhenWaiting" );
-
-But this results in nested paint events which crash LO:
-  QWidget::repaint: Recursive repaint detected
-
-To prevend yield mutex deadlocks, check for nested event loops
-and always release the yield lock before starting the nested Yield
-event loop.
-
-This fixes fdo#69002.
-
-Change-Id: I7e827abd3489783053ec7123372742a32555875d
-Reviewed-on: https://gerrit.libreoffice.org/6685
-Reviewed-by: Michael Meeks <[email protected]>
-Reviewed-by: Thorsten Behrens <[email protected]>
-Tested-by: Thorsten Behrens <[email protected]>
----
-diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx
-index ee4a6e3..cb20be4 100644
---- a/vcl/unx/kde4/KDE4FilePicker.cxx
-+++ b/vcl/unx/kde4/KDE4FilePicker.cxx
-@@ -58,6 +58,8 @@
- 
- #undef Region
- 
-+#include "generic/geninst.h"
-+
- using namespace ::com::sun::star;
- using namespace ::com::sun::star::ui::dialogs;
- using namespace ::com::sun::star::ui::dialogs::TemplateDescription;
-@@ -253,28 +255,16 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute()
-     _dialog->setFilter(_filter);
-     _dialog->filterWidget()->setEditable(false);
- 
--    // At this point, SolarMutex is held. Opening the KDE file dialog here
--    // can lead to QClipboard asking for clipboard contents. If LO core
--    // is the owner of the clipboard content, this will block for 5 seconds
--    // and timeout, since the clipboard thread will not be able to acquire
--    // SolarMutex and thus won't be able to respond. If the event loops
--    // are properly integrated and QClipboard can use a nested event loop
--    // (see the KDE VCL plug), then this won't happen, but otherwise
--    // simply release the SolarMutex here. The KDE file dialog does not
--    // call back to the core, so this should be safe (and if it does,
--    // SolarMutex will need to be re-acquired).
--    long mutexrelease = 0;
--    if( !qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool())
--        mutexrelease = Application::ReleaseSolarMutex();
--    //block and wait for user input
-+    // We're entering a nested loop.
-+    // Release the yield mutex to prevent deadlocks.
-     int result = _dialog->exec();
-+
-     // HACK: KFileDialog uses KConfig("kdeglobals") for saving some settings
-     // (such as the auto-extension flag), but that doesn't update 
KGlobal::config()
-     // (which is probably a KDE bug), so force reading the new configuration,
-     // otherwise the next opening of the dialog would use the old settings.
-     KGlobal::config()->reparseConfiguration();
--    if( !qApp->clipboard()->property( "useEventLoopWhenWaiting" ).toBool())
--        Application::AcquireSolarMutex( mutexrelease );
-+
-     if( result == KFileDialog::Accepted)
-         return ExecutableDialogResults::OK;
- 
-diff --git a/vcl/unx/kde4/KDEXLib.cxx b/vcl/unx/kde4/KDEXLib.cxx
-index 8e0eb67..67d7a4d 100644
---- a/vcl/unx/kde4/KDEXLib.cxx
-+++ b/vcl/unx/kde4/KDEXLib.cxx
-@@ -225,9 +225,6 @@ void KDEXLib::setupEventLoop()
-         eventLoopType = GlibEventLoop;
-         old_gpoll = g_main_context_get_poll_func( NULL );
-         g_main_context_set_poll_func( NULL, gpoll_wrapper );
--        // set QClipboard to use event loop, otherwise the main thread will 
hold
--        // SolarMutex locked, which will prevent the clipboard thread from 
answering
--        m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", 
true );
-         return;
-     }
- #endif
-@@ -244,9 +241,6 @@ void KDEXLib::setupEventLoop()
-         eventLoopType = QtUnixEventLoop;
-         QInternal::callFunction( QInternal::GetUnixSelectFunction, 
reinterpret_cast< void** >( &qt_select ));
-         QInternal::callFunction( QInternal::SetUnixSelectFunction, 
reinterpret_cast< void** >( lo_select ));
--        // set QClipboard to use event loop, otherwise the main thread will 
hold
--        // SolarMutex locked, which will prevent the clipboard thread from 
answering
--        m_pApplication->clipboard()->setProperty( "useEventLoopWhenWaiting", 
true );
-         return;
-     }
- #endif
-@@ -300,6 +294,9 @@ void KDEXLib::socketNotifierActivated( int fd )
- 
- void KDEXLib::Yield( bool bWait, bool bHandleAllCurrentEvents )
- {
-+    // Nested yield loop counter.
-+    static int loop_depth = 0;
-+
-     if( eventLoopType == LibreOfficeEventLoop )
-     {
-         if( qApp->thread() == QThread::currentThread())
-@@ -310,13 +307,24 @@ void KDEXLib::Yield( bool bWait, bool 
bHandleAllCurrentEvents )
-         }
-         return SalXLib::Yield( bWait, bHandleAllCurrentEvents );
-     }
-+
-     // if we are the main thread (which is where the event processing is 
done),
-     // good, just do it
--    if( qApp->thread() == QThread::currentThread())
-+    if( qApp->thread() == QThread::currentThread()) {
-+        // Release the yield lock before entering a nested loop.
-+        if (loop_depth > 0)
-+            SalYieldMutexReleaser aReleaser;
-+        loop_depth++;
-         processYield( bWait, bHandleAllCurrentEvents );
--    else
--    { // if this deadlocks, event processing needs to go into a separate 
thread
--      // or some other solution needs to be found
-+        loop_depth--;
-+    }
-+    else {
-+        // we were called from another thread;
-+        // release the yield lock to prevent deadlock.
-+        SalYieldMutexReleaser aReleaser;
-+
-+        // if this deadlocks, event processing needs to go into a separate
-+        // thread or some other solution needs to be found
-         emit processYieldSignal( bWait, bHandleAllCurrentEvents );
-     }
- }
---
-cgit v0.9.0.2-2-gbebe

diff --git a/app-office/libreoffice/files/libreoffice-4.1.4.2-curl-config.patch 
b/app-office/libreoffice/files/libreoffice-4.1.4.2-curl-config.patch
deleted file mode 100644
index cf76277..0000000
--- a/app-office/libreoffice/files/libreoffice-4.1.4.2-curl-config.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- libreoffice-4.1.4.2.orig/configure.ac      2013-12-10 17:11:21.000000000 
+0100
-+++ libreoffice-4.1.4.2/configure.ac   2014-01-25 12:15:02.000000000 +0100
-@@ -7965,39 +7965,32 @@
-     AC_MSG_RESULT([external])
-     SYSTEM_CURL=YES
- 
--    curl_version=""
--    if test "$cross_compiling" = "yes"; then
--        dnl At least the OBS mingw32-libcurl-devel package
--        dnl comes with a proper .pc file
--        PKG_CHECK_MODULES(CURL, libcurl,, [:])
--        if test -n "$CURL_PKG_ERRORS"; then
--            AC_MSG_RESULT([no])
--        else
--            curl_version=`$PKG_CONFIG --modversion libcurl`
--        fi
--    fi
--    if test -z "$curl_version"; then
-+    AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
-+
-+    # First try PKGCONFIG and then fall back
-+    PKG_CHECK_MODULES(CURL, libcurl >= 7.13.1,, [:])
-+
-+    if test -n "$CURL_PKG_ERRORS"; then
-         AC_PATH_PROG(CURLCONFIG, curl-config)
-         if test -z "$CURLCONFIG"; then
--            AC_MSG_ERROR([install the libcurl development package])
-+            AC_MSG_ERROR([curl developement files not found])
-         fi
-         CURL_LIBS=`$CURLCONFIG --libs`
-         CURL_CFLAGS=`$CURLCONFIG --cflags`
-         curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
--    fi
- 
--    AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
-+        case $curl_version in
-+        dnl brackets doubled below because Autoconf uses them as m4 quote 
characters,
-+        dnl so they need to be doubled to end up in the configure script
-+        7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
-+            ;;
-+        *)
-+            AC_MSG_ERROR([no, you have $curl_version])
-+            ;;
-+        esac
-+    fi
- 
--    case $curl_version in
--    dnl brackets doubled below because Autoconf uses them as m4 quote 
characters,
--    dnl so they need to be doubled to end up in the configure script
--    7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
--        AC_MSG_RESULT([yes, you have $curl_version])
--        ;;
--    *)
--        AC_MSG_ERROR([no, you have $curl_version])
--        ;;
--    esac
-+    AC_MSG_RESULT([yes])
- 
-     libo_MINGW_CHECK_DLL([libcurl])
-     libo_MINGW_TRY_DLL([libintl])

diff --git a/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch 
b/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch
deleted file mode 100644
index e07f5ad..0000000
--- a/app-office/libreoffice/files/libreoffice-4.2.0.4-curl-config.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/configure.ac     2014-01-27 22:35:34.000000000 +0100
-+++ b/configure.ac     2014-02-02 23:27:50.911033565 +0100
-@@ -8606,39 +8606,31 @@
-     AC_MSG_RESULT([external])
-     SYSTEM_CURL=YES
- 
--    curl_version=""
--    if test "$cross_compiling" = "yes"; then
--        dnl At least the OBS mingw32-libcurl-devel package
--        dnl comes with a proper .pc file
--        PKG_CHECK_MODULES(CURL, libcurl,, [:])
--        if test -n "$CURL_PKG_ERRORS"; then
--            AC_MSG_RESULT([no])
--        else
--            curl_version=`$PKG_CONFIG --modversion libcurl`
--        fi
--    fi
--    if test -z "$curl_version"; then
-+    AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
-+
-+    # First try PKGCONFIG and then fall back
-+    PKG_CHECK_MODULES(CURL, libcurl >= 7.13.1,, [:])
-+
-+    if test -n "$CURL_PKG_ERRORS"; then
-         AC_PATH_PROG(CURLCONFIG, curl-config)
-         if test -z "$CURLCONFIG"; then
--            AC_MSG_ERROR([install the libcurl development package])
-+            AC_MSG_ERROR([curl development files not found])
-         fi
-         CURL_LIBS=`$CURLCONFIG --libs`
-         CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g")
-         curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
--    fi
--
--    AC_MSG_CHECKING([whether libcurl is >= 7.13.1])
- 
--    case $curl_version in
--    dnl brackets doubled below because Autoconf uses them as m4 quote 
characters,
--    dnl so they need to be doubled to end up in the configure script
--    7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
--        AC_MSG_RESULT([yes, you have $curl_version])
--        ;;
--    *)
--        AC_MSG_ERROR([no, you have $curl_version])
--        ;;
--    esac
-+        case $curl_version in
-+        dnl brackets doubled below because Autoconf uses them as m4 quote 
characters,
-+        dnl so they need to be doubled to end up in the configure script
-+        7.13.1|7.1[[4-9]].*|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
-+            ;;
-+        *)
-+            AC_MSG_ERROR([no, you have $curl_version])
-+            ;;
-+        esac
-+    fi
-+    AC_MSG_RESULT([yes])
- 
-     libo_MINGW_CHECK_DLL([libcurl])
-     libo_MINGW_TRY_DLL([libintl])

diff --git a/app-office/libreoffice/files/libreoffice-9999-curl-config.patch 
b/app-office/libreoffice/files/libreoffice-9999-curl-config.patch
deleted file mode 100644
index 25ff20f..0000000
--- a/app-office/libreoffice/files/libreoffice-9999-curl-config.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From c1727287731dd0bd19ce36f58c1ce29a2a8603b3 Mon Sep 17 00:00:00 2001
-From: Tomas Chvatal <[email protected]>
-Date: Sat, 25 Jan 2014 11:44:27 +0100
-Subject: [PATCH] Use pkgconfig to detect curl first, then fallback to 
curl-config.
-
-Change-Id: I3666c4d0298a76062a24ad8ae1c319f3480a9290
----
-
-diff --git a/configure.ac b/configure.ac
-index 93c39d3..fb51308 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -8661,39 +8661,31 @@
-     AC_MSG_RESULT([external])
-     SYSTEM_CURL=YES
- 
--    curl_version=""
--    if test "$cross_compiling" = "yes"; then
--        dnl At least the OBS mingw32-libcurl-devel package
--        dnl comes with a proper .pc file
--        PKG_CHECK_MODULES(CURL, libcurl,, [:])
--        if test -n "$CURL_PKG_ERRORS"; then
--            AC_MSG_RESULT([no])
--        else
--            curl_version=`$PKG_CONFIG --modversion libcurl`
--        fi
--    fi
--    if test -z "$curl_version"; then
-+    AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
-+
-+    # First try PKGCONFIG and then fall back
-+    PKG_CHECK_MODULES(CURL, libcurl >= 7.19.4,, [:])
-+
-+    if test -n "$CURL_PKG_ERRORS"; then
-         AC_PATH_PROG(CURLCONFIG, curl-config)
-         if test -z "$CURLCONFIG"; then
--            AC_MSG_ERROR([install the libcurl development package])
-+            AC_MSG_ERROR([curl developement files not found])
-         fi
-         CURL_LIBS=`$CURLCONFIG --libs`
-         CURL_CFLAGS=$("$CURLCONFIG" --cflags | sed -e "s/-I/${ISYSTEM?}/g")
-         curl_version=`$CURLCONFIG --version | $SED -e 's/^libcurl //'`
-+
-+        case $curl_version in
-+        dnl brackets doubled below because Autoconf uses them as m4 quote 
characters,
-+        dnl so they need to be doubled to end up in the configure script
-+        7.19.4|7.19.[[5-9]]|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
-+            ;;
-+        *)
-+            AC_MSG_ERROR([no, you have $curl_version])
-+            ;;
-+        esac
-     fi
--
--    AC_MSG_CHECKING([whether libcurl is >= 7.19.4])
--
--    case $curl_version in
--    dnl brackets doubled below because Autoconf uses them as m4 quote 
characters,
--    dnl so they need to be doubled to end up in the configure script
--    7.19.4|7.19.[[5-9]]|7.[[2-9]]?.*|7.???.*|[[8-9]].*|[[1-9]][[0-9]].*)
--        AC_MSG_RESULT([yes, you have $curl_version])
--        ;;
--    *)
--        AC_MSG_ERROR([no, you have $curl_version])
--        ;;
--    esac
-+    AC_MSG_RESULT([yes])
- 
-     libo_MINGW_CHECK_DLL([libcurl])
-     libo_MINGW_TRY_DLL([libintl])

diff --git a/app-office/libreoffice/libreoffice-4.1.9999.ebuild 
b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
deleted file mode 100644
index d72cbbe..0000000
--- a/app-office/libreoffice/libreoffice-4.1.9999.ebuild
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 
1.21 2014/01/25 11:25:22 dilfridge Exp $
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-       http://dev-builds.libreoffice.org/pre-releases/src
-       http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-       http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice";
-ADDONS_URI="http://dev-www.libreoffice.org/src/";
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 
kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic 
nsplugins ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite."
-HOMEPAGE="http://www.libreoffice.org";
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" 
http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}";
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-       for i in ${DEV_URI}; do
-               for mod in ${MODULES}; do
-                       if [[ ${mod} == core ]]; then
-                               SRC_URI+=" ${i}/${P}.tar.xz"
-                       else
-                               SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-                       fi
-               done
-               unset mod
-       done
-       unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz"
-ADDONS_SRC+=" 
${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # 
modifies source code
-ADDONS_SRC+=" java? ( 
${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( 
${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release 
for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( 
${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not 
build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( 
${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement 
of rhino
-ADDONS_SRC+=" odk? ( 
http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll 
)" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding +cups dbus debug eds gnome gstreamer +gtk
-gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba +webdav"
-
-LO_EXTS="nlpsolver presenter-minimizer scripting-beanshell 
scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
-       IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-       ${PYTHON_DEPS}
-       app-arch/zip
-       app-arch/unzip
-       >=app-text/hunspell-1.3.2-r3
-       app-text/mythes
-       >=app-text/libexttextcat-3.2
-       app-text/liblangtag
-       app-text/libmspub
-       <app-text/libmwaw-0.2.0
-       app-text/libodfgen
-       app-text/libwpd:0.9[tools]
-       app-text/libwpg:0.2
-       >=app-text/libwps-0.2.2
-       >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
-       >=dev-cpp/clucene-2.3.3.4-r2
-       >=dev-cpp/libcmis-0.3.1:0.3
-       dev-db/unixODBC
-       >=dev-libs/boost-1.46:=
-       dev-libs/expat
-       >=dev-libs/hyphen-2.7.1
-       >=dev-libs/icu-4.8.1.1:=
-       >=dev-libs/liborcus-0.5.1:=
-       >=dev-libs/nspr-4.8.8
-       >=dev-libs/nss-3.12.9
-       >=dev-lang/perl-5.0
-       >=dev-libs/openssl-1.0.0d
-       >=dev-libs/redland-1.0.16[ssl]
-       media-gfx/graphite2
-       >=media-libs/fontconfig-2.8.0
-       media-libs/freetype:2
-       >=media-libs/harfbuzz-0.9.10:=[icu(+)]
-       media-libs/lcms:2
-       >=media-libs/libpng-1.4
-       >=media-libs/libcdr-0.0.5
-       media-libs/libvisio
-       >=net-misc/curl-7.21.4
-       net-nds/openldap
-       sci-mathematics/lpsolve
-       virtual/jpeg:0
-       >=x11-libs/cairo-1.10.0[X]
-       x11-libs/libXinerama
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       bluetooth? ( net-wireless/bluez )
-       cups? ( net-print/cups )
-       dbus? ( >=dev-libs/dbus-glib-0.92 )
-       eds? ( gnome-extra/evolution-data-server )
-       gnome? ( gnome-base/gconf:2 )
-       gtk? (
-               x11-libs/gdk-pixbuf[X]
-               >=x11-libs/gtk+-2.24:2
-       )
-       gtk3? ( >=x11-libs/gtk+-3.2:3 )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       jemalloc? ( dev-libs/jemalloc )
-       libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
-       libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-       libreoffice_extensions_wiki-publisher? (
-               dev-java/commons-codec:0
-               dev-java/commons-httpclient:3
-               dev-java/commons-lang:2.1
-               dev-java/commons-logging:0
-               dev-java/tomcat-servlet-api:3.0
-       )
-       mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-       opengl? (
-               virtual/glu
-               virtual/opengl
-       )
-       postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
-       telepathy? (
-               dev-libs/glib:2
-               >=net-libs/telepathy-glib-0.18.0
-               >=x11-libs/gtk+-2.24:2
-       )
-       webdav? ( net-libs/neon )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-office/libreoffice-bin
-       !app-office/libreoffice-bin-debug
-       !<app-office/openoffice-bin-3.4.0-r1
-       !app-office/openoffice
-       media-fonts/libertine-ttf
-       media-fonts/liberation-fonts
-       media-fonts/urw-fonts
-       java? ( >=virtual/jre-1.6 )
-"
-
-if [[ ${PV} != *9999* ]]; then
-       PDEPEND="~app-office/libreoffice-l10n-${PV}"
-else
-       # Translations are not reliable on live ebuilds
-       # rather force people to use english only.
-       PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-       >=dev-libs/libxml2-2.7.8
-       dev-libs/libxslt
-       dev-perl/Archive-Zip
-       dev-util/cppunit
-       >=dev-util/gperf-3
-       dev-util/intltool
-       =dev-util/mdds-0.8*:=
-       virtual/pkgconfig
-       net-misc/npapi-sdk
-       >=sys-apps/findutils-4.4.2
-       sys-devel/bison
-       sys-apps/coreutils
-       sys-devel/flex
-       sys-devel/gettext
-       >=sys-devel/make-3.82
-       sys-devel/ucpp
-       sys-libs/zlib
-       x11-libs/libXt
-       x11-libs/libXtst
-       x11-proto/randrproto
-       x11-proto/xextproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
-       java? (
-               >=virtual/jdk-1.6
-               >=dev-java/ant-core-1.7
-       )
-       odk? ( app-doc/doxygen )
-       test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-       # not upstreamable stuff
-       "${FILESDIR}/${PN}-3.7-system-pyuno.patch"
-
-       # picked from git master
-       "${FILESDIR}/${PN}-4.1.3.2-kde-recursiverepaint.patch"
-       "${FILESDIR}/${PN}-4.1.3.2-kde-calchang.patch"
-
-       # staged for git master
-       "${FILESDIR}/${PN}-4.1.4.2-curl-config.patch"
-)
-
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}
-       bluetooth? ( dbus )
-       gnome? ( gtk )
-       eds? ( gnome )
-       telepathy? ( gtk )
-       libreoffice_extensions_nlpsolver? ( java )
-       libreoffice_extensions_scripting-beanshell? ( java )
-       libreoffice_extensions_scripting-javascript? ( java )
-       libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-       local pgslot
-
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               check-reqs_pkg_pretend
-
-               if [[ $(gcc-major-version) -lt 4 ]] || \
-                                ( [[ $(gcc-major-version) -eq 4 && 
$(gcc-minor-version) -lt 6 ]] ) \
-                               ; then
-                       eerror "Compilation with gcc older than 4.6 is not 
supported"
-                       die "Too old gcc found."
-               fi
-       fi
-
-       # ensure pg version
-       if use postgres && has_version dev-db/postgresql-base; then
-                pgslot=$(postgresql-config show)
-                if [[ ${pgslot//.} < 90 ]] ; then
-                       eerror "PostgreSQL slot must be set to 9.0 or higher."
-                       eerror "    postgresql-config set 9.0"
-                       die "PostgreSQL slot is not set to 9.0 or higher."
-                fi
-       fi
-}
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-       kde4-base_pkg_setup
-       python-single-r1_pkg_setup
-
-       [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
-       local mod mod2 dest tmplfile tmplname mypv
-
-       [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-       use branding && unpack "${BRANDING}"
-
-       if [[ ${PV} != *9999* ]]; then
-               unpack "${P}.tar.xz"
-               for mod in ${MODULES}; do
-                       [[ ${mod} == core ]] && continue
-                       unpack "${PN}-${mod}-${PV}.tar.xz"
-               done
-       else
-               for mod in ${MODULES}; do
-                       mypv=${PV/.9999}
-                       [[ ${mypv} != ${PV} ]] && 
EGIT_BRANCH="${PN}-${mypv/./-}"
-                       EGIT_PROJECT="${PN}/${mod}"
-                       EGIT_SOURCEDIR="${WORKDIR}/${P}"
-                       [[ ${mod} != core ]] && 
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
-                       
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-                       EGIT_NOUNPACK="true"
-                       git-2_src_unpack
-                       if [[ ${mod} != core ]]; then
-                               mod2=${mod}
-                               # mapping does not match on help
-                               [[ ${mod} == help ]] && mod2="helpcontent2"
-                               mkdir -p "${S}/${mod2}/" || die
-                               mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* 
"${S}/${mod2}" || die
-                               rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-                       fi
-               done
-               unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
-       fi
-}
-
-src_prepare() {
-       # optimization flags
-       export GMAKE_OPTIONS="${MAKEOPTS}"
-       # System python 2.7 enablement:
-       export PYTHON_CFLAGS=$(python_get_CFLAGS)
-       export PYTHON_LIBS=$(python_get_LIBS)
-
-       # patchset
-       if [[ -n ${PATCHSET} ]]; then
-               EPATCH_FORCE="yes" \
-               EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-               EPATCH_SUFFIX="patch" \
-               epatch
-       fi
-
-       base_src_prepare
-
-       AT_M4DIR="m4" eautoreconf
-       # hack in the autogen.sh
-       touch autogen.lastrun
-
-       # system pyuno mess
-       sed \
-               -e "s:%eprefix%:${EPREFIX}:g" \
-               -e "s:%libdir%:$(get_libdir):g" \
-               -i pyuno/source/module/uno.py \
-               -i scripting/source/pyprov/officehelper.py || die
-       # sed in the tests
-       sed -i \
-               -e 's#all : build unitcheck#all : build#g' \
-               solenv/gbuild/Module.mk || die
-       sed -i \
-               -e 's#check: dev-install subsequentcheck#check: unitcheck 
slowcheck dev-install subsequentcheck#g' \
-               -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
-               Makefile.in || die
-
-       if use branding; then
-               # hack...
-               mv -v "${WORKDIR}/branding-intro.png" 
"${S}/icon-themes/galaxy/brand/intro.png" || die
-       fi
-}
-
-src_configure() {
-       local java_opts
-       local internal_libs
-       local lo_ext
-       local ext_opts
-       local jbs=$(sed -ne 
's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
-
-       # recheck that there is some value in jobs
-       [[ -z ${jbs} ]] && jbs="1"
-
-       # sane: just sane.h header that is used for scan in writer, not
-       #       linked or anything else, worthless to depend on
-       # vigra: just uses templates from there
-       #        it is serious pain in the ass for packaging
-       #        should be replaced by boost::gil if someone interested
-       internal_libs+="
-               --without-system-sane
-               --without-system-vigra
-       "
-
-       # libreoffice extensions handling
-       for lo_xt in ${LO_EXTS}; do
-               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt})"
-               else
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-               fi
-       done
-
-       if use java; then
-               # hsqldb: system one is too new
-               java_opts="
-                       --without-junit
-                       --without-system-hsqldb
-                       --with-ant-home="${ANT_HOME}"
-                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-                       --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
-               "
-
-               use libreoffice_extensions_scripting-beanshell && \
-                       java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh 
bsh.jar)"
-
-               use libreoffice_extensions_scripting-javascript && \
-                       java_opts+=" --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar)"
-
-               if use libreoffice_extensions_wiki-publisher; then
-                       java_opts+="
-                               --with-commons-codec-jar=$(java-pkg_getjar 
commons-codec commons-codec.jar)
-                               --with-commons-httpclient-jar=$(java-pkg_getjar 
commons-httpclient-3 commons-httpclient.jar)
-                               --with-commons-lang-jar=$(java-pkg_getjar 
commons-lang-2.1 commons-lang.jar)
-                               --with-commons-logging-jar=$(java-pkg_getjar 
commons-logging commons-logging.jar)
-                               --with-servlet-api-jar=$(java-pkg_getjar 
tomcat-servlet-api-3.0 servlet-api.jar)
-                       "
-               fi
-       fi
-
-       # system headers/libs/...: enforce using system packages
-       # --enable-cairo: ensure that cairo is always required
-       # --enable-graphite: disabling causes build breakages
-       # --enable-*-link: link to the library rather than just dlopen on 
runtime
-       # --enable-release-build: build the libreoffice as release
-       # --disable-fetch-external: prevent dowloading during compile phase
-       # --disable-gnome-vfs: old gnome virtual fs support
-       # --disable-kdeab: kde3 adressbook
-       # --disable-kde: kde3 support
-       # --disable-rpath: relative runtime path is not desired
-       # --disable-systray: quickstarter does not actually work at all so do 
not
-       #   promote it
-       # --enable-extension-integration: enable any extension integration 
support
-       # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-       # --disable-report-builder: too much java packages pulled in without 
pkgs
-       econf \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-               --with-system-headers \
-               --with-system-libs \
-               --with-system-jars \
-               --with-system-dicts \
-               --enable-cairo-canvas \
-               --enable-graphite \
-               --enable-largefile \
-               --enable-mergelibs \
-               --enable-python=system \
-               --enable-randr \
-               --enable-randr-link \
-               --enable-release-build \
-               --disable-hardlink-deliver \
-               --disable-ccache \
-               --disable-crashdump \
-               --disable-dependency-tracking \
-               --disable-epm \
-               --disable-fetch-external \
-               --disable-gnome-vfs \
-               --disable-gstreamer-0-10 \
-               --disable-report-builder \
-               --disable-kdeab \
-               --disable-kde \
-               --disable-online-update \
-               --disable-rpath \
-               --disable-systray \
-               --with-alloc=$(use jemalloc && echo "jemalloc" || echo 
"system") \
-               --with-build-version="Gentoo official package" \
-               --enable-extension-integration \
-               --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-tar="${DISTDIR}" \
-               --with-lang="" \
-               --with-parallelism=${jbs} \
-               --with-system-ucpp \
-               --with-vendor="Gentoo Foundation" \
-               --with-x \
-               --without-afms \
-               --without-fonts \
-               --without-myspell-dicts \
-               --without-help \
-               --with-helppack-integration \
-               --without-sun-templates \
-               $(use_enable bluetooth sdremote-bluetooth) \
-               $(use_enable cups) \
-               $(use_enable debug) \
-               $(use_enable dbus) \
-               $(use_enable eds evolution2) \
-               $(use_enable gnome gconf) \
-               $(use_enable gnome gio) \
-               $(use_enable gnome lockdown) \
-               $(use_enable gstreamer) \
-               $(use_enable gtk) \
-               $(use_enable gtk3) \
-               $(use_enable kde kde4) \
-               $(use_enable mysql ext-mariadb-connector) \
-               $(use_enable odk) \
-               $(use_enable opengl) \
-               $(use_enable postgres postgresql-sdbc) \
-               $(use_enable telepathy) \
-               $(use_enable test linkoo) \
-               $(use_enable vba) \
-               $(use_enable webdav neon) \
-               $(use_with java) \
-               $(use_with mysql system-mysql-cppconn) \
-               $(use_with odk doxygen) \
-               ${internal_libs} \
-               ${java_opts} \
-               ${ext_opts}
-}
-
-src_compile() {
-       # hack for offlinehelp, this needs fixing upstream at some point
-       # it is broken because we send --without-help
-       # https://bugs.freedesktop.org/show_bug.cgi?id=46506
-       (
-               grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
-               source "${T}/config_host.mk" 2&> /dev/null
-
-               local path="${SOLARVER}/${INPATH}/res/img"
-               mkdir -p "${path}" || die
-
-               echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" 
-dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
-               perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-                       -dir=icon-themes/galaxy/res/helpimg \
-                       > "${path}/helpimg.ilst"
-               [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list 
is empty, something is fishy, report a bug."
-       )
-
-       local target
-       use test && target="build" || target="build-nocheck"
-
-       # this is not a proper make script
-       make ${target} || die
-}
-
-src_test() {
-       make unitcheck || die
-       make slowcheck || die
-}
-
-src_install() {
-       # This is not Makefile so no buildserver
-       make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-       # Fix bash completion placement
-       newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
-       rm -rf "${ED}"/etc/
-
-       if use branding; then
-               insinto /usr/$(get_libdir)/${PN}/program
-               newins "${WORKDIR}/branding-sofficerc" sofficerc
-               echo 
"CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > 
"${ED}"/etc/env.d/99${PN}
-       fi
-
-       # symlink the nsplugin to proper location
-       # use gtk && inst_plugin 
/usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-
-       # Hack for offlinehelp, this needs fixing upstream at some point.
-       # It is broken because we send --without-help
-       # https://bugs.freedesktop.org/show_bug.cgi?id=46506
-       insinto /usr/$(get_libdir)/libreoffice/help
-       doins xmlhelp/util/*.xsl
-
-       # Remove desktop files for support to old installs that can't parse mime
-       rm -rf "${ED}"/usr/share/mimelnk/
-
-       pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-       pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-       # Cache updates - all handled by kde eclass for all environments
-       kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-       kde4-base_pkg_postinst
-
-       use java || \
-               ewarn 'If you plan to use lbase application you should enable 
java or you will get various crashes.'
-}
-
-pkg_postrm() {
-       kde4-base_pkg_postrm
-}

diff --git a/app-office/libreoffice/libreoffice-4.2.9999.ebuild 
b/app-office/libreoffice/libreoffice-4.2.9999.ebuild
deleted file mode 100644
index 6c2279e..0000000
--- a/app-office/libreoffice/libreoffice-4.2.9999.ebuild
+++ /dev/null
@@ -1,589 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.2.9999.ebuild,v 
1.6 2014/01/27 15:35:49 scarabeus Exp $
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-       http://dev-builds.libreoffice.org/pre-releases/src
-       http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-       http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice";
-ADDONS_URI="http://dev-www.libreoffice.org/src/";
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 
kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic 
nsplugins ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite."
-HOMEPAGE="http://www.libreoffice.org";
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" 
http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}";
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-       for i in ${DEV_URI}; do
-               for mod in ${MODULES}; do
-                       if [[ ${mod} == core ]]; then
-                               SRC_URI+=" ${i}/${P}.tar.xz"
-                       else
-                               SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-                       fi
-               done
-               unset mod
-       done
-       unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" 
${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # 
modifies source code
-ADDONS_SRC+=" java? ( 
${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( 
${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release 
for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( 
${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not 
build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( 
${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement 
of rhino
-ADDONS_SRC+=" odk? ( 
http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll 
)" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk
-gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
-       IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-       ${PYTHON_DEPS}
-       app-arch/zip
-       app-arch/unzip
-       >=app-text/hunspell-1.3.2-r3
-       app-text/mythes
-       app-text/libabw
-       >=app-text/libexttextcat-3.2
-       app-text/libebook
-       app-text/libetonyek
-       app-text/liblangtag
-       app-text/libmspub
-       >=app-text/libmwaw-0.2
-       >=app-text/libodfgen-0.0.3
-       app-text/libwpd:0.9[tools]
-       app-text/libwpg:0.2
-       >=app-text/libwps-0.2.2
-       >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
-       >=dev-cpp/clucene-2.3.3.4-r2
-       dev-cpp/libcmis:0.4
-       dev-db/unixODBC
-       >=dev-libs/boost-1.46:=
-       dev-libs/expat
-       >=dev-libs/hyphen-2.7.1
-       >=dev-libs/icu-4.8.1.1:=
-       >=dev-libs/libatomic_ops-7.2d
-       >=dev-libs/liborcus-0.5.1:=
-       >=dev-libs/nspr-4.8.8
-       >=dev-libs/nss-3.12.9
-       >=dev-lang/perl-5.0
-       >=dev-libs/openssl-1.0.0d
-       >=dev-libs/redland-1.0.16[ssl]
-       media-gfx/graphite2
-       >=media-libs/fontconfig-2.8.0
-       media-libs/freetype:2
-       >=media-libs/harfbuzz-0.9.18:=[icu(+)]
-       media-libs/lcms:2
-       >=media-libs/libpng-1.4
-       >=media-libs/libcdr-0.0.5
-       media-libs/libfreehand
-       media-libs/libvisio
-       >=net-misc/curl-7.21.4
-       net-nds/openldap
-       sci-mathematics/lpsolve
-       virtual/jpeg:0
-       >=x11-libs/cairo-1.10.0[X]
-       x11-libs/libXinerama
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       bluetooth? ( net-wireless/bluez )
-       cups? ( net-print/cups )
-       dbus? ( >=dev-libs/dbus-glib-0.92 )
-       eds? ( gnome-extra/evolution-data-server )
-       firebird? ( >=dev-db/firebird-2.5 )
-       gnome? ( gnome-base/gconf:2 )
-       gtk? (
-               x11-libs/gdk-pixbuf[X]
-               >=x11-libs/gtk+-2.24:2
-       )
-       gtk3? ( >=x11-libs/gtk+-3.2:3 )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       jemalloc? ( dev-libs/jemalloc )
-       libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
-       libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-       libreoffice_extensions_wiki-publisher? (
-               dev-java/commons-codec:0
-               dev-java/commons-httpclient:3
-               dev-java/commons-lang:2.1
-               dev-java/commons-logging:0
-               dev-java/tomcat-servlet-api:3.0
-       )
-       mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-       opengl? (
-               virtual/glu
-               virtual/opengl
-       )
-       postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
-       telepathy? (
-               dev-libs/glib:2
-               >=net-libs/telepathy-glib-0.18.0
-               >=x11-libs/gtk+-2.24:2
-       )
-       webdav? ( net-libs/neon )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-office/libreoffice-bin
-       !app-office/libreoffice-bin-debug
-       !<app-office/openoffice-bin-3.4.0-r1
-       !app-office/openoffice
-       media-fonts/libertine-ttf
-       media-fonts/liberation-fonts
-       media-fonts/urw-fonts
-       java? ( >=virtual/jre-1.6 )
-       vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-       PDEPEND="~app-office/libreoffice-l10n-${PV}"
-else
-       # Translations are not reliable on live ebuilds
-       # rather force people to use english only.
-       PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-       >=dev-libs/libxml2-2.7.8
-       dev-libs/libxslt
-       dev-perl/Archive-Zip
-       dev-util/cppunit
-       >=dev-util/gperf-3
-       dev-util/intltool
-       >=dev-util/mdds-0.10.1:=
-       virtual/pkgconfig
-       net-misc/npapi-sdk
-       >=sys-apps/findutils-4.4.2
-       sys-devel/bison
-       sys-apps/coreutils
-       sys-devel/flex
-       sys-devel/gettext
-       >=sys-devel/make-3.82
-       sys-devel/ucpp
-       sys-libs/zlib
-       x11-libs/libXt
-       x11-libs/libXtst
-       x11-proto/randrproto
-       x11-proto/xextproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
-       java? (
-               >=virtual/jdk-1.6
-               >=dev-java/ant-core-1.7
-       )
-       odk? ( >=app-doc/doxygen-1.8.4 )
-       test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-       # not upstreamable stuff
-       "${FILESDIR}/${PN}-3.7-system-pyuno.patch"
-
-       # staged for git master
-       "${FILESDIR}/${PN}-4.2.0.4-curl-config.patch"
-)
-
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}
-       bluetooth? ( dbus )
-       gnome? ( gtk )
-       eds? ( gnome )
-       telepathy? ( gtk )
-       libreoffice_extensions_nlpsolver? ( java )
-       libreoffice_extensions_scripting-beanshell? ( java )
-       libreoffice_extensions_scripting-javascript? ( java )
-       libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-       local pgslot
-
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               check-reqs_pkg_pretend
-
-               if [[ $(gcc-major-version) -lt 4 ]] || \
-                                ( [[ $(gcc-major-version) -eq 4 && 
$(gcc-minor-version) -lt 6 ]] ) \
-                               ; then
-                       eerror "Compilation with gcc older than 4.6 is not 
supported"
-                       die "Too old gcc found."
-               fi
-       fi
-
-       # Ensure pg version but we have to be sure the pg is installed (first
-       # install on clean system)
-       if use postgres && has_version dev-db/postgresql-base; then
-                pgslot=$(postgresql-config show)
-                if [[ ${pgslot//.} < 90 ]] ; then
-                       eerror "PostgreSQL slot must be set to 9.0 or higher."
-                       eerror "    postgresql-config set 9.0"
-                       die "PostgreSQL slot is not set to 9.0 or higher."
-                fi
-       fi
-}
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-       kde4-base_pkg_setup
-       python-single-r1_pkg_setup
-
-       [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
-       local mod mod2 dest tmplfile tmplname mypv
-
-       [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-       use branding && unpack "${BRANDING}"
-
-       if [[ ${PV} != *9999* ]]; then
-               unpack "${P}.tar.xz"
-               for mod in ${MODULES}; do
-                       [[ ${mod} == core ]] && continue
-                       unpack "${PN}-${mod}-${PV}.tar.xz"
-               done
-       else
-               for mod in ${MODULES}; do
-                       mypv=${PV/.9999}
-                       [[ ${mypv} != ${PV} ]] && 
EGIT_BRANCH="${PN}-${mypv/./-}"
-                       EGIT_PROJECT="${PN}/${mod}"
-                       EGIT_SOURCEDIR="${WORKDIR}/${P}"
-                       [[ ${mod} != core ]] && 
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
-                       
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-                       EGIT_NOUNPACK="true"
-                       git-2_src_unpack
-                       if [[ ${mod} != core ]]; then
-                               mod2=${mod}
-                               # mapping does not match on help
-                               [[ ${mod} == help ]] && mod2="helpcontent2"
-                               mkdir -p "${S}/${mod2}/" || die
-                               mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* 
"${S}/${mod2}" || die
-                               rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-                       fi
-               done
-               unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
-       fi
-}
-
-src_prepare() {
-       # optimization flags
-       export GMAKE_OPTIONS="${MAKEOPTS}"
-       # System python 2.7 enablement:
-       export PYTHON_CFLAGS=$(python_get_CFLAGS)
-       export PYTHON_LIBS=$(python_get_LIBS)
-
-       # patchset
-       if [[ -n ${PATCHSET} ]]; then
-               EPATCH_FORCE="yes" \
-               EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-               EPATCH_SUFFIX="patch" \
-               epatch
-       fi
-
-       base_src_prepare
-
-       AT_M4DIR="m4" eautoreconf
-       # hack in the autogen.sh
-       touch autogen.lastrun
-
-       # system pyuno mess
-       sed \
-               -e "s:%eprefix%:${EPREFIX}:g" \
-               -e "s:%libdir%:$(get_libdir):g" \
-               -i pyuno/source/module/uno.py \
-               -i scripting/source/pyprov/officehelper.py || die
-       # sed in the tests
-       sed -i \
-               -e 's#all : build unitcheck#all : build#g' \
-               solenv/gbuild/Module.mk || die
-       sed -i \
-               -e 's#check: dev-install subsequentcheck#check: unitcheck 
slowcheck dev-install subsequentcheck#g' \
-               -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
-               Makefile.in || die
-
-       if use branding; then
-               # hack...
-               mv -v "${WORKDIR}/branding-intro.png" 
"${S}/icon-themes/galaxy/brand/intro.png" || die
-       fi
-}
-
-src_configure() {
-       local java_opts
-       local internal_libs
-       local lo_ext
-       local ext_opts
-       local jbs=$(sed -ne 
's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
-
-       # recheck that there is some value in jobs
-       [[ -z ${jbs} ]] && jbs="1"
-
-       # sane: just sane.h header that is used for scan in writer, not
-       #       linked or anything else, worthless to depend on
-       # vigra: just uses templates from there
-       #        it is serious pain in the ass for packaging
-       #        should be replaced by boost::gil if someone interested
-       internal_libs+="
-               --without-system-sane
-               --without-system-vigra
-       "
-
-       # libreoffice extensions handling
-       for lo_xt in ${LO_EXTS}; do
-               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt})"
-               else
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-               fi
-       done
-
-       if use java; then
-               # hsqldb: system one is too new
-               java_opts="
-                       --without-junit
-                       --without-system-hsqldb
-                       --with-ant-home="${ANT_HOME}"
-                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-                       --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
-               "
-
-               use libreoffice_extensions_scripting-beanshell && \
-                       java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh 
bsh.jar)"
-
-               use libreoffice_extensions_scripting-javascript && \
-                       java_opts+=" --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar)"
-
-               if use libreoffice_extensions_wiki-publisher; then
-                       java_opts+="
-                               --with-commons-codec-jar=$(java-pkg_getjar 
commons-codec commons-codec.jar)
-                               --with-commons-httpclient-jar=$(java-pkg_getjar 
commons-httpclient-3 commons-httpclient.jar)
-                               --with-commons-lang-jar=$(java-pkg_getjar 
commons-lang-2.1 commons-lang.jar)
-                               --with-commons-logging-jar=$(java-pkg_getjar 
commons-logging commons-logging.jar)
-                               --with-servlet-api-jar=$(java-pkg_getjar 
tomcat-servlet-api-3.0 servlet-api.jar)
-                       "
-               fi
-       fi
-
-       # system headers/libs/...: enforce using system packages
-       # --enable-cairo: ensure that cairo is always required
-       # --enable-graphite: disabling causes build breakages
-       # --enable-*-link: link to the library rather than just dlopen on 
runtime
-       # --enable-release-build: build the libreoffice as release
-       # --disable-fetch-external: prevent dowloading during compile phase
-       # --disable-gnome-vfs: old gnome virtual fs support
-       # --disable-kdeab: kde3 adressbook
-       # --disable-kde: kde3 support
-       # --disable-systray: quickstarter does not actually work at all so do 
not
-       #   promote it
-       # --enable-extension-integration: enable any extension integration 
support
-       # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-       # --disable-report-builder: too much java packages pulled in without 
pkgs
-       econf \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-               --with-system-headers \
-               --with-system-libs \
-               --with-system-jars \
-               --with-system-dicts \
-               --enable-cairo-canvas \
-               --enable-graphite \
-               --enable-largefile \
-               --enable-mergelibs \
-               --enable-python=system \
-               --enable-randr \
-               --enable-randr-link \
-               --enable-release-build \
-               --disable-hardlink-deliver \
-               --disable-ccache \
-               --disable-crashdump \
-               --disable-dependency-tracking \
-               --disable-epm \
-               --disable-fetch-external \
-               --disable-gnome-vfs \
-               --disable-gstreamer-0-10 \
-               --disable-report-builder \
-               --disable-kdeab \
-               --disable-kde \
-               --disable-online-update \
-               --disable-systray \
-               --with-alloc=$(use jemalloc && echo "jemalloc" || echo 
"system") \
-               --with-build-version="Gentoo official package" \
-               --enable-extension-integration \
-               --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-tar="${DISTDIR}" \
-               --with-lang="" \
-               --with-parallelism=${jbs} \
-               --with-system-ucpp \
-               --with-vendor="Gentoo Foundation" \
-               --with-x \
-               --without-afms \
-               --without-fonts \
-               --without-myspell-dicts \
-               --without-help \
-               --with-helppack-integration \
-               --without-sun-templates \
-               $(use_enable bluetooth sdremote-bluetooth) \
-               $(use_enable cups) \
-               $(use_enable debug) \
-               $(use_enable dbus) \
-               $(use_enable eds evolution2) \
-               $(use_enable firebird firebird-sdbc) \
-               $(use_enable gnome gconf) \
-               $(use_enable gnome gio) \
-               $(use_enable gnome lockdown) \
-               $(use_enable gstreamer) \
-               $(use_enable gtk) \
-               $(use_enable gtk3) \
-               $(use_enable kde kde4) \
-               $(use_enable mysql ext-mariadb-connector) \
-               $(use_enable odk) \
-               $(use_enable opengl) \
-               $(use_enable postgres postgresql-sdbc) \
-               $(use_enable telepathy) \
-               $(use_enable vba) \
-               $(use_enable vlc) \
-               $(use_enable webdav neon) \
-               $(use_with java) \
-               $(use_with mysql system-mysql-cppconn) \
-               $(use_with odk doxygen) \
-               ${internal_libs} \
-               ${java_opts} \
-               ${ext_opts}
-}
-
-src_compile() {
-       # hack for offlinehelp, this needs fixing upstream at some point
-       # it is broken because we send --without-help
-       # https://bugs.freedesktop.org/show_bug.cgi?id=46506
-       (
-               grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
-               source "${T}/config_host.mk" 2&> /dev/null
-
-               local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-               mkdir -p "${path}" || die
-
-               echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" 
-dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
-               perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-                       -dir=icon-themes/galaxy/res/helpimg \
-                       > "${path}/helpimg.ilst"
-               [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list 
is empty, something is fishy, report a bug."
-       )
-
-       local target
-       use test && target="build" || target="build-nocheck"
-
-       # this is not a proper make script
-       make ${target} || die
-}
-
-src_test() {
-       make unitcheck || die
-       make slowcheck || die
-}
-
-src_install() {
-       # This is not Makefile so no buildserver
-       make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-       # Fix bash completion placement
-       newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
-       rm -rf "${ED}"/etc/
-
-       if use branding; then
-               insinto /usr/$(get_libdir)/${PN}/program
-               newins "${WORKDIR}/branding-sofficerc" sofficerc
-               echo 
"CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > 
"${ED}"/etc/env.d/99${PN}
-       fi
-
-       # symlink the nsplugin to proper location
-       # use gtk && inst_plugin 
/usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-
-       # Hack for offlinehelp, this needs fixing upstream at some point.
-       # It is broken because we send --without-help
-       # https://bugs.freedesktop.org/show_bug.cgi?id=46506
-       insinto /usr/$(get_libdir)/libreoffice/help
-       doins xmlhelp/util/*.xsl
-
-       # Remove desktop files for support to old installs that can't parse mime
-       rm -rf "${ED}"/usr/share/mimelnk/
-
-       pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-       pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-       # Cache updates - all handled by kde eclass for all environments
-       kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-       kde4-base_pkg_postinst
-
-       use java || \
-               ewarn 'If you plan to use lbase application you should enable 
java or you will get various crashes.'
-}
-
-pkg_postrm() {
-       kde4-base_pkg_postrm
-}

diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild 
b/app-office/libreoffice/libreoffice-9999-r2.ebuild
deleted file mode 100644
index 37f0ef8..0000000
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ /dev/null
@@ -1,586 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 
1.209 2014/01/27 15:35:49 scarabeus Exp $
-
-EAPI=5
-
-KDE_REQUIRED="optional"
-QT_MINIMAL="4.7.4"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_3 )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-       http://dev-builds.libreoffice.org/pre-releases/src
-       http://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-       http://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-EXT_URI="http://ooo.itc.hu/oxygenoffice/download/libreoffice";
-ADDONS_URI="http://dev-www.libreoffice.org/src/";
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 
kde4-base pax-utils python-single-r1 multilib toolchain-funcs flag-o-matic 
nsplugins ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="LibreOffice, a full office productivity suite."
-HOMEPAGE="http://www.libreoffice.org";
-SRC_URI="branding? ( http://dev.gentoo.org/~dilfridge/distfiles/${BRANDING} )"
-[[ -n ${PATCHSET} ]] && SRC_URI+=" 
http://dev.gentooexperimental.org/~scarabeus/${PATCHSET}";
-
-# Split modules following git/tarballs
-# Core MUST be first!
-# Help is used for the image generator
-MODULES="core help"
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-       for i in ${DEV_URI}; do
-               for mod in ${MODULES}; do
-                       if [[ ${mod} == core ]]; then
-                               SRC_URI+=" ${i}/${P}.tar.xz"
-                       else
-                               SRC_URI+=" ${i}/${PN}-${mod}-${PV}.tar.xz"
-                       fi
-               done
-               unset mod
-       done
-       unset i
-fi
-unset DEV_URI
-
-# Really required addons
-# These are bundles that can't be removed for now due to huge patchsets.
-# If you want them gone, patches are welcome.
-ADDONS_SRC+=" ${ADDONS_URI}/d62650a6f908e85643e557a236ea989c-vigra1.6.0.tar.gz"
-ADDONS_SRC+=" 
${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # 
modifies source code
-ADDONS_SRC+=" java? ( 
${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-ADDONS_SRC+=" libreoffice_extensions_wiki-publisher? ( 
${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )" # no release 
for 8 years, should we package it?
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( 
${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )" # Does not 
build with 1.6 rhino at all
-ADDONS_SRC+=" libreoffice_extensions_scripting-javascript? ( 
${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )" # requirement 
of rhino
-ADDONS_SRC+=" odk? ( 
http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll 
)" # not packageable
-SRC_URI+=" ${ADDONS_SRC}"
-
-unset ADDONS_URI
-unset EXT_URI
-unset ADDONS_SRC
-
-IUSE="bluetooth +branding +cups dbus debug eds firebird gnome gstreamer +gtk
-gtk3 jemalloc kde mysql odk opengl postgres telepathy test +vba vlc +webdav"
-
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-# Unpackaged separate extensions:
-# diagram: lo has 0.9.5 upstream is weirdly patched 0.9.4 -> wtf?
-# hunart: only on ooo extensions -> fubared download path somewhere on sf
-# numbertext, typo, validator, watch-window: ^^
-# oooblogger: no homepage or anything
-# Extensions that need extra work:
-for lo_xt in ${LO_EXTS}; do
-       IUSE+=" libreoffice_extensions_${lo_xt}"
-done
-unset lo_xt
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-COMMON_DEPEND="
-       ${PYTHON_DEPS}
-       app-arch/zip
-       app-arch/unzip
-       >=app-text/hunspell-1.3.2-r3
-       app-text/mythes
-       app-text/libabw
-       >=app-text/libexttextcat-3.2
-       app-text/libebook
-       app-text/libetonyek
-       app-text/liblangtag
-       app-text/libmspub
-       >=app-text/libmwaw-0.2
-       >=app-text/libodfgen-0.0.3
-       app-text/libwpd:0.9[tools]
-       app-text/libwpg:0.2
-       >=app-text/libwps-0.2.2
-       >=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
-       >=dev-cpp/clucene-2.3.3.4-r2
-       dev-cpp/libcmis:0.4
-       dev-db/unixODBC
-       >=dev-libs/boost-1.46:=
-       dev-libs/expat
-       >=dev-libs/hyphen-2.7.1
-       >=dev-libs/icu-4.8.1.1:=
-       >=dev-libs/libatomic_ops-7.2d
-       >=dev-libs/liborcus-0.5.1:=
-       >=dev-libs/nspr-4.8.8
-       >=dev-libs/nss-3.12.9
-       >=dev-lang/perl-5.0
-       >=dev-libs/openssl-1.0.0d
-       >=dev-libs/redland-1.0.16[ssl]
-       media-gfx/graphite2
-       >=media-libs/fontconfig-2.8.0
-       media-libs/freetype:2
-       >=media-libs/harfbuzz-0.9.18:=[icu(+)]
-       media-libs/lcms:2
-       >=media-libs/libpng-1.4
-       >=media-libs/libcdr-0.0.5
-       media-libs/libfreehand
-       media-libs/libvisio
-       >=net-misc/curl-7.21.4
-       net-nds/openldap
-       sci-mathematics/lpsolve
-       virtual/jpeg:0
-       >=x11-libs/cairo-1.10.0[X]
-       x11-libs/libXinerama
-       x11-libs/libXrandr
-       x11-libs/libXrender
-       bluetooth? ( net-wireless/bluez )
-       cups? ( net-print/cups )
-       dbus? ( >=dev-libs/dbus-glib-0.92 )
-       eds? ( gnome-extra/evolution-data-server )
-       firebird? ( >=dev-db/firebird-2.5 )
-       gnome? ( gnome-base/gconf:2 )
-       gtk? (
-               x11-libs/gdk-pixbuf[X]
-               >=x11-libs/gtk+-2.24:2
-       )
-       gtk3? ( >=x11-libs/gtk+-3.2:3 )
-       gstreamer? (
-               media-libs/gstreamer:1.0
-               media-libs/gst-plugins-base:1.0
-       )
-       jemalloc? ( dev-libs/jemalloc )
-       libreoffice_extensions_scripting-beanshell? ( >=dev-java/bsh-2.0_beta4 )
-       libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-       libreoffice_extensions_wiki-publisher? (
-               dev-java/commons-codec:0
-               dev-java/commons-httpclient:3
-               dev-java/commons-lang:2.1
-               dev-java/commons-logging:0
-               dev-java/tomcat-servlet-api:3.0
-       )
-       mysql? ( >=dev-db/mysql-connector-c++-1.1.0 )
-       opengl? (
-               virtual/glu
-               virtual/opengl
-       )
-       postgres? ( >=dev-db/postgresql-base-9.0[kerberos] )
-       telepathy? (
-               dev-libs/glib:2
-               >=net-libs/telepathy-glib-0.18.0
-               >=x11-libs/gtk+-2.24:2
-       )
-       webdav? ( net-libs/neon )
-"
-
-RDEPEND="${COMMON_DEPEND}
-       !app-office/libreoffice-bin
-       !app-office/libreoffice-bin-debug
-       !<app-office/openoffice-bin-3.4.0-r1
-       !app-office/openoffice
-       media-fonts/libertine-ttf
-       media-fonts/liberation-fonts
-       media-fonts/urw-fonts
-       java? ( >=virtual/jre-1.6 )
-       vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-       PDEPEND="~app-office/libreoffice-l10n-${PV}"
-else
-       # Translations are not reliable on live ebuilds
-       # rather force people to use english only.
-       PDEPEND="!app-office/libreoffice-l10n"
-fi
-
-# FIXME: cppunit should be moved to test conditional
-#        after everything upstream is under gbuild
-#        as dmake execute tests right away
-DEPEND="${COMMON_DEPEND}
-       >=dev-libs/libxml2-2.7.8
-       dev-libs/libxslt
-       dev-perl/Archive-Zip
-       dev-util/cppunit
-       >=dev-util/gperf-3
-       dev-util/intltool
-       >=dev-util/mdds-0.10.1:=
-       virtual/pkgconfig
-       net-misc/npapi-sdk
-       >=sys-apps/findutils-4.4.2
-       sys-devel/bison
-       sys-apps/coreutils
-       sys-devel/flex
-       sys-devel/gettext
-       >=sys-devel/make-3.82
-       sys-devel/ucpp
-       sys-libs/zlib
-       x11-libs/libXt
-       x11-libs/libXtst
-       x11-proto/randrproto
-       x11-proto/xextproto
-       x11-proto/xineramaproto
-       x11-proto/xproto
-       java? (
-               >=virtual/jdk-1.6
-               >=dev-java/ant-core-1.7
-       )
-       odk? ( >=app-doc/doxygen-1.8.4 )
-       test? ( dev-util/cppunit )
-"
-
-PATCHES=(
-       # not upstreamable stuff
-       "${FILESDIR}/${PN}-3.7-system-pyuno.patch"
-)
-
-REQUIRED_USE="
-       ${PYTHON_REQUIRED_USE}
-       bluetooth? ( dbus )
-       gnome? ( gtk )
-       eds? ( gnome )
-       telepathy? ( gtk )
-       libreoffice_extensions_nlpsolver? ( java )
-       libreoffice_extensions_scripting-beanshell? ( java )
-       libreoffice_extensions_scripting-javascript? ( java )
-       libreoffice_extensions_wiki-publisher? ( java )
-"
-
-CHECKREQS_MEMORY="512M"
-CHECKREQS_DISK_BUILD="6G"
-
-pkg_pretend() {
-       local pgslot
-
-       if [[ ${MERGE_TYPE} != binary ]]; then
-               check-reqs_pkg_pretend
-
-               if [[ $(gcc-major-version) -lt 4 ]] || \
-                                ( [[ $(gcc-major-version) -eq 4 && 
$(gcc-minor-version) -lt 6 ]] ) \
-                               ; then
-                       eerror "Compilation with gcc older than 4.6 is not 
supported"
-                       die "Too old gcc found."
-               fi
-       fi
-
-       # Ensure pg version but we have to be sure the pg is installed (first
-       # install on clean system)
-       if use postgres && has_version dev-db/postgresql-base; then
-                pgslot=$(postgresql-config show)
-                if [[ ${pgslot//.} < 90 ]] ; then
-                       eerror "PostgreSQL slot must be set to 9.0 or higher."
-                       eerror "    postgresql-config set 9.0"
-                       die "PostgreSQL slot is not set to 9.0 or higher."
-                fi
-       fi
-}
-
-pkg_setup() {
-       java-pkg-opt-2_pkg_setup
-       kde4-base_pkg_setup
-       python-single-r1_pkg_setup
-
-       [[ ${MERGE_TYPE} != binary ]] && check-reqs_pkg_setup
-}
-
-src_unpack() {
-       local mod mod2 dest tmplfile tmplname mypv
-
-       [[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-       use branding && unpack "${BRANDING}"
-
-       if [[ ${PV} != *9999* ]]; then
-               unpack "${P}.tar.xz"
-               for mod in ${MODULES}; do
-                       [[ ${mod} == core ]] && continue
-                       unpack "${PN}-${mod}-${PV}.tar.xz"
-               done
-       else
-               for mod in ${MODULES}; do
-                       mypv=${PV/.9999}
-                       [[ ${mypv} != ${PV} ]] && 
EGIT_BRANCH="${PN}-${mypv/./-}"
-                       EGIT_PROJECT="${PN}/${mod}"
-                       EGIT_SOURCEDIR="${WORKDIR}/${P}"
-                       [[ ${mod} != core ]] && 
EGIT_SOURCEDIR="${WORKDIR}/${PN}-${mod}-${PV}"
-                       
EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}/${mod}"
-                       EGIT_NOUNPACK="true"
-                       git-2_src_unpack
-                       if [[ ${mod} != core ]]; then
-                               mod2=${mod}
-                               # mapping does not match on help
-                               [[ ${mod} == help ]] && mod2="helpcontent2"
-                               mkdir -p "${S}/${mod2}/" || die
-                               mv -n "${WORKDIR}/${PN}-${mod}-${PV}"/* 
"${S}/${mod2}" || die
-                               rm -rf "${WORKDIR}/${PN}-${mod}-${PV}"
-                       fi
-               done
-               unset EGIT_PROJECT EGIT_SOURCEDIR EGIT_REPO_URI EGIT_BRANCH
-       fi
-}
-
-src_prepare() {
-       # optimization flags
-       export GMAKE_OPTIONS="${MAKEOPTS}"
-       # System python 2.7 enablement:
-       export PYTHON_CFLAGS=$(python_get_CFLAGS)
-       export PYTHON_LIBS=$(python_get_LIBS)
-
-       # patchset
-       if [[ -n ${PATCHSET} ]]; then
-               EPATCH_FORCE="yes" \
-               EPATCH_SOURCE="${WORKDIR}/${PATCHSET/.tar.xz/}" \
-               EPATCH_SUFFIX="patch" \
-               epatch
-       fi
-
-       base_src_prepare
-
-       AT_M4DIR="m4" eautoreconf
-       # hack in the autogen.sh
-       touch autogen.lastrun
-
-       # system pyuno mess
-       sed \
-               -e "s:%eprefix%:${EPREFIX}:g" \
-               -e "s:%libdir%:$(get_libdir):g" \
-               -i pyuno/source/module/uno.py \
-               -i scripting/source/pyprov/officehelper.py || die
-       # sed in the tests
-       sed -i \
-               -e 's#all : build unitcheck#all : build#g' \
-               solenv/gbuild/Module.mk || die
-       sed -i \
-               -e 's#check: dev-install subsequentcheck#check: unitcheck 
slowcheck dev-install subsequentcheck#g' \
-               -e 's#Makefile.gbuild all slowcheck#Makefile.gbuild all#g' \
-               Makefile.in || die
-
-       if use branding; then
-               # hack...
-               mv -v "${WORKDIR}/branding-intro.png" 
"${S}/icon-themes/galaxy/brand/intro.png" || die
-       fi
-}
-
-src_configure() {
-       local java_opts
-       local internal_libs
-       local lo_ext
-       local ext_opts
-       local jbs=$(sed -ne 
's/.*\(-j[[:space:]]*\|--jobs=\)\([[:digit:]]\+\).*/\2/;T;p' <<< "${MAKEOPTS}")
-
-       # recheck that there is some value in jobs
-       [[ -z ${jbs} ]] && jbs="1"
-
-       # sane: just sane.h header that is used for scan in writer, not
-       #       linked or anything else, worthless to depend on
-       # vigra: just uses templates from there
-       #        it is serious pain in the ass for packaging
-       #        should be replaced by boost::gil if someone interested
-       internal_libs+="
-               --without-system-sane
-               --without-system-vigra
-       "
-
-       # libreoffice extensions handling
-       for lo_xt in ${LO_EXTS}; do
-               if [[ "${lo_xt}" == "scripting-beanshell" || "${lo_xt}" == 
"scripting-javascript" ]]; then
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ${lo_xt})"
-               else
-                       ext_opts+=" $(use_enable 
libreoffice_extensions_${lo_xt} ext-${lo_xt})"
-               fi
-       done
-
-       if use java; then
-               # hsqldb: system one is too new
-               java_opts="
-                       --without-junit
-                       --without-system-hsqldb
-                       --with-ant-home="${ANT_HOME}"
-                       --with-jdk-home=$(java-config --jdk-home 2>/dev/null)
-                       --with-jvm-path="${EPREFIX}/usr/$(get_libdir)/"
-               "
-
-               use libreoffice_extensions_scripting-beanshell && \
-                       java_opts+=" --with-beanshell-jar=$(java-pkg_getjar bsh 
bsh.jar)"
-
-               use libreoffice_extensions_scripting-javascript && \
-                       java_opts+=" --with-rhino-jar=$(java-pkg_getjar 
rhino-1.6 js.jar)"
-
-               if use libreoffice_extensions_wiki-publisher; then
-                       java_opts+="
-                               --with-commons-codec-jar=$(java-pkg_getjar 
commons-codec commons-codec.jar)
-                               --with-commons-httpclient-jar=$(java-pkg_getjar 
commons-httpclient-3 commons-httpclient.jar)
-                               --with-commons-lang-jar=$(java-pkg_getjar 
commons-lang-2.1 commons-lang.jar)
-                               --with-commons-logging-jar=$(java-pkg_getjar 
commons-logging commons-logging.jar)
-                               --with-servlet-api-jar=$(java-pkg_getjar 
tomcat-servlet-api-3.0 servlet-api.jar)
-                       "
-               fi
-       fi
-
-       # system headers/libs/...: enforce using system packages
-       # --enable-cairo: ensure that cairo is always required
-       # --enable-graphite: disabling causes build breakages
-       # --enable-*-link: link to the library rather than just dlopen on 
runtime
-       # --enable-release-build: build the libreoffice as release
-       # --disable-fetch-external: prevent dowloading during compile phase
-       # --disable-gnome-vfs: old gnome virtual fs support
-       # --disable-kdeab: kde3 adressbook
-       # --disable-kde: kde3 support
-       # --disable-systray: quickstarter does not actually work at all so do 
not
-       #   promote it
-       # --enable-extension-integration: enable any extension integration 
support
-       # --without-{afms,fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-       # --disable-report-builder: too much java packages pulled in without 
pkgs
-       econf \
-               --docdir="${EPREFIX}/usr/share/doc/${PF}/" \
-               --with-system-headers \
-               --with-system-libs \
-               --with-system-jars \
-               --with-system-dicts \
-               --enable-cairo-canvas \
-               --enable-graphite \
-               --enable-largefile \
-               --enable-mergelibs \
-               --enable-python=system \
-               --enable-randr \
-               --enable-randr-link \
-               --enable-release-build \
-               --disable-hardlink-deliver \
-               --disable-ccache \
-               --disable-crashdump \
-               --disable-dependency-tracking \
-               --disable-epm \
-               --disable-fetch-external \
-               --disable-gnome-vfs \
-               --disable-gstreamer-0-10 \
-               --disable-report-builder \
-               --disable-kdeab \
-               --disable-kde \
-               --disable-online-update \
-               --disable-systray \
-               --with-alloc=$(use jemalloc && echo "jemalloc" || echo 
"system") \
-               --with-build-version="Gentoo official package" \
-               --enable-extension-integration \
-               --with-external-dict-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-hyph-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-thes-dir="${EPREFIX}/usr/share/myspell" \
-               --with-external-tar="${DISTDIR}" \
-               --with-lang="" \
-               --with-parallelism=${jbs} \
-               --with-system-ucpp \
-               --with-vendor="Gentoo Foundation" \
-               --with-x \
-               --without-afms \
-               --without-fonts \
-               --without-myspell-dicts \
-               --without-help \
-               --with-helppack-integration \
-               --without-sun-templates \
-               $(use_enable bluetooth sdremote-bluetooth) \
-               $(use_enable cups) \
-               $(use_enable debug) \
-               $(use_enable dbus) \
-               $(use_enable eds evolution2) \
-               $(use_enable firebird firebird-sdbc) \
-               $(use_enable gnome gconf) \
-               $(use_enable gnome gio) \
-               $(use_enable gnome lockdown) \
-               $(use_enable gstreamer) \
-               $(use_enable gtk) \
-               $(use_enable gtk3) \
-               $(use_enable kde kde4) \
-               $(use_enable mysql ext-mariadb-connector) \
-               $(use_enable odk) \
-               $(use_enable opengl) \
-               $(use_enable postgres postgresql-sdbc) \
-               $(use_enable telepathy) \
-               $(use_enable vba) \
-               $(use_enable vlc) \
-               $(use_enable webdav neon) \
-               $(use_with java) \
-               $(use_with mysql system-mysql-cppconn) \
-               $(use_with odk doxygen) \
-               ${internal_libs} \
-               ${java_opts} \
-               ${ext_opts}
-}
-
-src_compile() {
-       # hack for offlinehelp, this needs fixing upstream at some point
-       # it is broken because we send --without-help
-       # https://bugs.freedesktop.org/show_bug.cgi?id=46506
-       (
-               grep "^export" "${S}/config_host.mk" > "${T}/config_host.mk"
-               source "${T}/config_host.mk" 2&> /dev/null
-
-               local path="${WORKDIR}/helpcontent2/source/auxiliary/"
-               mkdir -p "${path}" || die
-
-               echo "perl \"${S}/helpcontent2/helpers/create_ilst.pl\" 
-dir=icon-themes/galaxy/res/helpimg > \"${path}/helpimg.ilst\""
-               perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-                       -dir=icon-themes/galaxy/res/helpimg \
-                       > "${path}/helpimg.ilst"
-               [[ -s "${path}/helpimg.ilst" ]] || ewarn "The help images list 
is empty, something is fishy, report a bug."
-       )
-
-       local target
-       use test && target="build" || target="build-nocheck"
-
-       # this is not a proper make script
-       make ${target} || die
-}
-
-src_test() {
-       make unitcheck || die
-       make slowcheck || die
-}
-
-src_install() {
-       # This is not Makefile so no buildserver
-       make DESTDIR="${D}" distro-pack-install -o build -o check || die
-
-       # Fix bash completion placement
-       newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
-       rm -rf "${ED}"/etc/
-
-       if use branding; then
-               insinto /usr/$(get_libdir)/${PN}/program
-               newins "${WORKDIR}/branding-sofficerc" sofficerc
-               echo 
"CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > 
"${ED}"/etc/env.d/99${PN}
-       fi
-
-       # symlink the nsplugin to proper location
-       # use gtk && inst_plugin 
/usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
-
-       # Hack for offlinehelp, this needs fixing upstream at some point.
-       # It is broken because we send --without-help
-       # https://bugs.freedesktop.org/show_bug.cgi?id=46506
-       insinto /usr/$(get_libdir)/libreoffice/help
-       doins xmlhelp/util/*.xsl
-
-       # Remove desktop files for support to old installs that can't parse mime
-       rm -rf "${ED}"/usr/share/mimelnk/
-
-       pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
-       pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-}
-
-pkg_preinst() {
-       # Cache updates - all handled by kde eclass for all environments
-       kde4-base_pkg_preinst
-}
-
-pkg_postinst() {
-       kde4-base_pkg_postinst
-
-       use java || \
-               ewarn 'If you plan to use lbase application you should enable 
java or you will get various crashes.'
-}
-
-pkg_postrm() {
-       kde4-base_pkg_postrm
-}

diff --git a/app-office/libreoffice/metadata.xml 
b/app-office/libreoffice/metadata.xml
deleted file mode 100644
index ac78a76..0000000
--- a/app-office/libreoffice/metadata.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
-  <herd>openoffice</herd>
-  <longdescription>LibreOffice is a fork of OpenOffice.org. 
-This ebuild allows you to compile it yourself. Unfortunately this 
-compilation can take up to a day depending on the speed of your 
-computer. It will however make a snappier openoffice than the binary 
-version</longdescription>
-  <use>
-    <flag name="gtk3">Enable highly experimental gtk3 frontend</flag>
-    <flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for 
allocations</flag>
-    <flag name="odk">Build the Office Development Kit</flag>
-    <flag name="telepathy">Enable document colaboration features using 
telepathy communication framework.</flag>
-    <flag name="vba">Enable support for VBA compatibility and ActiveX 
embedding</flag>
-       <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video 
embedding</flag>
-    <flag name="webdav">Adds support for HTTP content adding via 
<pkg>net-libs/neon</pkg></flag>
-  </use>
-</pkgmetadata>

Reply via email to