[media-gfx/digikam] Completely disable the bundled libraries (with a switch)

(Portage version: 2.1.8.3/git/Linux x86_64)
 (Signed Manifest commit)

3 files changed, 40 insertions, 18 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 9fc1b3eb13..21bbcd99a6 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX digikam-1.3.0-clapack.patch 5884 RMD160 89c94562fd45f3edebb40dcdd92ae77e5aaaa7ba SHA1 600f5162eb00afb1bb8ba2f130b89e8abe9196f6 SHA256 0f69841859b588e891b372070314e465e986de9481c495972f84c8edf9702825
+AUX digikam-1.3.0-clapack.patch 7182 RMD160 f0b8bfe449091e24d69bb54de6592fddf3e54c1c SHA1 6b70ac686c9ea0d1d5cb93a5d00f49ea1227f9c9 SHA256 273723c1bcd9bab8d5c301eeebfe572d3c8a5ef82a18a69eff424cb32722807a
 AUX digikam-1.3.0-docs.patch 1910 RMD160 c4d644e91a0b492c8c9a8e53ed0ae19fa743dabc SHA1 6d3c6519e4d7351198f6275639afe448e09d92b7 SHA256 d8048791e9623fe99796d71bc835ac568786b4c5a643b3d02c6d80472e725b99
 AUX digikam-1.3.0-pgf.patch 6006 RMD160 bfda7c95a633f4967935545f66d850fd94db9566 SHA1 43295130d7a62dc27097ed9730b3b47e13f2ab3f SHA256 84c219c7238790288b90acdb255bce2e40e3c5f19476885a2d456698e2f57205
 DIST digikam-1.3.0.tar.bz2 14990462 RMD160 45f6bc4ee80df278eb85f3de9eab9b221ee94377 SHA1 99ab242f075d7d5368b66996fffeed5dfd738cbe SHA256 76184c5e193b8338894db6a8c4af4bc773beb819856a83ae163529aefcc10321
-EBUILD digikam-1.3.0-r2.ebuild 2461 RMD160 5441e2cbdae105b4597be3f590bcad8d2cf89a97 SHA1 edfbdd154fac351ecddae28147202a97f7c082a3 SHA256 3ffc4d55dd1e9daa52202bfbad9b6e83a3936f8d69cd4c59f1c82ca4f4ea4515
+EBUILD digikam-1.3.0-r2.ebuild 2484 RMD160 2016274d9794d7f1b1015503de62c05be9122cdb SHA1 0b641a83b03729effbeb0d501a55ab8dc376b340 SHA256 f7594bea656f430963417f9395890e48436a86db70f9dc50b25ed116ae56c3f2
 EBUILD digikam-9999.ebuild 2541 RMD160 b4598d1d007202ff5dcdd4a8dbba5d56811685bf SHA1 0f869d851077028fc46d102cce27fef38ad6b712 SHA256 68b9fcf5654af895d9c9edda84900e438a762d7d729a3f5a2afec07e447988ed
 MISC metadata.xml 561 RMD160 4cd500a827d9f01fb799b34f126312c0462f0e7b SHA1 91432be778e43c9381a7bcdd602b3bc7d773b472 SHA256 002c1784fab700752d25b556bc16caec89d8c764e19fb1d950006a8adc4af939
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iQIcBAEBAgAGBQJMeTp8AAoJENwGBM22xffecxoP/0S5zbrtiIfD/DEwhQmPpWfg
-qMLFCwEGKOGBIw9Fq1uOhvYFkARPolhk3Xo2/xbTSRMySoB+YQG2deWrNsJKBPUy
-RjmJPVX4iyCDbzHivIaJa9ES619XEFod375y3CWa+d6fUW1hs/Wbf/EfSVdoguWd
-dNmcQ+EMftdAoSHMMe0u0AirZ20vDzAohIk9fhsVW9qhV/FadRMnB1SxKy6boZn9
-bI1FwNAThVEmGm8b/CHG6/KsEoZUEKbf08qZHXSkGY0NY51mRIaIEaf6qkdvm1H1
-QIungDgS4i1hxhgQ5JPj6CryIX35+2H1ukoudXJVYbe09DRz2VcyAFTzduGHxufO
-MMxDVK/93J3urVvPO1gYqlUKKHwNqjpRCIgv6IZI4O4jX42tvPqXNnQVd1u6F49i
-g1ZM2yXILnXt78Aj/VZAQQJRbZwNRN8MNhc0yBCQUssJv7aay5wV+JOY6JYuGJ+u
-SF5bEu1YL3pI6NsWHQ5HrO0Pkxs5HqewBhaOq75I8pmEO0EiyJnM5cxpiZqh7xUL
-eGD19cnh1mqv2ucoPddwOlouXKPP0pE7IjrKoJYDFCZbeA5zIlJWoJ+iFb3ZKw+i
-yBMvBhVoeE5UgsMB5B8fSmGccFXdSweqGcBNlVS7WDPkCIcltvBiQ+mahbvoGd0F
-RsvJzmgjKroRUFPEoHNd
-=2Ymh
+iQIcBAEBAgAGBQJMeWFtAAoJENwGBM22xffepV4P/3t/bnVmRcHlFfWc7w5YtBZ1
+FSEsi2qYQYhzR3G9rFMs5nJQ6aSZ5J1d2TZB16Tr2OpkBPzq5+bF3KukxMgck3a2
+kSpQ2MKP62OlcjEAgKAyTLsDG74Pn516CC/VGdmtvYYfnL9Ai5V+cQxubFBaZn7Q
+dGUfqCcWIuYnbYNIKdgeqCGj1GwnkmGqZfq3R9LkS7Yr1WbG3V0wvPqOUnVEfOh+
+Ds3Rm85SxIiEWCIZhAZDVWVjkHARnYUkIZOxiAREg/NGFRmSw+JwmvL3q51w9s4p
+9etuvByZTc6qrV3O5M4rmcc66rJu+9RrWiW1R6TrIl157goObaSrzfYv7z3gzTvH
+kVCMBPW38ZBMdI72+RY7iJG4xw8j1dUvmsx1KJPvaFI3DwUAzILtvJdjXxUnrPyR
+PsUf9wn5We0cQkUZfwFPfNBjysIYWO70DYyCRyGGY7JfoJwiDOGvqU3aCyNA97RH
+CMzU3HuIRVwmugSU0xGoH6OyPB6RBYdUZSJMnw3KA2Nqpgbd61T97+TqLposhM5m
+g4V5bfVpfcWW2X7cYi9jr83bl7zML63igBw6aKe8xd3yrAbdtMo2dsiUUFhHjeSL
+QOLZbjfkGzYR0ODaBKSQii+btgeiRII/opg0tL1rzzVDIiglJKTmo5521FqklcfL
+3NQZ6+nvxkiFTIh1MXZB
+=GVsj
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/digikam/digikam-1.3.0-r2.ebuild b/media-gfx/digikam/digikam-1.3.0-r2.ebuild
index 9e50b3c063..3657712ff0 100644
--- a/media-gfx/digikam/digikam-1.3.0-r2.ebuild
+++ b/media-gfx/digikam/digikam-1.3.0-r2.ebuild
@@ -71,6 +71,7 @@ src_configure() {
 	use semantic-desktop && backend="Nepomuk" || backend="None"
 	# LQR = only allows to choose between bundled/external
 	mycmakeargs=(
+		-DFORCED_UNBUNDLE=ON
 		-DWITH_LQR=ON
 		-DGWENVIEW_SEMANTICINFO_BACKEND=${backend}
 		$(cmake-utils_use_with addressbook KdepimLibs)
diff --git a/media-gfx/digikam/files/digikam-1.3.0-clapack.patch b/media-gfx/digikam/files/digikam-1.3.0-clapack.patch
index 03e23a0be1..6cc269891d 100644
--- a/media-gfx/digikam/files/digikam-1.3.0-clapack.patch
+++ b/media-gfx/digikam/files/digikam-1.3.0-clapack.patch
@@ -1,6 +1,6 @@
 diff -r -u -N digikam-1.3.0-2-pgf/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
 --- digikam-1.3.0-2-pgf/CMakeLists.txt	2010-08-26 23:44:46.000000000 +0200
-+++ digikam-1.3.0/CMakeLists.txt	2010-08-28 16:37:17.000000000 +0200
++++ digikam-1.3.0/CMakeLists.txt	2010-08-28 21:16:05.000000000 +0200
 @@ -141,6 +141,7 @@
  FIND_PACKAGE(Kdcraw)
  FIND_PACKAGE(Kexiv2)
@@ -24,7 +24,28 @@ diff -r -u -N digikam-1.3.0-2-pgf/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
  
  
  # ================================================================
-@@ -538,7 +545,8 @@
+@@ -374,13 +381,19 @@
+ ENDIF(DOXYGEN_FOUND)
+ 
+ IF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+-    MESSAGE(STATUS " digiKam will be compiled................. YES")
++    MESSAGE(STATUS " digiKam can be compiled.................. YES")
+     SET(DIGIKAM_CAN_BE_COMPILED true)
+ ELSE(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+     MESSAGE(FATAL_ERROR " digiKam will be compiled................. NO  (Look README file for more details about dependencies)")
+     SET(DIGIKAM_CAN_BE_COMPILED false)
+ ENDIF(LCMS_FOUND AND JPEG_FOUND AND PNG_FOUND AND TIFF_FOUND AND JASPER_FOUND AND KDCRAW_FOR_DIGIKAM AND KEXIV2_FOR_DIGIKAM AND KIPI_FOUND)
+ 
++IF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
++    MESSAGE(STATUS "")
++    MESSAGE(FATAL_ERROR " BUNDLED LIBRARIES HAVE BEEN FORCE-DISABLED IN THIS BUILD. Aborting.")
++    SET(DIGIKAM_CAN_BE_COMPILED false)
++ENDIF(DIGIKAM_CAN_BE_COMPILED AND FORCED_UNBUNDLE AND ((NOT PGF_FOUND) OR (NOT CLAPACK_FOUND)))
++
+ MESSAGE(STATUS "----------------------------------------------------------------------------------")
+ MESSAGE(STATUS "")
+ 
+@@ -538,7 +551,8 @@
          ${CMAKE_CURRENT_SOURCE_DIR}/libs/dimg/loaders/pgfsettings.cpp
         )
  
@@ -34,7 +55,7 @@ diff -r -u -N digikam-1.3.0-2-pgf/CMakeLists.txt digikam-1.3.0/CMakeLists.txt
          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/abort_.c
          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dgesv.c
          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/dlaswp.c
-@@ -571,6 +579,7 @@
+@@ -571,6 +585,7 @@
          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/util.c
          ${CMAKE_CURRENT_SOURCE_DIR}/libs/3rdparty/clapack/xerbla.c
         )