Fix some tests, unfortunately not all

Package-Manager: portage-2.1.10.52/cvs/Linux x86_64

4 files changed, 149 insertions, 12 deletions

diff --git a/kde-base/kcalc/ChangeLog b/kde-base/kcalc/ChangeLog
index 5c233d244cec..8bb7b3ed13b2 100644
--- a/kde-base/kcalc/ChangeLog
+++ b/kde-base/kcalc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcalc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.206 2012/03/23 07:37:20 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/ChangeLog,v 1.207 2012/04/01 16:39:03 dilfridge Exp $
+
+  01 Apr 2012; Andreas K. Huettel <dilfridge@gentoo.org> kcalc-4.8.1.ebuild,
+  +files/kcalc-4.8.1-dot.patch:
+  Fix some tests, unfortunately not all
 
   23 Mar 2012; Johannes Huber <johu@gentoo.org> -kcalc-4.8.0.ebuild:
   Remove KDE SC 4.8.0
diff --git a/kde-base/kcalc/Manifest b/kde-base/kcalc/Manifest
index 019f393db454..b05d21b63fd4 100644
--- a/kde-base/kcalc/Manifest
+++ b/kde-base/kcalc/Manifest
@@ -2,20 +2,27 @@
 Hash: SHA512
 
 AUX kcalc-4.3.2-solaris-knumber_priv.patch 552 RMD160 8df76b213eea471d7a44fbe9e6c27d1d912eec2a SHA1 a8f78bd7450ada820d22f91be78b98979db45ca4 SHA256 09b307580c694b97a4e07ec639e3f2e556c74a7706110194419364f48bc5d849
+AUX kcalc-4.8.1-dot.patch 11349 RMD160 89c7db91fc6185c5a7898d6fa27020dc2e6ef9ac SHA1 51b05f1f670879f9861f5892d3a93e064eb9baca SHA256 366e0df86381db45af8279ac8309b98f1b0bf89c9dc1bc5442e12acb18f26add
 DIST kcalc-4.8.1.tar.xz 86524 RMD160 9dbdc61a2ff77df238f06281ea949e3a0965b9ae SHA1 f119707ece800a2102eb881402a5bc289b2a55ea SHA256 cfc3a5636dd88c0a190b0084cb873ebca01be88050c923e57ba7d32d198d6a85
 DIST kdeutils-4.7.4.tar.bz2 3802873 RMD160 24c3af30a407523bdf853059fc38bfbf6e6d4604 SHA1 4630f01f36558eb5494fc562086fbd4e488e411e SHA256 bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
 EBUILD kcalc-4.7.4.ebuild 706 RMD160 476e72de0ddbce644c969065eb723371f611f91b SHA1 fd35762e0d1e4927e6cd92c0a983759e40839002 SHA256 e89aaca8e15f3a2d23abceb0bcc30e085efd3ef8869155c455b044ef96a2b065
-EBUILD kcalc-4.8.1.ebuild 587 RMD160 871e4e02fe9044404696291a72c2ebf7e53ab2c9 SHA1 bc304494a400946cfc3de2a8eed34f7bd42db773 SHA256 d4e23d6a98d0fb7fedf1571251dc57f75501d73be42d8cfb383b1ddea5091222
-MISC ChangeLog 24159 RMD160 cddb5f1c9fdee1313ab126690eba370f036dfda1 SHA1 dcfb72d194e4299a8724b37b54c25aac5e906d70 SHA256 5f379c428901ad6197f670c6a7d7e042df8ccd0e2048f4f1b6d5d71947c4e080
+EBUILD kcalc-4.8.1.ebuild 624 RMD160 622b5b9afcf8af83ccb9e30df3406a37038c7647 SHA1 c2d0d2be6e548a9de51080fbff7f8f1180079ab5 SHA256 9acd48e0bd2731162ab77fd9a4ae717bb35c5c364bb4345300f4679ba68a1c5e
+MISC ChangeLog 24314 RMD160 c1f22d7d4e33b7b12e78c9dd6b765daecb048b72 SHA1 d759776459aaedd1f58c9f1a1be6f2759c41c473 SHA256 0dfdf28401809af49881063c692f2e6f390de6637cfcf81a68211efc192c414d
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPbCgxAAoJEO+t9ga+3I3a5ToIAL6h+SaJZgV68JwtGxwnXzIB
-la18eCoIxSsVwUguhTlUFh4pnsx52k/iSO1ij42ULbLk90ZVPyi7Xgc37XUtp0d0
-NpDhMYtccg3BmBS8I/dwc5+wW/ZqHhSeqintOP9gs9hKTfDeIijxzq76Tn6JBKjW
-NhO4vYmUEGr6W5YlNPdtlu7O3iuBgg/naZoeowJqAGv53FxvNbACV1wdkmbDWc3g
-iX2oLs/mRq+L8/0HmMJZOzhGfvwsW2fDI8t+Y90ZomRRZhwv4IYYNUjfHTncLpxC
-c/MJmLVAPmu1S8O0nLLFm6jzzsltVmkDvOffvceB13EMdIKg/5YJZ2HX6uEWgc8=
-=5j7L
+iQIcBAEBCgAGBQJPeIS5AAoJEEb+UGWnxTyHCZcP/Rjpe0vvUmWN5nhjyTixa4sn
+PDxErsGj+ifueFaFCJ7KjSkdYlAnYvBYp68XFQNXegkY7tp3cU2xyfqiV1HmVkCy
+1yfbqC01M4Rvf4nJvPL2wkzu7v8C9BQGUBEH5sAfufRdaNstnDP3S33Y39e3PW1i
+jM2XCFHk0NPwzveJkNTLBVq/UT4fHztLLD0Drl++sL9bdK0J2DH+AaMPBNUQthrS
+Bi8OXQxoncz/6zmw33npagkmIlI987gI34whOvm4NItBW3eNBuqvmuCf3LTyOV5u
+bPDx5QraAc83SCU8JfcmRacNw0QzNmRICqxdIkN4zSyvkFaDoHMSXzGHu5BhPZ5F
+woUueAuWOPvTGfZkEky633OX/8oDrhOeswl9ToZFm6aidliDaeUnRfKi0W9wbVF9
+F3OhxO3LxugbRKNVE3YV2R3LyrdnprtCpKz6ZLF6X0RLI2z6Xy40MMFJ7oW9zsxu
+GBKlXQvRQ9gYpZK9VG+8Zmlup2H7I4xMeWnyyW4ITnRKP9lUhmn/ogF7S+xUigo0
+4rMX5F+jdGCsLkD+VAvdoOqWBBA4y1eNMK7tIofn/xZI23FuDQogRsnUaQCOTxWn
+SqjUIDUXAUS8xeUlWaa0zw5S43MxuhnfnFSLXso2FRGCzmXljrjcTwezpdpuUKKO
+Q682ZVnhYfvhHwW7c96Y
+=mfzm
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kcalc/files/kcalc-4.8.1-dot.patch b/kde-base/kcalc/files/kcalc-4.8.1-dot.patch
new file mode 100644
index 000000000000..de20529adb4b
--- /dev/null
+++ b/kde-base/kcalc/files/kcalc-4.8.1-dot.patch
@@ -0,0 +1,125 @@
+From dd35eaac4aa993688db25d368bd88d524c3ce80f Mon Sep 17 00:00:00 2001
+From: "Andreas K. Huettel (dilfridge)" <dilfridge@gentoo.org>
+Date: Thu, 22 Mar 2012 09:37:31 +0100
+Subject: [PATCH] It seems like 2/3 got replaced errorneously by 2.3 in some
+ places, making the tests fail needlessly.
+
+---
+ knumber/tests/knumbertest.cpp |   28 ++++++++++++++--------------
+ 1 file changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/knumber/tests/knumbertest.cpp b/knumber/tests/knumbertest.cpp
+index a072cc9..c555c73 100644
+--- a/knumber/tests/knumbertest.cpp
++++ b/knumber/tests/knumbertest.cpp
+@@ -129,11 +129,11 @@ void testingAdditions()
+     std::cout << "\n\nTesting additions:\n";
+ 
+     checkResult("KNumber(5) + KNumber(2)", KNumber(5) + KNumber(2), "7", KNumber::IntegerType);
+-    checkResult("KNumber(5) + KNumber(\"2/3\")", KNumber(5) + KNumber(QLatin1String("2.3")), "17/3", KNumber::FractionType);
++    checkResult("KNumber(5) + KNumber(\"2/3\")", KNumber(5) + KNumber(QLatin1String("2/3")), "17/3", KNumber::FractionType);
+     checkResult("KNumber(5) + KNumber(\"2.3\")", KNumber(5) + KNumber(QLatin1String("2.3")), "7.3", KNumber::FloatType);
+ 
+     checkResult("KNumber(\"5/3\") + KNumber(2)", KNumber(QLatin1String("5/3")) + KNumber(2), "11/3", KNumber::FractionType);
+-    checkResult("KNumber(\"5/3\") + KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) + KNumber(QLatin1String("2.3")), "7/3", KNumber::FractionType);
++    checkResult("KNumber(\"5/3\") + KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) + KNumber(QLatin1String("2/3")), "7/3", KNumber::FractionType);
+     checkResult("KNumber(\"5/3\") + KNumber(\"1/3\")", KNumber(QLatin1String("5/3")) + KNumber("1/3"), QLatin1String("2"), KNumber::IntegerType);
+     checkResult("KNumber(\"5/3\") + KNumber(\"-26/3\")", KNumber(QLatin1String("5/3")) + KNumber("-26/3"), "-7", KNumber::IntegerType);
+     checkResult("KNumber(\"5/2\") + KNumber(2.3)", KNumber(QLatin1String("5/2")) + KNumber(2.3), "4.8", KNumber::FloatType);
+@@ -149,12 +149,12 @@ void testingSubtractions()
+     std::cout << "\n\nTesting subtractions:\n";
+ 
+     checkResult("KNumber(5) - KNumber(2)", KNumber(5) - KNumber(2), QLatin1String("3"), KNumber::IntegerType);
+-    checkResult("KNumber(5) - KNumber(\"2/3\")", KNumber(5) - KNumber(QLatin1String("2.3")), "13/3", KNumber::FractionType);
++    checkResult("KNumber(5) - KNumber(\"2/3\")", KNumber(5) - KNumber(QLatin1String("2/3")), "13/3", KNumber::FractionType);
+     checkResult("KNumber(5) - KNumber(2.3)", KNumber(5) - KNumber(2.3), "2.7", KNumber::FloatType);
+ 
+     checkResult("KNumber(\"5/3\") - KNumber(2)", KNumber(QLatin1String("5/3")) - KNumber(2), "-1/3", KNumber::FractionType);
+     checkResult("KNumber(\"5/3\") - KNumber(\"1/3\")", KNumber(QLatin1String("5/3")) - KNumber("1/3"), "4/3", KNumber::FractionType);
+-    checkResult("KNumber(\"5/3\") - KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) - KNumber(QLatin1String("2.3")), QLatin1String("1"), KNumber::IntegerType);
++    checkResult("KNumber(\"5/3\") - KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) - KNumber(QLatin1String("2/3")), QLatin1String("1"), KNumber::IntegerType);
+     checkResult("KNumber(\"-5/3\") - KNumber(\"4/3\")", KNumber(QLatin1String("-5/3")) - KNumber("4/3"), "-3", KNumber::IntegerType);
+     checkResult("KNumber(\"5/4\") - KNumber(2.2)", KNumber("5/4") - KNumber(2.2), "-0.95", KNumber::FloatType);
+ 
+@@ -170,7 +170,7 @@ void testingMultiplications()
+     std::cout << "\n\nTesting multiplications:\n";
+ 
+     checkResult("KNumber(5) * KNumber(2)", KNumber(5) * KNumber(2), "10", KNumber::IntegerType);
+-    checkResult("KNumber(5) * KNumber(\"2/3\")", KNumber(5) * KNumber(QLatin1String("2.3")), "10/3", KNumber::FractionType);
++    checkResult("KNumber(5) * KNumber(\"2/3\")", KNumber(5) * KNumber(QLatin1String("2/3")), "10/3", KNumber::FractionType);
+     checkResult("KNumber(5) * KNumber(\"2/5\")", KNumber(5) * KNumber("2/5"), QLatin1String("2"), KNumber::IntegerType);
+     checkResult("KNumber(5) * KNumber(2.3)", KNumber(5) * KNumber(2.3), "11.5", KNumber::FloatType);
+     checkResult("KNumber(0) * KNumber(\"2/5\")", KNumber(0) * KNumber("2/5"), QLatin1String("0"), KNumber::IntegerType);
+@@ -178,7 +178,7 @@ void testingMultiplications()
+ 
+     checkResult("KNumber(\"5/3\") * KNumber(2)", KNumber(QLatin1String("5/3")) * KNumber(2), "10/3", KNumber::FractionType);
+     checkResult("KNumber(\"5/3\") * KNumber(0)", KNumber(QLatin1String("5/3")) * KNumber(0), QLatin1String("0"), KNumber::IntegerType);
+-    checkResult("KNumber(\"5/3\") * KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) * KNumber(QLatin1String("2.3")), "10/9", KNumber::FractionType);
++    checkResult("KNumber(\"5/3\") * KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) * KNumber(QLatin1String("2/3")), "10/9", KNumber::FractionType);
+     checkResult("KNumber(\"25/6\") * KNumber(\"12/5\")", KNumber("25/6") * KNumber("12/5"), "10", KNumber::IntegerType);
+     checkResult("KNumber(\"5/2\") * KNumber(2.3)", KNumber(QLatin1String("5/2")) * KNumber(2.3), "5.75", KNumber::FloatType);
+ 
+@@ -197,8 +197,8 @@ void testingDivisions()
+     checkResult("KNumber(122) / KNumber(2)", KNumber(122) / KNumber(2), "61", KNumber::IntegerType);
+     checkResult("KNumber(12) / KNumber(0)", KNumber(12) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
+     checkResult("KNumber(-12) / KNumber(0)", KNumber(-12) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
+-    checkResult("KNumber(5) / KNumber(\"2/3\")", KNumber(5) / KNumber(QLatin1String("2.3")), "15/2", KNumber::FractionType);
+-    checkResult("KNumber(6) / KNumber(\"2/3\")", KNumber(6) / KNumber(QLatin1String("2.3")), "9", KNumber::IntegerType);
++    checkResult("KNumber(5) / KNumber(\"2/3\")", KNumber(5) / KNumber(QLatin1String("2/3")), "15/2", KNumber::FractionType);
++    checkResult("KNumber(6) / KNumber(\"2/3\")", KNumber(6) / KNumber(QLatin1String("2/3")), "9", KNumber::IntegerType);
+     checkResult("KNumber(5) / KNumber(2.5)", KNumber(5) / KNumber(2.5), QLatin1String("2"), KNumber::FloatType);
+     checkResult("KNumber(5) / KNumber(0.0)", KNumber(5) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
+     checkResult("KNumber(-5) / KNumber(0.0)", KNumber(-5) / KNumber(0.0), QLatin1String("-inf"), KNumber::SpecialType);
+@@ -206,7 +206,7 @@ void testingDivisions()
+     checkResult("KNumber(\"5/3\") / KNumber(2)", KNumber(QLatin1String("5/3")) / KNumber(2), "5/6", KNumber::FractionType);
+     checkResult("KNumber(\"5/3\") / KNumber(0)", KNumber(QLatin1String("5/3")) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
+     checkResult("KNumber(\"-5/3\") / KNumber(0)", KNumber(QLatin1String("-5/3")) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
+-    checkResult("KNumber(\"5/3\") / KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) / KNumber(QLatin1String("2.3")), QLatin1String("5/2"), KNumber::FractionType);
++    checkResult("KNumber(\"5/3\") / KNumber(\"2/3\")", KNumber(QLatin1String("5/3")) / KNumber(QLatin1String("2/3")), QLatin1String("5/2"), KNumber::FractionType);
+     checkResult("KNumber(\"49/3\") / KNumber(\"7/9\")", KNumber("49/3") / KNumber("7/9"), "21", KNumber::IntegerType);
+     checkResult("KNumber(\"5/2\") / KNumber(2.5)", KNumber(QLatin1String("5/2")) / KNumber(2.5), QLatin1String("1"), KNumber::FloatType);
+     checkResult("KNumber(\"5/2\") / KNumber(0.0)", KNumber(QLatin1String("5/2")) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
+@@ -215,7 +215,7 @@ void testingDivisions()
+     checkResult("KNumber(5.3) / KNumber(2)", KNumber(5.3) / KNumber(2), "2.65", KNumber::FloatType);
+     checkResult("KNumber(5.3) / KNumber(0)", KNumber(5.3) / KNumber(0), QLatin1String("inf"), KNumber::SpecialType);
+     checkResult("KNumber(-5.3) / KNumber(0)", KNumber(-5.3) / KNumber(0), QLatin1String("-inf"), KNumber::SpecialType);
+-    checkResult("KNumber(5.3) / KNumber(\"2/3\")", KNumber(5.3) / KNumber(QLatin1String("2.3")), "7.95", KNumber::FloatType);
++    checkResult("KNumber(5.3) / KNumber(\"2/3\")", KNumber(5.3) / KNumber(QLatin1String("2/3")), "7.95", KNumber::FloatType);
+     checkResult("KNumber(5.5) / KNumber(2.5)", KNumber(5.5) / KNumber(2.5), "2.2", KNumber::FloatType);
+     checkResult("KNumber(5.5) / KNumber(0.0)", KNumber(5.5) / KNumber(0.0), QLatin1String("inf"), KNumber::SpecialType);
+     checkResult("KNumber(-5.5) / KNumber(0.0)", KNumber(-5.5) / KNumber(0.0), QLatin1String("-inf"), KNumber::SpecialType);
+@@ -258,11 +258,11 @@ void testingAbs()
+     std::cout << "\n\nTesting absolute value:\n";
+ 
+     checkResult("KNumber(5).abs()", KNumber(5).abs(), QLatin1String("5"), KNumber::IntegerType);
+-    checkResult("KNumber(\"2/3\").abs()", KNumber(QLatin1String("2.3")).abs(), QLatin1String("2.3"), KNumber::FractionType);
++    checkResult("KNumber(\"2/3\").abs()", KNumber(QLatin1String("2/3")).abs(), QLatin1String("2/3"), KNumber::FractionType);
+     checkResult("KNumber(\"2.3\").abs()", KNumber(QLatin1String("2.3")).abs(), QLatin1String("2.3"), KNumber::FloatType);
+ 
+     checkResult("KNumber(-5).abs()", KNumber(-5).abs(), QLatin1String("5"), KNumber::IntegerType);
+-    checkResult("KNumber(\"-2/3\").abs()", KNumber(QLatin1String("-2/3")).abs(), QLatin1String("2.3"), KNumber::FractionType);
++    checkResult("KNumber(\"-2/3\").abs()", KNumber(QLatin1String("-2/3")).abs(), QLatin1String("2/3"), KNumber::FractionType);
+     checkResult("KNumber(\"-2.3\").abs()", KNumber("-2.3").abs(), QLatin1String("2.3"), KNumber::FloatType);
+ }
+ 
+@@ -287,7 +287,7 @@ void testingSqrt()
+     checkResult("KNumber(\"16/9\").sqrt()", KNumber("16/9").sqrt(), "4/3", KNumber::FractionType);
+     checkResult("KNumber(\"-16/9\").sqrt()", KNumber("-16/9").sqrt(), QLatin1String("nan"), KNumber::SpecialType);
+     checkResult("KNumber(2).sqrt()", KNumber(2).sqrt(), "1.41421356237", KNumber::FloatType);
+-    checkResult("KNumber(\"2/3\").sqrt()", KNumber(QLatin1String("2.3")).sqrt(), "0.816496580928", KNumber::FloatType);
++    checkResult("KNumber(\"2/3\").sqrt()", KNumber(QLatin1String("2/3")).sqrt(), "0.816496580928", KNumber::FloatType);
+     checkResult("KNumber(\"0.25\").sqrt()", KNumber("0.25").sqrt(), "0.5", KNumber::FloatType);
+     checkResult("KNumber(\"-0.25\").sqrt()", KNumber("-0.25").sqrt(), QLatin1String("nan"), KNumber::SpecialType);
+ 
+@@ -378,7 +378,7 @@ void testingPower()
+     checkResult("KNumber(-2) ^ KNumber(3)", KNumber(-2).power(KNumber(3)), "-8", KNumber::IntegerType);
+     checkResult("KNumber(-2) ^ KNumber(4)", KNumber(-2).power(KNumber(4)), QLatin1String("16"), KNumber::IntegerType);
+     checkResult("KNumber(5) ^ KNumber(-2)", KNumber(5).power(KNumber(-2)), "1/25", KNumber::FractionType);
+-    checkResult("KNumber(8) ^ KNumber(\"2/3\")", KNumber(8).power(KNumber(QLatin1String("2.3"))), "4", KNumber::IntegerType);
++    checkResult("KNumber(8) ^ KNumber(\"2/3\")", KNumber(8).power(KNumber(QLatin1String("2/3"))), "4", KNumber::IntegerType);
+     checkResult("KNumber(8) ^ KNumber(\"-2/3\")", KNumber(8).power(KNumber(QLatin1String("-2/3"))), "1/4", KNumber::FractionType);
+     checkResult("KNumber(-16) ^ KNumber(\"1/4\")", KNumber(-16).power(KNumber("1/4")), QLatin1String("nan"), KNumber::SpecialType);
+     checkResult("KNumber(-8) ^ KNumber(\"1/3\")", KNumber(-8).power(KNumber("1/3")), QLatin1String("nan"), KNumber::SpecialType);
+-- 
+1.7.9.2
+
diff --git a/kde-base/kcalc/kcalc-4.8.1.ebuild b/kde-base/kcalc/kcalc-4.8.1.ebuild
index d8de49653e81..5c51831c642c 100644
--- a/kde-base/kcalc/kcalc-4.8.1.ebuild
+++ b/kde-base/kcalc/kcalc-4.8.1.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/kde-base/kcalc/kcalc-4.8.1.ebuild,v 1.1 2012/03/06 23:35:07 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcalc/kcalc-4.8.1.ebuild,v 1.2 2012/04/01 16:39:03 dilfridge Exp $
 
 EAPI=4
 
@@ -23,6 +23,7 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3.2-solaris-knumber_priv.patch
+	"${FILESDIR}"/${PN}-4.8.1-dot.patch
 )
 
 src_test() {