Bump EAPI in 1.2.0-r4, fix building of the tests in 1.8.0

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

5 files changed, 44 insertions, 22 deletions

diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 13066af49f8d..31e7934cbd3f 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,11 @@
 # 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.170 2011/01/28 18:41:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.171 2011/01/28 19:15:45 dilfridge Exp $
+
+  28 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
+  digikam-1.2.0-r4.ebuild, digikam-1.8.0.ebuild,
+  +files/digikam-1.8.0-tests.patch:
+  Bump EAPI in 1.2.0-r4, fix building of the tests in 1.8.0
 
 *digikam-1.8.0 (28 Jan 2011)
 
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 7589e44319fb..fb450aab9bb9 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,30 +7,31 @@ AUX digikam-1.2.0-libpgf-r3.patch 6824 RMD160 cf771745da65673a6783a3ed9d6d2a0e74
 AUX digikam-1.2.0-ratingwidget.patch 413 RMD160 b7e86997019fa16590a565b8e18fb43c287c7e88 SHA1 aa90381903000f28c105677e12f4b6813363659a SHA256 48cf828b847cd4346b9f5512fa1a010565680d31996bf2492c7bf256caf04231
 AUX digikam-1.6.0-docs.patch 1438 RMD160 d4507c7aabe6eceb700ae8e3b76ac90c500c3326 SHA1 b6f477d6e6ceaef8947071a12cf07e188789fc81 SHA256 21286862bb1dc5893cec0b16cf563b75edb6fe952f6aad7add6f4f59a575d2b8
 AUX digikam-1.7.0-docs.patch 1457 RMD160 e41322e23bb47234047fbe78aaf9202996907055 SHA1 281f7ad8644aa3f6c284cef7db40f330c8cec5d7 SHA256 7c32e5193a2ce168d10cdb3ea0bfa3a06774220013e51f61e8ba02fe65958ac6
+AUX digikam-1.8.0-tests.patch 914 RMD160 520675d0fb1080549a0c3f5c67fc51d36bb19b1d SHA1 1e80a74d91f593939a69a7f77870cbefbbb73235 SHA256 29a7e68abd804019b1ae533a62920e931d5057aaa10bf20cd81358cf8bfcee1c
 DIST digikam-1.2.0.tar.bz2 13970098 RMD160 f8177241536b2f099499977d9c3cbd2dc9880853 SHA1 7f12caf737a05043c7a9a5291a448684e5a4e2e6 SHA256 930539b5bb53af345f4bef3d06c7121c22af3dbd7ae7b338fa3d173a6a631206
 DIST digikam-1.7.0.tar.bz2 23386697 RMD160 6b13c1788e7fe97b8043d7d3237808815da6a8f4 SHA1 5e061570ab2cc8081d8207de4791950ffe73b49c SHA256 16efee432c4d8e115298abe9dcde6e68dcc93fe0c1fd4f39211e6f19e5a80389
 DIST digikam-1.8.0.tar.bz2 23376636 RMD160 aa86cae8048a8f7122285c5e27aaa59e5dbcc47c SHA1 65430990896b56b7ec76b9a6bc5f8472145f44fd SHA256 210de9d949265e910c65c9ab8b19efab13839f6a2ef761a5915d267ddfe494aa
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.2.0-r3.ebuild 3219 RMD160 6a5187b3e6a0866ecc0c1e95c77f737b84478969 SHA1 fa8f9eea4a6894f1ecd0494f19fbf2d21c07e844 SHA256 776fc41a003c8e0cbe61d123067b3d5cf9bf5d3cc0b57eb088d8fcc9d21db17c
-EBUILD digikam-1.2.0-r4.ebuild 3217 RMD160 9c7d2e493283873ed86f0740edcaed97377ba20e SHA1 06482c3df020633f578e94e3dacf4f49bcff0836 SHA256 4f8e0c95e0e1867083004092699f1933e490a99cd792073d9bdd583bb68b8e27
+EBUILD digikam-1.2.0-r4.ebuild 3215 RMD160 8b65234982a07cbca031e762cca9ad9fca0af112 SHA1 ed204cc640716af1998afe46f6cb2c3395da31ba SHA256 bba559b09bdb15fa23ffc390e70c26cb111143cca6bfc280e5c5240f1052aac1
 EBUILD digikam-1.7.0.ebuild 3148 RMD160 3c5f1e555f90c9426acc13cae2de7b2a85a8b6cd SHA1 a43ac64cdef4edb5fb24acb0fdaf9662965ccdfe SHA256 174b13da7a4b8cf16992e82c45a60820a2c749577933fce030b62a18627ec369
-EBUILD digikam-1.8.0.ebuild 3201 RMD160 c34311889a50a07b241fdde5146c65696a7198df SHA1 9667ec8cebd35c154892e57c4800df0748e9973e SHA256 1d2736ec22e4196b0989a076e30e8e60ea9347b6886ec3732e4ad079f8decc9a
-MISC ChangeLog 28566 RMD160 b4188dc07dfada20a47e56b387138d37a4dca5d2 SHA1 2c36bec71390a3509539e1a1485e4de5f7271a20 SHA256 6a219300b98a8e25178ea529f50ea3a4e8e814c9478fcce9acc3d53b3fcc5b3e
+EBUILD digikam-1.8.0.ebuild 3233 RMD160 c49460e169ca6a4ca4e0bc2d7cc375d9bf230d64 SHA1 5a7e9101f55305e9d75ed9555c2a428b2c75bdc2 SHA256 318ccfbca4b7648cd3d135e5d52d24f67920847026a90b095e7ff05763573e39
+MISC ChangeLog 28769 RMD160 89983a5b8f0101d1b84d0656442aed3acf296e49 SHA1 8bd7d86b59ff98eca9db26ab59f5e25c2e3e4548 SHA256 7ab259d0f176fcaf3082298c874c3e8fe5a13196f0e113cb6ca61d934e67ab21
 MISC metadata.xml 626 RMD160 c40d623ad086f0d2f47a8f1092b486b4ae92faef SHA1 fb1c2209b4eac3dc43fa09a7946d47c0156cee67 SHA256 a5d01bcd7e500161aed9a6a4fe9b65422091a375d1ee9cc0490e7776f8f925a6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNQw29AAoJENwGBM22xffewFAP/RCn5ESvtB0VFPxIImPH0Zm1
-Hn6MPa1h9ThSSx/72FiWuf4cRfKe6qCiNqEylaD6+6F/fe4eOTkf/Lo/Z0/qsARi
-lHYPVchA/ju3GgiVeGFy2Ksh8LO6ugb5lkzCxLlzfWGBmWPyw9jiYA5rqOBPt24R
-tfg5ADt7iU0SJblnmRdbwGaSkKk7Ubh/2VyJnhp5S/YZ2eTzWw05r2be7O7B/Ctx
-yc5EaThGo+HY550TfcMDww6h6BnhsspaInpBOlCZRmMGmucZQQT52DCDr/Kei77f
-jUyxPkjDsVVjbbZcz3f04nhoI9ZKj17OBIUp2no3yr4iBdFhR6zcfexgsGlLkrF1
-pKMujrO56vyB4ZGFbO6rU0SU31n4sXd4BaUibymT5/wmazmiYBWs4sfKecb77Fdf
-+uTTNS/v4ja7vz6a6YatmaqZDYWJ5n7G8+Hqwe0kmUQaMtDOKcfAm8BQlokp5XNO
-y8gpuNUC5IU6F/Or/mQfp62y0CeGjE6JO8p1B6p6q/i3Fes2nUf594chrFBxz8+N
-qX7lN7JCDoSIGBwlh6LlmaS95wsI+q54pchbxJjSTTjo4FO+1uRb9YqHqQ5G6smN
-cHH9fO4+dCEpEkR7aNr3VHqGDhkGhP9M+4kNK9Lz7USuuGkqQDcIt69oTuUdbVG9
-w/87MKIjk8pswlLrx9UM
-=19BT
+iQIcBAEBAgAGBQJNQxXIAAoJENwGBM22xffeA4oP/is/8kq1g7tpPOcuqLojGgX5
+wmxdv8nbrIWqm2Lq53odY4yOUEbH3jeQQlfcA3uzp4Y4stRS096QTb+k4gb14L+Z
+dcBl6WtgURj5dangiO90rwjMCNtnWuFh6NpyjWo4Sz8/dhoc1WrhtihwPo2B5kgx
+IOBnMwR5u32GD+P9bx2QswjdCtFbIe3Am2FpACewz5iw62L5DKRFtcertEUuAqZl
+eLc49ItiEHWBwYBvRw3M1aJCaKfg5pn7ZxpKoJKlPL53G7CTXKFgzcOcND0ZPcNE
+cYSiqdqGTEEAsgAldvm4XcUXvlzRAPsdAeRQKvKID0BtXUxLFCoj1/J9C0OU68W5
+JIM62GUl918omrnM0J19G9HFauhIQvA4EVbJJxhALVAiXB4Vcmm1ZE/DP+gnLr+Z
+mldQcreL+5qF7aicarhsGWgLcmN5vL6YuXvZnYPIfuhukzj6sO3ZvZk0riRzpFcV
+mKT4WrhsMdgNbUYvU3O0nJmdm7v4QDusiHWJnnVa+wCaH9/pbmAw3jNkLZ7c/PBd
+gVtLNd2rNjwhqHsdPYbdWGDDMjGoLXldUP6plvh7wwEJVnfBnwkcj0J+0H7TwBYJ
+W+UGJARMG9emxQSWGfboFS75NEyu4la+2b2EtMdSjAcV0Pv02Txhbnfb62L0Rvy4
+EMqfpwbpdDWNgAvN6eBH
+=j3V/
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.2.0-r4.ebuild b/media-gfx/digikam/digikam-1.2.0-r4.ebuild
index 6effb8bebd0f..f38aa63b1651 100644
--- a/media-gfx/digikam/digikam-1.2.0-r4.ebuild
+++ b/media-gfx/digikam/digikam-1.2.0-r4.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-1.2.0-r4.ebuild,v 1.1 2010/11/08 21:29:51 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.2.0-r4.ebuild,v 1.2 2011/01/28 19:15:45 dilfridge Exp $
 
-EAPI="2"
+EAPI=3
 
 KDE_LINGUAS="ar be bg ca cs da de el es et eu fa fi fr ga gl he hi is it ja km
 ko lt lv lb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sv th tr uk vi zh_CN zh_TW"
diff --git a/media-gfx/digikam/digikam-1.8.0.ebuild b/media-gfx/digikam/digikam-1.8.0.ebuild
index ed9a46db0277..37f50356b6a7 100644
--- a/media-gfx/digikam/digikam-1.8.0.ebuild
+++ b/media-gfx/digikam/digikam-1.8.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-1.8.0.ebuild,v 1.1 2011/01/28 18:41:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-1.8.0.ebuild,v 1.2 2011/01/28 19:15:45 dilfridge Exp $
 
 EAPI=3
 
@@ -64,7 +64,8 @@ DEPEND="${CDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch )
+PATCHES=( "${FILESDIR}/${PN}"-1.7.0-docs.patch
+	"${FILESDIR}/${P}"-tests.patch )
 
 src_prepare() {
 	if use handbook; then
diff --git a/media-gfx/digikam/files/digikam-1.8.0-tests.patch b/media-gfx/digikam/files/digikam-1.8.0-tests.patch
new file mode 100644
index 000000000000..ce03d2e5887d
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-1.8.0-tests.patch
@@ -0,0 +1,15 @@
+diff -ruN digikam-1.8.0.orig/tests/CMakeLists.txt digikam-1.8.0/tests/CMakeLists.txt
+--- digikam-1.8.0.orig/tests/CMakeLists.txt	2011-01-23 20:24:49.000000000 +0100
++++ digikam-1.8.0/tests/CMakeLists.txt	2011-01-28 19:56:04.000000000 +0100
+@@ -176,9 +176,9 @@
+ 
+ SET(qtpgftest_SRCS qtpgftest.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
+ KDE4_ADD_EXECUTABLE(qtpgftest NOGUI ${qtpgftest_SRCS})
+-TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++TARGET_LINK_LIBRARIES(qtpgftest ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES})
+ 
+ SET(pgfscaled_SRCS pgfscaled.cpp ${libpgf_SRCS} ${pgfutils_SRCS})
+ KDE4_ADD_EXECUTABLE(pgfscaled NOGUI ${pgfscaled_SRCS})
+-TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
++TARGET_LINK_LIBRARIES(pgfscaled ${KDE4_KIO_LIBS} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PGF_LIBRARIES})
+