app-office/libreoffice: Drop mergelibs hack

Gentoo-bug: 590596

Package-Manager: portage-2.2.28

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 5151dab35c7914b2ff7c4c66e046ae13c274dd34..68e7b73e08b18d75e15fccf37482feca659b1f77 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -541,10 +541,6 @@ src_install() {
        # Remove desktop files to support old installs that can't parse mime
        rm -r "${ED}"usr/share/mimelnk/ || die
 
-       # FIXME: Hack add missing file
-       exeinto /usr/$(get_libdir)/${PN}/program
-       doexe "${S}"/instdir/program/libsaxlo.so
-
        pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
        pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }

diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 2259e149ee7d5b5dff9997cec642dbaadd611de4..b95de748e3ed359da2de58c3c0ad8816713ce404 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -540,10 +540,6 @@ src_install() {
        # Remove desktop files to support old installs that can't parse mime
        rm -r "${ED}"usr/share/mimelnk/ || die
 
-       # FIXME: Hack add missing file
-       exeinto /usr/$(get_libdir)/${PN}/program
-       doexe "${S}"/instdir/program/libsaxlo.so
-
        pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/soffice.bin
        pax-mark -m "${ED}"usr/$(get_libdir)/libreoffice/program/unopkg.bin
 }