summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas K. Hüttel <dilfridge@gentoo.org>2013-12-26 22:06:55 +0000
committerAndreas K. Hüttel <dilfridge@gentoo.org>2013-12-26 22:06:55 +0000
commit34c8865803dd62705e59d843ecacd82a3ce0b757 (patch)
tree70b872b886e9169fd3052f00ea01212feea30911 /app-office/libreoffice
parentImport from dev-zero's overlay. Added small changes. (diff)
downloadgentoo-2-34c8865803dd62705e59d843ecacd82a3ce0b757.tar.gz
gentoo-2-34c8865803dd62705e59d843ecacd82a3ce0b757.tar.bz2
gentoo-2-34c8865803dd62705e59d843ecacd82a3ce0b757.zip
Move pax-mark to src_install, bug 494136
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 84AD142F)
Diffstat (limited to 'app-office/libreoffice')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/libreoffice-4.1.9999.ebuild8
-rw-r--r--app-office/libreoffice/libreoffice-9999-r2.ebuild8
3 files changed, 13 insertions, 9 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 2b854fb574f9..053fa2fe5bcc 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-office/libreoffice
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.529 2013/12/26 19:06:54 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.530 2013/12/26 22:06:55 dilfridge Exp $
+
+ 26 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+ libreoffice-4.1.9999.ebuild, libreoffice-9999-r2.ebuild:
+ Move pax-mark to src_install, bug 494136
26 Dec 2013; Andreas K. Huettel <dilfridge@gentoo.org>
-libreoffice-4.1.2.3.ebuild, -libreoffice-4.1.3.2.ebuild:
diff --git a/app-office/libreoffice/libreoffice-4.1.9999.ebuild b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
index 14f62353a704..29a0e94a8a33 100644
--- a/app-office/libreoffice/libreoffice-4.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-4.1.9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.17 2013/12/07 21:03:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-4.1.9999.ebuild,v 1.18 2013/12/26 22:06:55 dilfridge Exp $
EAPI=5
@@ -560,6 +560,9 @@ src_install() {
# Remove desktop files for support to old installs that can't parse mime
rm -rf "${ED}"/usr/share/mimelnk/
+
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
@@ -570,9 +573,6 @@ pkg_preinst() {
pkg_postinst() {
kde4-base_pkg_postinst
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
use java || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index a7b6243b6765..19ab392fd457 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.202 2013/11/15 14:15:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.203 2013/12/26 22:06:55 dilfridge Exp $
EAPI=5
@@ -562,6 +562,9 @@ src_install() {
# Remove desktop files for support to old installs that can't parse mime
rm -rf "${ED}"/usr/share/mimelnk/
+
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
+ pax-mark -m "${ED}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
}
pkg_preinst() {
@@ -572,9 +575,6 @@ pkg_preinst() {
pkg_postinst() {
kde4-base_pkg_postinst
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
- pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
-
use java || \
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
}