Fix tests, bug 379183

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

4 files changed, 39 insertions, 18 deletions

diff --git a/media-plugins/kipi-plugins/ChangeLog b/media-plugins/kipi-plugins/ChangeLog
index 3baad362e2e3..b5bc1091a2e6 100644
--- a/media-plugins/kipi-plugins/ChangeLog
+++ b/media-plugins/kipi-plugins/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/kipi-plugins
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.98 2011/07/30 12:14:02 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/ChangeLog,v 1.99 2011/08/14 18:14:02 dilfridge Exp $
+
+  14 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  kipi-plugins-2.0.0.ebuild, +files/kipi-plugins-2.0.0-tests.patch:
+  Fix tests, bug 379183
 
   30 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   kipi-plugins-2.0.0.ebuild, metadata.xml:
diff --git a/media-plugins/kipi-plugins/Manifest b/media-plugins/kipi-plugins/Manifest
index 7a71e941d358..1dc0392b4a12 100644
--- a/media-plugins/kipi-plugins/Manifest
+++ b/media-plugins/kipi-plugins/Manifest
@@ -3,27 +3,28 @@ Hash: SHA512
 
 AUX kipi-plugins-1.7.0-expoblending.patch 570 RMD160 c08b628dceb39b4a2dbe15fd376256785dd8cacf SHA1 763aec7f286f4cd208aa38f5665c62986bcfaddb SHA256 31788bac46a0af39e2b8475bdd84e07710af5d6655efbdaa6939795eb8b7d7f0
 AUX kipi-plugins-1.9.0-tests.patch 1153 RMD160 40fdf55531219fbeebf7ed8ac60981e05222f2d1 SHA1 f8c3b30fbc9bbf0b95518acc3e86bfaa5581d6de SHA256 a675fa82a67f6e99d60f108d5c6479f39a2afb2c1a596c4468908ff51ae74c09
+AUX kipi-plugins-2.0.0-tests.patch 933 RMD160 bcd1974a98a0471f381cde6ea91b2e980df63b74 SHA1 a77124e7c2b66616546b218ae9bc5e0bc0644ee0 SHA256 b8640df52463422dd53f0a4ac411eac67f15e8652157f820171ae85acd3ccb9f
 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
 DIST kipi-plugins-1.9.0.tar.bz2 5775775 RMD160 9bc1ae309e556335fa770e20b31b2527ddc4856b SHA1 fc12c018f4f73f7a7d025d7af2af99d4ae2dedc5 SHA256 d52466586725492788514c1b8d7bbea02f95c9deb744a0814d221c99c34e934c
 DIST kipi-plugins-doc-1.5.0.tar.bz2 1689039 RMD160 f4342798caf14817b96afdb11959f53ab175ae1d SHA1 55a57e1fffbd291ed2f31dbbe840ccd85cb499cc SHA256 13dfda13a1f5e276020dbae3f7c2227f5cc1ac4264070250eeff0a3eb59b67cf
 EBUILD kipi-plugins-1.9.0.ebuild 2697 RMD160 b42df2225066d816b710a7e76ef615c57ddc6b01 SHA1 ed22d2c0cab6e53944de8f6b739f5926ccb30d29 SHA256 5b6cf08ba75620d9701a997e243d205e8543187e3c95fc65372089d50aed37be
-EBUILD kipi-plugins-2.0.0.ebuild 2940 RMD160 9a613d1c3fdd84ff22bfb805e43d02d4e25b87de SHA1 1bc630710fe7ab64d1e88e1173546d5bba0d0dea SHA256 1db119229ad6e2e50e1ba908abc8d8aca6b2967cb7e4f2e39e4a00f42cf7696c
-MISC ChangeLog 16731 RMD160 c4804ddfb75e179daf3a148813d3aeb3588f0269 SHA1 b883ac72aaf3482baa1acba5cedcecd95ec5933d SHA256 0e989884b939fade17254c5d1616698fa68d2021ab5968978bda52e4bf54a4e1
+EBUILD kipi-plugins-2.0.0.ebuild 2980 RMD160 29d1a35b7c933f69267d5cafbe6fa402742f7802 SHA1 c0200c6588ad05eee14492d72baa71d4acd52428 SHA256 89e7134373befac67cb9cddfa65388ad1e443dd0db8194ca319aa0cb56e2e6cd
+MISC ChangeLog 16881 RMD160 9c0db66c19d7854d221164ace91d997105224386 SHA1 ff56bc9d2ad658673d494aec3f9fc69fb2e0e7de SHA256 ae28c76d2e8a1587644e1cdf20f1b792542b0131b4390fe7c615b11105abb761
 MISC metadata.xml 821 RMD160 027364a9c743a1e63022c5bef28aacd8c6c8f2d4 SHA1 c204cf22dd75121734996fb26cc3348eeedd41e7 SHA256 6af9d8367a1e61b517b0129ec26e4ca0c4747b66d7e398d0c889094db292e4f4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOM/WkAAoJEEb+UGWnxTyH7UsP/1k6rIyAkCVS6KPUl5zBb3zH
-tO32LrJ4rFk5EzjaLzNZ61IEFq2hzbTxV4xSF9uWJpQUCN0QFQzl35FXhMM/en1A
-Uv55KflFIIPP0D0aGSP5MvwS1FB4FbTKuuzlzoCVof+yWfzpeugUhrOk4t0LUMgr
-QTMIbk2KwDnEqKP7CB0PdXVCkyW3jJTRsGQDLFcM7BsukwUZfNv8omQyu0drILIX
-lxRhGxkybRTD3IAz6ngbqpi0xgApNHdxlwMj0LUDkTKnzwtDDMvfkSOANFsCMxsF
-rkYmb2Sa2I3d5xU9cP1wNCxDkSq8hUQx0L38BUt+CEoBKDRjb1oxGsbRk2d3TTmR
-TH/kdq9siRgaYGdo6J41xqm5HB2LXT4WaULbSFijg0xmiTWdf1m65fDVJHyRfk/U
-xDjWE9rNTOsZ1LcXFPGQDwY+FJP6h7xJPjfKzo4ZqAEpv1mHBDx5E8jJjHx501Gu
-9DHc/Pm8a3U6NFZQOOEDG96FnrY5YuqoFRSzSf8Mc97KddmjL0AT+f+VEnkAkbEM
-w6cVCKMB6Cgb50NzoGHujPgXsQYPXuAM7BWptV44+vqewqCfjI23tpBu5VhyeJlT
-9aACiBYB9N7FbNscoGe5bVa4+XbO9JxBsEDcOPccyH6Ceg1Xup5F+abXVcDP0TOy
-WmmR1yO4Zu0V7YwPZjs2
-=m8C/
+iQIcBAEBCgAGBQJOSBB3AAoJENwGBM22xffeqHwQAJvEeC4tgW8nTD94KAiYaoFT
+ztY2zRBM7hlwl7UZ3mkUHHNWg422LEENg5at+boZddjlrH0Ng3iKvoPgvY573nTQ
+Bf1feZPXVtPgvO43uBT4sxAtARfSXl9RAhSLIH5DDKlHLcNQv8DxXb7gw7Pt/47X
+JlC+APT5UxAABpw5/6GiMLjuqRm4gBJTqBKrgHRhYNS+CvK6H+fszisgSVoTwUuU
+OgSc1OHVOKRVeMWIGtIwmZKLetEcIlvCV3x64O+uL2odi6mTq0osEkyMyROl9hXb
+r+daMauZi+if1JjO4/caC4aheWqhrFIvkAUvxdUwauVyFEMmyUIAWktwXCW4njyr
+LwcSQw3kXkFCvu+yBVZ8OEAVKxMKfZqKpR3cMKvYp5hpTeoL28yNPZCAALgFKYZp
+Xr4pQs+CDtvUxJn8jbV9s8/6XjOckNF1shqzaPJ50AzssZLDEZUDbTEmuJgxnGP9
+zDbAHn0tx3VYCmcAb6OayWahGRCKKJK4KZ+BEC+os4pOzDuCULgcfW3ZyehOcPeS
+HAmBsCQ7MTawg2mZlNC9LefNEu1+ll8DYz3tFtp385JEHv/YgU9tOp0kTYpHyrBU
+b9MRlFw2hQuNIjdVLqE+svVEh/is+xNQta4bwNMSf7L4o1cs/g2ke+xK4yoRNZJM
+mEhPogXfBOLhW68i3UpO
+=2/sy
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/kipi-plugins/files/kipi-plugins-2.0.0-tests.patch b/media-plugins/kipi-plugins/files/kipi-plugins-2.0.0-tests.patch
new file mode 100644
index 000000000000..41f5cdf23647
--- /dev/null
+++ b/media-plugins/kipi-plugins/files/kipi-plugins-2.0.0-tests.patch
@@ -0,0 +1,13 @@
+diff -ruN digikam-2.0.0.orig/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp digikam-2.0.0/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp
+--- digikam-2.0.0.orig/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp	2011-07-28 01:27:35.000000000 +0200
++++ digikam-2.0.0/extra/kipi-plugins/kmlexport/tests/test_kmlexport_gpxparsing.cpp	2011-08-14 20:09:37.000000000 +0200
+@@ -53,7 +53,8 @@
+         QDateTime time1 = QDateTime::fromString("2010-01-14T09:26:02.287+02:00", Qt::ISODate);
+         // the date is parsed fine, but the time fails:
+         QCOMPARE(time1.date(), QDate(2010, 01, 14));
+-        QCOMPARE(time1.time(), QTime(0, 0, 0));
++        // QCOMPARE(time1.time(), QTime(0, 0, 0));
++        // it seems like the library has become more permissive in the meantime
+ 
+         // when we omit the time zone data, parsing succeeds
+         // time is interpreted as local time
diff --git a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
index b7d98dcb1f0b..011f405e325c 100644
--- a/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild
+++ b/media-plugins/kipi-plugins/kipi-plugins-2.0.0.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/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.2 2011/07/30 12:14:01 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/kipi-plugins/kipi-plugins-2.0.0.ebuild,v 1.3 2011/08/14 18:14:02 dilfridge Exp $
 
 EAPI=4
 
@@ -61,7 +61,10 @@ RDEPEND="${DEPEND}
 
 S=${WORKDIR}/${MY_P}/extra/${PN}
 
-PATCHES=( "${FILESDIR}/${PN}-1.7.0-expoblending.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-1.7.0-expoblending.patch"
+	"${FILESDIR}/${PN}-2.0.0-tests.patch"
+)
 
 src_prepare() {
 	# prepare the handbook