summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2016-11-18 00:23:34 +0100
committerAndreas K. Hüttel <dilfridge@gentoo.org>2016-11-18 00:23:54 +0100
commit6f1fafdad4cd5f2d4993691a580dc5c6e952540f (patch)
tree07a068b95d3745792f0265bdbb4db978d52e8ce3 /app-office
parentdev-util/drone: Add a subslot op on drone-ui (diff)
downloadgentoo-6f1fafdad4cd5f2d4993691a580dc5c6e952540f.tar.gz
gentoo-6f1fafdad4cd5f2d4993691a580dc5c6e952540f.tar.bz2
gentoo-6f1fafdad4cd5f2d4993691a580dc5c6e952540f.zip
app-office/libreoffice: Fix bash-completion installation, bug 448878
Package-Manager: portage-2.3.2
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/libreoffice-5.2.9999.ebuild8
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild8
2 files changed, 12 insertions, 4 deletions
diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 96fefc749ea1..663d010b2a0d 100644
--- a/app-office/libreoffice/libreoffice-5.2.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
@@ -341,6 +341,11 @@ src_prepare() {
-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
@@ -527,8 +532,7 @@ 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}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
+ # bash completion aliases
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 87acbbcd61e0..ebc28aaf3833 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -340,6 +340,11 @@ src_prepare() {
-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
@@ -525,8 +530,7 @@ 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}"usr/share/bash-completion/completions/libreoffice.sh ${PN}
+ # bash completion aliases
bashcomp_alias \
libreoffice \
unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice