Add junit fix. Wrt bug#402205.

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

5 files changed, 40 insertions, 19 deletions

diff --git a/app-office/libreoffice/ChangeLog b/app-office/libreoffice/ChangeLog
index 10d7dac6cd16..8c9cbde2f7a3 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.255 2012/03/18 09:11:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/ChangeLog,v 1.256 2012/03/18 11:36:57 scarabeus Exp $
+
+  18 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/libreoffice-3.5-junit.patch, libreoffice-3.5.1.2.ebuild,
+  libreoffice-3.5.9999.ebuild:
+  Add junit fix. Wrt bug#402205.
 
   18 Mar 2012; Tomáš Chvátal <scarabeus@gentoo.org>
   +files/libreoffice-3.5-propagate-gb_FULLDEPS.patch,
diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index 8cd0795d3677..8199119824c5 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX generate_libreoffice_package.sh 2586 RMD160 5a5059446e8ec1172bce8f69d3419f963c7e7e97 SHA1 95f8beeaa7603a75ec361bd109a60f76dbfd0d99 SHA256 8b48315f2f830136b1950cf1bfe50ba15c051404cd61155b76e553240b29d18b
 AUX libreoffice-3.3.1-neon_remove_SSPI_support.diff 1081 RMD160 9c91936b136055a61e90fb2269e63c720af1e562 SHA1 e9e83130a6d4814e2a15b0d1062c2b21d97d23b3 SHA256 646ccebdce09fd2d29093b956244725191f376099be0b397365064a974dc5e7e
 AUX libreoffice-3.4.1-salfix.diff 668 RMD160 3764e664888b423d81f9e78def6c2a93e037a462 SHA1 10e0128da7ddebdae3b52983e91363940b151cf1 SHA256 3adf1eab52b80c34b3ef1f8ab26eb6171af4515c8e05a264dcf10bd7c45e20e7
+AUX libreoffice-3.5-junit.patch 735 RMD160 fbababe28fe9a23c379430e2f0cbd826ae6e0d19 SHA1 b83cc743801a406c22246679d5b1bebfa978334b SHA256 6775993398f4a91a13aac6a1d6fa559df779cd5f8058196a325b691992c32252
 AUX libreoffice-3.5-propagate-gb_FULLDEPS.patch 922 RMD160 251ea777df53418e6acbb208e2a57ba374ad17a3 SHA1 09ede0550fcc518a3d30e4ebc06f842ef79b39c4 SHA256 73cbbec0744fc8cce99f5c9dd499935e9bf2db2e3d994045fab4c328116e3724
 AUX libreoffice-3.5.1-kde-4.8.1-namespace.patch 1053 RMD160 e36f8df60d988a5b2f086f1829e391c5df1c85f9 SHA1 0192c9f014adf932f9c734a50de8dac7d397c376 SHA256 c55e411f59e97cee0edb551e017422fce83ceafa80ea2c8912d59698a0c088de
 AUX libreoffice-3.6-system-pyuno.patch 1628 RMD160 c35c4a457fad1f216e9c8f469522f8b92eb4b1b4 SHA1 5319ff747ff78a225013e65046c82548617234ed SHA256 25f319caed7205e06d4b9e17a45ab268a2ac67846c4e02442a15acc540266a5b
@@ -111,25 +112,25 @@ DIST libreoffice-writer-3.4.3.2.tar.bz2 7295462 RMD160 ee24967297670205d42949d6a
 DIST libreoffice-writer-3.4.5.2.tar.bz2 7299202 RMD160 e0cc1509efa4f28350e82ce1de3b64322482c80b SHA1 277b886e63383cc37cead0deb6b1e02b40cfc9d0 SHA256 b0d34950f06de4fbf2b1ba40b1ddece0cb3d28bc23fca0edfd6daba54872fd4c
 EBUILD libreoffice-3.4.3.2-r1.ebuild 18554 RMD160 de3dd897454246b9cd210fc20c705e907733aff1 SHA1 187d063af4835b6598f5700a3f45d68bd47f8099 SHA256 dce97af4aa28d1142746509fd26df671fe38dd294decad20633e6691d83bf1fa
 EBUILD libreoffice-3.4.5.2.ebuild 15179 RMD160 10ba5494bdf149eab87c0cec140838044842e45e SHA1 4d74eca4ebf10bff87396ff59c3b342b7053d848 SHA256 c94720c170a1903c0a6a4d6e6300ea31fff2032f306e36147817f3d1d601ee8a
-EBUILD libreoffice-3.5.1.2.ebuild 14790 RMD160 15c27677474bb0320baa54fdbeed576a31bbfcce SHA1 c0b17e757fd4935e5e839de8c90d6c0b2d77b5d5 SHA256 331998c58e14e12abb0b428d06ce4b343ffe4a95842aa4e2570829de23cb39be
-EBUILD libreoffice-3.5.9999.ebuild 14733 RMD160 87f594544110c0a1bee5463764851934157f9347 SHA1 4540772e43b93e373d3c1f103a4784e84dee5108 SHA256 df9480ae17dec0a9fe31ce32f58bf2600a48c9ba4a013d4a038e21ea0183fc54
+EBUILD libreoffice-3.5.1.2.ebuild 14827 RMD160 4f91ae679398a4de1a355e1d2102bcd84b8da2ae SHA1 ff80e45851e7d5db800abe64a6bc96377e3b7484 SHA256 8d52195b14ffbb55c0d3899e015c3a34c191d233a140e5acf7e6dca24ce6e84b
+EBUILD libreoffice-3.5.9999.ebuild 14770 RMD160 66c65d03c54d60901be7a6cd7892d42f5ec89ce9 SHA1 0a4ebfaecc713bdbf1aae7747c5678fc849837ab SHA256 75f6c13fc46a4bde2fa67bebb32a3d6ae82803e0dd344d5953f3f99a39410147
 EBUILD libreoffice-9999-r2.ebuild 14653 RMD160 3cd6ef4045d022fbc758a75cb06d84b3bfa1d6c9 SHA1 0c7a10488dc996f6a18026bf3dfdf5cc53611d3c SHA256 c6d0ad14eb4ee99d7184ab790484765985ce45780d3a055dcea87cc05f7ebf6d
-MISC ChangeLog 46706 RMD160 211a132e85af8464e16c1e7b3e52dc8d8c8a7287 SHA1 950b9441535102a11478626cb31a7449448a1955 SHA256 7b568bce20e4cc0556ddaeea4a2f2e32f2606ee6c663d0ecca63be43a89d1f38
+MISC ChangeLog 46892 RMD160 025d27ace34b653ec137d5f0914f5c0954306678 SHA1 28a5ecf6afa60ceb3d6a590b6990882aff80e2ae SHA256 f510f031ff69e6ba4cb32d233e716fb5e8b8893fe5c655ee9a17e4008d152b77
 MISC metadata.xml 1409 RMD160 9861b490a44757ecaebb14ac28eec292f347ac3f SHA1 268b78192669f12c513fd7b68fe588f140ea2e1b SHA256 862a214105b2f7b07a015d656794aac9b94a3f40b3f8cbf74a5299f990b82b2e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPZaa6AAoJEOSiRoyO7jvoKSQQALAD+2qJXdFcZ4N1QqZqCMm8
-IbWqhpqjhCEtD5j0g0ghzf52km5bquRH/h2NscFXfZj5N48J3UzF3y+3ngqmC9lv
-m3M20AIPXnb7075jF4BRDqWk6rbsU9PucgAGXUbcHsQkFwbTceqKfIvze/yp9PnF
-vQcPOzjIUw15jqyBalLc6imsm+qZcwwbqR1Fsbmp/+CzmX7YqmkGJAHtzRveLYKG
-prtflmJcjB4ia6lK3K5L++6Q82XOHVfZ43L374E//klmYJ5pwr4LJLZel1pJRuHj
-uaLjRSdqkKMz6Cnj11tjjOulMI5UtPcSip5xipVoZiIfEDkdezXeuMPV8pKerQKT
-Z9qPVyZHz4pkEkxQa07r380jLv3klcE/2lPdqUY/Bby97CkN0TZCYVhu9rrivS1P
-stul7uBjBDfZLyURKPUKIOMgw+jQrKf1fX7bcv6F3soHwTYnNr1H1OTD8ImjkCC5
-GiPilW1KSbLfBLKfMurOjHoJtAMK8yDRkGy73u2afvfA5+8/1Sy52YbjONsUoyII
-W5LGoplCD51S4NmXzM3eXGhPJJHdOyQ94mYT2q5t+yY37Zsx1YkxznaTEmPySszs
-k7yJt4qboN5ZqOhqGsiyD4nSD/DNSrKjTfNWvOYGLaDEwCRjRtmnCMVNGRgYgCvn
-iDM0M8V7B0SDYSf0ELDx
-=oVO1
+iQIcBAEBAgAGBQJPZcjfAAoJEOSiRoyO7jvoVnoQAJT1x6n/+dfZSFQJu/glxDtI
+vySs/v/wx3s5+WmfRUg7yrLQSo+ruLr4rn67BKArZwu0SE7+eqU/EPCo/iK9t3CM
+xMMppH+3WNHbRUdYOOFEoNULebd9gKBjLGnB0SPIvoBVyFSHR5pgg6lxXtZuK2Vz
++Ep7p0W9KmWcsbosGlad9O/ip2sayKmjtUeUn1QLCUpAtUw8Q1Og3JFOU1Lyev6I
+ByIr1zKNVa/go3+59eQqMnK8E2vqRjpB09OvC/hm5X3Ys+kjTif5r5i2bO1Y+CdI
+29kHyk+w77rEIxUT2P5S88PXPTJdemfBH4Z0WlY4UFRsS2NwQaw40bmPUVd9My4W
+OufYPWZNdlut+g97p+4k3Jsj3Eko1HPEnPQTNiq6i9/lEeMUjk/btmhu+JGmGrsF
+Ojl6m9gwVpWnTMkZSeSS16vqPG/biUz7+6NKcWU3zxvtOVXqHYcJxBCmHP8XHJjG
+zP45CD1ogJkCLFNvaLy3I8GjCp5y5qfuF1qZvyM2t3XyP+898mej0ObGwFWW7pLk
+fgtEP2WKMMpNHntLHPszQ5QaVllANDVv8ieihPBTXhKiM1O2PgkIuFKdmMwLKEYF
+4GN5Ih59pJmeAODTNcmHLNIf3AD2ipyKP1jlBW9ikJ0iYs0b9sGq1mcavdniZgml
+J5JvEpESIujKGbPzkHuE
+=c2DZ
 -----END PGP SIGNATURE-----
diff --git a/app-office/libreoffice/files/libreoffice-3.5-junit.patch b/app-office/libreoffice/files/libreoffice-3.5-junit.patch
new file mode 100644
index 000000000000..d1916c34ea02
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-3.5-junit.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.in b/configure.in
+index f7ee08f..dab9503 100644
+--- a/configure.in
++++ b/configure.in
+@@ -9155,7 +9155,7 @@ if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then
+         # check if either class-path entry is available for hamcrest or
+         # it's bundled
+         if "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" |grep -q hamcrest || \
+-            "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep -q 'Class-Path: hamcrest'; then
++            "$UNZIP" -c "$OOO_JUNIT_JAR" META-INF/MANIFEST.MF |grep 'Class-Path:' | grep -q 'hamcrest'; then
+             AC_MSG_RESULT([$OOO_JUNIT_JAR])
+         else
+             AC_MSG_ERROR([your junit jar neither sets a classpath nor includes hamcrest; please
diff --git a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild b/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
index 7bcb1f7f3728..6794ef0f06fd 100644
--- a/app-office/libreoffice/libreoffice-3.5.1.2.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.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.5.1.2.ebuild,v 1.4 2012/03/18 09:11:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.1.2.ebuild,v 1.5 2012/03/18 11:36:57 scarabeus Exp $
 
 EAPI=4
 
@@ -193,6 +193,7 @@ PATCHES=(
 	# this can't be upstreamed :(
 	"${FILESDIR}/${PN}-system-pyuno.patch"
 	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
+	"${FILESDIR}/${PN}-3.5-junit.patch"
 	"${FILESDIR}/libreoffice-3.5.1-kde-4.8.1-namespace.patch"
 )
 
diff --git a/app-office/libreoffice/libreoffice-3.5.9999.ebuild b/app-office/libreoffice/libreoffice-3.5.9999.ebuild
index a843fc485cf0..a2875c992452 100644
--- a/app-office/libreoffice/libreoffice-3.5.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-3.5.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.5.9999.ebuild,v 1.22 2012/03/18 09:11:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice/libreoffice-3.5.9999.ebuild,v 1.23 2012/03/18 11:36:57 scarabeus Exp $
 
 EAPI=4
 
@@ -193,6 +193,7 @@ PATCHES=(
 	# this can't be upstreamed :(
 	"${FILESDIR}/${PN}-system-pyuno.patch"
 	"${FILESDIR}/${PN}-3.5-propagate-gb_FULLDEPS.patch"
+	"${FILESDIR}/${PN}-3.5-junit.patch"
 )
 
 REQUIRED_USE="