Added -f to rm in src_install to fix installation as non root on prefix

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

4 files changed, 25 insertions, 11 deletions

diff --git a/app-office/libreoffice-bin/ChangeLog b/app-office/libreoffice-bin/ChangeLog
index f743028f407b..6d790ad65a0b 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.30 2011/08/31 11:56:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/ChangeLog,v 1.31 2011/09/01 19:17:06 jlec Exp $
+
+  01 Sep 2011; Justin Lecher <jlec@gentoo.org> libreoffice-bin-3.4.3.ebuild,
+  metadata.xml:
+  Added -f to rm in src_install to fix installation as non root on prefix
 
 *libreoffice-bin-3.4.3 (31 Aug 2011)
 
diff --git a/app-office/libreoffice-bin/Manifest b/app-office/libreoffice-bin/Manifest
index 9b4b8fb975d8..76be364ff2b4 100644
--- a/app-office/libreoffice-bin/Manifest
+++ b/app-office/libreoffice-bin/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 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.4_Linux_x86-64_helppack-rpm_af.tar.gz 9047890 RMD160 88afdc7fb727c5deeaade76c52463da52fc17b84 SHA1 15beaa393baf5339f76709c54ed9d72d3a0be55f SHA256 cd28c38da2010beba3d4f63fa2ff3d22c138346aa9e351e66eb69ac17bc72c74
@@ -735,6 +738,13 @@ DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-CN.tar.gz 1772291 RMD160 19218e0cf581a
 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zh-TW.tar.gz 1764731 RMD160 33de70443758e3cc38d62c254ea1bc98574f2bfc SHA1 d813ab13c16fba69e549b143d6948f08b1c0d62c SHA256 e1dcba904952b3feef0b9c3957960c49cb6d720b1d135becac1ddc71e67344a6
 DIST LibO_3.4.3_Linux_x86_langpack-rpm_zu.tar.gz 1721114 RMD160 058a2e21902ab9312464c9976ed6fa1edb341afe SHA1 0875fd47bb40fb0875c5c492cedcca60917dcee3 SHA256 5f866e2061b9dabee78a81fe9743b539e25a725d17312a66eecfd0139eab4a65
 EBUILD libreoffice-bin-3.3.4.ebuild 6892 RMD160 405a9a3639d538a6c241e41398a7274c24f40ba7 SHA1 ac9d08a0943b7e1b1f0f7004288f628d4b6f4073 SHA256 16fbae2d18290e8ae6c16dbab6c1ddd261c81f239c7420db6d44a853d50ba0e3
-EBUILD libreoffice-bin-3.4.3.ebuild 7109 RMD160 5c3e659be3625447fb4883c65bd28d260f6fcca3 SHA1 d14ac63aecc4ba36deea188aa95b8d408a91bb31 SHA256 f56d13e610cc86599addc6cf0e7a537d15b94adcf564656ec1883c57df526f93
-MISC ChangeLog 5506 RMD160 4014be404bdde782bff47c8daa78809b649f3fd6 SHA1 c20ec5c6e74ebf5eb2f80be41076466842e24ef1 SHA256 5baaa6627138eeaa34318c6dd69e9a6a6e2b50545cc22d276029cae6c4c362d8
-MISC metadata.xml 470 RMD160 252033a0fe2dea9ea521587808f2403870f961c0 SHA1 8dd15d8cb9fa113656a5f77de79d9fbee5fe58ed SHA256 d455809468711d16b0a1401b67b676876f5f7b6cc59affbc63c0a889a4ba103e
+EBUILD libreoffice-bin-3.4.3.ebuild 7112 RMD160 8d3a2e41cbe65ffdf4e5884beb50c947696970f8 SHA1 b115c1e23d0653c3d020a8b5d37b25c2fa3f3f02 SHA256 62cfc6b06d87fde2e395464af7b86089c46143808f6d7109cb22b9a009b2fe08
+MISC ChangeLog 5674 RMD160 ae53d594581d0dbfb1fdeb5aa29fcd0a4574dea8 SHA1 da92f1a3b995060001e05aa86fc4ad311c562b24 SHA256 fca90db7eaf57c45e2383792dbb6446ec8431149eab3c3a7f58165801a76daad
+MISC metadata.xml 474 RMD160 7104bf15d70449529df6259b71620443392a14e9 SHA1 a4055e99444213fea16f282b2fa7c25ec0b21be6 SHA256 b92b55b2aec0028aaac8afdb01f4b9ea416c8e00a2207dd8d0db317e4fad48b8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iEYEAREKAAYFAk5f2j4ACgkQgAnW8HDreRYgdACcCwoKoRthqj6lz3hV4PcA5iGc
+zMAAoJt1e9TZJbY+Fvo08pWYuf8kDGjb
+=E6A9
+-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.ebuild b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.ebuild
index 0bb0a51cd084..d3f8cd06dcf7 100644
--- a/app-office/libreoffice-bin/libreoffice-bin-3.4.3.ebuild
+++ b/app-office/libreoffice-bin/libreoffice-bin-3.4.3.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-bin/libreoffice-bin-3.4.3.ebuild,v 1.1 2011/08/31 11:56:52 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-3.4.3.ebuild,v 1.2 2011/09/01 19:17:06 jlec Exp $
 
 EAPI="3"
 
@@ -161,7 +161,7 @@ src_install () {
 	cd "${ED}${INSTDIR}/share/xdg/"
 	for desk in base calc draw impress javafilter math printeradmin qstart startcenter writer; do
 		if [ "${desk}" = "javafilter" ] ; then
-			use java || { rm javafilter.desktop; continue; }
+			use java || { rm -f javafilter.desktop; continue; }
 		fi
 		mv ${desk}.desktop ${NM1}-${desk}.desktop
 		sed -i -e s/${NM2}/${NM}/g ${NM1}-${desk}.desktop || die
diff --git a/app-office/libreoffice-bin/metadata.xml b/app-office/libreoffice-bin/metadata.xml
index 695ed551e4fb..f06286a91783 100644
--- a/app-office/libreoffice-bin/metadata.xml
+++ b/app-office/libreoffice-bin/metadata.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>openoffice</herd>
-<longdescription>LibreOffice is a free office suite.
+	<herd>openoffice</herd>
+	<longdescription>LibreOffice is a free office suite.
 This is the binary version of Libreoffice. Use this if you don't want to wait for the source version to build.</longdescription>
-<use>
-  <flag name='offlinehelp'>Download and install help files locally instead of using the LibreOffice Wiki</flag>
-</use>
+	<use>
+		<flag name="offlinehelp">Download and install help files locally instead of using the LibreOffice Wiki</flag>
+	</use>
 </pkgmetadata>