Use bashcomp-r1 eclass instead of old one.

Package-Manager: portage-2.2.0_alpha54/cvs/Linux x86_64

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 4414f3fc4f819e1a33474852b098de89c2bbda73..d21ee1ce634d7cde53fcfa60ef9f527c556ecd80 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.130 2011/09/08 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.131 2011/09/08 16:31:23 scarabeus Exp $
+
+  08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+  Use bashcomp-r1 eclass instead of old one.
 
   08 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.3.2-r1.ebuild, libreoffice-3.4.9999-r1.ebuild,

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 6ae7dea7494b2f7692164a7e572879acd85aa51f..e0ad85933ece270cdf1287567efa35959238c6e3 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -172,24 +172,25 @@ DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
-EBUILD libreoffice-3.4.9999-r1.ebuild 18351 RMD160 d9c2102826919b44bf5a559502f245ac6a731b89 SHA1 f15fb2546e57bddd540947677b20ed0f105188b3 SHA256 aab9e1396604e9d3d10bbafa673e86e62c4fe8aac53f5cf9f100299ec0573df2
-EBUILD libreoffice-9999-r1.ebuild 17659 RMD160 12db205f32142f88dbda61f0e01836d7f324b4cb SHA1 23e4edc72bb53e93ecfdefc640ba3ae4952eb98e SHA256 fccb7c4ecdbe74b30cea431dfea6c6da8b30e4fc86ef931579a0854aae4ddefe
-MISC ChangeLog 25805 RMD160 4ae8ce56c75cb73c244e2935f1b75162424eba7d SHA1 9993de42930de3c6d36b274bc35afd8a6412547a SHA256 82e40f604e13ec7db9f9489d8c2aa0aae07e86bb5e216c38c6dfe18ace9e2301
+EBUILD libreoffice-3.4.9999-r1.ebuild 18349 RMD160 20bed67d768fce33b18b7d2f2aee20aaeeefefa6 SHA1 fff6d1bbd4d83304c4b04e96e02794e24b66a95d SHA256 5b8a1db59f305fcdaaa6eb5736e13396d080b5a8bd9d21465bd81e3e8dcdcbd3
+EBUILD libreoffice-9999-r1.ebuild 17657 RMD160 1b4b1f317892cd804c58c8c939ea554262559891 SHA1 93508d06e46c165e952a03f13986e9d3b6a7d49f SHA256 e486ef7b8a428d1ef67c9f5f1fb96eda632e51e1d3913e283f26a4bfe568ca83
+MISC ChangeLog 25968 RMD160 aa1fc321f000070c117cce121245ae45862b48a8 SHA1 7d3627b0422d1b29c3dc4e353a36014193f927df SHA256 b931bc5a653b11bb90c8ad4d54ebabcae52f3eef8589b82d16c723130f36b643
+MISC libreoffice-3.4.9999-r1.ebuild.orig 18351 RMD160 d9c2102826919b44bf5a559502f245ac6a731b89 SHA1 f15fb2546e57bddd540947677b20ed0f105188b3 SHA256 aab9e1396604e9d3d10bbafa673e86e62c4fe8aac53f5cf9f100299ec0573df2
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOaLYpAAoJEOSiRoyO7jvoK3sP/3KQgEf3SnSibIS69RyQ35Zz
-85kLFxBS6KFmNLeEQWTgVhNbwm8UNkLT7xAjNyXLJEs3qSXh6j5g1svyCH8V338X
-uBC5YXLEMfR4KIXRsHYHeect+mNpY80f9FG01alzZS18Ophtj7GI2QXC4c2q7TGB
-TGBX7F+g10L84Krc5ZmpHCzofJMj8FE4N7iew7la1wfPwUKlwpCmNyXjLQoDKW20
-q8bV9VbcuCoKj3l3Jwi2MwCfREb1uaZvbKrsbhqpwbB2WYCKoqcBjeSu7/AAVFZT
-jGjSya3+yXdY3WFHMvZf8Ku6NMBf03SAFtpUtaMoeYf52/945Ihfmm4XU60QRMqn
-T1300JtKbBzK0ZuQRrZTq/q1fgfK3gc0hlTMW/j9TkpPhWp1UcD9FT47OdGa3QE5
-wUhXZWt210l0s2Cwzvw3xq4qVwM7XBOR3aODUP1LA3jsDmHLUAoClbb2ZdEH6qMy
-rhReop3IDl8eG+knYUdvZiajSOmNq44epGl8JFP00+/muHKbtUQmiIDXkmsW+32D
-boFjHz9LJ41uQnQjhg8FpjTu0GiTXAkk0udenc0C8uFWoSqHGY57ovo/G4XPeq5z
-nPk6KxDzMmbeh5s5wjmuZfHCvkJuN12uDb3kzHBnr2zAyTnQmdK8mo+EjO8UFM40
-ZkQi63a/+3W5HZ6D17Wm
-=MZdl
+iQIcBAEBAgAGBQJOaO3lAAoJEOSiRoyO7jvovz0P/2bRH5KAp6yVKFwgfzA4bQhK
+Wle3gFW7+5anDb0AbV6csxtqDF71CW6HwIA56U1ekIN1ZeUQaiF8KEMfW9Uq5bBf
++ExH4NjEhGUcw6aerozjNxZXKg9l6rxTKH3UdNlsEvVGHD2ebJqkNHkNjZiG1vlS
+fpYSqOdMQp6/oKhAi4df4jsUZraXu09JVc3SM5JWzAamBAwz6TWJ903lPphWQOFJ
+sA9SEB40EB1H/AgPtNBHOLRA+zUwbPQeCvkpPcIihqz/MaQmv9oHFf1vvXdFF+fr
+2VjpWqFJFc0kS1cTu0ZT25wTMKDo7OOwZGkjh+2bOfxIis0rMmgpP2ectCrJEI0p
+uTwEKxOD6XWAWGa9FijDOtI3KAoMv9vlqXyZhoxFfY97RpiFM0TatjU4xUAdXAeY
+OIxJ96ks9UdDCBR+FgjtVeYYtw3XrmgLurBBxF8fQTWei8f3XG+M5jXmLSsqWCBF
+XEElxo4pRqcNt5ezdLu6+1nqoE1PytCxgUZezNcoZSyu6l085UpFkHm71A8MKUFv
+I+I10uRF1U4Wpd9erMQArihejIPejx70OoELq76gUAmVgNjGhnxQKg331T1A0elf
+zZvnqMw2li3c6mIxz1+6IA0LRAly1uOq1h2jalvqN6F7PHJEI4nvIeySVdYwOzIs
+oXTHGgAwBw1d5Zk3vWvs
+=AZdG
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 7a7d3ba4eafe6bff6cdf97bf07ce36b10a243f8e..91c8e0353815a0742622d10adee39da37e86c82f 100644 (file)
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999-r1.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-r1.ebuild,v 1.7 2011/09/08 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.8 2011/09/08 16:31:23 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 bash-completion check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
+inherit base autotools bash-completion-r1 check-reqs eutils java-pkg-opt-2 kde4-base pax-utils prefix python multilib toolchain-funcs flag-o-matic nsplugins versionator ${SCM_ECLASS}
 unset SCM_ECLASS
 
 DESCRIPTION="LibreOffice, a full office productivity suite."
@@ -529,7 +529,7 @@ src_install() {
        make DESTDIR="${D}" distro-pack-install || die
 
        # Fix bash completion placement
-       dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+       newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
        rm -rf "${ED}"/etc/
 
        # symlink the plugin to system location

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index abe8a8afe9bb44ceb9b2c1c0bc2a8e3071ca0fc7..26b6a179158d3f0de89c33b08d1a6d3607d47721 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.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-r1.ebuild,v 1.6 2011/09/08 12:33:26 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.7 2011/09/08 16:31:23 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 bash-completion 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-r1 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."
@@ -519,7 +519,7 @@ src_install() {
        make DESTDIR="${D}" distro-pack-install || die
 
        # Fix bash completion placement
-       dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
+       newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN}
        rm -rf "${ED}"/etc/
 
        # symlink the plugin to system location