[gentoo-commits] proj/musl:master commit in: app-office/libreoffice/files/, app-office/libreoffice/

[Anthony G. Basile]

commit:     a493916aac9b87e177628e2fedd0f267a7a25dd8
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Fri May  4 12:54:10 2018 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri May  4 12:54:10 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a493916a

app-office/libreoffice: very out of date, breaks overlay

 app-office/libreoffice/Manifest                    |   9 -
 .../files/libreoffice-5.2.3.3-fix-includes.patch   |  26 -
 .../files/libreoffice-5.2.5.1-glibc-2.24.patch     |  10 -
 .../files/libreoffice-5.2.5.1-musl-vlc.patch       |  10 -
 .../files/libreoffice-5.3.4.2-kioclient5.patch     |  11 -
 .../files/libreoffice-5.4-system-pyuno.patch       |  42 --
 .../files/libreoffice-5.4.2.2-linux-musl.patch     |  76 ---
 .../libreoffice-5.4.2.2-musl-fix-execinfo.patch    |  39 --
 app-office/libreoffice/libreoffice-5.4.2.2.ebuild  | 579 ---------------------
 app-office/libreoffice/metadata.xml                |  25 -
 10 files changed, 827 deletions(-)

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
deleted file mode 100644
index 79ff2b0..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 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4
-DIST 4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 555291 SHA256 b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb SHA512 1e8a39205f21206d239871bd636f17768eb3997e08ba065c1111a537564bec2b4e97bcb2f7cd9e652a1d9b4f31cb0662010303c393aedc84b920bb5f41b27be8 WHIRLPOOL d809712c3fcaca922d64f67a14d9dc3e750ecf359687c7ba0e8c6c7fc7750e43721a21ce29d5a3b0b87b83bfe7b71947e701ba4aed0a337ec35ecbb22d8dec34
-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 libreoffice-5.4.2.2.tar.xz 192795940 SHA256 2fda4a8c446786a3afff2cf1b07b818c45c9dcd136bfae1f3191b0b1565ba675 SHA512 37edf44b4b3c3e694f5b5915647f9555413c3fcc6d29f5f8d74806439b65ed90418905476d7b75ce58a032abb1f55cecf1ca74b63279666ca2af5f3ac95a645c WHIRLPOOL 1d2f55af8da2d1c8f2998cc3ab6346be7f6e2e524fef664281ba585910a9e98914c9e07612d597a89c77ab6dc25beffc4dcb1b4575f314752a892d18ea15415d
-DIST libreoffice-branding-gentoo-0.8.tar.xz 151568 SHA256 22722121be062742624e0634beae92289c75e6a99ed507d3bf0a05c5164e3c69 SHA512 785031a699b1d1895ce4b50ffc3ddf645f3a0ef9acdf37facfd18cf75db9484cb8f53a50abb63d6006ead76a80b6ff5aa99661063245ebb84bd64013d713de7f WHIRLPOOL 1f36652a52d501d6548cfa9aa013b3e3a1867aa2b0693d2274cf7816d4aa4e0cde3c7096cc71ed47cf74e5f96da2757bf537f553021f8fd86939accb227bf538
-DIST libreoffice-help-5.4.2.2.tar.xz 2343504 SHA256 5fc740dbe77876b96ed731f0a6ce793925a9a4a4ba983b5a3506ab24beb73057 SHA512 ba845653d6388bae53eaa945abebb367fedace81c1949ed975a2ad0c270c688649b385b463256b362a6397f18d214aed9b876869434c6c3868649180e57c3112 WHIRLPOOL f5c81288d7d6f608a47f59fe6ae75b6d90b30383fc7fafbc398394c3274014c29fc6933c7b09c517e033e2477355584cb8970f55cf925d645bee57b935e1d253

diff --git a/app-office/libreoffice/files/libreoffice-5.2.3.3-fix-includes.patch b/app-office/libreoffice/files/libreoffice-5.2.3.3-fix-includes.patch
deleted file mode 100644
index 1c925fc..0000000
--- a/app-office/libreoffice/files/libreoffice-5.2.3.3-fix-includes.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
-index f177d86..99bb408 100644
---- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
-+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
-@@ -21,7 +21,7 @@
-   #include <dbus/dbus.h>
-   #include <errno.h>
-   #include <fcntl.h>
--  #include <sys/unistd.h>
-+  #include <unistd.h>
-   #include <sys/socket.h>
-   #include <bluetooth/bluetooth.h>
-   #include <bluetooth/rfcomm.h>
-diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx
-index 932e928..b65ced7 100644
---- a/vcl/inc/headless/svpinst.hxx
-+++ b/vcl/inc/headless/svpinst.hxx
-@@ -30,7 +30,7 @@
- 
- #include <list>
- 
--#include <time.h>
-+#include <sys/time.h>
- 
- #define VIRTUAL_DESKTOP_WIDTH 1024
- #define VIRTUAL_DESKTOP_HEIGHT 768

diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
deleted file mode 100644
index d714ff2..0000000
--- a/app-office/libreoffice/files/libreoffice-5.2.5.1-glibc-2.24.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libreoffice-5.2.5.1.orig/desktop/unx/source/pagein.c	2017-01-11 16:54:33.000000000 -0800
-+++ libreoffice-5.2.5.1/desktop/unx/source/pagein.c	2017-02-03 10:22:51.697673613 -0800
-@@ -26,6 +26,7 @@
- #include <string.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- 
- /* do_pagein */
- static void do_pagein (const char * filename)

diff --git a/app-office/libreoffice/files/libreoffice-5.2.5.1-musl-vlc.patch b/app-office/libreoffice/files/libreoffice-5.2.5.1-musl-vlc.patch
deleted file mode 100644
index 2188309..0000000
--- a/app-office/libreoffice/files/libreoffice-5.2.5.1-musl-vlc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libreoffice-5.2.5.1.orig/avmedia/source/vlc/wrapper/Types.hxx	2017-01-12 01:54:33.000000000 +0100
-+++ libreoffice-5.2.5.1/avmedia/source/vlc/wrapper/Types.hxx	2017-01-27 20:03:39.243895504 +0100
-@@ -15,6 +15,7 @@
- #if defined(_WIN32)
-         typedef __int64 libvlc_time_t;
- #else
-+#	include <stdint.h>
-         typedef int64_t libvlc_time_t;
- #endif
- 

diff --git a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch b/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
deleted file mode 100644
index a6e732f..0000000
--- a/app-office/libreoffice/files/libreoffice-5.3.4.2-kioclient5.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/shell/source/unix/misc/senddoc.sh	2017-06-15 15:44:22.000000000 +0200
-+++ b/shell/source/unix/misc/senddoc.sh	2017-06-25 01:00:08.525435930 +0200
-@@ -389,6 +389,8 @@
-         elif [ -n "$DESKTOP_LAUNCH" ]; then
-             # http://lists.freedesktop.org/pipermail/xdg/2004-August/002873.html
-             MAILER=${DESKTOP_LAUNCH}
-+        elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open5 ] ; then
-+            MAILER=/usr/bin/kde-open5
-         elif [ -n "$KDE_FULL_SESSION" -a -x /usr/bin/kde-open ] ; then
-             MAILER=/usr/bin/kde-open
-         elif [ -x /usr/bin/xdg-open ] ; then

diff --git a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch b/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
deleted file mode 100644
index 83b56d1..0000000
--- a/app-office/libreoffice/files/libreoffice-5.4-system-pyuno.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/desktop/scripts/soffice.sh	
-+++ a/desktop/scripts/soffice.sh	
-@@ -147,6 +147,9 @@ if echo "$checks" | grep -q "cc" ; then
-     exit 1;
- fi
- 
-+PYTHONPATH=$sd_prog${PYTHONPATH+:$PYTHONPATH}
-+export PYTHONPATH
-+
- case "$(uname -s)" in
- NetBSD|OpenBSD|DragonFly)
- # this is a temporary hack until we can live with the default search paths
---- a/pyuno/source/module/uno.py	
-+++ a/pyuno/source/module/uno.py	
-@@ -16,11 +16,16 @@ 
- #   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 pyuno
- import sys
- import traceback
- import warnings
- 
-+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"
-+
- # since on Windows sal3.dll no longer calls WSAStartup
- import socket
- 
---- a/pyuno/source/officehelper.py	
-+++ a/pyuno/source/officehelper.py	
-@@ -45,7 +45,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-5.4.2.2-linux-musl.patch b/app-office/libreoffice/files/libreoffice-5.4.2.2-linux-musl.patch
deleted file mode 100644
index b170c03..0000000
--- a/app-office/libreoffice/files/libreoffice-5.4.2.2-linux-musl.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -Naur libreoffice-5.4.2.2.orig/configure.ac libreoffice-5.4.2.2/configure.ac
---- libreoffice-5.4.2.2.orig/configure.ac	2017-09-27 14:03:26.000000000 -0400
-+++ libreoffice-5.4.2.2/configure.ac	2017-11-20 04:22:51.742130616 -0500
-@@ -1,4 +1,4 @@
--dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*-
-+12927dnl -*- Mode: Autoconf; tab-width: 4; indent-tabs-mode: nil; fill-column: 102 -*-
- dnl configure.ac serves as input for the GNU autoconf package
- dnl in order to create a configure script.
- 
-@@ -441,7 +441,7 @@
-     # all objects have been built with debug information.)
-     toolchain_system='*'
-     case $build_os in
--    linux-gnu*)
-+    linux-gnu*|linux-musl*)
-         ndk_build_os=linux
-         ;;
-     darwin*)
-@@ -664,7 +664,7 @@
-     fi
-     ;;
- 
--linux-gnu*|k*bsd*-gnu*)
-+linux-gnu*|linux-musl*|k*bsd*-gnu*)
-     test_gtk=yes
-     build_gstreamer_1_0=yes
-     build_gstreamer_0_10=yes
-@@ -4129,7 +4129,7 @@
-     esac
-     ;;
- 
--linux-gnu*)
-+linux-gnu*|linux-musl*)
-     COM=GCC
-     USING_X11=TRUE
-     OS=LINUX
-@@ -7135,7 +7135,7 @@
-         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-         ;;
- 
--    linux-gnu*)
-+    linux-gnu*|linux-musl*)
-         JAVAINC="-I$JAVA_HOME/include"
-         JAVAINC="$JAVAINC -I$JAVA_HOME/include/linux"
-         test -d "$JAVA_HOME/include/native_thread" && JAVAINC="$JAVAINC -I$JAVA_HOME/include/native_thread"
-@@ -9645,21 +9645,6 @@
- fi
- AC_SUBST(SYSTEM_LIBEXTTEXTCAT_DATA)
- 
--dnl ***************************************
--dnl testing libc version for Linux...
--dnl ***************************************
--if test "$_os" = "Linux"; then
--    AC_MSG_CHECKING([whether libc is >= 2.1.1])
--    exec 6>/dev/null # no output
--    AC_CHECK_LIB(c, gnu_get_libc_version, HAVE_LIBC=yes; export HAVE_LIBC)
--    exec 6>&1 # output on again
--    if test "$HAVE_LIBC"; then
--        AC_MSG_RESULT([yes])
--    else
--        AC_MSG_ERROR([no, upgrade libc])
--    fi
--fi
--
- dnl =========================================
- dnl Check for uuidgen
- dnl =========================================
-@@ -12572,7 +12557,7 @@
- 
-     case "$host_os" in
- 
--    aix*|dragonfly*|freebsd*|linux-gnu*|*netbsd*|openbsd*)
-+    aix*|dragonfly*|freebsd*|linux-gnu*|linux-musl*|*netbsd*|openbsd*)
-         if test "$ENABLE_JAVA" != ""; then
-             pathmunge "$JAVA_HOME/bin" "after"
-         fi

diff --git a/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch b/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch
deleted file mode 100644
index 4c3b359..0000000
--- a/app-office/libreoffice/files/libreoffice-5.4.2.2-musl-fix-execinfo.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/sal/osl/unx/backtrace.h b/sal/osl/unx/backtrace.h
-index 5fafc1c..408c12c 100644
---- a/sal/osl/unx/backtrace.h
-+++ b/sal/osl/unx/backtrace.h
-@@ -20,7 +20,7 @@
- #ifndef INCLUDED_SAL_OSL_UNX_BACKTRACE_H
- #define INCLUDED_SAL_OSL_UNX_BACKTRACE_H
- 
--#if defined (LINUX)
-+#if defined (LINUX) && defined (__GLIBC__)
- 
- #include <execinfo.h>
- 
-diff --git a/sal/osl/unx/signal.cxx b/sal/osl/unx/signal.cxx
-index f4c9a9c..da6d9cf 100644
---- a/sal/osl/unx/signal.cxx
-+++ b/sal/osl/unx/signal.cxx
-@@ -35,7 +35,7 @@
- 
- #endif /* MACOSX */
- 
--#ifdef LINUX
-+#if defined(LINUX) && defined(__GLIBC__)
- #include <execinfo.h>
- #include <link.h>
- #define INCLUDE_BACKTRACE
-diff --git a/sal/osl/unx/backtrace.c b/sal/osl/unx/backtrace.c
-index 1d9a58b..fd648e4 100644
---- a/sal/osl/unx/backtrace.c
-+++ b/sal/osl/unx/backtrace.c
-@@ -282,7 +282,7 @@ void backtrace_symbols_fd( void **buffer, int size, int fd )
-     }
- }
- 
--#elif !defined LINUX
-+#elif !defined(__GLIBC__)
- 
- int backtrace( void **buffer, int max_frames )
- {

diff --git a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild b/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
deleted file mode 100644
index 3715395..0000000
--- a/app-office/libreoffice/libreoffice-5.4.2.2.ebuild
+++ /dev/null
@@ -1,579 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_REQUIRED="optional"
-KDE_SCM="git"
-CMAKE_REQUIRED="never"
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-PYTHON_REQ_USE="threads,xml"
-
-# experimental ; release ; old
-# Usually the tarballs are moved a lot so this should make
-# everyone happy.
-DEV_URI="
-	https://dev-builds.libreoffice.org/pre-releases/src
-	https://download.documentfoundation.org/libreoffice/src/${PV:0:5}/
-	https://download.documentfoundation.org/libreoffice/old/${PV}/
-"
-ADDONS_URI="https://dev-www.libreoffice.org/src/"
-
-BRANDING="${PN}-branding-gentoo-0.8.tar.xz"
-# PATCHSET="${P}-patchset-01.tar.xz"
-
-[[ ${PV} == *9999* ]] && SCM_ECLASS="git-r3"
-inherit multiprocessing autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils python-single-r1 toolchain-funcs flag-o-matic versionator xdg-utils qmake-utils ${SCM_ECLASS}
-unset SCM_ECLASS
-
-DESCRIPTION="A full office productivity suite"
-HOMEPAGE="https://www.libreoffice.org"
-SRC_URI="branding? ( https://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
-# Only release has the tarballs
-if [[ ${PV} != *9999* ]]; then
-	for i in ${DEV_URI}; do
-		SRC_URI+=" ${i}/${P}.tar.xz"
-		SRC_URI+=" ${i}/${PN}-help-${PV}.tar.xz"
-	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=(
-	"collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )"
-	"java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )"
-	# no release for 8 years, should we package it?
-	"libreoffice_extensions_wiki-publisher? ( ${ADDONS_URI}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip )"
-	# Does not build with 1.6 rhino at all
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip )"
-	# requirement of rhino
-	"libreoffice_extensions_scripting-javascript? ( ${ADDONS_URI}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip )"
-	# not packageable
-	"odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )"
-)
-SRC_URI+=" ${ADDONS_SRC[*]}"
-
-unset ADDONS_URI
-unset ADDONS_SRC
-
-# Extensions that need extra work:
-LO_EXTS="nlpsolver scripting-beanshell scripting-javascript wiki-publisher"
-
-IUSE="bluetooth +branding coinmp collada +cups dbus debug eds firebird gltf gnome googledrive
-gstreamer +gtk gtk3 jemalloc kde libressl mysql odk pdfimport postgres quickstarter test vlc
-$(printf 'libreoffice_extensions_%s ' ${LO_EXTS})"
-
-LICENSE="|| ( LGPL-3 MPL-1.1 )"
-SLOT="0"
-[[ ${PV} == *9999* ]] || \
-KEYWORDS="amd64 ~arm x86"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	app-arch/unzip
-	app-arch/zip
-	app-crypt/gpgme[cxx]
-	app-text/hunspell:=
-	>=app-text/libabw-0.1.0
-	>=app-text/libebook-0.1
-	>=app-text/libetonyek-0.1
-	app-text/libexttextcat
-	app-text/liblangtag
-	>=app-text/libmspub-0.1.0
-	>=app-text/libmwaw-0.3.1
-	>=app-text/libodfgen-0.1.0
-	app-text/libstaroffice
-	app-text/libwpd:0.10[tools]
-	app-text/libwpg:0.3
-	>=app-text/libwps-0.4
-	app-text/mythes
-	>=dev-cpp/clucene-2.3.3.4-r2
-	=dev-cpp/libcmis-0.5*
-	dev-db/unixODBC
-	dev-lang/perl
-	dev-libs/boost:=
-	dev-libs/expat
-	dev-libs/hyphen
-	dev-libs/icu:=
-	dev-libs/libassuan
-	dev-libs/libgpg-error
-	=dev-libs/liborcus-0.12*
-	dev-libs/librevenge
-	dev-libs/nspr
-	dev-libs/nss
-	!libressl? ( >=dev-libs/openssl-1.0.0d:0 )
-	libressl? ( dev-libs/libressl )
-	>=dev-libs/redland-1.0.16
-	>=dev-libs/xmlsec-1.2.24[nss]
-	media-gfx/graphite2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	>=media-libs/harfbuzz-0.9.42:=[graphite,icu]
-	media-libs/lcms:2
-	>=media-libs/libcdr-0.1.0
-	>=media-libs/libepoxy-1.3.1
-	>=media-libs/libfreehand-0.1.0
-	media-libs/libpagemaker
-	>=media-libs/libpng-1.4:0=
-	>=media-libs/libvisio-0.1.0
-	media-libs/libzmf
-	net-libs/neon
-	net-misc/curl
-	net-nds/openldap
-	sci-mathematics/lpsolve
-	x11-libs/cairo[X]
-	x11-libs/libXinerama
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	virtual/glu
-	virtual/jpeg:0
-	virtual/opengl
-	bluetooth? ( net-wireless/bluez )
-	coinmp? ( sci-libs/coinor-mp )
-	collada? ( media-libs/opencollada )
-	cups? ( net-print/cups )
-	dbus? ( dev-libs/dbus-glib )
-	eds? (
-		dev-libs/glib:2
-		gnome-extra/evolution-data-server
-	)
-	firebird? ( >=dev-db/firebird-3.0.2.32703.0-r1 )
-	gltf? ( >=media-libs/libgltf-0.1.0 )
-	gnome? ( gnome-base/dconf )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	gtk? (
-		x11-libs/gdk-pixbuf
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		x11-libs/gtk+:3
-	)
-	jemalloc? ( dev-libs/jemalloc )
-	libreoffice_extensions_scripting-beanshell? ( dev-java/bsh )
-	libreoffice_extensions_scripting-javascript? ( dev-java/rhino:1.6 )
-	mysql? ( dev-db/mysql-connector-c++ )
-	pdfimport? ( app-text/poppler:=[cxx] )
-	postgres? ( >=dev-db/postgresql-9.0:*[kerberos] )
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!app-office/libreoffice-bin
-	!app-office/libreoffice-bin-debug
-	!app-office/openoffice
-	media-fonts/dejavu
-	media-fonts/liberation-fonts
-	media-fonts/libertine
-	|| ( x11-misc/xdg-utils kde-plasma/kde-cli-tools )
-	java? ( >=virtual/jre-1.6 )
-	vlc? ( media-video/vlc )
-"
-
-if [[ ${PV} != *9999* ]]; then
-	PDEPEND="=app-office/libreoffice-l10n-$(get_version_component_range 1-2)*"
-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}
-	!<sys-devel/make-3.82
-	>=dev-libs/libatomic_ops-7.2d
-	>=dev-libs/libxml2-2.7.8
-	dev-libs/libxslt
-	dev-perl/Archive-Zip
-	>=dev-util/cppunit-1.14.0
-	>=dev-util/gperf-3
-	dev-util/intltool
-	>=dev-util/mdds-1.2.2:1=
-	media-libs/glm
-	sys-devel/bison
-	sys-devel/flex
-	sys-devel/gettext
-	sys-devel/ucpp
-	sys-libs/zlib
-	virtual/pkgconfig
-	x11-libs/libXt
-	x11-libs/libXtst
-	x11-proto/randrproto
-	x11-proto/xextproto
-	x11-proto/xineramaproto
-	x11-proto/xproto
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.6
-	)
-	odk? ( >=app-doc/doxygen-1.8.4 )
-	test? (
-		dev-util/cppunit
-		media-fonts/dejavu
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	bluetooth? ( dbus )
-	collada? ( gltf )
-	eds? ( gnome )
-	gnome? ( gtk )
-	libreoffice_extensions_nlpsolver? ( java )
-	libreoffice_extensions_scripting-beanshell? ( java )
-	libreoffice_extensions_scripting-javascript? ( java )
-	libreoffice_extensions_wiki-publisher? ( java )
-"
-
-PATCHES=(
-	# not upstreamable stuff
-	"${FILESDIR}/${PN}-5.4-system-pyuno.patch"
-	"${FILESDIR}/${PN}-5.3.4.2-kioclient5.patch"
-
-	# TODO: upstream
-	"${FILESDIR}/${PN}-5.2.5.1-glibc-2.24.patch"
-
-	# musl patches
-	"${FILESDIR}/${PN}-5.4.2.2-musl-fix-execinfo.patch"
-	"${FILESDIR}/${PN}-5.4.2.2-linux-musl.patch"
-	"${FILESDIR}/${PN}-5.2.3.3-fix-includes.patch"
-	"${FILESDIR}/${PN}-5.2.5.1-musl-vlc.patch"
-)
-
-pkg_pretend() {
-	use java || \
-		ewarn "If you plan to use Base application you should enable java or you will get various crashes."
-
-	if has_version "<app-office/libreoffice-5.3.0[firebird]"; then
-		ewarn "Firebird has been upgraded to version 3.0.0. It is unable to read back Firebird 2.5 data,"
-		ewarn "so embedded firebird odb files created in LibreOffice pre-5.3 cannot be opened with LibreOffice 5.3."
-		ewarn "See also: https://wiki.documentfoundation.org/ReleaseNotes/5.3#Base"
-	fi
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	kde4-base_pkg_setup
-	python-single-r1_pkg_setup
-	xdg_environment_reset
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		CHECKREQS_MEMORY="512M"
-		if is-flagq "-g*" && ! is-flagq "-g*0" ; then
-			CHECKREQS_DISK_BUILD="22G"
-		else
-			CHECKREQS_DISK_BUILD="6G"
-		fi
-		check-reqs_pkg_setup
-	fi
-}
-
-src_unpack() {
-	[[ -n ${PATCHSET} ]] && unpack ${PATCHSET}
-	use branding && unpack "${BRANDING}"
-
-	if [[ ${PV} != *9999* ]]; then
-		unpack "${P}.tar.xz"
-		unpack "${PN}-help-${PV}.tar.xz"
-	else
-		local base_uri branch mypv
-		base_uri="https://anongit.freedesktop.org/git"
-		branch="master"
-		mypv=${PV/.9999}
-		[[ ${mypv} != ${PV} ]] && branch="${PN}-${mypv/./-}"
-		git-r3_fetch "${base_uri}/${PN}/core" "refs/heads/${branch}"
-		git-r3_checkout "${base_uri}/${PN}/core"
-
-		git-r3_fetch "${base_uri}/${PN}/help" "refs/heads/master"
-		git-r3_checkout "${base_uri}/${PN}/help" "helpcontent2" # doesn't match on help
-	fi
-}
-
-src_prepare() {
-	[[ -n ${PATCHSET} ]] && eapply "${WORKDIR}/${PATCHSET/.tar.xz/}"
-	eapply "${PATCHES[@]}"
-	eapply_user
-
-	AT_M4DIR="m4" eautoreconf
-	# hack in the autogen.sh
-	touch autogen.lastrun
-
-	# system pyuno mess
-	sed -i \
-		-e "s:%eprefix%:${EPREFIX}:g" \
-		-e "s:%libdir%:$(get_libdir):g" \
-		pyuno/source/module/uno.py \
-		pyuno/source/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
-
-	sed -i \
-		-e "s,/usr/share/bash-completion/completions,$(get_bashcompdir)," \
-		-e "s,\$INSTALLDIRNAME.sh,${PN}," \
-		bin/distro-install-desktop-integration || die
-
-	if use branding; then
-		# hack...
-		mv -v "${WORKDIR}/branding-intro.png" "${S}/icon-themes/galaxy/brand/intro.png" || die
-	fi
-
-	# Don't list pdfimport support in desktop when built with none, bug # 605464
-	if ! use pdfimport; then
-		sed -i \
-			-e ":MimeType: s:application/pdf;::" \
-			-e ":Keywords: s:pdf;::" \
-			sysui/desktop/menus/draw.desktop || die
-	fi
-}
-
-src_configure() {
-	local java_opts
-	local ext_opts
-
-	# Set up Google API keys, see https://www.chromium.org/developers/how-tos/api-keys
-	# Note: these are for Gentoo use ONLY. For your own distribution, please get
-	# your own set of keys. Feel free to contact chromium@g.o for more info.
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-
-	# optimization flags
-	export GMAKE_OPTIONS="${MAKEOPTS}"
-	# System python enablement:
-	export PYTHON_CFLAGS=$(python_get_CFLAGS)
-	export PYTHON_LIBS=$(python_get_LIBS)
-
-	if use collada; then
-		export OPENCOLLADA_CFLAGS="-I/usr/include/opencollada/COLLADABaseUtils -I/usr/include/opencollada/COLLADAFramework -I/usr/include/opencollada/COLLADASaxFrameworkLoader -I/usr/include/opencollada/GeneratedSaxParser"
-		export OPENCOLLADA_LIBS="-L /usr/$(get_libdir)/opencollada -lOpenCOLLADABaseUtils -lOpenCOLLADAFramework -lOpenCOLLADASaxFrameworkLoader -lGeneratedSaxParser"
-	fi
-
-	# 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/lib/"
-		"
-
-		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)"
-	fi
-
-	if use kde; then
-		# bug 544108, bug 599076
-		export QMAKEQT4="$(qt4_get_bindir)/qmake"
-		export MOCQT4="$(qt4_get_bindir)/moc"
-	fi
-
-	# system headers/libs/...: enforce using system packages
-	# --disable-breakpad: requires not-yet-in-tree dev-utils/breakpad
-	# --enable-cairo: ensure that cairo is always required
-	# --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
-	# --enable-extension-integration: enable any extension integration support
-	# --without-{fonts,myspell-dicts,ppsd}: prevent install of sys pkgs
-	# --disable-report-builder: too much java packages pulled in without pkgs
-	# --without-system-sane: just sane.h header that is used for scan in writer,
-	#   not linked or anything else, worthless to depend on
-	# --disable-pdfium: not yet packaged
-	econf \
-		--with-system-dicts \
-		--with-system-epoxy \
-		--with-system-headers \
-		--with-system-jars \
-		--with-system-libs \
-		--enable-cairo-canvas \
-		--enable-largefile \
-		--enable-mergelibs \
-		--enable-neon \
-		--enable-python=system \
-		--enable-randr \
-		--enable-release-build \
-		--disable-breakpad \
-		--disable-ccache \
-		--disable-dependency-tracking \
-		--disable-epm \
-		--disable-fetch-external \
-		--disable-gstreamer-0-10 \
-		--disable-online-update \
-		--disable-pdfium \
-		--disable-report-builder \
-		--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=$(makeopts_jobs) \
-		--with-system-ucpp \
-		--with-vendor="Gentoo Foundation" \
-		--with-x \
-		--without-fonts \
-		--without-myspell-dicts \
-		--without-help \
-		--with-helppack-integration \
-		--with-system-gpgmepp \
-		--without-system-sane \
-		$(use_enable bluetooth sdremote-bluetooth) \
-		$(use_enable coinmp) \
-		$(use_enable collada) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable dbus) \
-		$(use_enable eds evolution2) \
-		$(use_enable firebird firebird-sdbc) \
-		$(use_enable gltf) \
-		$(use_enable gnome gio) \
-		$(use_enable gnome dconf) \
-		$(use_enable gstreamer gstreamer-1-0) \
-		$(use_enable gtk) \
-		$(use_enable gtk3) \
-		$(use_enable kde kde4) \
-		$(use_enable mysql ext-mariadb-connector) \
-		$(use_enable odk) \
-		$(use_enable pdfimport) \
-		$(use_enable postgres postgresql-sdbc) \
-		$(use_enable quickstarter systray) \
-		$(use_enable vlc) \
-		$(use_with coinmp system-coinmp) \
-		$(use_with collada system-opencollada) \
-		$(use_with gltf system-libgltf) \
-		$(use_with googledrive gdrive-client-id ${google_default_client_id}) \
-		$(use_with googledrive gdrive-client-secret ${google_default_client_secret}) \
-		$(use_with java) \
-		$(use_with mysql system-mysql-cppconn) \
-		$(use_with odk doxygen) \
-		${java_opts} \
-		${ext_opts}
-}
-
-src_compile() {
-	# more and more LO stuff tries to use OpenGL, including tests during build
-	# bug 501508, bug 540624, bug 545974 and probably more
-	addpredict /dev/dri
-	addpredict /dev/ati
-	addpredict /dev/nvidiactl
-
-	# 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" || die
-		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=helpcontent2/source/media/helpimg > \"${path}/helpimg.ilst\""
-		perl "${S}/helpcontent2/helpers/create_ilst.pl" \
-			-dir=helpcontent2/source/media/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
-
-	# bug 593514
-	if use gtk3; then
-		dosym libreoffice/program/liblibreofficekitgtk.so \
-			/usr/$(get_libdir)/liblibreofficekitgtk.so
-	fi
-
-	# bash completion aliases
-	bashcomp_alias \
-		libreoffice \
-		unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
-
-	if use branding; then
-		insinto /usr/$(get_libdir)/${PN}/program
-		newins "${WORKDIR}/branding-sofficerc" sofficerc
-		dodir /etc/env.d
-		echo "CONFIG_PROTECT=/usr/$(get_libdir)/${PN}/program/sofficerc" > "${ED}"etc/env.d/99${PN} || die
-	fi
-
-	# 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 to support old installs that can't parse mime
-	rm -r "${ED}"usr/share/mimelnk/ || die
-
-	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
-}
-
-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 1d3010d..0000000
--- a/app-office/libreoffice/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>office@g.o</email>
-    <name>Gentoo Office project</name>
-  </maintainer>
-  <longdescription>LibreOffice is the successor 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 LibreOffice than the binary 
-version</longdescription>
-  <use>
-    <flag name="coinmp">Use sci-libs/coinor-mp as alternative solver</flag>
-    <flag name="collada">Enable Collada for rendering 3D models stored in *.dae and *.kmz format</flag>
-    <flag name="gltf">Use media-libs/libgltf for inserting 3D models in the glTF format into presentations</flag>
-    <flag name="googledrive">Enable support for remote files on Google Drive</flag>
-    <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="pdfimport">Enable PDF import via the Poppler library</flag>
-    <flag name="quickstarter">Build the system tray quickstarter</flag>
-    <flag name="vlc">Use <pkg>media-video/vlc</pkg> for video embedding</flag>
-  </use>
-</pkgmetadata>