commit: 6f1fafdad4cd5f2d4993691a580dc5c6e952540f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 23:23:34 2016 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 23:23:54 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f1fafda
app-office/libreoffice: Fix bash-completion installation, bug 448878
Package-Manager: portage-2.3.2
app-office/libreoffice/libreoffice-5.2.9999.ebuild | 8 ++++++--
app-office/libreoffice/libreoffice-9999.ebuild | 8 ++++++--
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 96fefc7..663d010 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 87acbbc..ebc28aa 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
