From bca9630982960e2e8190dcefc157cf7063102e7a Mon Sep 17 00:00:00 2001 From: Jeremy Olexa Date: Wed, 7 Apr 2010 04:22:12 +0000 Subject: [PATCH] Due to portage's environment filtering, variables that start with BASH_ cannot be used. As such, s/BASH_COMPLETION_NAME/BASHCOMPLETION_NAME/g for bug 312671 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- app-office/openoffice/ChangeLog | 8 +++++++- app-office/openoffice/Manifest | 16 +++------------- app-office/openoffice/openoffice-3.1.1.ebuild | 4 ++-- app-office/openoffice/openoffice-3.2.0.ebuild | 4 ++-- 4 files changed, 14 insertions(+), 18 deletions(-) diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index 9d9e31153787..a9d24fd52cc2 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.524 2010/03/30 08:35:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.525 2010/04/07 04:22:12 darkside Exp $ + + 07 Apr 2010; Jeremy Olexa openoffice-3.1.1.ebuild, + openoffice-3.2.0.ebuild: + Due to portage's environment filtering, variables that start with BASH_ + cannot be used. As such, s/BASH_COMPLETION_NAME/BASHCOMPLETION_NAME/g for + bug 312671 30 Mar 2010; Pacho Ramos openoffice-3.2.0.ebuild: stable x86, security bug 305195 diff --git a/app-office/openoffice/Manifest b/app-office/openoffice/Manifest index f0c71ca31941..333c309a3525 100644 --- a/app-office/openoffice/Manifest +++ b/app-office/openoffice/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX Gentoo_ODK_install.patch 868 RMD160 62a69900ce2e0250b35277d36b84a2bd8913c88d SHA1 58ebb2cb06e03a2db56e798769e3f2d9b95dd823 SHA256 9ca280d88594658c214b21075e1a0f504106b29afe1b9b68915ca4c93b4fd1c2 AUX base64.diff 770 RMD160 acea95d2f4ac09ef6252eb9a0e22405858574d51 SHA1 4097bc9406ba568ef2dfe7d8a8bfd43ed153d44d SHA256 fd298c97fd28e765138a18d570a99613df3fa25076fa5d6243e86f9cbb750a03 AUX boost-undefined-references.diff 409 RMD160 0a2ef66416f3b5f27f5acef23da21e77c619d81b SHA1 bdceb87ef22cb795836dd53d5946e4f7e26cd35a SHA256 f280a5bfe4206465cb00ebd97abbb3dff42136b6d4e59265f42153c22bf5fa07 @@ -53,14 +50,7 @@ DIST ooo310-m19-writer.tar.bz2 9021103 RMD160 47d18795af5e643d4f9eb323b27458ad1f DIST ooo_oxygen_images-2009-06-17.tar.gz 14296938 RMD160 355b7d43aff12578fc0af6ca6030301577477857 SHA1 c3dd261bfe366ac514a019b0fa829369b833c0c7 SHA256 3fcc0eb394ddfc43111ac27f35a7d966d4f775b0b46d6853c9b2b2612a940f4a DIST scsolver.2008-10-30.tar.bz2 230572 RMD160 2176fd8207cce2e2db56c888849e766eedfb1a63 SHA1 7ad9c3396c3b1b9ac63274eb53818ba2d0a9f70c SHA256 865ac491bfbc7d4cc66b51fff78f3962a0a91efba1a8b5cc0bf5cf36be60e193 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -EBUILD openoffice-3.1.1.ebuild 13586 RMD160 f09fb2f1ae5b2692758bd148a0bd1ecaa9c261b7 SHA1 d60f323041fb5e6a46fa383f5d3325fd5ab448be SHA256 216a9487563b78614d57e6464cc3d493357d5b6bf34f23d84255611e6859f39c -EBUILD openoffice-3.2.0.ebuild 13376 RMD160 66014fa82e74a42ba584440ccae5529b7fdddbe4 SHA1 b2a87ddfbdb3eda6009bc036f14787e3948808e9 SHA256 49098b0586d83b40f3a86ad84c05bacf5018e8b696ba56f10733718fadbf1b13 -MISC ChangeLog 107675 RMD160 592ca0611f026412acca587d04e54b48433fff3d SHA1 5fe7987c9388c904992061f010af0db2fa1bb796 SHA256 83a2f5a710ea66e14198681497378e2083e6325f44cd219ffd1612856a39c66a +EBUILD openoffice-3.1.1.ebuild 13584 RMD160 15969f5a766e81e3f58b329020cca83364cb1ba1 SHA1 c7e6f89929daf55a52828578f4b731a087c071e4 SHA256 ca222631f0b5510e4940415221afd60ce1f733936837fee297dfa1f993f3b7ef +EBUILD openoffice-3.2.0.ebuild 13378 RMD160 3ac0b7c93fff03a4af5eb9f81a5b2adc819f6a0f SHA1 8516b2aa0696112004e1a1059649cde1bd9b3b14 SHA256 969ea3103f2c800a915c2024581f8c84205a12e3d6da20de79a6ada9be82ccbc +MISC ChangeLog 107944 RMD160 7f6034e5cbbbc90c3e28795db8742d3ff33f8e47 SHA1 21e6613cc618b28fbaf0cceaedc41dde0ac115d2 SHA256 20def298e4110367ae2f9a09971bc16bc6775bb61d857aa5eef4b7db1637eefe MISC metadata.xml 704 RMD160 c65911c6a5496c96e51d40848179c3321fb5fafd SHA1 25c8229286d330cdf48dbca4847594359a35820f SHA256 c60a22487a895dd589228b2bd964c2481067bbdabd4d91c49bb38927482abd78 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.14 (GNU/Linux) - -iEYEARECAAYFAkuxt/YACgkQCaWpQKGI+9Sx7wCfewDYIMdvhtmGo7CHBBWEjNtm -wl4An38RyQJOvL4AAwwSMO4n3uKq6e+B -=BV8X ------END PGP SIGNATURE----- diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild index c178567862b3..eb07a8761d6d 100644 --- a/app-office/openoffice/openoffice-3.1.1.ebuild +++ b/app-office/openoffice/openoffice-3.1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.27 2010/02/10 21:10:36 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.28 2010/04/07 04:22:12 darkside Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -398,7 +398,7 @@ pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update - BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst + BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin diff --git a/app-office/openoffice/openoffice-3.2.0.ebuild b/app-office/openoffice/openoffice-3.2.0.ebuild index b236166dc3cd..28ade77d546f 100644 --- a/app-office/openoffice/openoffice-3.2.0.ebuild +++ b/app-office/openoffice/openoffice-3.2.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.18 2010/03/30 08:35:54 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.2.0.ebuild,v 1.19 2010/04/07 04:22:12 darkside Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -379,7 +379,7 @@ pkg_postinst() { fdo-mime_desktop_database_update fdo-mime_mime_database_update - BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst + BASHCOMPLETION_NAME=ooffice && bash-completion_pkg_postinst ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin -- 2.26.2