[gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/

[Andreas Hüttel]

commit:     6e385693666818496d96a78db411b11a9286ed2e
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Tue Aug 16 22:21:16 2016 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 21:32:12 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e385693

app-office/libreoffice: Drop mergelibs hack

Gentoo-bug: 590596

Package-Manager: portage-2.2.28

 app-office/libreoffice/libreoffice-5.2.9999.ebuild | 4 ----
 app-office/libreoffice/libreoffice-9999.ebuild     | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild 
b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 5151dab..68e7b73 100644
--- 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 2259e14..b95de74 100644
--- 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
 }