gentoo resync : 28.12.2017

2 files changed, 0 insertions, 171 deletions

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index 65909b3c01c9..5189b45afe33 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,4 +1,3 @@
-AUX digikam-5.5.0-cmake-3.9.patch 7298 BLAKE2B d4c9085b9d65977dad1932cbd57f132c8aee844827d28dd74b4ab3ce8dea199ce959306f56064f5abe0a6acaad11c2c45f3932444bda79bb72520ab68c240320 SHA512 0a0f33f8b288fc98b95397ff615ab747bb78e35f8b6ed517e814dfebd32dd3f626f0c232d5b45a69bf80c4b548b72932fb376ce2308b0786b196e7fcdeda9b19
 AUX digikam-5.7.0-kcalcore-1.patch 1489 BLAKE2B af340a573d5cff28ef6d7fe91564ff858d3f55d0a641e05cbaf2428b3bd6351f04fd09a69bfa27d1b6e17e6ba2576571914923ceef84c4920e549d254af03886 SHA512 da3b1bd9586757174333fcfba927ef6d91e0b45813eaf5e9cde5d1062f1154fc6449b1fb746dbac2ddc05ba5c92ca162198fb6a4e36789786d81179c56770e29
 AUX digikam-5.7.0-kcalcore-2.patch 3221 BLAKE2B 6bd179c65797444a4ddbc133c9a1e3204b8127acd360bdb18a766ecaecc0d8efd5284686c424379c8a80010135f0f1653c4efacd83500018da9724bcce1f1db3 SHA512 1f3b9434a53ac0d6111c8b3c306b30515684ab09eca2f8794cdcf21639af6e8148da881c4fb0fcf5aacb4531be35c1ecf51ee2ee7bb6fde9013736e04ec0f66d
 AUX digikam-5.7.0-kreadconfig5.patch 1068 BLAKE2B 4a19e8c0806e7d4ba6219711385db7865507414203f4a273114e1ece3e62983f36cac3b299c3d498a6118dd608719d18ad1c29d1d66bf4774151f530fcb08e01 SHA512 cc78a318f865a85c5a1b0a89734c6c320367c961313db1f8acac25a340c481aa79154ae0c21683f967e0042008235ccf5c9a28078d359c07aaa3e4244b543871
diff --git a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch b/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch
deleted file mode 100644
index d87096a6024e..000000000000
--- a/media-gfx/digikam/files/digikam-5.5.0-cmake-3.9.patch
+++ /dev/null
@@ -1,170 +0,0 @@
-commit 7e00441c257e7e9e5dc5ab983fc06046fb72b0c5
-Author: Gilles Caulier <caulier.gilles@gmail.com>
-Date:   Sat Jul 22 15:46:08 2017 +0200
-
-    fix broken linking stage under MacOS with macports.
-    move database models into libdigikamdatabase.
-    Let's others model in place to be included into libdigikamcore
-
-diff --git a/libs/database/CMakeLists.txt b/libs/database/CMakeLists.txt
-index 7d055363fb..a431a36d7b 100644
---- a/libs/database/CMakeLists.txt
-+++ b/libs/database/CMakeLists.txt
-@@ -13,6 +13,18 @@ endif (POLICY CMP0063)
- # Boost uses operator names (and, not, ...)
- string(REPLACE "-fno-operator-names" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
- 
-+set(libdatabasemodels_SRCS
-+    models/imagemodel.cpp
-+    models/imagefiltermodel.cpp
-+    models/imagefiltermodelpriv.cpp
-+    models/imagefiltermodelthreads.cpp
-+    models/imagefiltersettings.cpp
-+    models/imagelistmodel.cpp
-+    models/imagesortsettings.cpp
-+    models/imagethumbnailmodel.cpp
-+    models/imageversionsmodel.cpp
-+)
-+
- set(libdatabasecore_SRCS
-     server/databaseserverstarter.cpp
-     server/databaseservererror.cpp
-@@ -152,10 +164,10 @@ if(ENABLE_DBUS)
-     include_directories($<TARGET_PROPERTY:Qt5::DBus,INTERFACE_INCLUDE_DIRECTORIES>)
- endif()
- 
--add_library(digikamdatabase_src     OBJECT ${digikamdatabase_LIB_SRCS})
-+add_library(digikamdatabase_src     OBJECT ${digikamdatabase_LIB_SRCS} ${libdatabasemodels_SRCS})
- add_library(digikamdatabasemain_src OBJECT ${libdatabaseutils_SRCS} ${libimgqsort_SRCS})
- add_library(digikamdatabasecore_src OBJECT ${libdatabasecore_SRCS})
--add_library(digikamdatabase         SHARED $<TARGET_OBJECTS:digikamdatabase_src> $<TARGET_OBJECTS:digikamdatabasemodels_src>)
-+add_library(digikamdatabase         $<TARGET_OBJECTS:digikamdatabase_src>)
- 
- generate_export_header(digikamdatabase
-                        BASE_NAME digikam_database
-diff --git a/libs/models/imagefiltermodel.cpp b/libs/database/models/imagefiltermodel.cpp
-similarity index 100%
-rename from libs/models/imagefiltermodel.cpp
-rename to libs/database/models/imagefiltermodel.cpp
-diff --git a/libs/models/imagefiltermodel.h b/libs/database/models/imagefiltermodel.h
-similarity index 100%
-rename from libs/models/imagefiltermodel.h
-rename to libs/database/models/imagefiltermodel.h
-diff --git a/libs/models/imagefiltermodelpriv.cpp b/libs/database/models/imagefiltermodelpriv.cpp
-similarity index 100%
-rename from libs/models/imagefiltermodelpriv.cpp
-rename to libs/database/models/imagefiltermodelpriv.cpp
-diff --git a/libs/models/imagefiltermodelpriv.h b/libs/database/models/imagefiltermodelpriv.h
-similarity index 100%
-rename from libs/models/imagefiltermodelpriv.h
-rename to libs/database/models/imagefiltermodelpriv.h
-diff --git a/libs/models/imagefiltermodelthreads.cpp b/libs/database/models/imagefiltermodelthreads.cpp
-similarity index 100%
-rename from libs/models/imagefiltermodelthreads.cpp
-rename to libs/database/models/imagefiltermodelthreads.cpp
-diff --git a/libs/models/imagefiltermodelthreads.h b/libs/database/models/imagefiltermodelthreads.h
-similarity index 100%
-rename from libs/models/imagefiltermodelthreads.h
-rename to libs/database/models/imagefiltermodelthreads.h
-diff --git a/libs/models/imagefiltersettings.cpp b/libs/database/models/imagefiltersettings.cpp
-similarity index 100%
-rename from libs/models/imagefiltersettings.cpp
-rename to libs/database/models/imagefiltersettings.cpp
-diff --git a/libs/models/imagefiltersettings.h b/libs/database/models/imagefiltersettings.h
-similarity index 100%
-rename from libs/models/imagefiltersettings.h
-rename to libs/database/models/imagefiltersettings.h
-diff --git a/libs/models/imagelistmodel.cpp b/libs/database/models/imagelistmodel.cpp
-similarity index 100%
-rename from libs/models/imagelistmodel.cpp
-rename to libs/database/models/imagelistmodel.cpp
-diff --git a/libs/models/imagelistmodel.h b/libs/database/models/imagelistmodel.h
-similarity index 100%
-rename from libs/models/imagelistmodel.h
-rename to libs/database/models/imagelistmodel.h
-diff --git a/libs/models/imagemodel.cpp b/libs/database/models/imagemodel.cpp
-similarity index 100%
-rename from libs/models/imagemodel.cpp
-rename to libs/database/models/imagemodel.cpp
-diff --git a/libs/models/imagemodel.h b/libs/database/models/imagemodel.h
-similarity index 100%
-rename from libs/models/imagemodel.h
-rename to libs/database/models/imagemodel.h
-diff --git a/libs/models/imagesortsettings.cpp b/libs/database/models/imagesortsettings.cpp
-similarity index 100%
-rename from libs/models/imagesortsettings.cpp
-rename to libs/database/models/imagesortsettings.cpp
-diff --git a/libs/models/imagesortsettings.h b/libs/database/models/imagesortsettings.h
-similarity index 100%
-rename from libs/models/imagesortsettings.h
-rename to libs/database/models/imagesortsettings.h
-diff --git a/libs/models/imagethumbnailmodel.cpp b/libs/database/models/imagethumbnailmodel.cpp
-similarity index 100%
-rename from libs/models/imagethumbnailmodel.cpp
-rename to libs/database/models/imagethumbnailmodel.cpp
-diff --git a/libs/models/imagethumbnailmodel.h b/libs/database/models/imagethumbnailmodel.h
-similarity index 100%
-rename from libs/models/imagethumbnailmodel.h
-rename to libs/database/models/imagethumbnailmodel.h
-diff --git a/libs/models/imageversionsmodel.cpp b/libs/database/models/imageversionsmodel.cpp
-similarity index 100%
-rename from libs/models/imageversionsmodel.cpp
-rename to libs/database/models/imageversionsmodel.cpp
-diff --git a/libs/models/imageversionsmodel.h b/libs/database/models/imageversionsmodel.h
-similarity index 100%
-rename from libs/models/imageversionsmodel.h
-rename to libs/database/models/imageversionsmodel.h
-diff --git a/libs/models/CMakeLists.txt b/libs/models/CMakeLists.txt
-index cbabfaa9b8..804456b955 100644
---- a/libs/models/CMakeLists.txt
-+++ b/libs/models/CMakeLists.txt
-@@ -9,18 +9,6 @@ if (POLICY CMP0063)
-     cmake_policy(SET CMP0063 NEW)
- endif (POLICY CMP0063)
- 
--set(libdatabasemodels_SRCS
--    imagemodel.cpp
--    imagefiltermodel.cpp
--    imagefiltermodelpriv.cpp
--    imagefiltermodelthreads.cpp
--    imagefiltersettings.cpp
--    imagelistmodel.cpp
--    imagesortsettings.cpp
--    imagethumbnailmodel.cpp
--    imageversionsmodel.cpp
--)
--
- set(libalbummodels_SRCS
-     imagealbummodel.cpp
-     imagealbumfiltermodel.cpp
-@@ -52,5 +40,4 @@ endif()
- #for digikam core lib
- add_library(digikamgenericmodels_src OBJECT ${libgenericmodels_SRCS})
- 
--add_library(digikamdatabasemodels_src OBJECT ${libdatabasemodels_SRCS})
--add_library(digikammodels_src OBJECT  ${libalbummodels_SRCS} ${libgenericmodels_SRCS})
-+add_library(digikammodels_src OBJECT ${libalbummodels_SRCS} ${libgenericmodels_SRCS})
-
-From c51043283aa9d2612b88afe0146f0d63c77b08ed Mon Sep 17 00:00:00 2001
-From: Simon Frei <freisim93@gmail.com>
-Date: Wed, 2 Aug 2017 12:12:55 +0200
-Subject: cmake: Fix warning: Remove ECMPackageConfigHelpers (unused)
-
----
- CMakeLists.txt | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2aaf56b..9a48492 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -80,7 +80,6 @@ include(ECMAddTests)
- include(ECMMarkNonGuiExecutable)
- include(ECMGenerateHeaders)
- include(ECMGeneratePriFile)
--include(ECMPackageConfigHelpers)
- include(ECMSetupVersion)
- include(ECMInstallIcons)
- include(ECMAddAppIcon)
--- 
-cgit v0.11.2