4 files changed, 55 insertions, 17 deletions
diff --git a/media-gfx/digikam/ChangeLog b/media-gfx/digikam/ChangeLog
index 3aa4df7d0ffe..795bc9bc09f0 100644
--- a/media-gfx/digikam/ChangeLog
+++ b/media-gfx/digikam/ChangeLog
@@ -1,6 +1,13 @@
 # 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.192 2011/08/02 20:47:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/ChangeLog,v 1.193 2011/08/26 19:46:48 dilfridge Exp $
+
+*digikam-2.0.0-r1 (26 Aug 2011)
+
+  26 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -digikam-2.0.0.ebuild,
+  +digikam-2.0.0-r1.ebuild, +files/digikam-2.0.0-underlinking.patch:
+  Fix underlinking and library linking order. Fixes bug 380687, revbump because
+  it might also be related to bug 380287
 
   02 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> digikam-2.0.0.ebuild:
   Fix semantic-desktop dependency, bug 377167
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 3d63fcb02a56..3f1d0a7e4639 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -7,28 +7,29 @@ AUX digikam-1.9.0-newpgf.patch 3463 RMD160 4e5c506e81436aaafe5b789d79adcb1caee44
 AUX digikam-1.9.0-nomysql.patch 3323 RMD160 9b03cc09f81188a9373212af0bfc079eeced3c37 SHA1 7fe8a51f5d8c5eddfc22f37f6741f0c96ca64f16 SHA256 c3e09ee35172c9e38d13fe20b5e65ae1d53e954e3c50be1fbddd0223990cac5c
 AUX digikam-1.9.0-turbo.patch 2265 RMD160 ecff0e0fa2ba6d51cdb6ec5bb90b41c3ed7310a2 SHA1 e9383e730b81348656c3482700dec59a3ba5a499 SHA256 765338d842b39622428c068d9e190cf0f97933cd66845fea2ff0b5f79ed7b2cc
 AUX digikam-2.0.0-tests-1.patch 1880 RMD160 8961d7cd5cc31469da1e0d338f05b56c0c90f43d SHA1 f52a04eb8fc4288cbadf6c975622af0cffbf8776 SHA256 ca07b4ce9651386f7355007a4c02727b0097962f2664a2a2b20c7208fdc01bc2
+AUX digikam-2.0.0-underlinking.patch 843 RMD160 c13b49b2703cd3940743fa7f7555510cc04e5568 SHA1 1954ab4b923246f74b225fc5fb1a9ae31536657a SHA256 3d3fbaf8aa006e4f2aea0d258457c7103d3c5c009687a1f2558dc8b6dcb0c514
 DIST digikam-1.9.0.tar.bz2 22866660 RMD160 5c23e525729eb795c5d22aeb00bd0bc6789d926a SHA1 3958c47756e816b3ab8709fcbf41a945bcd4903c SHA256 e218bf18971711c5f4ef2cb43f6b5caceeb04f346a60378aee031ef209c87ed5
 DIST digikam-2.0.0.tar.bz2 53906557 RMD160 010f6b37920828003fa56159f1a7cf8452226fc6 SHA1 5941681163d90a13d316bd606589354099fd4f8a SHA256 c7d19f0562a06f02479cf84a257fe30aa523f82e668a16b21ce9ae5443034234
 DIST digikam-doc-1.4.0.tar.bz2 17447988 RMD160 ea41c9721875617e828eb6f10cb10cf1306f622f SHA1 b430a535b10a65d1d3e73504df9657428205164e SHA256 1a65b20b08a1ebe748b81efe83d043ecdb38d2c98259c4f7963e6bd2b407e467
 EBUILD digikam-1.9.0-r1.ebuild 3347 RMD160 3cdaf055dc0b801a3cd05ce5ebd91a7db10ff819 SHA1 29390bef0da866f1f914ba05e046f15f78297d4e SHA256 2b83becdcae58d502d977afe0551abf24b80365bb42be54144444b969d7342e2
 EBUILD digikam-1.9.0.ebuild 3178 RMD160 1f56c6f8cc4d7595dd751866f7a342974c0b67ea SHA1 e4193070e15b3851ff8fa2b6bb18ec48d3bfb0ac SHA256 b75d893953c1f37396f4f4b6a0c59005b4bf09307cb85aef958bc3910f3e9c75
-EBUILD digikam-2.0.0.ebuild 3691 RMD160 7cd550230a311e39b82c5676e04318a12ae97a03 SHA1 44b4db824ce9cf134b1429ad4b5fec8b5b50de64 SHA256 c63ec8d5f7111de08154ba74a0bed968d5dd906da3441b4aa90dba655c15d004
-MISC ChangeLog 32300 RMD160 0499f2705311137ca8cd84b043706461b2080d2b SHA1 2c44de5a0d91f3ca9c469ef05d7d0742199d31a0 SHA256 fba46858d8b122e423586f7330d2c558bc642cf3c76b1eeaba26eec2511171ca
+EBUILD digikam-2.0.0-r1.ebuild 3733 RMD160 9412cc5c539d304ba2252dc30df950262dc90cc9 SHA1 6550eea307e7cfe3a99e660bec573171456b394d SHA256 c80ad678226847aa563d63d5a151fb9880f99530892c699827ec0f7ec8306cb5
+MISC ChangeLog 32604 RMD160 4842a0227b1a9bd3d88825813c26af03c9cb1f92 SHA1 41c41a22e835441a950569e26d6ac0f8e74336fd SHA256 0126af1daf661e5bbb5a78bb1123cb27ceb50292ec7519f734423850170ba6f3
 MISC metadata.xml 751 RMD160 b65e7816a03a284f440d296c1853aa913105129a SHA1 c6bf2cf0d471e4d4ffdbb5185889a0e9cd65af39 SHA256 4b8eced4b0649dc935acffac97119bb70862bebd51a686b32778745b407eb0cb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOOGJpAAoJENwGBM22xffezIIP+wekGCdmGizj+SBrffo6aNZ0
-fwKXJ/m4c2s6ahu+B+RZ8Gl+AU+3lOv7sRCy9u+hGxyoKnsDN3BHVCcAyW8JOUm9
-ny+cr23BysTORtGjzc1xT9qj5HTjDhGPtlDQtp8N77fEE+rROahDSzrosKhY9WXU
-ImpRev1+Ll+jXkQWl/XjMgjp5iHESNXqyRfV4GT7B39dgv21Zsa5w+6jd5UbgQq9
-RcWRLTmwiPxbliZwDzsnKIMSFyJvoNNAmkRCBX2ed1p83Re985fbGD7iTkC8d0WH
-Mgl+M/SpNxT9TReptIDA3lp7KFajhpikSGkH2fBcau+v1DhBDIXmvSB3xvyAU2mp
-EUfVbb27/nxXJBjKk07XyyysMHnzVIFYmtJ8rM1VrK+knk9bEANPJ5WlEU/LfNfd
-mcyjEeaZd1VLI9LVOz7THxOWRWXqZtmBDF1nOC3rSYPL+80L0FJ0mvFMf+CwZ6nz
-qZb6k/CebkOgp5I8oZUd0GHyu/Ljla5gaa9DLrXE1LdYsAGaVAQqvKGdMICD6Eh8
-VBL1jli9OzO8V/T0RxG3hZWqTSOT70EmRX2yhhznEWn+f7hkvkRhYhDQFmbN+WI5
-5rGcsq0ZrYy/6PBr3FGxhetevFaGs6LGsAODBeNX3G/JXPUAW33dHwdRJ7DlnZDy
-eJ/vrfBB5IyX/1Cz7nWw
-=SxC3
+iQIcBAEBCgAGBQJOV/hDAAoJENwGBM22xffeingP/1qotNZ3Y464m/Zs1YDfdYYZ
+BvzkaJp3oLRAMOFaMkdbxNh0ut4JLt2JU96FX1qd1j89G5FJ++kW9WBQ3jaiKZbx
+qHnCLucBSYwDLsNzzVHZJ0E8xNtfRzewYiPK2s+3Z9wwg8dwjqCB1AK2KpcIO3rd
+Y/hoVOVM45uV9rSZUDwNA3Bco4k16JpGqly7L6MY9C4GoervTNOad/7dbSY4GtEY
+2wcXqPyZLAJAky9GlMQCWlij3U5P9Ze5tTTCE9xGDvwbz3TLgcX+/G7G2KwNxFlF
+FcuARt3XTHSSspApn8Kk6KOKU/rWhszPHjhtDFb0KNmwvXCb96OLcrUDtDFIE8Ej
+v86cQyFozCDwNN1JHRZBbk3y8bKiJCUpU9BB6JFnUFbepEXYHMfYxZZEJydQiyzP
+bYwUTHXqu68MKUoVWEbfMOdl3U7HVv1haj9UklQzSyrW5W/r4GXqwUXObUHqGv74
+hdDdJpIdr/cY15xkt+YNcxEsS7Z/RkeR8Q1lG95thJROeQh51E8V1dV6tMW3CfeN
+5VjmKDf14Z8m5W7X99K0iktV4xz12aPOH2zWWB4e69gH4X0lH3tiocUzbT+CgVeD
+hIWQQpw4t8gYKgBxtNtl7J7fr4SRboCG+gcywBCz0Ty3JNOHypY2w0F25OVvkhdi
+s78IQKWicQtpzS5+BuaB
+=F3cQ
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-2.0.0.ebuild b/media-gfx/digikam/digikam-2.0.0-r1.ebuild
index 4b235a0bdf83..f9e20a1bd631 100644
--- a/media-gfx/digikam/digikam-2.0.0.ebuild
+++ b/media-gfx/digikam/digikam-2.0.0-r1.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.3 2011/08/02 20:47:21 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/digikam/digikam-2.0.0-r1.ebuild,v 1.1 2011/08/26 19:46:48 dilfridge Exp $
 
 EAPI=4
 
@@ -70,6 +70,7 @@ S="${WORKDIR}/${MY_P}/core"
 
 PATCHES=(
 	"${FILESDIR}/${P}-tests-1.patch"
+	"${FILESDIR}/${P}-underlinking.patch"
 )
 
 RESTRICT=test
diff --git a/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch b/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch
new file mode 100644
index 000000000000..a5f05e08d3ce
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-2.0.0-underlinking.patch
@@ -0,0 +1,29 @@
+commit 772f592f639f52d0c1a991265098b46672fecb6e
+Author: Gilles Caulier <caulier.gilles@gmail.com>
+Date:   Fri Aug 26 11:58:59 2011 +0200
+
+    Fix order to link gphoto2 library with digiKam shared lib. This must be the last on linker command line...
+    CCBUGS: 258931
+    CCBUGS: 268267
+
+diff --git a/digikam/CMakeLists.txt b/digikam/CMakeLists.txt
+index 42017df..78ca1f1 100644
+--- a/digikam/CMakeLists.txt
++++ b/digikam/CMakeLists.txt
+@@ -279,13 +279,15 @@ TARGET_LINK_LIBRARIES(digikam
+ 
+         ${STRIGI_LIBRARIES}
+         ${LCMS_LIBRARIES}
+-        ${GPHOTO2_LIBRARIES}
+ 
+         digikamcore
+         digikamdatabase
+         advancedrename
+         queuemanager
+         cameragui
++
++        # See B.K.O #258931: libgphoto2 library must be the last arg for linker.
++        ${GPHOTO2_LIBRARIES}
+ )
+ 
+ IF (NOT WIN32 AND GPHOTO2_FOUND)