diff options
| author |   Andreas Proschofsky <suka@gentoo.org> | 2011-01-25 22:22:07 +0000 |
|---|---|---|
| committer | Andreas Proschofsky <suka@gentoo.org> | 2011-01-25 22:22:07 +0000 |
| commit | 18d9eeaa62968d456fdd0099c6ebd18c6678c149 (patch) | |
| tree | 6e795ff9548420d0d5dcbfb8586bb6c6c7739475 /app-office/libreoffice | |
| parent | Stable on amd64 wrt bug #352599 (diff) | |
| download | gentoo-2-18d9eeaa62968d456fdd0099c6ebd18c6678c149.tar.gz gentoo-2-18d9eeaa62968d456fdd0099c6ebd18c6678c149.tar.bz2 gentoo-2-18d9eeaa62968d456fdd0099c6ebd18c6678c149.zip | |
Fix jpeg-dep and some ebuild cleanups
(Portage version: 2.1.9.35/cvs/Linux x86_64)
Diffstat (limited to 'app-office/libreoffice')
| -rw-r--r-- | app-office/libreoffice/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/libreoffice/libreoffice-3.3.0.ebuild | 14 |
2 files changed, 11 insertions, 8 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog index a52132884fee..59b652e105ce 100644 --- a/app-office/libreoffice/ChangeLog +++ b/app-office/libreoffice/ChangeLog @@ -1,6 +1,9 @@ # 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.6 2011/01/25 12:35:53 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.7 2011/01/25 22:22:07 suka Exp $ + + 25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild: + Fix jpeg-dep and some ebuild cleanups 25 Jan 2011; Andreas Proschofsky <suka@gentoo.org> libreoffice-3.3.0.ebuild: Ooops, another little fix for bash-completion diff --git a/app-office/libreoffice/libreoffice-3.3.0.ebuild b/app-office/libreoffice/libreoffice-3.3.0.ebuild index fb999bfa051e..982508d484ca 100644 --- a/app-office/libreoffice/libreoffice-3.3.0.ebuild +++ b/app-office/libreoffice/libreoffice-3.3.0.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.3.0.ebuild,v 1.3 2011/01/25 12:35:53 suka Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.0.ebuild,v 1.4 2011/01/25 22:22:07 suka Exp $ EAPI="3" @@ -152,7 +152,7 @@ COMMON_DEPEND="!app-office/libreoffice-bin >=media-libs/fontconfig-2.3.0 cups? ( net-print/cups ) dev-libs/redland[ssl] - media-libs/jpeg + virtual/jpeg media-libs/libpng app-arch/zip app-arch/unzip @@ -414,18 +414,18 @@ src_install() { make DESTDIR="${D}" install || die "Installation failed!" # Fix the permissions for security reasons - chown -RP root:0 "${D}" + chown -RP root:0 "${ED}" # record java libraries if use java; then - java-pkg_regjar "${D}"/usr/$(get_libdir)/${PN}/${BASIS}/program/classes/*.jar - java-pkg_regjar "${D}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar + java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/${BASIS}/program/classes/*.jar + java-pkg_regjar "${ED}"/usr/$(get_libdir)/${PN}/ure/share/java/*.jar fi # Upstream places the bash-completion module in /etc. Gentoo places them in # /usr/share/bash-completion. bug 226061 - dobashcompletion "${D}"/etc/bash_completion.d/libreoffice.sh libreoffice - rm -rf "${D}"/etc/bash_completion.d/ || die "rm failed" + dobashcompletion "${ED}"/etc/bash_completion.d/libreoffice.sh libreoffice + rm -rf "${ED}"/etc/bash_completion.d/ || die "rm failed" } |