Some more prefix fixes

(Portage version: 2.1.9.35/cvs/Linux x86_64)

4 files changed, 18 insertions, 9 deletions

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index 43d6be2cee66..713b15366d66 100644
--- a/app-office/libreoffice-bin/ChangeLog
+++ b/app-office/libreoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/libreoffice-bin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.6 2011/02/05 09:11:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.7 2011/02/05 11:07:55 suka Exp $
+
+  05 Feb 2011; Andreas Proschofsky <suka@gentoo.org> files/50-libreoffice-bin,
+  libreoffice-bin-3.3.0.ebuild, files/wrapper.in:
+  Some more prefix fixes
 
   05 Feb 2011; Andreas Proschofsky <suka@gentoo.org>
   libreoffice-bin-3.3.0.ebuild:
diff --git a/app-office/libreoffice-bin/files/50-libreoffice-bin b/app-office/libreoffice-bin/files/50-libreoffice-bin
index 69ca57c4f953..1c30771209a1 100644
--- a/app-office/libreoffice-bin/files/50-libreoffice-bin
+++ b/app-office/libreoffice-bin/files/50-libreoffice-bin
@@ -1 +1,3 @@
-SEARCH_DIRS_MASK="/usr/lib/libreoffice /usr/lib32/libreoffice /usr/lib64/libreoffice"
+SEARCH_DIRS_MASK="@GENTOO_PORTAGE_EPREFIX@/usr/lib/libreoffice
+@GENTOO_PORTAGE_EPREFIX@/usr/lib32/libreoffice
+@GENTOO_PORTAGE_EPREFIX@/usr/lib64/libreoffice"
diff --git a/app-office/libreoffice-bin/files/wrapper.in b/app-office/libreoffice-bin/files/wrapper.in
index d73e3ac79371..1a50a5414eb9 100644
--- a/app-office/libreoffice-bin/files/wrapper.in
+++ b/app-office/libreoffice-bin/files/wrapper.in
@@ -1,4 +1,4 @@
 #!/bin/sh
 export OOO_EXTRA_ARG=''
 unset PYTHONPATH
-/usr/LIBDIR/libreoffice/program/soffice  "$@"
+@GENTOO_PORTAGE_EPREFIX@/usr/LIBDIR/libreoffice/program/soffice  "$@"
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild
index 21e64c13117a..41e7c767116b 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild,v 1.4 2011/02/05 09:11:16 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.3.0.ebuild,v 1.5 2011/02/05 11:07:55 suka Exp $
 
 EAPI="3"
 
-inherit eutils fdo-mime gnome2-utils pax-utils rpm multilib
+inherit eutils fdo-mime gnome2-utils pax-utils prefix rpm multilib
 
 IUSE="gnome java kde offlinehelp"
 
@@ -47,13 +47,13 @@ HOMEPAGE="http://www.documentfoundation.org"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="!app-office/libreoffice
 	!app-office/openoffice
 	!app-office/openoffice-bin
 	x11-libs/libXaw
-	sys-libs/glibc
+	!prefix? ( sys-libs/glibc )
 	>=dev-lang/perl-5.0
 	app-arch/zip
 	app-arch/unzip
@@ -83,6 +83,9 @@ src_unpack() {
 
 	unpack ${A}
 
+	cp "${FILESDIR}"/{50-libreoffice-bin,wrapper.in} "${T}"
+	eprefixify "${T}"/{50-libreoffice-bin,wrapper.in}
+
 	for i in base binfilter calc core01 core02 core03 core04 core05 core06 \
 		core07 draw graphicfilter images impress math ogltrans ooofonts \
 		ooolinguistic pyuno testtool writer xsltfilter ; do
@@ -161,7 +164,7 @@ src_install () {
 	doins -r "${WORKDIR}"/usr/share/mime
 
 	# Install wrapper script
-	newbin "${FILESDIR}/wrapper.in" libreoffice
+	newbin "${T}/wrapper.in" libreoffice
 	sed -i -e s/LIBDIR/$(get_libdir)/g "${ED}/usr/bin/libreoffice" || die
 
 	# Component symlinks
@@ -180,7 +183,7 @@ src_install () {
 	use !java && rm -f "${ED}${INSTDIR}/ure/bin/javaldx"
 
 	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins "${FILESDIR}/50-libreoffice-bin"
+	insinto /etc/revdep-rebuild && doins "${T}/50-libreoffice-bin"
 
 }