Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-08-31 09:11:32 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-08-31 09:11:32 +0000
commit9d3578a1603a0ff2d5cad1d5ae6de64853fd846a (patch)
treed674e498025a92105a5d8c5624dac273364aeedb
parentMask net-irc/conspire for removal (diff)
downloadhistorical-9d3578a1603a0ff2d5cad1d5ae6de64853fd846a.tar.gz
historical-9d3578a1603a0ff2d5cad1d5ae6de64853fd846a.tar.bz2
historical-9d3578a1603a0ff2d5cad1d5ae6de64853fd846a.zip
Fix bash completion placement. Fixes bug #380977.
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
Diffstat
-rw-r--r--app-office/libreoffice/ChangeLog7
-rw-r--r--app-office/libreoffice/Manifest20
-rw-r--r--app-office/libreoffice/libreoffice-3.4.2.3.ebuild8
-rw-r--r--app-office/libreoffice/libreoffice-3.4.3.2.ebuild8
-rw-r--r--app-office/libreoffice/libreoffice-3.4.9999.ebuild8
-rw-r--r--app-office/libreoffice/libreoffice-9999.ebuild8
6 files changed, 45 insertions, 14 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 37d75fb45727..b7999a7eb6f8 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.116 2011/08/23 19:27:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.117 2011/08/31 09:11:32 scarabeus Exp $
+
+ 31 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild, libreoffice-3.4.3.2.ebuild,
+ libreoffice-3.4.9999.ebuild, libreoffice-9999.ebuild:
+ Fix bash completion placement. Fixes bug #380977.
*libreoffice-3.4.3.2 (23 Aug 2011)
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 59305788b786..11ef5b0d6772 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
@@ -189,9 +192,16 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
EBUILD libreoffice-3.3.4.ebuild 18141 RMD160 50ac48e5cc3206f2cfc35c69a098fba8e38da4b7 SHA1 a2bb549a0c6c66c477db08bae202d581ecfea5b4 SHA256 1233871084a7fb29500478bc3891f23c398d30811c06224c3da4344f3c4fd280
-EBUILD libreoffice-3.4.2.3.ebuild 19702 RMD160 d227cd67ccaa56da97ff90fafd05518ce2f41175 SHA1 6e1e5473f92e677660b6e861aaa15c4141348ec9 SHA256 55b8d237745e825b3cedae134ea7a44e51849447129b0e78ce291f727ee69f33
-EBUILD libreoffice-3.4.3.2.ebuild 19584 RMD160 e1fa4928bcdaca094d0d06b6f9ad835e75e7f4d5 SHA1 6a2cfde67989ec0e12bbb8d70621b5e5e15756dc SHA256 7cd0b2e499a64bcca224dc570f45afcb541c5f172d44b8174a549c1c22940a78
-EBUILD libreoffice-3.4.9999.ebuild 19586 RMD160 4662503dfd2b12af541846d1a239cc9bc7193c56 SHA1 c656bd5904fa27b366462d8f79a021c05fa673ef SHA256 8e9092539648893e22838b2c9d51377b70427909e1a1d4f032db98f0838dd582
-EBUILD libreoffice-9999.ebuild 18918 RMD160 4d75dfa59d2cc49ec004735edc50bbbd3d1dbd09 SHA1 650cfbed2612526cb8621c3798e74ab2d2faf473 SHA256 7b59e5165db4b390808eb4737995209f61b92a653b4031d4a831f1f3197a76c8
-MISC ChangeLog 22558 RMD160 18a2655d05068cf00ff21c25465d1626ff546886 SHA1 f15df353724e95d2a3d2fc45bce3b9a64ac20cd9 SHA256 ba2dc89df1815d9e4f6591d55b9a44f9608970ead4b58f94c1435755b48ee01f
+EBUILD libreoffice-3.4.2.3.ebuild 19842 RMD160 ea4237ff7de4a789ed1ba4e13d3f0d7e9f3e45d5 SHA1 450e7643d32948c7f8ec58151e3f03dcb146ccf6 SHA256 d06c233c0ff8155540ac540f30db7c428ec381fc7335008040721fdebf1b3d5c
+EBUILD libreoffice-3.4.3.2.ebuild 19724 RMD160 53c3c377743cf3cb194fe7eb4956aeec47286e3e SHA1 bc05990e22e623a3f2db912c0d5678152da22911 SHA256 494e53ceb883fbee68efab66e5cb5dc7546fb95189dc311a5a901c1c0a89956c
+EBUILD libreoffice-3.4.9999.ebuild 19726 RMD160 f72152c30b53fe511cd59fcb4fd6017066822a4e SHA1 7c6b462e6d38ec94b9b8794a8f7010551aada55f SHA256 47b2d7e6b348a55ef7d322114cff66401b1a95812d86de5aad8003e3eabb3b1a
+EBUILD libreoffice-9999.ebuild 19058 RMD160 5cb9aedc2bc6bb8db5cace2afa89d7167132acb8 SHA1 cf55b367aad6820e03d89421ed3b84887c5635fe SHA256 daf1ec91f9e7e1ba13530a92a4a364be2aefcfb3f547d99406395f53d34c6aee
+MISC ChangeLog 22780 RMD160 3c7f4c8b2de78ba3df6559321ca24c4a0a427b67 SHA1 f7dc020525f8cf0e2e8c9cb6eaae4895a3d82f23 SHA256 7cc925d0f29806c2063d876100ec7add6bbfd610bcc6f0a31c7b2c91b2204c0f
MISC metadata.xml 1081 RMD160 df0ee3e614054cbd5f850530a17c0958b81a5d19 SHA1 8fc6d58e473f009d55a8876dc77135c0234d943b SHA256 2c90f32341f47586996dce605e83037a6759854a2871b8396f9832cb64f4db19
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEARECAAYFAk5d+ssACgkQHB6c3gNBRYdergCgz56t0c5nMYFiTKVhRknz+Hyl
+yC8AniIEWC28aQzuJSORr6UNH7JzgBTd
+=R7oP
+-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index 0bb32bbe6438..c434ea56cb71 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.30 2011/08/19 12:40:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.31 2011/08/31 09:11:32 scarabeus Exp $
EAPI=3
@@ -24,7 +24,7 @@ ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -560,6 +560,10 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install || die
+ # Fix bash completion placement
+ dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ rm -rf "${ED}"/etc/
+
# symlink the plugin to system location
if use nsplugin; then
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2.ebuild
index 10f201c3a88f..6c77e70bcd18 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild,v 1.1 2011/08/23 19:27:22 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2.ebuild,v 1.2 2011/08/31 09:11:32 scarabeus Exp $
EAPI=3
@@ -25,7 +25,7 @@ ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -558,6 +558,10 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install || die
+ # Fix bash completion placement
+ dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ rm -rf "${ED}"/etc/
+
# symlink the plugin to system location
if use nsplugin; then
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
index 745e0203eaa5..396d175d37b8 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.21 2011/08/19 09:56:20 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.22 2011/08/31 09:11:32 scarabeus Exp $
EAPI=3
@@ -25,7 +25,7 @@ ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -558,6 +558,10 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install || die
+ # Fix bash completion placement
+ dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ rm -rf "${ED}"/etc/
+
# symlink the plugin to system location
if use nsplugin; then
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index b92ac4e24745..fe9143c17f69 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.18 2011/08/23 11:07:51 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.19 2011/08/31 09:11:32 scarabeus Exp $
EAPI=3
@@ -25,7 +25,7 @@ ADDONS_URI="http://dev-www.libreoffice.org/src/"
BRANDING="${PN}-branding-gentoo-0.3.tar.xz"
[[ ${PV} == *9999* ]] && SCM_ECLASS="git-2"
-inherit base autotools check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
+inherit base autotools bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins ${SCM_ECLASS}
unset SCM_ECLASS
DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -548,6 +548,10 @@ src_install() {
# This is not Makefile so no buildserver
make DESTDIR="${D}" distro-pack-install || die
+ # Fix bash completion placement
+ dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+ rm -rf "${ED}"/etc/
+
# symlink the plugin to system location
if use nsplugin; then
inst_plugin /usr/$(get_libdir)/libreoffice/program/libnpsoplugin.so