Move most test to their own phase. Thanks to debian/buntu guys :-)

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

5 files changed, 86 insertions, 8 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 657b3fc933b8..ad9de257b63e 100644
--- a/app-office/libreoffice/ChangeLog
+++ b/app-office/libreoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/libreoffice
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.372 2012/09/21 09:04:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.373 2012/09/24 08:26:04 scarabeus Exp $
+
+  24 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-3.6-separate-checks.patch, libreoffice-3.6.1.2.ebuild,
+  libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
+  Move most test to their own phase. Thanks to debian/buntu guys :-)
 
   21 Sep 2012; Tomáš Chvátal <scarabeus@gentoo.org> libreoffice-3.6.1.2.ebuild,
   libreoffice-3.6.9999.ebuild, libreoffice-9999-r2.ebuild:
diff --git a/app-office/libreoffice/files/libreoffice-3.6-separate-checks.patch b/app-office/libreoffice/files/libreoffice-3.6-separate-checks.patch
new file mode 100644
index 000000000000..de314df17034
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.6-separate-checks.patch
@@ -0,0 +1,74 @@
+From 4fb35cfbf4b10d5644fd636ddfe3e07b5a932d45 Mon Sep 17 00:00:00 2001
+From: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
+Date: Sun, 24 Jun 2012 14:01:54 +0200
+Subject: [PATCH] dont run check targets in build, to allow running them
+ separately later
+
+Change-Id: Idb46ebcb427522c74632a1813afcbb841fb61243
+---
+ Makefile.top            |   10 ++++++++--
+ solenv/bin/build.pl     |    2 +-
+ solenv/gbuild/Module.mk |    2 +-
+ 3 files changed, 10 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.top b/Makefile.top
+index 7362bbc..ae849fb 100644
+--- a/Makefile.top
++++ b/Makefile.top
+@@ -243,7 +243,7 @@ xsltml\
+ zlib\
+ 
+ gb_TAILBUILDMODULES := $(shell $(GNUMAKE) -r -f $(SRCDIR)/tail_build/Makefile showmodules)
+-export gb_TAILBUILDTARGET=all slowcheck
++export gb_TAILBUILDTARGET=all
+ 
+ define gbuild_module_rules
+ .PHONY: $(1) $(1).all $(1).clean $(1).deliver
+@@ -480,11 +480,17 @@ findunusedcode:
+               | grep -v WPX \
+               > unusedcode.easy
+ 
+-check: dev-install subsequentcheck
++check: unitcheck slowcheck dev-install subsequentcheck
+ 
+ subsequentcheck :| $(if $(filter-out subsequentcheck,$(MAKECMDGOALS)),dev-install)
+ 	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ 
++unitcheck:
++	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
++
++slowcheck:
++	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
++
+ debugrun:
+ 	$(GNUMAKE) -j $(GMAKE_PARALLELISM) $(GMAKE_OPTIONS) -f Makefile.post $@
+ 
+diff --git a/solenv/bin/build.pl b/solenv/bin/build.pl
+index 74d0f32..daa4ae0 100755
+--- a/solenv/bin/build.pl
++++ b/solenv/bin/build.pl
+@@ -1901,7 +1901,7 @@ sub run_job {
+             return 1 if (! $path =~ /prj$/ );
+             mkpath("$workdir/Logs");
+             my $gbuild_flags = '-j' . $ENV{GMAKE_MODULE_PARALLELISM};
+-            my $gbuild_target = 'all slowcheck';
++            my $gbuild_target = 'all';
+             if ($registered_name =~ /tail_build\/prj$/ )
+             {
+                 $gbuild_flags = '-j' . $ENV{GMAKE_PARALLELISM};
+diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
+index e5f87f0..9c2608c 100644
+--- a/solenv/gbuild/Module.mk
++++ b/solenv/gbuild/Module.mk
+@@ -129,7 +129,7 @@ gb_Module_DEVINSTALLHINT=
+ debugrun :| build
+ endif
+ 
+-all : build unitcheck
++all : build
+ 	$(info $(gb_Module_BUILDHINT))
+ 
+ build : 
+-- 
+1.7.9.5
+
diff --git a/app-office/libreoffice/libreoffice-3.6.1.2.ebuild b/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
index f17f93027389..2d00b931625a 100644
--- a/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.1.2.ebuild,v 1.4 2012/09/21 09:04:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.1.2.ebuild,v 1.5 2012/09/24 08:26:04 scarabeus Exp $
 
 EAPI=4
 
@@ -215,6 +215,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6-separate-checks.patch"
 )
 
 REQUIRED_USE="
@@ -226,8 +227,6 @@ REQUIRED_USE="
 	libreoffice_extensions_wiki-publisher? ( java )
 "
 
-RESTRICT="test"
-
 S="${WORKDIR}/${PN}-core-${PV}"
 
 CHECKREQS_MEMORY="512M"
diff --git a/app-office/libreoffice/libreoffice-3.6.9999.ebuild b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
index 0ed0f83b984d..ec99c1946ab3 100644
--- a/app-office/libreoffice/libreoffice-3.6.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.6.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.28 2012/09/21 09:04:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.6.9999.ebuild,v 1.29 2012/09/24 08:26:04 scarabeus Exp $
 
 EAPI=4
 
@@ -215,6 +215,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.6-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6-separate-checks.patch"
 )
 
 REQUIRED_USE="
@@ -226,8 +227,6 @@ REQUIRED_USE="
 	libreoffice_extensions_wiki-publisher? ( java )
 "
 
-RESTRICT="test"
-
 S="${WORKDIR}/${PN}-core-${PV}"
 
 CHECKREQS_MEMORY="512M"
diff --git a/app-office/libreoffice/libreoffice-9999-r2.ebuild b/app-office/libreoffice/libreoffice-9999-r2.ebuild
index 3e131bf19751..ddadd6e97338 100644
--- a/app-office/libreoffice/libreoffice-9999-r2.ebuild
+++ b/app-office/libreoffice/libreoffice-9999-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.112 2012/09/21 09:04:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999-r2.ebuild,v 1.113 2012/09/24 08:26:04 scarabeus Exp $
 
 EAPI=4
 
@@ -225,6 +225,7 @@ DEPEND="${COMMON_DEPEND}
 PATCHES=(
 	# not upstreamable stuff
 	"${FILESDIR}/${PN}-3.7-system-pyuno.patch"
+	"${FILESDIR}/${PN}-3.6-separate-checks.patch"
 )
 
 REQUIRED_USE="