Fix tests, bug 376763

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

4 files changed, 37 insertions, 18 deletions

diff --git a/media-libs/libkgeomap/ChangeLog b/media-libs/libkgeomap/ChangeLog
index 6c3bfc626874..df1a55f95a84 100644
--- a/media-libs/libkgeomap/ChangeLog
+++ b/media-libs/libkgeomap/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libkgeomap
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/ChangeLog,v 1.1 2011/07/29 19:13:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/ChangeLog,v 1.2 2011/08/08 21:44:02 dilfridge Exp $
+
+  08 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  libkgeomap-2.0.0.ebuild, +files/libkgeomap-2.0.0-tests.patch:
+  Fix tests, bug 376763
 
 *libkgeomap-2.0.0 (29 Jul 2011)
 
diff --git a/media-libs/libkgeomap/Manifest b/media-libs/libkgeomap/Manifest
index d395e70a24e0..35a0c96c0bce 100644
--- a/media-libs/libkgeomap/Manifest
+++ b/media-libs/libkgeomap/Manifest
@@ -1,24 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX libkgeomap-2.0.0-tests.patch 750 RMD160 4d432a8caf5ad22ea90f25a45fb99e9bc7ddd735 SHA1 8ef87f66e72ab7040551b7bb70e76b42ffc81f57 SHA256 5ced122845c5a74b0bba744b0863e9c3bd9663556dd1d90836ba3536563494c2
 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
-EBUILD libkgeomap-2.0.0.ebuild 751 RMD160 f93c42756e7a60ddcf1141ac514592efb182643a SHA1 f03b19ef89af41070ead35630b93ab3d61c8e6b9 SHA256 82db7d0a6b136358e06322d658f24127296bfab1fa19febe4590fd3c1db6f219
-MISC ChangeLog 723 RMD160 d053932ae7bcd14afd10acdd3844a8c5dee8fd9e SHA1 941a75be0885f4e17b87f1db9be06e5df2072516 SHA256 075d0e1a48032326d996929e866276ed62ad4957d03d6a281a18dbd9ee22e88b
+EBUILD libkgeomap-2.0.0.ebuild 796 RMD160 4753f2bd09417d3b49fda03acc2d3b05a14169e6 SHA1 28d2383945d6a8b19db8899a3f384d7030307c8b SHA256 8a82f200b38fe36605b0c802ddafe9b8e2fc1d24490bef8012d0b158d5106c22
+MISC ChangeLog 869 RMD160 c75e03c9cd282367ca16dcca9135094b29613765 SHA1 4d7674b73094d0513344ef0ec125e4bc9a6514d7 SHA256 0de09c774fca4bc9bc2dd7c8d86ddab5090516a35b33aa44261fe1bca0878be8
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOMwZfAAoJENwGBM22xffeWSYP/2bCq0QYVbcODc+qCdp/VQWw
-m+kJTxFZDovbu6RXmVMlxV1qvfFV5Xib/bZP3HtKCSczg78d2Vth/kSuzYHAwh6s
-LE1FEC/PYLqCgMzG6QGxBf804hDQDu2FmRCGJJhCRJ3FwEozm5pVpTFdeA68fYgq
-fseeAPKrUIosX/uaOeEKfeyH3gZtUC9bi1er9+kD2P5buwVQdWmVKBSXE0/eu3EQ
-3izELyo8yS4aWYdPJAeKZmsiWwXi5qp18U493JlNRQX2VsOHEa2Ju37G6n+AgO/U
-VXLLGhAhrdgdK33VmVdjR4zT7ZMJaxsra4cXWhX9oxo+qyiOTFQIyiSNX/5ejiLK
-BoHOKpA+fJFESER98orJ6VfxcJCqV7gk48mAig66dqXC3vjXVvPPN+dhiTemc7BO
-BOPrZcBUkEtRN8iu24fySveJ0oJrlpDc0TyNMe8mNsvHOvlsjIhGNz/Ash2lriR7
-aNsZOoPMYKUiIuoO3T4YBd+7guXb05y++E8J9zsMwEDpQiw3l9M3ZabD75KwmBD2
-6V1wOUBRp7S8y8Npczc4I7yuMmWQMbD7pBcUag9psrHZggc2k6o3NJcGw7FKSoVk
-kKqyldBuLLWvobXoRbD9ya+ePOM0PX/7By1NriHZjsKNsvpSNQ5Bi1iGWcyfm39N
-zlROG6YbOsKH6TtxVxyl
-=JrkG
+iQIcBAEBCgAGBQJOQFiwAAoJENwGBM22xffeQ/8P/ieXS4tCjVVE4byu53HKnTAh
+Gajarjp9wAaBEFVCK3JldgHXF15H08DKmMOjZEp+0jvsDOWtApVsaZNY2JjbLGL+
+GnIFIokOi3GciJpOVp0VQrsQdI7kskzn+X/VlH5JYkDX2glYgrtXURCZ5Ci07dFH
+MRFH5GMirvcmegTBwotA+37gq/kqWsD8NWd4Gew+vTXJOO1dgvyUEtCz0MbvoOBk
+aT1yxL2Hjf9vw8SJqqG3hSPwSfYaPm63tkIifZZJFxyFOSN2ZzsG9Gg2j8/GUJ8N
+EdzUZm4/fClSBE+FwxBZnm5truPDeOJQPqRyWg2ZxGtOQV5nsGNkIaOHaV1owqHF
+LEoOa/FmAGSLFdPwa/s9hXc94LRPr4i1EIXUVLlf58SDHOn6HyQOX2iRYs2Ssv3U
+zKYQVFFXDobnVCcxRk+ICb7Z89XAfB8hHUcORkYJtFra2nyDyJoO/bIq1dZE/HDm
+yRK+d4VoiZeIrF0JiiLWTxrzXw5r2cHrKJLXB0ZR6KH+24ppDAm9P1bi/ANPuyQ5
+0NUQv8itzCT2vJsa/8eOBDeY9tHZaTcCudomSEKynWnWuPu0WeAZ8/eL1HMLmk99
+9VwFODEc9gfpK7dO/ARzhufzFu6MjZZ/bpotpGFuG5ui3Wd/C6+Pq5tHTAqQnfnS
+BEtHRpDGU3u9fJqyV3XG
+=BTMu
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libkgeomap/files/libkgeomap-2.0.0-tests.patch b/media-libs/libkgeomap/files/libkgeomap-2.0.0-tests.patch
new file mode 100644
index 000000000000..b06a624db03d
--- /dev/null
+++ b/media-libs/libkgeomap/files/libkgeomap-2.0.0-tests.patch
@@ -0,0 +1,12 @@
+diff -ruN digikam-2.0.0.orig/extra/libkgeomap/test/CMakeLists.txt digikam-2.0.0/extra/libkgeomap/test/CMakeLists.txt
+--- digikam-2.0.0.orig/extra/libkgeomap/test/CMakeLists.txt	2011-07-28 01:27:44.000000000 +0200
++++ digikam-2.0.0/extra/libkgeomap/test/CMakeLists.txt	2011-08-08 23:40:38.077189447 +0200
+@@ -59,7 +59,7 @@
+         test_tileindex.cpp
+        )
+     KDE4_ADD_EXECUTABLE(kgeomap_test_tileindex ${test_tileindex_sources})
+-    TARGET_LINK_LIBRARIES(kgeomap_test_tileindex kgeomap ${QT_QTTEST_LIBRARY})
++    TARGET_LINK_LIBRARIES(kgeomap_test_tileindex kgeomap ${QT_QTTEST_LIBRARY} ${KDE4_KDECORE_LIBS})
+     ADD_TEST(kgeomap_test_tileindex ${EXECUTABLE_OUTPUT_PATH}/kgeomap_test_tileindex)
+ 
+     # test the LookupAltitudeGeonames class
diff --git a/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild b/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild
index c075dcd68317..3262aefa2f67 100644
--- a/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild
+++ b/media-libs/libkgeomap/libkgeomap-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-libs/libkgeomap/libkgeomap-2.0.0.ebuild,v 1.1 2011/07/29 19:13:27 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libkgeomap/libkgeomap-2.0.0.ebuild,v 1.2 2011/08/08 21:44:02 dilfridge Exp $
 
 EAPI=4
 
@@ -29,5 +29,7 @@ RDEPEND=${DEPEND}
 
 S="${WORKDIR}/${MY_P}/extra/${PN}"
 
+PATCHES=( "${FILESDIR}/${P}-tests.patch" )
+
 # bug 376763
-RESTRICT="test"
+#RESTRICT="test"