First attempt to kill cppunit execution during make phase.

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

6 files changed, 72 insertions, 11 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 60decab88f0a..b97ff6c1e379 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.100 2011/08/11 10:00:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.101 2011/08/11 10:15:27 scarabeus Exp $
+
+  11 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild,
+  libreoffice-9999.ebuild, +files/libreoffice-kill-cppunit.patch:
+  First attempt to kill cppunit execution during make phase.
 
   11 Aug 2011; Tomáš Chvátal <scarabeus@gentoo.org>
   libreoffice-3.4.2.3.ebuild, libreoffice-3.4.9999.ebuild,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c1c60488bc4b..16141740dc43 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -20,6 +20,7 @@ AUX libreoffice-check-for-avx.patch 1973 RMD160 49ec33a7a230886e59658000ff0469bd
 AUX libreoffice-fix-sandbox-install.patch 1609 RMD160 e79859f6343e04808cc261c101483ff2ba0f1a5d SHA1 579d30eafb7a7e54531faf4bc8d3bd35150494f7 SHA256 fdb54126c78837d73e7a095ceedba9329b121ce2ce1d1a23ad75247b8f144b50
 AUX libreoffice-gbuild-use-cxxflags.patch 353 RMD160 97f0c4cffe624ca8df71471cae61975176464847 SHA1 d1a2de4de89055fc4150f27022ea9f0fa5a34f20 SHA256 27ccd9ec886f2f6433969524860b3fa7199531b5f5d774f7643d6bc75883222a
 AUX libreoffice-installed-files-permissions.patch 374 RMD160 83d650b6b0e84a02e2ad0667b20d4dba72cf4ee2 SHA1 87345e895473a8bb209b0ad542670c5eb7717ab0 SHA256 a664796c27c69fe5119af5d82313dc65371eb873c1d15691d97745d9a1ee3e81
+AUX libreoffice-kill-cppunit.patch 2349 RMD160 3d44d65dba2789196af1354690d73419bf56c3cf SHA1 5446e57e017bac10aa19b58c8a5a2509c8268835 SHA256 d8180a6a3ab007ac504557ff857a73a3acdd50ece1cda0e46b16c5269e24c727
 AUX libreoffice-libdb5-fix-check.diff 1197 RMD160 dea8896745502035e899f9f685c662a1dbdfbbeb SHA1 07202400d8c17a12cb965331ddbef57c4438e7be SHA256 f8532c4ee3ebb8cb424cbb736abcb7b3c7027fd7c749f39571e76527808bd51a
 AUX libreoffice-solenv-build-crash.patch 492 RMD160 b5220c76d90e785a5bb38548cad8d5d9d73de7d2 SHA1 a0571d2301ce9f03ff5b58326906fe2078ea39b5 SHA256 45276cdc69444a0542bac4e949ef92bac4286db58b824198a59f797bd71c81f6
 AUX libreoffice-svx.patch 1347 RMD160 91d5f142df33d119666252ecc319dc4e7ec70f6d SHA1 020db7d4e784a131acc63413ccc625715d44df70 SHA256 dbcd451e390c78102075b048e1472cb45c8d960608bef4ac0c0611c7aeaea736
@@ -86,6 +87,7 @@ DIST b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt 4961173
 DIST b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 11922684 RMD160 70435964d18c4b3c633dd50225c177ca4546269a SHA1 4ad95f5d07eae50dc4f95b04eb900c39e202fd21 SHA256 2c3ed36476e1279ba35d7c675961bfa9c40b1360153472e80508a99963c8d46c
 DIST ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip 743031 RMD160 ecf14c46ddf095734752ef260134c97b1772be57 SHA1 1acd76cd63f7b19f6a0252eb029c3cb13a25aa9b SHA256 233f66e8d25c5dd971716d4200203a612a407649686ef3b52075d04b4c9df0dd
 DIST bc702168a2af16869201dbe91e46ae48-LICENSE_Python-2.6.1 13176 RMD160 df5850e54a1049328050d6a0c46a2d109a9827d0 SHA1 cef151475872853a9f0b8e3ce6c65d829403008f SHA256 9bb0f3d57c170a6833c3aec020ec52b6c7280d26bf42c9134773c54cd238ac75
+DIST bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz 762803 RMD160 c5f38b1d201afcba7913f2b53fb7558add3d21f5 SHA1 f1ab8986af7a1ffa6760f4bacf5622924639bf4a SHA256 ac28a04c8e6c9217d910b0ae7122832d28d9917fa668bcc9e0b8b09acb4ea44a
 DIST biblio.tar.bz2 6000 RMD160 d6d74ed50fd12ab1b7363e1611aa5bae5a8b19d6 SHA1 5a12014afa75ecb51b9688497450115d64f1c167 SHA256 c0410a80028c8c0a6c28f4727e89b632875a128c9fccc17102f18773f0ea620b
 DIST c441926f3a552ed3e5b274b62e86af16-STLport-4.0.tar.gz 686207 RMD160 1d5d88a8521eab43a57f270550bb654c8c980b32 SHA1 7c36232506c5cfc911b2e2edc44a1841a74630f5 SHA256 3be3b80c0151fbc69bc93767e952cf4bfbe61874328b1c979126bbbcf1e75da5
 DIST ca4870d899fd7e943ffc310a5421ad4d-liberation-fonts-ttf-1.06.0.20100721.tar.gz 1324547 RMD160 4ff48c470d788e0fccdd9b8c3acdb66b73fcf546 SHA1 e36555ed4e13a8109bfdb5a8c621de6d581f5ab7 SHA256 9cdea85d1ee40160cf48fc482fbd9038b07b47d909f2091039338d39b0bb7d2f
@@ -169,15 +171,16 @@ 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 19179 RMD160 133c97c7c54ff0bcae4ae81651fb76d646f57992 SHA1 29adf48b6c7db8fd7196a7aec287ba75a60ddcc7 SHA256 d31fca8d093fd6a313229a468552d5243cc7289d39ca3bba18f725122bdb163c
-EBUILD libreoffice-3.4.9999.ebuild 19100 RMD160 b0da23a66092e353b08a25e0d10d6d568b4e8243 SHA1 35b5402d7babf09da6207bf647dbc8580658ad56 SHA256 7e0f18714fafee47e62f7b14613f88cdd997c5f8410d2d4f17f71f09b4d542fc
-EBUILD libreoffice-9999.ebuild 18527 RMD160 964089db1744f875e339cc1a7088e17920b81571 SHA1 99a7af5cf9da5ad9017d2e9c9a790e96b9c94121 SHA256 e8a11ce19c9d68b1da9c08692c905f30fd8944bdc32435c4de8ec30b7e011c92
-MISC ChangeLog 19636 RMD160 6cc4b41b0096454b6ce0083edcfd5db83ca27e2c SHA1 1003d3d9c3aa69a01261719d854720f43cdc59b4 SHA256 45b4b790d980f7a3f0d5aa3bd41541a5c8bd526c2bf3548ff55f8e3514944dc3
+EBUILD libreoffice-3.4.2.3.ebuild 19463 RMD160 bed8f1150fc5ce4abb267b94a27c7c0e98b6b096 SHA1 3c16f636decfcb93746d83441d97f4c4c6dad3a4 SHA256 d41242e848051571ef27050d1e8aa7549aa8c6549877363835ee8a8367b92803
+EBUILD libreoffice-3.4.9999.ebuild 19384 RMD160 f7fe2cbd98f0314e1952ebb2f732bbe7cf3f38f0 SHA1 33fdc421cfe6438091f397fb3864093d76b3a271 SHA256 ebf1b77e020af895a98b4a13fa5b2d6a62fde9494e3fbd5a1d9ac8b12c3ab17b
+EBUILD libreoffice-9999.ebuild 18811 RMD160 b2ba688711449c35f928a6f2f5187c3562ec43c3 SHA1 a2988492a9be9da108e30ab2573cfafb1cfbdc51 SHA256 dda013f39000d6bedd77371698ccef25a58858f5548b6be93095ebb4b1a9e93b
+MISC ChangeLog 19878 RMD160 7ebea46122be436e73861755a02b5e282e207ac2 SHA1 fa4350ed2c00938b8eeb85f27444094da03f415c SHA256 f62b04c77d455de0c95f66c1f62af2ddf42a1193a9122f00b93c237ab800fb7a
+MISC libreoffice-9999.ebuild.orig 18527 RMD160 964089db1744f875e339cc1a7088e17920b81571 SHA1 99a7af5cf9da5ad9017d2e9c9a790e96b9c94121 SHA256 e8a11ce19c9d68b1da9c08692c905f30fd8944bdc32435c4de8ec30b7e011c92
 MISC metadata.xml 1070 RMD160 5a010568eabba00eaa6193765fa5d181462dc5a5 SHA1 9973d230e4e10704136eddd33c8e20ddf485ba9f SHA256 c15b697bd70ccf20aef38b02b55a316cc02df24e027daf6d9b0d185d920469b3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5DqCcACgkQHB6c3gNBRYdpfwCfe+0e+z6jSs7Chh+Ke0+Fsz2R
-t68An19pMUeZRivHXMloTmzVkVePXmNl
-=sxeQ
+iEYEARECAAYFAk5Dq9MACgkQHB6c3gNBRYcx2QCfUNwvbM6uc4KsrmKsDID3OwzU
+4s0AoKi0oQRiCbgcrjB+u/nKAzHZ73aw
+=udCR
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-kill-cppunit.patch b/app-office/libreoffice/files/libreoffice-kill-cppunit.patch
new file mode 100644
index 000000000000..fc1f6c34b380
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-kill-cppunit.patch
@@ -0,0 +1,38 @@
+diff -urN libreoffice-libs-extern-3.4.2.3.old/cppunit/kill_switch.patch libreoffice-libs-extern-3.4.2.3/cppunit/kill_switch.patch
+--- libreoffice-libs-extern-3.4.2.3.old/cppunit/kill_switch.patch	1970-01-01 01:00:00.000000000 +0100
++++ libreoffice-libs-extern-3.4.2.3/cppunit/kill_switch.patch	2011-08-11 12:11:50.319812105 +0200
+@@ -0,0 +1,22 @@
++diff -urN cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.cpp cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTester.cpp
++--- cppunit-1.12.1/src/DllPlugInTester/DllPlugInTester.cpp	2004-06-25 13:11:45.000000000 +0200
+++++ cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTester.cpp	2011-08-11 12:08:33.597271474 +0200
++@@ -207,6 +207,7 @@
++ main( int argc, 
++       const char *argv[] )
++ {
+++	return 0;
++   const int successReturnCode = 0;
++   const int failureReturnCode = 1;
++   const int badCommadLineReturnCode = 2;
++diff -urN cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.cpp cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTesterTest.cpp
++--- cppunit-1.12.1/src/DllPlugInTester/DllPlugInTesterTest.cpp	2004-06-25 12:41:27.000000000 +0200
+++++ cppunit-1.12.1.new/src/DllPlugInTester/DllPlugInTesterTest.cpp	2011-08-11 12:08:50.338062186 +0200
++@@ -5,6 +5,7 @@
++ 
++ int main(int argc, char* argv[])
++ {
+++  return 0;
++   CPPUNIT_NS::Test *suite = CPPUNIT_NS::TestFactoryRegistry::getRegistry().makeTest();
++   CPPUNIT_NS::TextUi::TestRunner runner;
++   runner.addTest( suite );
+diff -urN libreoffice-libs-extern-3.4.2.3.old/cppunit/makefile.mk libreoffice-libs-extern-3.4.2.3/cppunit/makefile.mk
+--- libreoffice-libs-extern-3.4.2.3.old/cppunit/makefile.mk	2011-08-11 12:11:13.141276903 +0200
++++ libreoffice-libs-extern-3.4.2.3/cppunit/makefile.mk	2011-08-11 12:12:10.071565172 +0200
+@@ -34,7 +34,7 @@
+     # from <https://sourceforge.net/projects/cppunit/files/cppunit/1.12.1/
+     #  cppunit-1.12.1.tar.gz/download>
+ 
+-PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch
++PATCH_FILES = solarisfinite.patch warnings.patch windows.patch ldflags.patch aix.patch avoid-synthetised-destructor.patch kill_switch.patch
+     # solarisfinite.patch: see <https://sourceforge.net/tracker/?func=detail&
+     #  aid=2912590&group_id=11795&atid=311795>
+     # warnings.patch: see <https://sourceforge.net/tracker/?func=detail&
diff --git a/app-office/libreoffice/libreoffice-3.4.2.3.ebuild b/app-office/libreoffice/libreoffice-3.4.2.3.ebuild
index 5aa203da1ad6..808c5f2c50f6 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.23 2011/08/11 10:00:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.2.3.ebuild,v 1.24 2011/08/11 10:15:27 scarabeus Exp $
 
 EAPI=3
 
@@ -52,6 +52,7 @@ unset DEV_URI
 # FIXME: actually review which one of these are used
 ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
@@ -240,6 +241,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-append-no-avx.patch"
 	"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
 	"${FILESDIR}/${PN}-binfilter-as-needed.patch"
+	"${FILESDIR}/${PN}-kill-cppunit.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -404,8 +406,11 @@ src_configure() {
 
 	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
 	# dmake: not worth of splitting out
+	# cppunit: patched not to run anything, just main() { return 0; }
+	#          workaround to upstream running the tests during build
 	internal_libs+="
 		--without-system-hsqldb
+		--without-system-cppunit
 	"
 
 	# When building without java some things needs to be done
diff --git a/app-office/libreoffice/libreoffice-3.4.9999.ebuild b/app-office/libreoffice/libreoffice-3.4.9999.ebuild
index 1b349875bc38..f73876c5a211 100644
--- a/app-office/libreoffice/libreoffice-3.4.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.4.9999.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.ebuild,v 1.15 2011/08/11 10:00:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.4.9999.ebuild,v 1.16 2011/08/11 10:15:27 scarabeus Exp $
 
 EAPI=3
 
@@ -52,6 +52,7 @@ unset DEV_URI
 # FIXME: actually review which one of these are used
 ADDONS_SRC+=" ${ADDONS_URI}/128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
@@ -239,6 +240,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-append-no-avx.patch"
 	"${FILESDIR}/${PN}-32b-qt4-libdir.patch"
 	"${FILESDIR}/${PN}-binfilter-as-needed.patch"
+	"${FILESDIR}/${PN}-kill-cppunit.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -403,8 +405,11 @@ src_configure() {
 
 	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
 	# dmake: not worth of splitting out
+	# cppunit: patched not to run anything, just main() { return 0; }
+	#          workaround to upstream running the tests during build
 	internal_libs+="
 		--without-system-hsqldb
+		--without-system-cppunit
 	"
 
 	# When building without java some things needs to be done
diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild
index 8a51a90dc2e9..81f88b8cb082 100644
--- a/app-office/libreoffice/libreoffice-9999.ebuild
+++ b/app-office/libreoffice/libreoffice-9999.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.ebuild,v 1.10 2011/08/11 10:00:00 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-9999.ebuild,v 1.11 2011/08/11 10:15:27 scarabeus Exp $
 
 EAPI=3
 
@@ -50,6 +50,7 @@ unset DEV_URI
 # addons
 # FIXME: actually review which one of these are used
 ADDONS_SRC+=" ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"
+ADDONS_SRC+=" ${ADDONS_URI}/bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz"
 ADDONS_SRC+=" ${ADDONS_URI}/24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html"
@@ -233,6 +234,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-svx.patch"
 	"${FILESDIR}/${PN}-installed-files-permissions.patch"
 	"${FILESDIR}/${PN}-binfilter-as-needed.patch"
+	"${FILESDIR}/${PN}-kill-cppunit.patch"
 )
 
 # Uncoment me when updating to eapi4
@@ -397,8 +399,11 @@ src_configure() {
 
 	# hsqldb: requires just 1.8.0 not 1.8.1 which we don't ship at all
 	# dmake: not worth of splitting out
+	# cppunit: patched not to run anything, just main() { return 0; }
+	#          workaround to upstream running the tests during build
 	internal_libs+="
 		--without-system-hsqldb
+		--without-system-cppunit
 	"
 
 	# When building without java some things needs to be done