app-office/libreoffice: Fix bash-completion installation, bug 448878

Package-Manager: portage-2.3.2

diff --git a/app-office/libreoffice/libreoffice-5.2.9999.ebuild b/app-office/libreoffice/libreoffice-5.2.9999.ebuild
index 96fefc749ea178780ca0d810080442e52e874ecc..663d010b2a0dcc68ed34d6ee8bb0ab19f41c03d2 100644 (file)
--- 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 87acbbcd61e0421ab58899b9c8279e8da1cbdb8e..ebc28aaf3833f5256ed26274d15cf4fabe4302da 100644 (file)
--- 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