diff options
| -rw-r--r-- | app-office/openoffice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-office/openoffice/openoffice-3.1.1.ebuild | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog index b90bb8a00259..bebba20f555f 100644 --- a/app-office/openoffice/ChangeLog +++ b/app-office/openoffice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-office/openoffice # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.498 2009/11/25 11:43:59 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.499 2009/11/25 12:32:52 suka Exp $ + + 25 Nov 2009; Andreas Proschofsky <suka@gentoo.org> + openoffice-3.1.1.ebuild: + better pax check, see bug #258051 25 Nov 2009; Andreas Proschofsky <suka@gentoo.org> openoffice-3.1.1.ebuild: diff --git a/app-office/openoffice/openoffice-3.1.1.ebuild b/app-office/openoffice/openoffice-3.1.1.ebuild index 7758d14b77af..a733fb8af754 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-2009 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.19 2009/11/25 11:43:59 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-3.1.1.ebuild,v 1.20 2009/11/25 12:32:52 suka Exp $ WANT_AUTOMAKE="1.9" EAPI="2" @@ -395,7 +395,7 @@ pkg_postinst() { fdo-mime_mime_database_update BASH_COMPLETION_NAME=ooffice && bash-completion_pkg_postinst - [[ -x /sbin/chpax ]] && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && chpax -zm /usr/$(get_libdir)/openoffice/program/soffice.bin + ( [[ -x /sbin/chpax ]] || [[ -x /sbin/paxctl ]] ) && [[ -e /usr/$(get_libdir)/openoffice/program/soffice.bin ]] && scanelf -Xzm /usr/$(get_libdir)/openoffice/program/soffice.bin # Add available & useful jars to openoffice classpath use java && /usr/$(get_libdir)/openoffice/${BASIS}/program/java-set-classpath $(java-config --classpath=jdbc-mysql 2>/dev/null) >/dev/null |