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

(Portage version: 2.2.0_alpha53/cvs/Linux x86_64)

5 files changed, 22 insertions, 29 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/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() {