Run only build when compiling, and exclude it on install.

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

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 60cbdfd765c6063b5580c5906e110ff80f2c543c..8fc6184c67d39cf0d4359308cd867c34d1ec5404 100644 (file)
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,10 @@
 # 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.141 2011/09/18 09:45:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.142 2011/09/20 16:01:14 scarabeus Exp $
+
+  20 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-9999-r1.ebuild:
+  Run only build when compiling, and exclude it on install.
 
   18 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-9999-r1.ebuild:

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index ea38e75f94cf1d9f56afc016f216c71695ffddb2..9637cd1a93b925048a4fae296c1deff1f208773c 100644 (file)
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -173,23 +173,23 @@ EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c0
 EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18350 RMD160 54bbfb6be956667016eefe1dad15737cc44e1deb SHA1 59dafcc4461a5c8571f814b41843950420b54fdc SHA256 8f883984653e50045ec2404ce4286950bafd82cf31e97347edc38a61e1fe2b4d
 EBUILD libreoffice-3.4.9999-r1.ebuild 18444 RMD160 6209f79b7aee2ef034810b62a30d80a6c573e683 SHA1 76cd9106979325bbc55127c9a37d83514f179a11 SHA256 578c8666330d5e81c00f11127f6c671e780addb01ac8052dcf508388b691c8fb
-EBUILD libreoffice-9999-r1.ebuild 16989 RMD160 42c0e0e3a40b3d82d3a60ef8ef8c3206b480a716 SHA1 1baddc650ebe724aa163bf5512bf60ea88d88410 SHA256 9e11f4b523b9f16583606c94a00f7a99f936cdafa21d01fa3655a8632477c79c
-MISC ChangeLog 27338 RMD160 61320f45f3db106f89a81d1129da8e34d0af4fc2 SHA1 50f20b9dfaa94464daa5314c11a7bd216e61cd8d SHA256 233e6cb3f43a67b914f0bf00db099ddc07c7198ade441e8831513571aa47907a
+EBUILD libreoffice-9999-r1.ebuild 17004 RMD160 b23a7b8de4b344b014f9adf6b7502d2e64a42167 SHA1 d3fcfaba40b6881a3f7a0641191d080a8bfac55d SHA256 6e09cfa269f1fc8c4e4195e5d085cd9e8e5bf9e5cdc4599a4584626d391693f9
+MISC ChangeLog 27484 RMD160 af0f26ce466bda262142ff1ed42b3f279c9170de SHA1 5775990960ca3b8e2d95532e3cc6b76b60918c17 SHA256 b4fd1777b6a77e82e7174aadec11b263e2008997ece0b20d5f53f6d760b2e2bb
 MISC metadata.xml 1060 RMD160 d45f264670abdfa12c42935b489af5f462f70189 SHA1 d3932fab9bb5ab0bc404a95c60fa6a03f08044bd SHA256 f7a39bf4b3077ec5bada9e35940d1a02dcf9a62b77a56cc6346f750528a1e092
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJOdb2LAAoJEOSiRoyO7jvojKgP/R5KCK6vHOvFPRAUecMbb5Yp
-f2oyDPyGtjZDlMW5f9sqK4/D+3ds4zghB7jVmgUkvZD4uPCqkcg190nQVDQJiWrY
-ZiPMUiOW4RzgNoR+xW4CgTbfycnsyKLJRIItfGmiJZJTOv1n3SEiyrq/VxdKQp0Y
-Oq43+nyrQAT8q+OcL+oaIvbHgT7+N+rnv5RCV+OqxRHyyLmwmMxga+JoCmyrLii1
-TKuQidpCX6dZzuxaD/gK9FJVqK/birgg4vm1Y8oo+6p0L1wsAjYkov7giOgBLDK2
-pQ+8EKD8QZmRSq4krsmrpQNoBJGTZ1YHZh2lTxNN4Udnw0Cy1LfHx+xM8suOWGGx
-GPtq5UXy8qAoGd87p19610BuXQXTQF7TyLhdYXS/GRYAJnGdqSsdOe0bwxV6AU/M
-vVxbzJx78drS8sD/L5m0N7nD3zoan6gQhetttb03lKQKo5XJp6QOzE6UXb02d24U
-7QN0Ky+Z4qWZoGHR/lyGabAOcyZqjr8QyQGztRK/ILbDjcDR6TjTL/FmYbhhh0/L
-WfvjeOyWVTdPNBo1rhNaY/Cecd0nqgANd735EIFzr7IkKdHCcG7R6kyXWNhC5W9x
-nc9IXIDas0Tvc8Y5hJxxYhwmDQYbOll1hpfdfAwYROtTbNzWamZC8mnyzxzhQ4cE
-qVudb3gu3aidtbQWAPov
-=ncyS
+iQIcBAEBAgAGBQJOeLiyAAoJEOSiRoyO7jvozdkQAJh/3xcN9Tty4V8nJYYKH5DN
+AYPyb5mS61erOT8ocdxJ0tzRUrgTfMtKqmI/mBA1iHLg01rdTw2xQpTbILSgGM80
+o4N/5TIjW92PHv8t6H1diwhl9dnMmKqjT4MPGW3uOkG7ZfFRYmzgN/YSdn1H4bBs
+9szXtIpoFQg50TuOUIYWt3JZSFlHKkenR9/goGPpYr7wvQLouhP5VJpYV7RLfDWQ
+NpmmBy+VI8vHkspFHsBIB11Jk841IaOlnUl/sUeC1i83MhzUmMFo9nfYKhjTSiyd
+tn3tRtOS9uv1ybVbYGBMDd4j9eHYbbMXtUbgVBkT0sakzNxOJrSUDLahPMZK2BAb
+8bUO2g3cvPgnceJjvfHdPGGYjIcfldxWcjr7Bl2EKwSBiLHYSFoIrMwZ1+XuY0Mo
+MA2Xyg0VO5u3UiSVznTiuNwzJvNv3CcV94iuzBF/av6o93HpOmHaCdai91LjO094
+xb5folXd2YiZA9Bw/hrEMxw6dxuG9h87LNcn0dvEU+b1SOnKysFUezUZ5JWgD6IY
+eMdxAwvOqa4R0qV3dc/CHYQB0zE26xm8oVnY+iOf0PtFufYli+xyQpe+Ly6tSszn
+B/0wZ6M64mBftNr735yaCoCcCluKTaAcafM9wldt4n0WBnhQ9k/rqBJlMOk1RJOE
+7B++sOhHd6pnUTxy0fkG
+=GJk9
 -----END PGP SIGNATURE-----

diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index 38eb48f96c55e928b50010309135105f67f9b716..4b60ce146dbbbbe5224dceb8e0bce0a78ba23485 100644 (file)
--- a/app-office/libreoffice/libreoffice-9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r1.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-9999-r1.ebuild,v 1.17 2011/09/18 09:45:10 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.18 2011/09/20 16:01:14 scarabeus Exp $
 
 EAPI=3
 
@@ -486,12 +486,12 @@ src_configure() {
 
 src_compile() {
        # this is not a proper make script and the jobs are passed during configure
-       make || die
+       make build || die
 }
 
 src_install() {
        # This is not Makefile so no buildserver
-       make DESTDIR="${D}" distro-pack-install || die
+       make DESTDIR="${D}" distro-pack-install -o build || die
 
        # Fix bash completion placement
        newbashcomp "${ED}"/etc/bash_completion.d/libreoffice.sh ${PN} || die