Update the check-reqs eclass usage. Remove obsolete warning about jobs.

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

6 files changed, 47 insertions, 34 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 29e36ae649f0..b522340b6af9 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # 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.126 2011/09/04 20:06:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.127 2011/09/05 08:36:50 scarabeus Exp $
+
+  05 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.3.4.ebuild, libreoffice-3.4.3.2-r1.ebuild,
+  libreoffice-3.4.9999-r1.ebuild, libreoffice-9999-r1.ebuild:
+  Update the check-reqs eclass usage. Remove obsolete warning about jobs.
 
   04 Sep 2011; Tony Vroon <chainsaw@gentoo.org> libreoffice-3.3.4.ebuild:
   Marked stable on AMD64 based on arch testing by Elijah "Armageddon" El
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index bf7799226a33..33b15447d68f 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
@@ -165,9 +168,26 @@ DIST libreoffice-writer-3.3.4.1.tar.bz2 6778265 RMD160 a2a3bbe1f8e6ff0f03b419ece
 DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6addb59fee22ace29 SHA1 57a549b811c0b95898a9532968ce4a9f6fc33f16 SHA256 65fdcb132a84fae9f4ec0d84501f13ada3861fbd7646947ad0cea495b637be9a
 DIST unowinreg.dll 6144 RMD160 9e2a2789a96842a2aec747a62dee3db3e8370761 SHA1 712720da502d36175cd7aa05cb1862ee0330638c SHA256 f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 EBUILD libreoffice-3.3.3.ebuild 18131 RMD160 9ac5d82927f327bff9ef1f37304f13239c009f77 SHA1 572dee87269784bd1864e96e1eca820bfee2d513 SHA256 5452357751a154c65c126e4b3bdea17fd1c2d221734d5859d39808cae91d3599
-EBUILD libreoffice-3.3.4.ebuild 18138 RMD160 8c177eb506268915f378749500b648a797a763dd SHA1 de15e543c338df7fd109b04dfdcbd2aa1b83bc3b SHA256 acacc07e82c76296605247d6579753dd17d3926d3b5065cbadb9f7ae67584803
-EBUILD libreoffice-3.4.3.2-r1.ebuild 18556 RMD160 1d0b7a84aea772e4ff950ffab34baf10a9349f2b SHA1 d23b8e2422a39b79f8abc0d03119b7e4cd59eb7b SHA256 a67bc0be9feccbb88c28bceb038835fe7fad245df9db8e01fb1a9cffc1070caa
-EBUILD libreoffice-3.4.9999-r1.ebuild 18557 RMD160 5ee2944f460d4a124f9f6d8f485a20ee24c44e5f SHA1 b72b9457950888930917b258818cd6bd102045c4 SHA256 ca9fe06c69485e233b5600e7b96bccf3b8fe9fa24c2e13adb5a956466a771a32
-EBUILD libreoffice-9999-r1.ebuild 17904 RMD160 5bee8df8614bb19964a553a3cfd434cec6048598 SHA1 ae90da7f3e32b238d344897381230a448096de21 SHA256 b79d3133a7366e552c1cc4c824c5b81ed36bed7b4853da6ec95794297a35abfb
-MISC ChangeLog 24884 RMD160 362e5c44e57b63f5a47128f0596e514d8fb4acc3 SHA1 d1d0b156209e0839a5151ac1712f6dbe640df068 SHA256 66c52bd97d48a84c52060a49bdfc4b204a7f9a2b695c6c13ad7dbc0475ef97b2
+EBUILD libreoffice-3.3.4.ebuild 18146 RMD160 1c71a223f37c402ab01d95b71dfa5af2c69f61af SHA1 18c1211e8eaf8c587f52ee303dc264c941e7c045 SHA256 d602a3efffc23cb848b1fdc667a0d7b1c9dde2502dfae0fb537fecb9ee744cc2
+EBUILD libreoffice-3.4.3.2-r1.ebuild 18357 RMD160 611fe6c4c03dc2f8c81448ae5cd763ca4b51cc4c SHA1 c6fc89daeba55e40e8ae50b595235e1ead7187c9 SHA256 1bc30f5d228c689cd158f19e7b01f26bd1ff8cb079e92b55dd7be4153a51fbd7
+EBUILD libreoffice-3.4.9999-r1.ebuild 18358 RMD160 b8a29d8ba48dc36cf698f85a4a479ba204c99876 SHA1 05f118cf24cd3ff082cb2e304aa2b99a70a938c2 SHA256 6558c0b31d1f39885f8115b21f25542da5a1a8a5df92b5d691f5664a5841d157
+EBUILD libreoffice-9999-r1.ebuild 17705 RMD160 df3f28d33ba74011a1a37fba3ac843e4e5b9d21c SHA1 ff970db8e944299d728cf173a3654fea0dd36420 SHA256 eec10daebc40ac9a190a232543410a1af644a3a28d8b74a6cf8099b68f2ffdf1
+MISC ChangeLog 25136 RMD160 be13773e15c6874a109313b809d706e8d34305a3 SHA1 e80d9000af8ffe51bff72387249708cf792306bf SHA256 ce87f14e028b504e71f7dfdf41bc37d698153593c09ff46c4fe56eb15e64c0a4
 MISC metadata.xml 980 RMD160 5201a4943c69632cf94cfaf309fba261ea5146ec SHA1 069a007c495275783c7a025f44e4f1ab59edb715 SHA256 191a40132b182e7dc3f504055341014664f42d74caa27ee8dda2b5edbbdac6c2
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOZIosAAoJEOSiRoyO7jvoP5oQAJCH+wxWAyecO/wKIaXpI68L
+RNXZ31tlRG7FzFoR9GOA3xO0gu24SbgbenoS2+iSKTtv3rwDKgRwcuyYwhbQEnsT
+7NPFkgHc205yA1tNBa0eTP2oJ+SI+KRT8v/RxKNNVxAxd9of6W2r75wsjMrLoBdN
+FOkTC0iXRci31Jbjapk9DqdtRE3Rn49mJfqnyPtO0GSO6jHIBfvjtE2vWFSW0Bsf
+e2IQiTM0qon4W7k9LF9P2xNIdNXqxuBw76GxVeuloiEsbpVDUWSyAA8hwZ5sP4pM
+ZAH495l/uwvn0tJGBmneF0Ce5xR8vMKjXXTKlOUxud4HxOSsl1hRRMEr56INbaEu
+brAzwb8vs6qtMrX1iRxsy5Fb087mDKj4awmotkjJdnQp4RNN1KgydsTsrmu72id0
+xdpdsmcDJDSICiDBYNIDtPT1c/0ED7kxq3I5WKFoK0z0sm8habOcGyNo7mjRcyA0
+NTt/8xwyDJmzGZGveiBvjYKjC/6/4pX+NNq2OpCDtS43nsLuG43bdXgyKgSfOGcm
+9ruQ/d6QOzCUxJ3VG2JcEi0UvCIMjDvyWgStCBQyPhGwokPjhlsEQ3ld1kCS0QnP
+708ktlX/hbyg3pw0tDqspIbRRqgSBjuhiw9BjJzp9k8Tp1C+29MqUp6LNNKDg+hj
++CFRr40BoiBMb1DkqLoW
+=6mD2
+-----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/libreoffice-3.3.4.ebuild b/app-office/libreoffice/libreoffice-3.3.4.ebuild
index a1e2cccbb01a..2cfffbb774ba 100644
--- a/app-office/libreoffice/libreoffice-3.3.4.ebuild
+++ b/app-office/libreoffice/libreoffice-3.3.4.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.3.4.ebuild,v 1.3 2011/09/04 20:06:04 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.3.4.ebuild,v 1.4 2011/09/05 08:36:50 scarabeus Exp $
 
 EAPI="3"
 
@@ -226,9 +226,9 @@ src_prepare() {
 	ewarn
 
 	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="512"
-	use debug && CHECKREQS_DISK_BUILD="12288" || CHECKREQS_DISK_BUILD="7144"
-	check_reqs
+	CHECKREQS_MEMORY="512M"
+	use debug && CHECKREQS_DISK_BUILD="12G" || CHECKREQS_DISK_BUILD="7G"
+	check-reqs_pkg_setup
 
 	strip-linguas ${LANGS}
 
diff --git a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
index 329d861ab6b3..bafeabe6c3ab 100644
--- a/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.3.2-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-3.4.3.2-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.3.2-r1.ebuild,v 1.4 2011/09/05 08:36:50 scarabeus Exp $
 
 EAPI=3
 
@@ -279,14 +279,10 @@ pkg_setup() {
 		ewarn
 	fi
 
-	ewarn "Libreoffice compilation often fails on parallel issues"
-	ewarn "but the slowdown by enforcing MAKEOPTS=-j1 is too huge."
-	ewarn "If you encounter errors try yourself to disable parallel build."
-
 	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="1024"
-	use debug && CHECKREQS_DISK_BUILD="15360" || CHECKREQS_DISK_BUILD="9216"
-	check_reqs
+	CHECKREQS_MEMORY="1G"
+	use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+	check-reqs_pkg_setup
 }
 
 src_unpack() {
diff --git a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild b/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
index 14dd4fc68487..74da9674f77b 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.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-3.4.9999-r1.ebuild,v 1.3 2011/09/04 11:52:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999-r1.ebuild,v 1.4 2011/09/05 08:36:50 scarabeus Exp $
 
 EAPI=3
 
@@ -279,14 +279,10 @@ pkg_setup() {
 		ewarn
 	fi
 
-	ewarn "Libreoffice compilation often fails on parallel issues"
-	ewarn "but the slowdown by enforcing MAKEOPTS=-j1 is too huge."
-	ewarn "If you encounter errors try yourself to disable parallel build."
-
 	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="1024"
-	use debug && CHECKREQS_DISK_BUILD="15360" || CHECKREQS_DISK_BUILD="9216"
-	check_reqs
+	CHECKREQS_MEMORY="1G"
+	use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+	check-reqs_pkg_setup
 }
 
 src_unpack() {
diff --git a/app-office/libreoffice/libreoffice-9999-r1.ebuild b/app-office/libreoffice/libreoffice-9999-r1.ebuild
index f86db839d3c9..1a63c906caa4 100644
--- 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.3 2011/09/04 11:52:14 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r1.ebuild,v 1.4 2011/09/05 08:36:50 scarabeus Exp $
 
 EAPI=3
 
@@ -270,14 +270,10 @@ pkg_setup() {
 		ewarn
 	fi
 
-	ewarn "Libreoffice compilation often fails on parallel issues"
-	ewarn "but the slowdown by enforcing MAKEOPTS=-j1 is too huge."
-	ewarn "If you encounter errors try yourself to disable parallel build."
-
 	# Check if we have enough RAM and free diskspace to build this beast
-	CHECKREQS_MEMORY="1024"
-	use debug && CHECKREQS_DISK_BUILD="15360" || CHECKREQS_DISK_BUILD="9216"
-	check_reqs
+	CHECKREQS_MEMORY="1G"
+	use debug && CHECKREQS_DISK_BUILD="15G" || CHECKREQS_DISK_BUILD="9G"
+	check-reqs_pkg_setup
 }
 
 src_unpack() {