Some more prefix fixes

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

5 files changed, 22 insertions, 13 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/Manifest b/app-office/libreoffice-bin/Manifest
index 0a02d103a174..112f6947f782 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,5 +1,5 @@
-AUX 50-libreoffice-bin 86 RMD160 835b41f20a3d0811496f9ab4763c5e760633cadf SHA1 da494baafc636a6d765b4f4a4870698c950e19f2 SHA256 5200756440b63166df1664d6329b457285b9ec2d97c58db552de302ebf3794c2
-AUX wrapper.in 97 RMD160 ae3313d030dd84e746b4e9c13e94b6597ceddf22 SHA1 f7b7b9a9cee816e5a1a5d9a624b80098135fc236 SHA256 38ac317f7803d56dbd991fa92a99edd8a1615dcdff26ad1449f6029e8b6b8a04
+AUX 50-libreoffice-bin 158 RMD160 2087dd09f0fb7549f6ecdb0b128558b4f5f74a51 SHA1 4d3560da3c8ca0eef8d9ff9c968d49d49c7cadc7 SHA256 6c6cebcce51b639545a42c0b9cc6268f0ce1e8bb9d7d22bb11e5ebd1448638e9
+AUX wrapper.in 121 RMD160 844912d256e5e5b99e3e7dc7aaa8ed87aa64c29a SHA1 53817a456c83a1543f851ae16e05b4cd6a2be07f SHA256 ae37f02db372b7b26796732a453fbe3b9afe4692ca1591f8e5ad30be71d09980
 DIST LibO_3.3.0_Linux_x86-64_helppack-rpm_af.tar.gz 9178287 RMD160 ba102fad70a01e0d4fe6277c6842ff6e997478d8 SHA1 394fb3f1a7e70e928da9bd9dfebe9fef5fe95813 SHA256 87c70eaca136f0ff0ab050c6f19bbda0afa704fe9878f94ed500208ecac69a55
 DIST LibO_3.3.0_Linux_x86-64_helppack-rpm_ar.tar.gz 9177892 RMD160 45bffe99953bb7354462f469fb6ed07be4c1716a SHA1 4c3dc03ac6df941017247d8cbec3a000cef566f3 SHA256 e5fae2f356b1b8ebd4da5e392494791a476cb29561024c625cfa9795fe1f479a
 DIST LibO_3.3.0_Linux_x86-64_helppack-rpm_as.tar.gz 9181054 RMD160 9651216f36ae65e2a7ea97ec2f1c29e95d6dc6a6 SHA1 b14f2a68eeccff791abd7d32370f2b2d2782f701 SHA256 432f9b6c713020cd002aa80f4b4bdf451c689039166740384560b9cc6ba7e4ed
@@ -440,6 +440,6 @@ DIST LibO_3.3.0_Linux_x86_langpack-rpm_xh.tar.gz 8409332 RMD160 ef621f4a67ddae08
 DIST LibO_3.3.0_Linux_x86_langpack-rpm_zh-CN.tar.gz 1980273 RMD160 eb75c2f55e0b75346242ef61ffbdcbd27bab7e0c SHA1 f3dd3fb28e99dca9fd6cb289ac478be4d9f7e2b1 SHA256 9dee2b712e8bdd7e4d620cd859e8230acf2ff2e7608c332f6adef6aa8ba9108f
 DIST LibO_3.3.0_Linux_x86_langpack-rpm_zh-TW.tar.gz 1970628 RMD160 1f0b3142608e7dfe635ae9353557890925c21c0e SHA1 ceeaaf0831368b01b1a8a1230173d3d4ec3093a3 SHA256 fbcd0daee08b16a654bfa8f63742743a6111d41859fad7d8f96802bda12020e7
 DIST LibO_3.3.0_Linux_x86_langpack-rpm_zu.tar.gz 1909565 RMD160 6eb9a0b09761bdea237bbcb4bc265813248a2242 SHA1 0ed7713cc8a439f0b3ac93eb76cf195d2cac93c4 SHA256 ccc106c1c46371fcb7c63afd1389687b08d45b25fb3c09a415a146ae2ba0c9bc
-EBUILD libreoffice-bin-3.3.0.ebuild 7029 RMD160 556692e26eff28c11e53c7f1789561af5ea6c942 SHA1 aaddada95fc9e1f2c4e373a5617ad5613aabc7c0 SHA256 ea289a76867658de9f2b2e869541e9c3688029acd7d09c46db97ec80f02ffc5b
-MISC ChangeLog 1430 RMD160 317297642d4fac076b16409e2c685684f8df468b SHA1 db5c9e1aec9eb7f92191a3e71f06259e01bf1569 SHA256 6c51edecdd78ac598984284ed91d6de168c51382e5c121140f7ea4854824099f
+EBUILD libreoffice-bin-3.3.0.ebuild 7168 RMD160 acc0e4996e4c9724579ae7c24aa02687c2892b96 SHA1 fc3d0650d98d7473b7cd932593da3baa5da6352b SHA256 7605bf8843d80ec3d4c4d028585f9d1919dd393469fb81d2b44ef970dc2424f1
+MISC ChangeLog 1585 RMD160 bc0e2c6f15badaa0ee26aaa0f32e1967f5f3aae3 SHA1 5dd45002a55bbd05c646d9799f25bee3ebd1dd6c SHA256 4de2f03928879377161f69a1b717a511d86df2795c6fb3e02d06559a39cfd6af
 MISC metadata.xml 470 RMD160 252033a0fe2dea9ea521587808f2403870f961c0 SHA1 8dd15d8cb9fa113656a5f77de79d9fbee5fe58ed SHA256 d455809468711d16b0a1401b67b676876f5f7b6cc59affbc63c0a889a4ba103e
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"
 
 }