Fix building of tests, but restrict them anyway, see bug 366505

(Portage version: 2.1.10.8/cvs/Linux x86_64)

3 files changed, 54 insertions, 2 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index edd01068802d..f1a695be1d8f 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/digikam
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.190 2011/07/29 19:28:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.191 2011/07/31 20:21:12 dilfridge Exp $
+
+  31 Jul 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-2.0.0.ebuild,
+  +files/digikam-2.0.0-tests-1.patch:
+  Fix building of tests, but restrict them anyway, see bug 366505
 
 *digikam-2.0.0 (29 Jul 2011)
 
diff --git a/media-gfx/digikam/digikam-2.0.0.ebuild b/media-gfx/digikam/digikam-2.0.0.ebuild
index 1cae284751fd..12e64ffba5f0 100644
--- a/media-gfx/digikam/digikam-2.0.0.ebuild
+++ b/media-gfx/digikam/digikam-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-gfx/digikam/digikam-2.0.0.ebuild,v 1.1 2011/07/29 19:28:45 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0.ebuild,v 1.2 2011/07/31 20:21:12 dilfridge Exp $
 
 EAPI=4
 
@@ -68,6 +68,13 @@ DEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}/core"
 
+PATCHES=(
+	"${FILESDIR}/${P}-tests-1.patch"
+)
+
+RESTRICT=test
+# bug 366505
+
 src_prepare() {
 	# just to make absolutely sure
 	rm -rf "${WORKDIR}/${MY_P}/extra" || die
diff --git a/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch b/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch
new file mode 100644
index 000000000000..298ce901ada8
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0-tests-1.patch
@@ -0,0 +1,41 @@
+diff -ruN digikam-2.0.0.orig/core/tests/CMakeLists.txt digikam-2.0.0/core/tests/CMakeLists.txt
+--- digikam-2.0.0.orig/core/tests/CMakeLists.txt	2011-07-28 01:28:08.000000000 +0200
++++ digikam-2.0.0/core/tests/CMakeLists.txt	2011-07-31 21:47:05.000000000 +0200
+@@ -223,9 +223,13 @@
+ 
+ #------------------------------------------------------------------------
+ 
+-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio
+-                    ${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf
+-                   )
++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/threadimageio)
++
++IF(PGF_FOUND)
++    INCLUDE_DIRECTORIES(${PGF_INCLUDE_DIRS})
++ELSE(PGF_FOUND)
++    INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../libs/3rdparty/libpgf)
++ENDIF(PGF_FOUND)
+ 
+ # Disable libpgf warnings.
+ SET_SOURCE_FILES_PROPERTIES(${libpgf_SRCS} PROPERTIES COMPILE_FLAGS "-w")
+@@ -233,11 +237,20 @@
+ SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
+ KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS})
+ TARGET_LINK_LIBRARIES(qtpgftest ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++IF(PGF_FOUND)
++    TARGET_LINK_LIBRARIES(qtpgftest ${PGF_LIBRARIES})
++ENDIF(PGF_FOUND)
+ 
+ SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
+ KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS})
+ TARGET_LINK_LIBRARIES(pgfscaled ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++IF(PGF_FOUND)
++    TARGET_LINK_LIBRARIES(pgfscaled ${PGF_LIBRARIES})
++ENDIF(PGF_FOUND)
+ 
+ SET(loadpgfdata_SRCS loadpgfdata.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
+ KDE4_ADD_EXECUTABLE(loadpgfdata NOGUI ${loadpgfdata_SRCS})
+ TARGET_LINK_LIBRARIES(loadpgfdata ${OPENMP_LDFLAGS} ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++IF(PGF_FOUND)
++    TARGET_LINK_LIBRARIES(loadpgfdata ${PGF_LIBRARIES})
++ENDIF(PGF_FOUND)