summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2011-07-28 14:22:21 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2011-07-28 14:22:21 +0000
commit49537fe05fb37290f5908c7762fbbaabf907fd27 (patch)
treef8894e9ae5bdfb07f47136584d7f16f2f21d7227 /app-office
parentwhitespace (diff)
downloadhistorical-49537fe05fb37290f5908c7762fbbaabf907fd27.tar.gz
historical-49537fe05fb37290f5908c7762fbbaabf907fd27.tar.bz2
historical-49537fe05fb37290f5908c7762fbbaabf907fd27.zip
Respect the jobs more by not running emake in compile phase
Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64
Diffstat (limited to 'app-office')
-rw-r--r--app-office/libreoffice/ChangeLog6
-rw-r--r--app-office/libreoffice/Manifest14
-rw-r--r--app-office/libreoffice/libreoffice-3.4.2.3.ebuild5
3 files changed, 20 insertions, 5 deletions
diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index dc5ef9713a66..dc0d62c52d27 100644
--- 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.71 2011/07/28 10:43:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.72 2011/07/28 14:22:21 scarabeus Exp $
+
+ 28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+ libreoffice-3.4.2.3.ebuild:
+ Respect the jobs more by not running emake in compile phase
28 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org>
libreoffice-3.4.2.3.ebuild:
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 990208100ef6..3c70dca652aa 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
AUX enable-startup-notification.diff 6377 RMD160 6a5cc928ea3da3fb1428d0e0bbd2d4635c1da8ec SHA1 413f54a589f910e5e2401dec0025617028fdc361 SHA256 da334268ba47e5b25c72063ececbb0619f2033eab7bfafbd58e981c361b72f3a
AUX env_log.diff 617 RMD160 480edf4962e8d55f82a4103297c3cc10a1bd4f3e SHA1 b655566079c408e72f1046262fe269ba8bf66040 SHA256 efb99da32fcc2029418b4c4c080ccc97cb622fcc24a6a6dd69d8cc5508c54bf1
AUX fix-ooo-collision.diff 1253 RMD160 6ad0355c7530d5fe490ea377ed10e047926f2ff7 SHA1 41a3a26973f95531cf76a673eb7b7bab5c50de91 SHA256 991f311611f812699c8d39df85d64d9041d6033ddd73d4aed10ba019406733e4
@@ -162,6 +165,13 @@ DIST libreoffice-writer-3.4.2.3.tar.bz2 7294695 RMD160 2a7210c518376d9fe5c6e8a50
DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
EBUILD libreoffice-3.3.1.ebuild 18572 RMD160 d92d1933c8bbde7d28425b11717614cf6cf7b1e0 SHA1 60ef1f62c341ce7997de7ff5bcef04b304f4dfd9 SHA256 a3fae0a7f7da4a92e67d9c86ba4e7f92a92bbfac8f40a2703c64f317b670da6b
EBUILD libreoffice-3.3.3.ebuild 18134 RMD160 95cf52bf10765cd9bb7862c673dc57a96bcca376 SHA1 4a001ff974125839ad5219915bb2f8399e6f90f8 SHA256 a60d52f57767ac5e9f46ad5204dd27b4f4a45ac1468357c41462b502d37b8626
-EBUILD libreoffice-3.4.2.3.ebuild 18308 RMD160 899b7c436202edfdfdeaa0a33b83f5e7b1f3849a SHA1 5f37fdcb93f554a9293d47496ece10e8d5c793a7 SHA256 b5784441ff301083dd9b6c97946471243483c66494dc8e500a4c3352d2a58ff7
-MISC ChangeLog 14458 RMD160 50be394e5edb098da0e2847621ba10fd362a3f9f SHA1 7174f0bb41ebd027d36c421a90acf31983a60d29 SHA256 49b805a1209e990b35bc6ecf811557ecf70a5702f618312ca386a566b1b18620
+EBUILD libreoffice-3.4.2.3.ebuild 18384 RMD160 ede96109f1902b4a0e11f82e93462566572767ac SHA1 30eea1b1425b255e1bc4e273befdd021b1f9cecb SHA256 6e8dc652afe37f6a4a897b0abfb699fb196b8b20591f53b7fbcf088678fcd302
+MISC ChangeLog 14606 RMD160 2d26b91040dac43a4e4307faccf3f6f507d6263f SHA1 ffb0525ee90c15c4b5a16ce7327cb22bf709bbab SHA256 ed0e1dfa3a5636fb5a80d313f55fa761314beb52e50a0168c48e6ce9cb1c13d2
MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk4xcHEACgkQHB6c3gNBRYeAmACfey03N8ysN+uUM/3J02hKGtj2
+hOQAn0f2zM+3Q3n/yQz35r3Hm9WoRnQW
+=es+l
+-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index c0ac59a77b87..f19f3afcb5c7 100644
--- a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.2.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/libreoffice-3.4.2.3.ebuild,v 1.8 2011/07/28 14:04:41 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.9 2011/07/28 14:22:21 scarabeus Exp $
EAPI=3
@@ -516,7 +516,8 @@ src_configure() {
}
src_compile() {
- emake || die
+ # this is not a proper make script and the jobs are passed during configure
+ make || die
}
src_install() {