summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <andreas.sturmlechner@gmail.com>2016-08-17 00:21:16 +0200
committerAndreas K. Hüttel <dilfridge@gentoo.org>2016-09-17 23:32:12 +0200
commit6e385693666818496d96a78db411b11a9286ed2e (patch)
tree39bb2a19fa724cd5e794afb1b27149a40c65667e /app-office/libreoffice
parentapp-office/libreoffice: Use xdg-utils.eclass to cleanup XDG_* env (diff)
downloadgentoo-6e385693666818496d96a78db411b11a9286ed2e.tar.gz
gentoo-6e385693666818496d96a78db411b11a9286ed2e.tar.bz2
gentoo-6e385693666818496d96a78db411b11a9286ed2e.zip
app-office/libreoffice: Drop mergelibs hack
Gentoo-bug: 590596 Package-Manager: portage-2.2.28
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/libreoffice-5.2.9999.ebuild4
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild4
2 files changed, 0 insertions, 8 deletions
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 5151dab35c79..68e7b73e08b1 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 2259e149ee7d..b95de748e3ed 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
}